fix(mcp): satisfy CI for trace context client factory

Author: pandego

src/google/adk/tools/mcp_tool/mcp_session_manager.py

@@ -32,6 +32,7 @@
 from typing import TextIO
 from typing import Union
 
+import httpx
 from mcp import ClientSession
 from mcp import StdioServerParameters
 from mcp.client.sse import sse_client
@@ -48,10 +49,10 @@
 
 
 def create_mcp_http_client(
-    headers=None,
-    timeout=None,
-    auth=None,
-):
+    headers: dict[str, str] | None = None,
+    timeout: httpx.Timeout | None = None,
+    auth: httpx.Auth | None = None,
+) -> httpx.AsyncClient:
   """Creates MCP HTTP client and instruments it when OTel is available."""
   client = _create_mcp_http_client(
       headers=headers,

tests/unittests/tools/mcp_tool/test_mcp_session_manager.py

@@ -13,12 +13,12 @@
 # limitations under the License.
 
 import asyncio
+import builtins
 from datetime import timedelta
 import hashlib
 from io import StringIO
 import json
 import sys
-import builtins
 from unittest.mock import ANY
 from unittest.mock import AsyncMock
 from unittest.mock import Mock
@@ -193,7 +193,9 @@ def test_init_with_streamable_http_default_httpx_factory(
         ].get_default(),
     )
 
-  @patch("google.adk.tools.mcp_tool.mcp_session_manager._create_mcp_http_client")
+  @patch(
+      "google.adk.tools.mcp_tool.mcp_session_manager._create_mcp_http_client"
+  )
   def test_default_httpx_factory_instruments_client_when_available(
       self, mock_base_factory
   ):
@@ -215,7 +217,9 @@ def test_default_httpx_factory_instruments_client_when_available(
     assert result is client
     mock_instrumentor.instrument_client.assert_called_once_with(client)
 
-  @patch("google.adk.tools.mcp_tool.mcp_session_manager._create_mcp_http_client")
+  @patch(
+      "google.adk.tools.mcp_tool.mcp_session_manager._create_mcp_http_client"
+  )
   def test_default_httpx_factory_handles_missing_opentelemetry(
       self, mock_base_factory
   ):