Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
python: move the MCP servers and SDK to mcp 2.x
Antonio Ojeaecb7e25bc01d
diff --git a/development/examples/agent-harness/requirements.txt b/development/examples/agent-harness/requirements.txtindex 0bdfb2da..9171cd2f 100644--- a/development/examples/agent-harness/requirements.txt+++ b/development/examples/agent-harness/requirements.txt@@ -5,8 +5,8 @@# There is no proxy support here on purpose. The sandbox routes the agent's# traffic to the boundary through tun0, so the agent neither configures a proxy# nor knows there is one.-openai>=1.40,<3+openai>=3.11.0,<4# Pinned to a major version: 1.x spells the transport streamablehttp_client and# 2.x spells it streamable_http_client, so an unpinned floor silently changes# the API underneath a sandbox image.-mcp>=2.0,<3+mcp>=2.2.0,<3diff --git a/development/examples/calc-mcp/calc_server.py b/development/examples/calc-mcp/calc_server.pyindex 64fc5c1d..4450085c 100644--- a/development/examples/calc-mcp/calc_server.py+++ b/development/examples/calc-mcp/calc_server.py@@ -1,7 +1,7 @@"""Calculator MCP backend exposed by node B in the local dev mesh."""-from mcp.server.fastmcp import FastMCP+from mcp.server.mcpserver import MCPServer-mcp = FastMCP("calculator", host="0.0.0.0", port=7777)+mcp = MCPServer("calculator")@mcp.tool()@@ -17,4 +17,4 @@ def multiply(a: float, b: float) -> float:if __name__ == "__main__":- mcp.run(transport="streamable-http")+ mcp.run(transport="streamable-http", host="0.0.0.0", port=7777)diff --git a/development/examples/calc-mcp/requirements.txt b/development/examples/calc-mcp/requirements.txtindex 7ba9cdc1..15494d73 100644--- a/development/examples/calc-mcp/requirements.txt+++ b/development/examples/calc-mcp/requirements.txt@@ -1 +1 @@-mcp[cli]>=1.0.0,<2.0.0+mcp[cli]>=2.2.0,<3diff --git a/development/examples/chat-a2a/requirements.txt b/development/examples/chat-a2a/requirements.txtindex ee9c850d..5f93b3bf 100644--- a/development/examples/chat-a2a/requirements.txt+++ b/development/examples/chat-a2a/requirements.txt@@ -1,6 +1,6 @@-a2a-sdk>=1.0-google-genai>=1.0-httpx>=0.27-sse-starlette>=2.0-starlette>=0.40-uvicorn>=0.30+a2a-sdk>=1.1.2+google-genai>=2.22.0+httpx>=0.28.1+sse-starlette>=3.4.11+starlette>=1.6.0+uvicorn>=0.52.4diff --git a/development/examples/greeter-mcp/greeter_server.py b/development/examples/greeter-mcp/greeter_server.pyindex 34041416..c4785c13 100644--- a/development/examples/greeter-mcp/greeter_server.py+++ b/development/examples/greeter-mcp/greeter_server.py@@ -1,7 +1,7 @@"""Greeter MCP backend exposed by node C in the local dev mesh."""-from mcp.server.fastmcp import FastMCP+from mcp.server.mcpserver import MCPServer-mcp = FastMCP("greeter", host="0.0.0.0", port=7778)+mcp = MCPServer("greeter")@mcp.tool()@@ -17,4 +17,4 @@ def shout(text: str) -> str:if __name__ == "__main__":- mcp.run(transport="streamable-http")+ mcp.run(transport="streamable-http", host="0.0.0.0", port=7778)diff --git a/development/examples/greeter-mcp/requirements.txt b/development/examples/greeter-mcp/requirements.txtindex 7ba9cdc1..15494d73 100644--- a/development/examples/greeter-mcp/requirements.txt+++ b/development/examples/greeter-mcp/requirements.txt@@ -1 +1 @@-mcp[cli]>=1.0.0,<2.0.0+mcp[cli]>=2.2.0,<3diff --git a/sam-mcp-python/pyproject.toml b/sam-mcp-python/pyproject.tomlindex 1c5e374f..f5bd8e41 100644--- a/sam-mcp-python/pyproject.toml+++ b/sam-mcp-python/pyproject.toml@@ -1,5 +1,5 @@[build-system]-requires = ["setuptools>=61.0"]+requires = ["setuptools>=84.0.0"]build-backend = "setuptools.build_meta"[project]@@ -9,17 +9,17 @@ description = "Python SDK for Sovereign Agent Mesh (SAM) using MCP"readme = "README.md"requires-python = ">=3.10"dependencies = [- "mcp>=1.0.0",- "httpx>=0.20.0",+ "mcp>=2.2.0,<3",+ "httpx2>=2.5.0",][project.optional-dependencies]langchain = [- "langchain-core>=0.1.0",+ "langchain-core>=1.6.2",]test = [- "pytest>=7.0.0",- "pytest-asyncio>=0.20.0",+ "pytest>=9.1.1",+ "pytest-asyncio>=1.4.0",][tool.hatch.build.targets.sdist]diff --git a/sam-mcp-python/src/sam_mcp/client.py b/sam-mcp-python/src/sam_mcp/client.pyindex 8365bfa1..5a4a36f0 100644--- a/sam-mcp-python/src/sam_mcp/client.py+++ b/sam-mcp-python/src/sam_mcp/client.py@@ -1,10 +1,19 @@import asyncioimport osfrom typing import Any, Dict, List, Optional-import httpx+import httpx2from mcp import ClientSessionfrom mcp.client.streamable_http import streamable_http_client++def _dump(model: Any) -> Any:+ # mcp 2.x fields are snake_case in Python; by_alias keeps the MCP wire shape+ # (inputSchema, isError) that callers and the adapters were written against.+ if hasattr(model, "model_dump"):+ return model.model_dump(by_alias=True, mode="json")+ return model++class SamClient:"""High-level developer interface for SAM MCP using official SDK."""@@ -24,16 +33,17 @@ class SamClient:if self.token:headers["X-Sam-Authentication"] = f"Bearer {self.token}"- self._http_client = httpx.AsyncClient(+ # mcp 2.x speaks httpx2; an httpx client here is accepted but drops+ # server-initiated messages.+ self._http_client = httpx2.AsyncClient(headers=headers,follow_redirects=True,- # The SDK's SSE-friendly defaults; httpx's default 5s read timeout drops the stream.- timeout=httpx.Timeout(30.0, read=300.0),+ # The SDK's SSE-friendly defaults; the default 5s read timeout drops the stream.+ timeout=httpx2.Timeout(30.0, read=300.0),)try:self._sh_cm = streamable_http_client(self.server_url, http_client=self._http_client)- res = await self._sh_cm.__aenter__()- read_stream, write_stream = res[0], res[1]+ read_stream, write_stream = await self._sh_cm.__aenter__()self.session = ClientSession(read_stream, write_stream)await self.session.__aenter__()await self.session.initialize()@@ -54,18 +64,18 @@ class SamClient:self._http_client = Noneasync def get_tools(self) -> List[Dict[str, Any]]:- """Returns available mesh tools."""+ """Returns available mesh tools as wire-format dicts (camelCase keys such as inputSchema)."""if not self.session:raise RuntimeError("Not connected")resp = await self.session.list_tools()- return [t.model_dump() if hasattr(t, "model_dump") else t for t in resp.tools]+ return [_dump(t) for t in resp.tools]async def call_tool(self, name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:- """Executes a tool over the mesh."""+ """Executes a tool over the mesh and returns the wire-format result dict."""if not self.session:raise RuntimeError("Not connected")resp = await self.session.call_tool(name, arguments)- return resp.model_dump() if hasattr(resp, "model_dump") else resp+ return _dump(resp)async def __aenter__(self):await self.connect()diff --git a/sam-mcp-python/tests/unit/test_unit.py b/sam-mcp-python/tests/unit/test_unit.pyindex d72f0735..71323f7c 100644--- a/sam-mcp-python/tests/unit/test_unit.py+++ b/sam-mcp-python/tests/unit/test_unit.py@@ -12,7 +12,7 @@ async def test_client_get_tools():mock_cm = AsyncMock()mock_sh_client.return_value = mock_cm- mock_cm.__aenter__.return_value = (MagicMock(), MagicMock(), MagicMock())+ mock_cm.__aenter__.return_value = (MagicMock(), MagicMock())mock_cm.__aexit__ = AsyncMock()mock_session = MockClientSession.return_value@@ -22,16 +22,17 @@ async def test_client_get_tools():mock_tool = MagicMock()mock_tool.name = "test_tool"- mock_tool.model_dump.return_value = {"name": "test_tool"}+ mock_tool.model_dump.return_value = {"name": "test_tool", "inputSchema": {"type": "object"}}mock_resp = MagicMock()mock_resp.tools = [mock_tool]mock_session.list_tools = AsyncMock(return_value=mock_resp)- async with SamClient(server_url="http://localhost:8080/sse") as client:+ async with SamClient(server_url="http://localhost:8080/mcp") as client:tools = await client.get_tools()assert len(tools) == 1assert tools[0]["name"] == "test_tool"+ mock_tool.model_dump.assert_called_once_with(by_alias=True, mode="json")# Adapter Testsdef test_langchain_adapter():diff --git a/tests/e2e/docker/a2a-echo/requirements.txt b/tests/e2e/docker/a2a-echo/requirements.txtindex 70e80861..728f9cd9 100644--- a/tests/e2e/docker/a2a-echo/requirements.txt+++ b/tests/e2e/docker/a2a-echo/requirements.txt@@ -1,5 +1,5 @@-a2a-sdk>=1.0-httpx>=0.27-sse-starlette>=2.0-starlette>=0.40-uvicorn>=0.30+a2a-sdk>=1.1.2+httpx>=0.28.1+sse-starlette>=3.4.11+starlette>=1.6.0+uvicorn>=0.52.4diff --git a/tests/e2e/docker/calc-mcp/calc_server.py b/tests/e2e/docker/calc-mcp/calc_server.pyindex 8afdb528..8851a5bb 100644--- a/tests/e2e/docker/calc-mcp/calc_server.py+++ b/tests/e2e/docker/calc-mcp/calc_server.py@@ -1,7 +1,7 @@"""Tiny MCP backend exposed by Node B as a 'calculator' service."""-from mcp.server.fastmcp import FastMCP+from mcp.server.mcpserver import MCPServer-mcp = FastMCP("calculator", host="0.0.0.0", port=7777)+mcp = MCPServer("calculator")@mcp.tool()@@ -18,4 +18,4 @@ def multiply(a: float, b: float) -> float:if __name__ == "__main__":# Streamable-HTTP exposes a single /mcp endpoint that handles JSON-RPC.- mcp.run(transport="streamable-http")+ mcp.run(transport="streamable-http", host="0.0.0.0", port=7777)diff --git a/tests/e2e/docker/calc-mcp/requirements.txt b/tests/e2e/docker/calc-mcp/requirements.txtindex 7ba9cdc1..15494d73 100644--- a/tests/e2e/docker/calc-mcp/requirements.txt+++ b/tests/e2e/docker/calc-mcp/requirements.txt@@ -1 +1 @@-mcp[cli]>=1.0.0,<2.0.0+mcp[cli]>=2.2.0,<3