simplifying

Author: ihrpr

src/mcp/shared/httpx_utils.py

@@ -10,23 +10,19 @@
 
 
 def create_mcp_http_client(
-    *,
     headers: dict[str, Any] | None = None,
     timeout: httpx.Timeout | None = None,
-    **kwargs: Any,
 ) -> httpx.AsyncClient:
     """Create a standardized httpx AsyncClient with MCP defaults.
 
     This function provides common defaults used throughout the MCP codebase:
     - follow_redirects=True (always enabled)
     - Default timeout of 30 seconds if not specified
-    - Headers will be merged with any existing headers in kwargs
 
     Args:
         headers: Optional headers to include with all requests.
         timeout: Request timeout as httpx.Timeout object.
             Defaults to 30 seconds if not specified.
-        **kwargs: Additional keyword arguments to pass to AsyncClient.
 
     Returns:
         Configured httpx.AsyncClient instance with MCP defaults.
@@ -42,32 +38,27 @@ def create_mcp_http_client(
 
         # With custom headers
         headers = {"Authorization": "Bearer token"}
-        async with create_mcp_http_client(headers=headers) as client:
+        async with create_mcp_http_client(headers) as client:
             response = await client.get("/endpoint")
 
-        # With custom timeout
+        # With both custom headers and timeout
         timeout = httpx.Timeout(60.0, read=300.0)
-        async with create_mcp_http_client(timeout=timeout) as client:
+        async with create_mcp_http_client(headers, timeout) as client:
             response = await client.get("/long-request")
     """
     # Set MCP defaults
-    defaults: dict[str, Any] = {
+    kwargs: dict[str, Any] = {
         "follow_redirects": True,
     }
 
     # Handle timeout
     if timeout is None:
-        defaults["timeout"] = httpx.Timeout(30.0)
+        kwargs["timeout"] = httpx.Timeout(30.0)
     else:
-        defaults["timeout"] = timeout
+        kwargs["timeout"] = timeout
 
-    # Handle headers with proper merging
+    # Handle headers
     if headers is not None:
-        existing_headers = kwargs.get("headers", {})
-        merged_headers = {**existing_headers, **headers}
-        kwargs["headers"] = merged_headers
+        kwargs["headers"] = headers
 
-    # Merge kwargs with defaults (defaults take precedence)
-    kwargs = {**kwargs, **defaults}
-
-    return httpx.AsyncClient(**kwargs)
+    return httpx.AsyncClient(**kwargs)

tests/shared/test_httpx_utils.py

@@ -5,42 +5,20 @@
 from mcp.shared.httpx_utils import create_mcp_http_client
 
 
-class TestCreateMcpHttpClient:
-    """Test create_mcp_http_client function."""
+def test_default_settings():
+    """Test that default settings are applied correctly."""
+    client = create_mcp_http_client()
+    
+    assert client.follow_redirects is True
+    assert client.timeout.connect == 30.0
 
-    def test_default_settings(self):
-        """Test that default settings are applied correctly."""
-        client = create_mcp_http_client()
-        
-        # Check follow_redirects is True
-        assert client.follow_redirects is True
-        
-        # Check default timeout is 30 seconds
-        assert client.timeout.connect == 30.0
-        assert client.timeout.read == 30.0
-        assert client.timeout.write == 30.0
-        assert client.timeout.pool == 30.0
 
-    def test_custom_parameters(self):
-        """Test custom headers and timeout are set correctly."""
-        headers = {"Authorization": "Bearer token", "X-Custom": "value"}
-        timeout = httpx.Timeout(connect=5.0, read=10.0, write=15.0, pool=20.0)
-        
-        client = create_mcp_http_client(headers=headers, timeout=timeout)
-        
-        # Check headers
-        assert client.headers["Authorization"] == "Bearer token"
-        assert client.headers["X-Custom"] == "value"
-        
-        # Check custom timeout
-        assert client.timeout.connect == 5.0
-        assert client.timeout.read == 10.0
-        assert client.timeout.write == 15.0
-        assert client.timeout.pool == 20.0
-
-    def test_follow_redirects_enforced(self):
-        """Test follow_redirects is always True even if False is passed."""
-        client = create_mcp_http_client(follow_redirects=False)
-        
-        # Should still be True because our defaults override user input
-        assert client.follow_redirects is True
+def test_custom_parameters():
+    """Test custom headers and timeout are set correctly."""
+    headers = {"Authorization": "Bearer token"}
+    timeout = httpx.Timeout(60.0)
+    
+    client = create_mcp_http_client(headers, timeout)
+    
+    assert client.headers["Authorization"] == "Bearer token"
+    assert client.timeout.connect == 60.0