Merge branch 'main' into add-mcp-authentication-param

omaryashraf5 · web-flow · commit a9bcc0a99c3b · 2025-11-13T14:22:44.000-08:00
diff --git a/src/llama_stack/core/routers/inference.py b/src/llama_stack/core/routers/inference.py
@@ -417,7 +417,7 @@ async def stream_tokens_and_compute_metrics_openai_chat(
                             prompt_tokens=chunk.usage.prompt_tokens,
                             completion_tokens=chunk.usage.completion_tokens,
                             total_tokens=chunk.usage.total_tokens,
-                            model_id=fully_qualified_model_id,
+                            fully_qualified_model_id=fully_qualified_model_id,
                             provider_id=provider_id,
                         )
                         for metric in metrics:

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ async def stream_tokens_and_compute_metrics_openai_chat(`
`417`	`417`	`prompt_tokens=chunk.usage.prompt_tokens,`
`418`	`418`	`completion_tokens=chunk.usage.completion_tokens,`
`419`	`419`	`total_tokens=chunk.usage.total_tokens,`
`420`		`- model_id=fully_qualified_model_id,`
	`420`	`+ fully_qualified_model_id=fully_qualified_model_id,`
`421`	`421`	`provider_id=provider_id,`
`422`	`422`	`)`
`423`	`423`	`for metric in metrics:`