diff --git a/python/packages/ag-ui/tests/ag_ui/test_ag_ui_client.py b/python/packages/ag-ui/tests/ag_ui/test_ag_ui_client.py index 4279d972075..c1a3a046a69 100644 --- a/python/packages/ag-ui/tests/ag_ui/test_ag_ui_client.py +++ b/python/packages/ag-ui/tests/ag_ui/test_ag_ui_client.py @@ -815,7 +815,7 @@ async def mock_post_run(*args: object, **kwargs: Any) -> AsyncGenerator[dict[str stream = client.inner_get_response(messages=messages, stream=True, options=chat_options) assert isinstance(stream, ResponseStream) async for update in stream: - updates.append(cast(ChatResponseUpdate, update)) + updates.append(update) assert len(updates) == 4 assert updates[0].additional_properties is not None @@ -1835,7 +1835,7 @@ async def mock_post_run(*args: object, **kwargs: Any) -> AsyncGenerator[dict[str stream = client.inner_get_response(messages=messages, stream=True, options={"tools": [my_tool]}) assert isinstance(stream, ResponseStream) async for update in stream: - updates.append(cast(ChatResponseUpdate, update)) + updates.append(update) # Find the function_call content - it should have agui_thread_id found = False diff --git a/python/packages/core/agent_framework/observability.py b/python/packages/core/agent_framework/observability.py index 13c84c69445..245a15eddde 100644 --- a/python/packages/core/agent_framework/observability.py +++ b/python/packages/core/agent_framework/observability.py @@ -2017,13 +2017,14 @@ def get_response( model = merged_client_kwargs.get("model") or opts.get("model") or getattr(self, "model", None) or "unknown" service_url_func = getattr(self, "service_url", None) service_url = str(service_url_func() if callable(service_url_func) else "unknown") - attributes = _get_span_attributes( + span_kwargs = dict(merged_client_kwargs) + span_kwargs.update( operation_name=OtelAttr.CHAT_COMPLETION_OPERATION, provider_name=provider_name, model=model, service_url=service_url, - **merged_client_kwargs, ) + attributes = _get_span_attributes(**span_kwargs) if (telemetry_conversation_id := _TELEMETRY_CONVERSATION_ID.get()) is not None: # Keep application-managed telemetry correlation separate from the # provider-owned conversation_id forwarded through chat options. diff --git a/python/packages/core/tests/core/test_observability.py b/python/packages/core/tests/core/test_observability.py index 2e8c3994468..1e011bdb981 100644 --- a/python/packages/core/tests/core/test_observability.py +++ b/python/packages/core/tests/core/test_observability.py @@ -299,6 +299,35 @@ async def test_chat_client_observability(mock_chat_client, span_exporter: InMemo assert span.attributes[OtelAttr.OUTPUT_MESSAGES] is not None # type: ignore[index] # pyrefly: ignore[unsupported-operation] # ty: ignore[not-subscriptable] +@pytest.mark.parametrize("stream", [False, True]) +@pytest.mark.parametrize("enable_sensitive_data", [False], indirect=True) +async def test_chat_client_observability_accepts_model_in_client_kwargs( + mock_chat_client, span_exporter: InMemorySpanExporter, enable_sensitive_data, stream: bool +): + """Test that model in client_kwargs overrides the default model without TypeError.""" + client = mock_chat_client() + + messages = [Message(role="user", contents=["Test message"])] + span_exporter.clear() + if stream: + resp_stream = client.get_response( + messages=messages, stream=True, client_kwargs={"model": "override-model"} + ) + async for _ in resp_stream: + pass + response = await resp_stream.get_final_response() + else: + response = await client.get_response( + messages=messages, client_kwargs={"model": "override-model"} + ) + assert response is not None + spans = span_exporter.get_finished_spans() + assert len(spans) == 1 + span = spans[0] + assert span.attributes is not None # ensure attributes dict exists for type checkers + assert span.attributes[OtelAttr.REQUEST_MODEL] == "override-model" + + @pytest.mark.parametrize("enable_sensitive_data", [True, False], indirect=True) async def test_chat_client_observability_accepts_model_option( mock_chat_client, span_exporter: InMemorySpanExporter, enable_sensitive_data