deps: migrate from mcp to fastmcp

allmonday · allmonday · commit f21b74c0b790 · 2026-03-27T21:36:37.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## 0.12.0
+- migrate from mcp to fastmcp
 
 ## 0.11.0
 
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ Or with uv:
 
 ```bash
 uv add sqlmodel-graphql
-uv add sqlmodel-graphql[mcp]  # include mcp server
+uv add sqlmodel-graphql[fastmcp]  # include mcp server
 ```
 
 ## Demo
@@ -99,8 +99,8 @@ uv run python -m demo.app
 running MCP demo
 
 ```bash
-uv run --with mcp python -m demo.mcp_server   # stdio mode
-uv run --with mcp python -m demo.mcp_server --http   # http mode
+uv run --with fastmcp python -m demo.mcp_server   # stdio mode
+uv run --with fastmcp python -m demo.mcp_server --http   # http mode
 ```
 
 
@@ -431,14 +431,14 @@ mcp.run()
 ### Installation
 
 ```bash
-pip install sqlmodel-graphql[mcp]
+pip install sqlmodel-graphql[fastmcp]
 ```
 
 ### Running MCP Server
 
 ```bash
-uv run --with mcp python -m demo.mcp_server   # stdio mode
-uv run --with mcp python -m demo.mcp_server --http   # http mode
+uv run --with fastmcp python -m demo.mcp_server   # stdio mode
+uv run --with fastmcp python -m demo.mcp_server --http   # http mode
 ```
 
 ## API Reference
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "sqlmodel-graphql"
-version = "0.11.0"
+version = "0.12.0"
 description = "GraphQL SDL generation and query optimization for SQLModel"
 authors = [{ name = "tangkikodo", email = "allmonday@126.com" }]
 readme = "README.md"
@@ -39,8 +39,8 @@ demo = [
     "aiosqlite>=0.19.0",
     "greenlet>=3.3.2",
 ]
-mcp = [
-    "mcp>=1.0.0",
+fastmcp = [
+    "fastmcp>=3.1,<3.2",
 ]
 
 [project.urls]
diff --git a/src/sqlmodel_graphql/mcp/server.py b/src/sqlmodel_graphql/mcp/server.py
@@ -13,7 +13,7 @@
 from sqlmodel_graphql.mcp.types.app_config import AppConfig
 
 if TYPE_CHECKING:
-    from mcp.server.fastmcp import FastMCP
+    from fastmcp import FastMCP
 
 
 def create_mcp_server(
@@ -103,7 +103,7 @@ def create_mcp_server(
         - get_mutation_schema(name, app_name, response_type): Get mutation details
         - graphql_mutation(mutation, app_name): Execute a GraphQL mutation
     """
-    from mcp.server.fastmcp import FastMCP
+    from fastmcp import FastMCP
 
     # Create the multi-app manager
     manager = MultiAppManager(apps)
@@ -192,7 +192,7 @@ async def get_users(cls) -> list['User']:
     Additional tool (when allow_mutation=True):
         - graphql_mutation(mutation): Execute a GraphQL mutation
     """
-    from mcp.server.fastmcp import FastMCP
+    from fastmcp import FastMCP
 
     from sqlmodel_graphql.mcp.managers.single_app_manager import SingleAppManager
     from sqlmodel_graphql.mcp.tools.simple_tools import register_simple_tools
diff --git a/src/sqlmodel_graphql/mcp/tools/get_operation_schema.py b/src/sqlmodel_graphql/mcp/tools/get_operation_schema.py
@@ -19,7 +19,7 @@
 )
 
 if TYPE_CHECKING:
-    from mcp.server.fastmcp import FastMCP
+    from fastmcp import FastMCP
 
     from sqlmodel_graphql.mcp.builders.type_tracer import TypeTracer
     from sqlmodel_graphql.sdl_generator import SDLGenerator
diff --git a/src/sqlmodel_graphql/mcp/tools/graphql_mutation.py b/src/sqlmodel_graphql/mcp/tools/graphql_mutation.py
@@ -14,7 +14,7 @@
 )
 
 if TYPE_CHECKING:
-    from mcp.server.fastmcp import FastMCP
+    from fastmcp import FastMCP
 
     from sqlmodel_graphql.handler import GraphQLHandler
 
diff --git a/src/sqlmodel_graphql/mcp/tools/graphql_query.py b/src/sqlmodel_graphql/mcp/tools/graphql_query.py
@@ -14,7 +14,7 @@
 )
 
 if TYPE_CHECKING:
-    from mcp.server.fastmcp import FastMCP
+    from fastmcp import FastMCP
 
     from sqlmodel_graphql.handler import GraphQLHandler
 
diff --git a/src/sqlmodel_graphql/mcp/tools/list_operations.py b/src/sqlmodel_graphql/mcp/tools/list_operations.py
@@ -11,7 +11,7 @@
 from sqlmodel_graphql.mcp.types.errors import create_success_response
 
 if TYPE_CHECKING:
-    from mcp.server.fastmcp import FastMCP
+    from fastmcp import FastMCP
 
     from sqlmodel_graphql.mcp.builders.type_tracer import TypeTracer
 
diff --git a/src/sqlmodel_graphql/mcp/tools/multi_app_tools.py b/src/sqlmodel_graphql/mcp/tools/multi_app_tools.py
@@ -14,7 +14,7 @@
 )
 
 if TYPE_CHECKING:
-    from mcp.server.fastmcp import FastMCP
+    from fastmcp import FastMCP
 
     from sqlmodel_graphql.mcp.managers.multi_app_manager import MultiAppManager
 
diff --git a/src/sqlmodel_graphql/mcp/tools/simple_tools.py b/src/sqlmodel_graphql/mcp/tools/simple_tools.py
@@ -14,7 +14,7 @@
 )
 
 if TYPE_CHECKING:
-    from mcp.server.fastmcp import FastMCP
+    from fastmcp import FastMCP
 
     from sqlmodel_graphql.mcp.managers.single_app_manager import SingleAppManager
 
diff --git a/tests/mcp/test_multi_app_tools.py b/tests/mcp/test_multi_app_tools.py
@@ -5,12 +5,22 @@
 
 from sqlmodel_graphql import mutation, query
 
-# Skip all tests in this module if mcp is not installed
-pytest.importorskip("mcp")
+# Skip all tests in this module if fastmcp is not installed
+pytest.importorskip("fastmcp")
 
 from sqlmodel_graphql.mcp import create_mcp_server  # noqa: E402
 
 
+def _get_tools_dict(mcp):
+    """Get tools as dict {name: tool} from FastMCP (compatible with fastmcp 3.x)."""
+    components = mcp._local_provider._components
+    return {
+        key.split(":")[1].split("@")[0]: value
+        for key, value in components.items()
+        if key.startswith("tool:")
+    }
+
+
 # Test models for App 1
 class BlogBaseEntity(SQLModel):
     """Base entity for Blog app."""
@@ -96,7 +106,7 @@ def test_server_creation(self, multi_app_mcp):
     def test_list_apps_tool(self, multi_app_mcp):
         """Test list_apps tool returns all configured apps."""
         # Get the tool
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         list_apps_tool = tools.get("list_apps")
 
         assert list_apps_tool is not None
@@ -121,7 +131,7 @@ def test_list_apps_tool(self, multi_app_mcp):
 
     def test_list_queries_with_valid_app(self, multi_app_mcp):
         """Test list_queries tool with a valid app_name."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         list_queries_tool = tools.get("list_queries")
 
         result = list_queries_tool.fn(app_name="blog")
@@ -137,7 +147,7 @@ def test_list_queries_with_valid_app(self, multi_app_mcp):
 
     def test_list_queries_with_invalid_app(self, multi_app_mcp):
         """Test list_queries tool with an invalid app_name."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         list_queries_tool = tools.get("list_queries")
 
         result = list_queries_tool.fn(app_name="nonexistent")
@@ -148,7 +158,7 @@ def test_list_queries_with_invalid_app(self, multi_app_mcp):
 
     def test_list_mutations_with_valid_app(self, multi_app_mcp):
         """Test list_mutations tool with a valid app_name."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         list_mutations_tool = tools.get("list_mutations")
 
         result = list_mutations_tool.fn(app_name="shop")
@@ -164,7 +174,7 @@ def test_list_mutations_with_valid_app(self, multi_app_mcp):
 
     def test_list_mutations_with_invalid_app(self, multi_app_mcp):
         """Test list_mutations tool with an invalid app_name."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         list_mutations_tool = tools.get("list_mutations")
 
         result = list_mutations_tool.fn(app_name="nonexistent")
@@ -174,7 +184,7 @@ def test_list_mutations_with_invalid_app(self, multi_app_mcp):
 
     def test_get_query_schema_sdl_format(self, multi_app_mcp):
         """Test get_query_schema tool with SDL format."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         get_query_schema_tool = tools.get("get_query_schema")
 
         # First get the list of queries to find a valid query name
@@ -192,7 +202,7 @@ def test_get_query_schema_sdl_format(self, multi_app_mcp):
 
     def test_get_query_schema_introspection_format(self, multi_app_mcp):
         """Test get_query_schema tool with introspection format."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         get_query_schema_tool = tools.get("get_query_schema")
 
         # First get the list of queries to find a valid query name
@@ -210,7 +220,7 @@ def test_get_query_schema_introspection_format(self, multi_app_mcp):
 
     def test_get_query_schema_invalid_query(self, multi_app_mcp):
         """Test get_query_schema tool with an invalid query name."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         get_query_schema_tool = tools.get("get_query_schema")
 
         result = get_query_schema_tool.fn(
@@ -222,7 +232,7 @@ def test_get_query_schema_invalid_query(self, multi_app_mcp):
 
     def test_get_mutation_schema_sdl_format(self, multi_app_mcp):
         """Test get_mutation_schema tool with SDL format."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         get_mutation_schema_tool = tools.get("get_mutation_schema")
 
         # First get the list of mutations to find a valid mutation name
@@ -241,7 +251,7 @@ def test_get_mutation_schema_sdl_format(self, multi_app_mcp):
     @pytest.mark.asyncio
     async def test_graphql_query_with_valid_app(self, multi_app_mcp):
         """Test graphql_query tool with a valid app_name."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         graphql_query_tool = tools.get("graphql_query")
 
         result = await graphql_query_tool.fn(
@@ -254,7 +264,7 @@ async def test_graphql_query_with_valid_app(self, multi_app_mcp):
     @pytest.mark.asyncio
     async def test_graphql_query_with_invalid_app(self, multi_app_mcp):
         """Test graphql_query tool with an invalid app_name."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         graphql_query_tool = tools.get("graphql_query")
 
         result = await graphql_query_tool.fn(
@@ -267,7 +277,7 @@ async def test_graphql_query_with_invalid_app(self, multi_app_mcp):
     @pytest.mark.asyncio
     async def test_graphql_query_empty_query(self, multi_app_mcp):
         """Test graphql_query tool with an empty query."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         graphql_query_tool = tools.get("graphql_query")
 
         result = await graphql_query_tool.fn(query="", app_name="blog")
@@ -278,7 +288,7 @@ async def test_graphql_query_empty_query(self, multi_app_mcp):
     @pytest.mark.asyncio
     async def test_graphql_mutation_with_valid_app(self, multi_app_mcp):
         """Test graphql_mutation tool with a valid app_name."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         graphql_mutation_tool = tools.get("graphql_mutation")
 
         result = await graphql_mutation_tool.fn(
@@ -293,7 +303,7 @@ async def test_graphql_mutation_with_valid_app(self, multi_app_mcp):
     @pytest.mark.asyncio
     async def test_graphql_mutation_with_invalid_app(self, multi_app_mcp):
         """Test graphql_mutation tool with an invalid app_name."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         graphql_mutation_tool = tools.get("graphql_mutation")
 
         result = await graphql_mutation_tool.fn(
@@ -306,7 +316,7 @@ async def test_graphql_mutation_with_invalid_app(self, multi_app_mcp):
     @pytest.mark.asyncio
     async def test_graphql_mutation_empty_mutation(self, multi_app_mcp):
         """Test graphql_mutation tool with an empty mutation."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
         graphql_mutation_tool = tools.get("graphql_mutation")
 
         result = await graphql_mutation_tool.fn(mutation="", app_name="shop")
@@ -316,7 +326,7 @@ async def test_graphql_mutation_empty_mutation(self, multi_app_mcp):
 
     def test_apps_are_isolated(self, multi_app_mcp):
         """Test that queries to different apps return different schemas."""
-        tools = multi_app_mcp._tool_manager._tools
+        tools = _get_tools_dict(multi_app_mcp)
 
         # Get queries from blog app
         list_queries_tool = tools.get("list_queries")
@@ -356,7 +366,7 @@ def read_only_mcp(self):
 
     def test_list_apps_mutations_count_zero(self, read_only_mcp):
         """Test list_apps returns mutations_count=0 when allow_mutation=False."""
-        tools = read_only_mcp._tool_manager._tools
+        tools = _get_tools_dict(read_only_mcp)
         list_apps_tool = tools.get("list_apps")
 
         result = list_apps_tool.fn()
@@ -368,7 +378,7 @@ def test_list_apps_mutations_count_zero(self, read_only_mcp):
 
     def test_mutation_tools_not_registered(self, read_only_mcp):
         """Test mutation-related tools are not registered when allow_mutation=False."""
-        tools = read_only_mcp._tool_manager._tools
+        tools = _get_tools_dict(read_only_mcp)
 
         # These tools should NOT be registered
         assert "list_mutations" not in tools
@@ -383,7 +393,7 @@ def test_mutation_tools_not_registered(self, read_only_mcp):
 
     def test_query_tools_still_work(self, read_only_mcp):
         """Test query tools still work in read-only mode."""
-        tools = read_only_mcp._tool_manager._tools
+        tools = _get_tools_dict(read_only_mcp)
 
         # Test list_queries
         list_queries_tool = tools.get("list_queries")
diff --git a/tests/mcp/test_simple_mcp.py b/tests/mcp/test_simple_mcp.py
diff --git a/tests/test_mcp.py b/tests/test_mcp.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`if TYPE_CHECKING:`
`22`		`- from mcp.server.fastmcp import FastMCP`
	`22`	`+ from fastmcp import FastMCP`
`23`	`23`
`24`	`24`	`from sqlmodel_graphql.mcp.builders.type_tracer import TypeTracer`
`25`	`25`	`from sqlmodel_graphql.sdl_generator import SDLGenerator`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`if TYPE_CHECKING:`
`17`		`- from mcp.server.fastmcp import FastMCP`
	`17`	`+ from fastmcp import FastMCP`
`18`	`18`
`19`	`19`	`from sqlmodel_graphql.handler import GraphQLHandler`
`20`	`20`