Python: Fix agent_with_hosted_mcp sample to use Responses API client for MCP tools

python/packages/core/tests/openai/test_openai_chat_client.py

@@ -188,6 +188,63 @@ class UnsupportedTool:
     assert result["tools"] == [dict_tool]
 
 
+def test_mcp_tool_dict_passed_through_to_chat_api(openai_unit_test_env: dict[str, str]) -> None:
+    """Test that MCP tool dicts are passed through unchanged by the chat client.
+
+    The Chat Completions API does not support "type": "mcp" tools. MCP tools
+    should be used with the Responses API client instead. This test documents
+    that the chat client passes dict-based tools through without filtering,
+    so callers must use the correct client for MCP tools.
+    """
+    client = OpenAIChatClient()
+
+    mcp_tool = {
+        "type": "mcp",
+        "server_label": "Microsoft_Learn_MCP",
+        "server_url": "https://learn.microsoft.com/api/mcp",
+    }
+
+    result = client._prepare_tools_for_openai(mcp_tool)
+    assert "tools" in result
+    assert len(result["tools"]) == 1
+    # The chat client passes dict tools through unchanged, including unsupported types
+    assert result["tools"][0]["type"] == "mcp"
+
+
+@pytest.mark.asyncio
+async def test_mcp_tool_dict_causes_api_rejection(openai_unit_test_env: dict[str, str]) -> None:
+    """Test that MCP tool dicts passed to the Chat Completions API cause a rejection.
+
+    The Chat Completions API only supports "type": "function" tools.
+    When an MCP tool dict reaches the API, it returns a 400 error.
+    This regression test for #4861 verifies the chat client does not
+    silently drop or transform MCP dicts, so callers get a clear error
+    rather than a silent no-op.
+    """
+    client = OpenAIChatClient()
+    messages = [Message(role="user", text="test message")]
+
+    mcp_tool = {
+        "type": "mcp",
+        "server_label": "Microsoft_Learn_MCP",
+        "server_url": "https://learn.microsoft.com/api/mcp",
+    }
+
+    mock_response = MagicMock()
+    mock_error = BadRequestError(
+        message="Invalid tool type: mcp",
+        response=mock_response,
+        body={"error": {"code": "invalid_request", "message": "Invalid tool type: mcp"}},
+    )
+    mock_error.code = "invalid_request"
+
+    with (
+        patch.object(client.client.chat.completions, "create", side_effect=mock_error),
+        pytest.raises(ChatClientException),
+    ):
+        await client._inner_get_response(messages=messages, options={"tools": mcp_tool})  # type: ignore
+
+
 def test_prepare_tools_with_single_function_tool(
     openai_unit_test_env: dict[str, str],
 ) -> None:

python/samples/05-end-to-end/hosted_agents/agent_with_hosted_mcp/agent.yaml

@@ -22,7 +22,7 @@ template:
   environment_variables:
     - name: AZURE_OPENAI_ENDPOINT
       value: ${AZURE_OPENAI_ENDPOINT}
-    - name: AZURE_OPENAI_CHAT_DEPLOYMENT_NAME
+    - name: AZURE_OPENAI_RESPONSES_DEPLOYMENT_NAME
       value: "{{chat}}"
 resources:
   - kind: model

python/samples/05-end-to-end/hosted_agents/agent_with_hosted_mcp/main.py

@@ -1,6 +1,6 @@
 # Copyright (c) Microsoft. All rights reserved.
 
-from agent_framework.azure import AzureOpenAIChatClient
+from agent_framework.azure import AzureOpenAIResponsesClient
 from azure.ai.agentserver.agentframework import from_agent_framework  # pyright: ignore[reportUnknownVariableType]
 from azure.identity import DefaultAzureCredential
 from dotenv import load_dotenv
@@ -10,18 +10,19 @@
 
 
 def main():
-    # Create MCP tool configuration as dict
-    mcp_tool = {
-        "type": "mcp",
-        "server_label": "Microsoft_Learn_MCP",
-        "server_url": "https://learn.microsoft.com/api/mcp",
-    }
-
-    # Create an Agent using the Azure OpenAI Chat Client with a MCP Tool that connects to Microsoft Learn MCP
-    agent = AzureOpenAIChatClient(credential=DefaultAzureCredential()).as_agent(
+    client = AzureOpenAIResponsesClient(credential=DefaultAzureCredential())
+
+    # Create MCP tool configuration using the Responses Client helper
+    mcp_tool = client.get_mcp_tool(
+        name="Microsoft Learn MCP",
+        url="https://learn.microsoft.com/api/mcp",
+    )
+
+    # Create an Agent using the Azure OpenAI Responses Client with a MCP Tool that connects to Microsoft Learn MCP
+    agent = client.as_agent(
         name="DocsAgent",
         instructions="You are a helpful assistant that can help with microsoft documentation questions.",
-        tools=mcp_tool,
+        tools=[mcp_tool],
     )
 
     # Run the agent as a hosted agent

python/samples/05-end-to-end/hosted_agents/agent_with_hosted_mcp/requirements.txt

@@ -1,2 +1,2 @@
-azure-ai-agentserver-agentframework==1.0.0b3
-agent-framework
+azure-ai-agentserver-agentframework==1.0.0b16
+agent-framework-azure-ai