Upgrade mcp SDK from 2.0.0b1 to 2.0.0b2

The b2 release replaces httpx with httpx2 internally. Update the MCP
transport client factory in client.py to use httpx2.AsyncClient and
related types. Adjust the corresponding test mock path accordingly.

Author: jonpspri

MIGRATION_MCP_V2.md

@@ -1,7 +1,7 @@
 # CPEX MCP SDK v1 → v2 Migration Strategy
 
 **Date:** 2025-07-03
-**Target SDK:** `mcp==2.0.0b1`, `mcp-types==2.0.0b1` (already pinned in `pyproject.toml`)
+**Target SDK:** `mcp==2.0.0b2`, `mcp-types==2.0.0b2` (already pinned in `pyproject.toml`)
 **Source of truth:** [MCP Python SDK v2 Migration Guide](https://py.sdk.modelcontextprotocol.io/v2/migration/)
 
 ---
@@ -470,8 +470,8 @@ from mcp.client.stdio import stdio_client
 
 The `pyproject.toml` already pins:
 ```toml
-"mcp==2.0.0b1",
-"mcp-types==2.0.0b1",
+    "mcp==2.0.0b2",
+    "mcp-types==2.0.0b2",
 ```
 
 Per the [Dependency floors section](https://py.sdk.modelcontextprotocol.io/v2/migration/#dependency-floors-raised-and-new-required-dependencies), these new floors apply:

cpex/framework/external/mcp/client.py

@@ -19,7 +19,7 @@
 from typing import Any, Awaitable, Callable, Optional
 
 # Third-Party
-import httpx
+import httpx2
 import orjson
 from mcp import ClientSession, MCPError, StdioServerParameters
 from mcp.client.stdio import stdio_client
@@ -315,10 +315,10 @@ async def __connect_to_http_server(self, uri: str) -> None:
 
         def _tls_httpx_client_factory(
             headers: Optional[dict[str, str]] = None,
-            timeout: Optional[httpx.Timeout] = None,
-            auth: Optional[httpx.Auth] = None,
-        ) -> httpx.AsyncClient:
-            """Build an httpx client with TLS configuration for external MCP servers.
+            timeout: Optional[httpx2.Timeout] = None,
+            auth: Optional[httpx2.Auth] = None,
+        ) -> httpx2.AsyncClient:
+            """Build an httpx2 client with TLS configuration for external MCP servers.
 
             Args:
                 headers: Optional HTTP headers to include in requests.
@@ -334,14 +334,14 @@ def _tls_httpx_client_factory(
 
             kwargs: dict[str, Any] = {"follow_redirects": True}
             if uds_path:
-                kwargs["transport"] = httpx.AsyncHTTPTransport(uds=uds_path)
+                kwargs["transport"] = httpx2.AsyncHTTPTransport(uds=uds_path)
             if headers:
                 kwargs["headers"] = headers
             http_settings = get_http_client_settings()
             kwargs["timeout"] = (
                 timeout
                 if timeout
-                else httpx.Timeout(
+                else httpx2.Timeout(
                     connect=http_settings.httpx_connect_timeout,
                     read=http_settings.httpx_read_timeout,
                     write=http_settings.httpx_write_timeout,
@@ -352,7 +352,7 @@ def _tls_httpx_client_factory(
                 kwargs["auth"] = auth
 
             # Add connection pool limits
-            kwargs["limits"] = httpx.Limits(
+            kwargs["limits"] = httpx2.Limits(
                 max_connections=http_settings.httpx_max_connections,
                 max_keepalive_connections=http_settings.httpx_max_keepalive_connections,
                 keepalive_expiry=http_settings.httpx_keepalive_expiry,
@@ -361,14 +361,14 @@ def _tls_httpx_client_factory(
             if not tls_config:
                 # Use skip_ssl_verify setting when no custom TLS config
                 kwargs["verify"] = not http_settings.skip_ssl_verify
-                return httpx.AsyncClient(**kwargs)
+                return httpx2.AsyncClient(**kwargs)
 
             # Create SSL context using the utility function
             # This implements certificate validation per test_client_certificate_validation.py
             ssl_context = create_ssl_context(tls_config, self.name)
             kwargs["verify"] = ssl_context
 
-            return httpx.AsyncClient(**kwargs)
+            return httpx2.AsyncClient(**kwargs)
 
         max_retries = 3
         base_delay = 1.0

pyproject.toml

@@ -26,8 +26,8 @@ dependencies = [
     "httpx>=0.28.1",
     "httpx[http2]>=0.28.1",
     "jinja2>=3.1.6",
-    "mcp==2.0.0b1",
-    "mcp-types==2.0.0b1",
+    "mcp==2.0.0b2",
+    "mcp-types==2.0.0b2",
     "orjson>=3.11.7",
     "prometheus-fastapi-instrumentator>=7.1.0",
     "prometheus_client>=0.24.1",

tests/unit/cpex/framework/external/mcp/test_client_coverage.py

@@ -7,7 +7,6 @@
 from unittest.mock import AsyncMock, MagicMock, patch
 
 # Third-Party
-import httpx
 import orjson
 import pytest
 from mcp_types import TextContent
@@ -587,7 +586,7 @@ async def __aexit__(self, *args):
             patch("cpex.framework.external.mcp.client.streamable_http_client", return_value=OkCtx()),
             patch("cpex.framework.external.mcp.client.ClientSession", return_value=mock_session),
             patch("cpex.framework.external.mcp.client.create_ssl_context", return_value="sslctx"),
-            patch("cpex.framework.external.mcp.client.httpx.AsyncClient") as mock_httpx,
+            patch("cpex.framework.external.mcp.client.httpx2.AsyncClient") as mock_httpx,
             patch("cpex.framework.external.mcp.client.get_http_client_settings", return_value=mock_http_settings),
         ):
             plugin._exit_stack = AsyncExitStack()