mypy fix

Author: jjcampana

src/agents/mcp/server.py

@@ -649,14 +649,24 @@ def create_streams(
         ]
     ]:
         """Create the streams for the server."""
-        return streamablehttp_client(
-            url=self.params["url"],
-            headers=self.params.get("headers", None),
-            timeout=self.params.get("timeout", 5),
-            sse_read_timeout=self.params.get("sse_read_timeout", 60 * 5),
-            terminate_on_close=self.params.get("terminate_on_close", True),
-            httpx_client_factory=self.params.get("httpx_client_factory", None),
-        )
+        # Only pass httpx_client_factory if it's provided
+        if "httpx_client_factory" in self.params:
+            return streamablehttp_client(
+                url=self.params["url"],
+                headers=self.params.get("headers", None),
+                timeout=self.params.get("timeout", 5),
+                sse_read_timeout=self.params.get("sse_read_timeout", 60 * 5),
+                terminate_on_close=self.params.get("terminate_on_close", True),
+                httpx_client_factory=self.params["httpx_client_factory"],
+            )
+        else:
+            return streamablehttp_client(
+                url=self.params["url"],
+                headers=self.params.get("headers", None),
+                timeout=self.params.get("timeout", 5),
+                sse_read_timeout=self.params.get("sse_read_timeout", 60 * 5),
+                terminate_on_close=self.params.get("terminate_on_close", True),
+            )
 
     @property
     def name(self) -> str:

tests/mcp/test_streamable_http_client_factory.py

@@ -36,15 +36,19 @@ async def test_default_httpx_client_factory(self):
                 timeout=10,
                 sse_read_timeout=300,  # Default value
                 terminate_on_close=True,  # Default value
-                httpx_client_factory=None,  # Should be None when not provided
+                # httpx_client_factory should not be passed when not provided
             )
 
     @pytest.mark.asyncio
     async def test_custom_httpx_client_factory(self):
         """Test that custom httpx_client_factory is passed correctly."""
 
         # Create a custom factory function
-        def custom_factory() -> httpx.AsyncClient:
+        def custom_factory(
+            headers: dict[str, str] | None = None,
+            timeout: httpx.Timeout | None = None,
+            auth: httpx.Auth | None = None,
+        ) -> httpx.AsyncClient:
             return httpx.AsyncClient(
                 verify=False,  # Disable SSL verification for testing
                 timeout=httpx.Timeout(60.0),
@@ -81,7 +85,11 @@ def custom_factory() -> httpx.AsyncClient:
     async def test_custom_httpx_client_factory_with_ssl_cert(self):
         """Test custom factory with SSL certificate configuration."""
 
-        def ssl_cert_factory() -> httpx.AsyncClient:
+        def ssl_cert_factory(
+            headers: dict[str, str] | None = None,
+            timeout: httpx.Timeout | None = None,
+            auth: httpx.Auth | None = None,
+        ) -> httpx.AsyncClient:
             return httpx.AsyncClient(
                 verify="/path/to/cert.pem",  # Custom SSL certificate
                 timeout=httpx.Timeout(120.0),
@@ -113,9 +121,13 @@ def ssl_cert_factory() -> httpx.AsyncClient:
     async def test_custom_httpx_client_factory_with_proxy(self):
         """Test custom factory with proxy configuration."""
 
-        def proxy_factory() -> httpx.AsyncClient:
+        def proxy_factory(
+            headers: dict[str, str] | None = None,
+            timeout: httpx.Timeout | None = None,
+            auth: httpx.Auth | None = None,
+        ) -> httpx.AsyncClient:
             return httpx.AsyncClient(
-                proxies="http://proxy.example.com:8080",
+                proxy="http://proxy.example.com:8080",
                 timeout=httpx.Timeout(60.0),
             )
 
@@ -144,7 +156,11 @@ def proxy_factory() -> httpx.AsyncClient:
     async def test_custom_httpx_client_factory_with_retry_logic(self):
         """Test custom factory with retry logic configuration."""
 
-        def retry_factory() -> httpx.AsyncClient:
+        def retry_factory(
+            headers: dict[str, str] | None = None,
+            timeout: httpx.Timeout | None = None,
+            auth: httpx.Auth | None = None,
+        ) -> httpx.AsyncClient:
             return httpx.AsyncClient(
                 timeout=httpx.Timeout(30.0),
                 # Note: httpx doesn't have built-in retry, but this shows how
@@ -194,7 +210,11 @@ def test_httpx_client_factory_type_annotation(self):
     async def test_all_parameters_with_custom_factory(self):
         """Test that all parameters work together with custom factory."""
 
-        def comprehensive_factory() -> httpx.AsyncClient:
+        def comprehensive_factory(
+            headers: dict[str, str] | None = None,
+            timeout: httpx.Timeout | None = None,
+            auth: httpx.Auth | None = None,
+        ) -> httpx.AsyncClient:
             return httpx.AsyncClient(
                 verify=False,
                 timeout=httpx.Timeout(90.0),