Fix test failures from httpx_client API changes

This commit fixes all test failures introduced by the API change from
httpx_client_factory to direct httpx_client parameter:

1. Updated deprecated imports: Changed streamablehttp_client to
   streamable_http_client in test files

2. Fixed 307 redirect errors: Replaced httpx.AsyncClient with
   create_mcp_http_client which includes follow_redirects=True by default

3. Fixed test assertion: Updated test_session_group.py to mock
   create_mcp_http_client and verify the new API signature where
   streamable_http_client receives httpx_client parameter instead of
   individual headers/timeout parameters

4. Removed unused httpx import from main.py after inlining client creation

All tests now pass with the new API.

Author: felixweinberger

examples/clients/simple-auth-client/mcp_simple_auth_client/main.py

@@ -15,8 +15,6 @@
 from typing import Any
 from urllib.parse import parse_qs, urlparse
 
-import httpx
-
 from mcp.client.auth import OAuthClientProvider, TokenStorage
 from mcp.client.session import ClientSession
 from mcp.client.sse import sse_client

tests/client/test_notification_response.py

@@ -18,7 +18,7 @@
 from starlette.routing import Route
 
 from mcp import ClientSession, types
-from mcp.client.streamable_http import streamablehttp_client
+from mcp.client.streamable_http import streamable_http_client
 from mcp.shared.session import RequestResponder
 from mcp.types import ClientNotification, RootsListChangedNotification
 from tests.test_helpers import wait_for_server
@@ -127,7 +127,7 @@ async def message_handler(  # pragma: no cover
         if isinstance(message, Exception):
             returned_exception = message
 
-    async with streamablehttp_client(server_url) as (read_stream, write_stream, _):
+    async with streamable_http_client(server_url) as (read_stream, write_stream, _):
         async with ClientSession(
             read_stream,
             write_stream,

tests/client/test_session_group.py

@@ -292,6 +292,20 @@ async def test_establish_session_parameterized(
     ):
         with mock.patch("mcp.client.session_group.mcp.ClientSession") as mock_ClientSession_class:
             with mock.patch(patch_target_for_client_func) as mock_specific_client_func:
+                # For streamablehttp, also need to mock create_mcp_http_client
+                if client_type_name == "streamablehttp":
+                    mock_create_http_client = mock.patch("mcp.client.session_group.create_mcp_http_client")
+                    mock_create_http_client_func = mock_create_http_client.start()
+                    # Mock httpx_client returned by create_mcp_http_client
+                    mock_httpx_client = mock.AsyncMock(name="MockHttpxClient")
+                    mock_httpx_client.__aenter__.return_value = mock_httpx_client
+                    mock_httpx_client.__aexit__ = mock.AsyncMock(return_value=None)
+                    mock_create_http_client_func.return_value = mock_httpx_client
+                else:
+                    mock_create_http_client = None
+                    mock_create_http_client_func = None
+                    mock_httpx_client = None
+
                 mock_client_cm_instance = mock.AsyncMock(name=f"{client_type_name}ClientCM")
                 mock_read_stream = mock.AsyncMock(name=f"{client_type_name}Read")
                 mock_write_stream = mock.AsyncMock(name=f"{client_type_name}Write")
@@ -354,11 +368,22 @@ async def test_establish_session_parameterized(
                     )
                 elif client_type_name == "streamablehttp":  # pragma: no branch
                     assert isinstance(server_params_instance, StreamableHttpParameters)
+                    # Verify create_mcp_http_client was called with headers and timeout
+                    import httpx
+
+                    assert mock_create_http_client_func is not None
+                    expected_timeout = httpx.Timeout(
+                        server_params_instance.timeout.total_seconds(),
+                        read=server_params_instance.sse_read_timeout.total_seconds(),
+                    )
+                    mock_create_http_client_func.assert_called_once_with(
+                        headers=server_params_instance.headers,
+                        timeout=expected_timeout,
+                    )
+                    # Verify streamable_http_client was called with url, httpx_client, and terminate_on_close
                     mock_specific_client_func.assert_called_once_with(
                         url=server_params_instance.url,
-                        headers=server_params_instance.headers,
-                        timeout=server_params_instance.timeout,
-                        sse_read_timeout=server_params_instance.sse_read_timeout,
+                        httpx_client=mock_httpx_client,
                         terminate_on_close=server_params_instance.terminate_on_close,
                     )
 
@@ -382,3 +407,7 @@ async def test_establish_session_parameterized(
                 # 3. Assert returned values
                 assert returned_server_info is mock_initialize_result.serverInfo
                 assert returned_session is mock_entered_session
+
+                # Clean up streamablehttp-specific mock
+                if mock_create_http_client:
+                    mock_create_http_client.stop()

tests/shared/test_streamable_http.py

@@ -27,7 +27,6 @@
 from mcp.client.session import ClientSession
 from mcp.client.streamable_http import StreamableHTTPTransport, streamable_http_client
 from mcp.server import Server
-from mcp.shared._httpx_utils import create_mcp_http_client
 from mcp.server.streamable_http import (
     MCP_PROTOCOL_VERSION_HEADER,
     MCP_SESSION_ID_HEADER,
@@ -41,6 +40,7 @@
 )
 from mcp.server.streamable_http_manager import StreamableHTTPSessionManager
 from mcp.server.transport_security import TransportSecuritySettings
+from mcp.shared._httpx_utils import create_mcp_http_client
 from mcp.shared.context import RequestContext
 from mcp.shared.exceptions import McpError
 from mcp.shared.message import ClientMessageMetadata, ServerMessageMetadata, SessionMessage
@@ -1539,7 +1539,7 @@ async def test_streamablehttp_request_context_propagation(context_aware_server:
         "X-Trace-Id": "trace-123",
     }
 
-    async with httpx.AsyncClient(headers=custom_headers) as httpx_client:
+    async with create_mcp_http_client(headers=custom_headers) as httpx_client:
         async with streamable_http_client(f"{basic_server_url}/mcp", httpx_client=httpx_client) as (
             read_stream,
             write_stream,
@@ -1577,8 +1577,12 @@ async def test_streamablehttp_request_context_isolation(context_aware_server: No
             "Authorization": f"Bearer token-{i}",
         }
 
-        async with httpx.AsyncClient(headers=headers) as httpx_client:
-            async with streamable_http_client(f"{basic_server_url}/mcp", httpx_client=httpx_client) as (read_stream, write_stream, _):
+        async with create_mcp_http_client(headers=headers) as httpx_client:
+            async with streamable_http_client(f"{basic_server_url}/mcp", httpx_client=httpx_client) as (
+                read_stream,
+                write_stream,
+                _,
+            ):
                 async with ClientSession(read_stream, write_stream) as session:
                     await session.initialize()