agent-context-graph 0.3.0__tar.gz → 0.3.1__tar.gz

{agent_context_graph-0.3.0 → agent_context_graph-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: agent-context-graph
-Version: 0.3.0
+Version: 0.3.1
 Summary: Connect agent SDKs to context-graph components (actions-graph, skills-graph, etc.)
 License: MIT
 License-File: LICENSE
@@ -13,11 +13,11 @@ Requires-Dist: memgraph-toolbox>=0.1.11
 Provides-Extra: claude
 Requires-Dist: claude-agent-sdk>=0.1.0; extra == 'claude'
 Provides-Extra: mcp
-Requires-Dist: mcp>=1.23.0; extra == 'mcp'
+Requires-Dist: mcp<3,>=1.23.0; extra == 'mcp'
 Provides-Extra: openai
 Requires-Dist: openai-agents>=0.1.0; extra == 'openai'
 Provides-Extra: test
-Requires-Dist: mcp>=1.23.0; extra == 'test'
+Requires-Dist: mcp<3,>=1.23.0; extra == 'test'
 Requires-Dist: pytest-asyncio>=0.24.0; extra == 'test'
 Requires-Dist: pytest>=9.0.3; extra == 'test'
 Description-Content-Type: text/markdown

{agent_context_graph-0.3.0 → agent_context_graph-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-context-graph"
-version = "0.3.0"
+version = "0.3.1"
 description = "Connect agent SDKs to context-graph components (actions-graph, skills-graph, etc.)"
 readme = "README.md"
 license = { text = "MIT" }
@@ -27,13 +27,13 @@ claude = [
     "claude-agent-sdk>=0.1.0",
 ]
 mcp = [
-    "mcp>=1.23.0",
+    "mcp>=1.23.0,<3",
 ]
 openai = [
     "openai-agents>=0.1.0",
 ]
 test = [
-    "mcp>=1.23.0",
+    "mcp>=1.23.0,<3",
     "pytest>=9.0.3",
     "pytest-asyncio>=0.24.0",
 ]

{agent_context_graph-0.3.0 → agent_context_graph-0.3.1}/src/agent_context_graph/mcp_server.py

@@ -23,7 +23,11 @@ SERVER_NAME = "context-graph"
 
 
 def build_server(tools: dict[str, Tool] | None = None) -> Server:
-    """An MCP server exposing ``tools``, all registered tools by default."""
+    """An MCP server exposing ``tools``, all registered tools by default.
+
+    Supports mcp 1.x, which registers handlers through decorators, and 2.x,
+    which takes them as constructor arguments; the protocol is the same.
+    """
     import mcp.types as types
     from anyio import to_thread
     from mcp.server.lowlevel import Server
@@ -31,28 +35,37 @@ def build_server(tools: dict[str, Tool] | None = None) -> Server:
     from agent_context_graph.adapters._identity import load_config
 
     tools = load_tools() if tools is None else tools
-    server: Server = Server(SERVER_NAME)
 
-    @server.list_tools()
     async def list_tools() -> list[types.Tool]:
         return [
             types.Tool(name=tool.name, description=tool.description, inputSchema=tool.input_schema)
             for tool in tools.values()
         ]
 
-    @server.call_tool()
-    async def call_tool(name: str, arguments: dict[str, Any]) -> types.CallToolResult:
+    async def call_tool(name: str, arguments: dict[str, Any] | None) -> types.CallToolResult:
         tool = tools.get(name)
         if tool is None:
             return _error(f"Unknown tool: {name}")
         try:
             # Tools query Memgraph synchronously; a thread keeps the server responsive.
-            result = await to_thread.run_sync(tool.call, arguments, load_config())
+            result = await to_thread.run_sync(tool.call, arguments or {}, load_config())
         except ToolError as exc:
             return _error(str(exc))
         return types.CallToolResult(content=[types.TextContent(type="text", text=result.text)])
 
-    return server
+    if hasattr(Server, "call_tool"):  # mcp 1.x
+        server: Server = Server(SERVER_NAME)
+        server.list_tools()(list_tools)
+        server.call_tool()(call_tool)
+        return server
+
+    async def on_list_tools(ctx: Any, params: Any) -> types.ListToolsResult:
+        return types.ListToolsResult(tools=await list_tools())
+
+    async def on_call_tool(ctx: Any, params: Any) -> types.CallToolResult:
+        return await call_tool(params.name, params.arguments)
+
+    return Server(SERVER_NAME, on_list_tools=on_list_tools, on_call_tool=on_call_tool)
 
 
 def serve() -> int:

{agent_context_graph-0.3.0 → agent_context_graph-0.3.1}/tests/test_tools.py

@@ -9,6 +9,7 @@ from __future__ import annotations
 
 import io
 import json
+from contextlib import asynccontextmanager
 from dataclasses import dataclass
 from typing import Any, ClassVar
 
@@ -58,38 +59,55 @@ def tools(monkeypatch):
     return registered
 
 
+@asynccontextmanager
+async def _connected(server):
+    """A client session talking to ``server`` in memory, the same way under mcp 1.x and 2.x."""
+    import anyio
+    from mcp import ClientSession
+    from mcp.shared.memory import create_client_server_memory_streams
+
+    async with (
+        create_client_server_memory_streams() as (client_streams, server_streams),
+        anyio.create_task_group() as tg,
+    ):
+        tg.start_soon(lambda: server.run(*server_streams, server.create_initialization_options()))
+        async with ClientSession(*client_streams) as client:
+            await client.initialize()
+            yield client
+        tg.cancel_scope.cancel()
+
+
+def _wire(model) -> dict:
+    """A result as the harness receives it: mcp 2.x renamed the Python fields, not the JSON."""
+    return model.model_dump(by_alias=True, exclude_none=True)
+
+
 @pytest.mark.asyncio
 async def test_mcp_lists_tools_and_returns_only_the_text(tools):
     """Text only: Claude Code and Codex both show structuredContent instead of the text when both are sent."""
     pytest.importorskip("mcp")
-    from mcp.shared.memory import create_connected_server_and_client_session
-    from mcp.types import TextContent
-
     from agent_context_graph.mcp_server import build_server
 
-    async with create_connected_server_and_client_session(build_server(tools)) as client:
-        listed = await client.list_tools()
-        result = await client.call_tool("recall", {"question": "deploy day"})
+    async with _connected(build_server(tools)) as client:
+        listed = _wire(await client.list_tools())
+        result = _wire(await client.call_tool("recall", {"question": "deploy day"}))
 
-    assert [(tool.name, tool.inputSchema["required"]) for tool in listed.tools] == [("recall", ["question"])]
-    assert not result.isError
-    assert result.content == [TextContent(type="text", text="rows for deploy day of ante")]
-    assert result.structuredContent is None
+    assert [(tool["name"], tool["inputSchema"]["required"]) for tool in listed["tools"]] == [("recall", ["question"])]
+    assert not result.get("isError")
+    assert result["content"] == [{"type": "text", "text": "rows for deploy day of ante"}]
+    assert "structuredContent" not in result
 
 
 @pytest.mark.asyncio
 async def test_mcp_reports_a_tool_error_to_the_model(tools):
     pytest.importorskip("mcp")
-    from mcp.shared.memory import create_connected_server_and_client_session
-    from mcp.types import TextContent
-
     from agent_context_graph.mcp_server import build_server
 
-    async with create_connected_server_and_client_session(build_server(tools)) as client:
-        result = await client.call_tool("recall", {"question": "fail"})
+    async with _connected(build_server(tools)) as client:
+        result = _wire(await client.call_tool("recall", {"question": "fail"}))
 
-    assert result.isError
-    assert result.content == [TextContent(type="text", text="no user configured")]
+    assert result["isError"]
+    assert result["content"] == [{"type": "text", "text": "no user configured"}]
 
 
 def test_recall_cli_prints_the_text_or_the_json(tools, capsys):