Leave wrong Context for now

Author: Kludex

src/mcp/server/fastmcp/tools/base.py

@@ -6,7 +6,6 @@
 
 from pydantic import BaseModel, Field
 
-import mcp.server.fastmcp
 from mcp.server.fastmcp.exceptions import ToolError
 from mcp.server.fastmcp.utilities.func_metadata import FuncMetadata, func_metadata
 
@@ -41,6 +40,8 @@ def from_function(
         context_kwarg: str | None = None,
     ) -> Tool:
         """Create a Tool from a function."""
+        from mcp.server.fastmcp import Context
+
         func_name = name or fn.__name__
 
         if func_name == "<lambda>":
@@ -49,11 +50,10 @@ def from_function(
         func_doc = description or fn.__doc__ or ""
         is_async = inspect.iscoroutinefunction(fn)
 
-        # Find context parameter if it exists
         if context_kwarg is None:
             sig = inspect.signature(fn)
             for param_name, param in sig.parameters.items():
-                if param.annotation is mcp.server.fastmcp.Context:
+                if param.annotation is Context:
                     context_kwarg = param_name
                     break
 

tests/client/test_config.py

@@ -1,5 +1,6 @@
 import json
 import subprocess
+from pathlib import Path
 from unittest.mock import patch
 
 import pytest
@@ -8,31 +9,28 @@
 
 
 @pytest.fixture
-def temp_config_dir(tmp_path):
+def temp_config_dir(tmp_path: Path):
     """Create a temporary Claude config directory."""
     config_dir = tmp_path / "Claude"
     config_dir.mkdir()
     return config_dir
 
 
 @pytest.fixture
-def mock_config_path(temp_config_dir):
+def mock_config_path(temp_config_dir: Path):
     """Mock get_claude_config_path to return our temporary directory."""
     with patch("mcp.cli.claude.get_claude_config_path", return_value=temp_config_dir):
         yield temp_config_dir
 
 
-def test_command_execution(mock_config_path):
+def test_command_execution(mock_config_path: Path):
     """Test that the generated command can actually be executed."""
     # Setup
     server_name = "test_server"
     file_spec = "test_server.py:app"
 
     # Update config
-    success = update_claude_config(
-        file_spec=file_spec,
-        server_name=server_name,
-    )
+    success = update_claude_config(file_spec=file_spec, server_name=server_name)
     assert success
 
     # Read the generated config

tests/client/test_list_roots_callback.py

@@ -3,16 +3,11 @@
 
 from mcp.client.session import ClientSession
 from mcp.server.fastmcp.server import Context
-from mcp.server.session import ServerSession
 from mcp.shared.context import RequestContext
 from mcp.shared.memory import (
     create_connected_server_and_client_session as create_session,
 )
-from mcp.types import (
-    ListRootsResult,
-    Root,
-    TextContent,
-)
+from mcp.types import ListRootsResult, Root, TextContent
 
 
 @pytest.mark.anyio
@@ -40,7 +35,7 @@ async def list_roots_callback(
         return callback_return
 
     @server.tool("test_list_roots")
-    async def test_list_roots(context: Context[ServerSession, None], message: str):
+    async def test_list_roots(context: Context, message: str):
         roots = await context.session.list_roots()
         assert roots == callback_return
         return True