fix: Fix test failures after prefix filtering implementation

Tapan Chugh · claude · Tapan Chugh · commit 5d025a95788d · 2025-08-01T18:01:47.000-07:00
This commit fixes all test failures that occurred after implementing consistent prefix-based filtering across tools, prompts, and resources. Changes: - Add required URI fields to all Tool instances in tests - Update all list_tools handlers to accept request parameter - Fix client session to use ListRequestParams for all list methods - Update test handlers in streamable_http, SSE, and WS tests The tests were failing because: 1. Tool objects now require a URI field 2. Low-level server list_tools handlers expect a request parameter 3. Client session was using old RequestParams class names All tests now pass except for one unrelated connection error. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/src/mcp/client/session.py b/src/mcp/client/session.py
@@ -225,7 +225,7 @@ async def list_resources(self, prefix: str | None = None, cursor: str | None = N
         """Send a resources/list request."""
         params = None
         if cursor is not None or prefix is not None:
-            params = types.ListResourcesRequestParams(prefix=prefix, cursor=cursor)
+            params = types.ListRequestParams(prefix=prefix, cursor=cursor)
         return await self.send_request(
             types.ClientRequest(
                 types.ListResourcesRequest(
@@ -244,7 +244,7 @@ async def list_resource_templates(
         """Send a resources/templates/list request."""
         params = None
         if cursor is not None or prefix is not None:
-            params = types.ListResourceTemplatesRequestParams(prefix=prefix, cursor=cursor)
+            params = types.ListRequestParams(prefix=prefix, cursor=cursor)
         return await self.send_request(
             types.ClientRequest(
                 types.ListResourceTemplatesRequest(
diff --git a/src/mcp/server/fastmcp/prompts/manager.py b/src/mcp/server/fastmcp/prompts/manager.py
@@ -43,7 +43,7 @@ def add_prompt(
     ) -> Prompt:
         """Add a prompt to the manager."""
         logger.debug(f"Adding prompt: {prompt.name} with URI: {prompt.uri}")
-        
+
         # Check for duplicates
         existing = self._prompts.get(prompt.uri)
         if existing:
diff --git a/tests/client/test_output_schema_validation.py b/tests/client/test_output_schema_validation.py
@@ -42,9 +42,10 @@ async def test_tool_structured_output_client_side_validation_basemodel(self):
         }
 
         @server.list_tools()
-        async def list_tools():
+        async def list_tools(request):
             return [
                 Tool(
+                    uri="tool://get_user",
                     name="get_user",
                     description="Get user data",
                     inputSchema={"type": "object"},
@@ -81,9 +82,10 @@ async def test_tool_structured_output_client_side_validation_primitive(self):
         }
 
         @server.list_tools()
-        async def list_tools():
+        async def list_tools(request):
             return [
                 Tool(
+                    uri="tool://calculate",
                     name="calculate",
                     description="Calculate something",
                     inputSchema={"type": "object"},
@@ -112,9 +114,10 @@ async def test_tool_structured_output_client_side_validation_dict_typed(self):
         output_schema = {"type": "object", "additionalProperties": {"type": "integer"}, "title": "get_scores_Output"}
 
         @server.list_tools()
-        async def list_tools():
+        async def list_tools(request):
             return [
                 Tool(
+                    uri="tool://get_scores",
                     name="get_scores",
                     description="Get scores",
                     inputSchema={"type": "object"},
@@ -147,9 +150,10 @@ async def test_tool_structured_output_client_side_validation_missing_required(se
         }
 
         @server.list_tools()
-        async def list_tools():
+        async def list_tools(request):
             return [
                 Tool(
+                    uri="tool://get_person",
                     name="get_person",
                     description="Get person data",
                     inputSchema={"type": "object"},
@@ -175,7 +179,7 @@ async def test_tool_not_listed_warning(self, caplog):
         server = Server("test-server")
 
         @server.list_tools()
-        async def list_tools():
+        async def list_tools(request):
             # Return empty list - tool is not listed
             return []
 
diff --git a/tests/client/test_session_group.py b/tests/client/test_session_group.py
@@ -58,7 +58,7 @@ def hook(name, server_info):
             return f"{(server_info.name)}-{name}"
 
         mcp_session_group = ClientSessionGroup(component_name_hook=hook)
-        mcp_session_group._tools = {"server1-my_tool": types.Tool(name="my_tool", inputSchema={})}
+        mcp_session_group._tools = {"server1-my_tool": types.Tool(uri="tool://my_tool", name="my_tool", inputSchema={})}
         mcp_session_group._tool_to_session = {"server1-my_tool": mock_session}
         text_content = types.TextContent(type="text", text="OK")
         mock_session.call_tool.return_value = types.CallToolResult(content=[text_content])
diff --git a/tests/issues/test_88_random_error.py b/tests/issues/test_88_random_error.py
@@ -31,14 +31,16 @@ async def test_notification_validation_error(tmp_path: Path):
     slow_request_lock = anyio.Event()
 
     @server.list_tools()
-    async def list_tools() -> list[types.Tool]:
+    async def list_tools(request) -> list[types.Tool]:
         return [
             types.Tool(
+                uri="tool://slow",
                 name="slow",
                 description="A slow tool",
                 inputSchema={"type": "object"},
             ),
             types.Tool(
+                uri="tool://fast",
                 name="fast",
                 description="A fast tool",
                 inputSchema={"type": "object"},
diff --git a/tests/server/test_cancel_handling.py b/tests/server/test_cancel_handling.py
@@ -31,9 +31,10 @@ async def test_server_remains_functional_after_cancel():
     first_request_id = None
 
     @server.list_tools()
-    async def handle_list_tools() -> list[Tool]:
+    async def handle_list_tools(request) -> list[Tool]:
         return [
             Tool(
+                uri="tool://test_tool",
                 name="test_tool",
                 description="Tool for testing",
                 inputSchema={},
diff --git a/tests/server/test_lowlevel_input_validation.py b/tests/server/test_lowlevel_input_validation.py
@@ -35,7 +35,7 @@ async def run_tool_test(
     server = Server("test")
 
     @server.list_tools()
-    async def list_tools():
+    async def list_tools(request):
         return tools
 
     @server.call_tool()
@@ -99,6 +99,7 @@ async def handle_messages():
 def create_add_tool() -> Tool:
     """Create a standard 'add' tool for testing."""
     return Tool(
+        uri="tool://add",
         name="add",
         description="Add two numbers",
         inputSchema={
@@ -189,6 +190,7 @@ async def test_cache_refresh_on_missing_tool():
     """Test that tool cache is refreshed when tool is not found."""
     tools = [
         Tool(
+            uri="tool://multiply",
             name="multiply",
             description="Multiply two numbers",
             inputSchema={
@@ -230,6 +232,7 @@ async def test_enum_constraint_validation():
     """Test that enum constraints are validated."""
     tools = [
         Tool(
+            uri="tool://greet",
             name="greet",
             description="Greet someone",
             inputSchema={
@@ -267,6 +270,7 @@ async def test_tool_not_in_list_logs_warning(caplog):
     """Test that calling a tool not in list_tools logs a warning and skips validation."""
     tools = [
         Tool(
+            uri="tool://add",
             name="add",
             description="Add two numbers",
             inputSchema={
diff --git a/tests/server/test_lowlevel_output_validation.py b/tests/server/test_lowlevel_output_validation.py
@@ -35,7 +35,7 @@ async def run_tool_test(
     server = Server("test")
 
     @server.list_tools()
-    async def list_tools():
+    async def list_tools(request):
         return tools
 
     @server.call_tool()
@@ -101,6 +101,7 @@ async def test_content_only_without_output_schema():
     """Test returning content only when no outputSchema is defined."""
     tools = [
         Tool(
+            uri="tool://echo",
             name="echo",
             description="Echo a message",
             inputSchema={
@@ -140,6 +141,7 @@ async def test_dict_only_without_output_schema():
     """Test returning dict only when no outputSchema is defined."""
     tools = [
         Tool(
+            uri="tool://get_info",
             name="get_info",
             description="Get structured information",
             inputSchema={
@@ -177,6 +179,7 @@ async def test_both_content_and_dict_without_output_schema():
     """Test returning both content and dict when no outputSchema is defined."""
     tools = [
         Tool(
+            uri="tool://process",
             name="process",
             description="Process data",
             inputSchema={
@@ -215,6 +218,7 @@ async def test_content_only_with_output_schema_error():
     """Test error when outputSchema is defined but only content is returned."""
     tools = [
         Tool(
+            uri="tool://structured_tool",
             name="structured_tool",
             description="Tool expecting structured output",
             inputSchema={
@@ -254,6 +258,7 @@ async def test_valid_dict_with_output_schema():
     """Test valid dict output matching outputSchema."""
     tools = [
         Tool(
+            uri="tool://calc",
             name="calc",
             description="Calculate result",
             inputSchema={
@@ -303,6 +308,7 @@ async def test_invalid_dict_with_output_schema():
     """Test dict output that doesn't match outputSchema."""
     tools = [
         Tool(
+            uri="tool://user_info",
             name="user_info",
             description="Get user information",
             inputSchema={
@@ -347,6 +353,7 @@ async def test_both_content_and_valid_dict_with_output_schema():
     """Test returning both content and valid dict with outputSchema."""
     tools = [
         Tool(
+            uri="tool://analyze",
             name="analyze",
             description="Analyze data",
             inputSchema={
@@ -394,6 +401,7 @@ async def test_output_schema_type_validation():
     """Test outputSchema validates types correctly."""
     tools = [
         Tool(
+            uri="tool://stats",
             name="stats",
             description="Get statistics",
             inputSchema={
diff --git a/tests/server/test_lowlevel_tool_annotations.py b/tests/server/test_lowlevel_tool_annotations.py
@@ -20,9 +20,10 @@ async def test_lowlevel_server_tool_annotations():
 
     # Create a tool with annotations
     @server.list_tools()
-    async def list_tools():
+    async def list_tools(request):
         return [
             Tool(
+                uri="tool://echo",
                 name="echo",
                 description="Echo a message back",
                 inputSchema={
diff --git a/tests/shared/test_progress_notifications.py b/tests/shared/test_progress_notifications.py
@@ -76,9 +76,10 @@ async def handle_progress(
 
     # Register list tool handler
     @server.list_tools()
-    async def handle_list_tools() -> list[types.Tool]:
+    async def handle_list_tools(request) -> list[types.Tool]:
         return [
             types.Tool(
+                uri="tool://test_tool",
                 name="test_tool",
                 description="A tool that sends progress notifications <o/",
                 inputSchema={},
diff --git a/tests/shared/test_session.py b/tests/shared/test_session.py
@@ -72,9 +72,10 @@ async def handle_call_tool(name: str, arguments: dict | None) -> list:
 
         # Register the tool so it shows up in list_tools
         @server.list_tools()
-        async def handle_list_tools() -> list[types.Tool]:
+        async def handle_list_tools(request) -> list[types.Tool]:
             return [
                 types.Tool(
+                    uri="tool://slow_tool",
                     name="slow_tool",
                     description="A slow tool that takes 10 seconds to complete",
                     inputSchema={},
diff --git a/tests/shared/test_sse.py b/tests/shared/test_sse.py
@@ -64,9 +64,10 @@ async def handle_read_resource(uri: AnyUrl) -> str | bytes:
             raise McpError(error=ErrorData(code=404, message="OOPS! no resource with that URI was found"))
 
         @self.list_tools()
-        async def handle_list_tools() -> list[Tool]:
+        async def handle_list_tools(request) -> list[Tool]:
             return [
                 Tool(
+                    uri="tool://test_tool",
                     name="test_tool",
                     description="A test tool",
                     inputSchema={"type": "object", "properties": {}},
@@ -323,14 +324,16 @@ async def handle_call_tool(name: str, args: dict) -> list[TextContent]:
             return [TextContent(type="text", text=f"Called {name}")]
 
         @self.list_tools()
-        async def handle_list_tools() -> list[Tool]:
+        async def handle_list_tools(request) -> list[Tool]:
             return [
                 Tool(
+                    uri="tool://echo_headers",
                     name="echo_headers",
                     description="Echoes request headers",
                     inputSchema={"type": "object", "properties": {}},
                 ),
                 Tool(
+                    uri="tool://echo_context",
                     name="echo_context",
                     description="Echoes request context",
                     inputSchema={
diff --git a/tests/shared/test_streamable_http.py b/tests/shared/test_streamable_http.py
@@ -138,34 +138,40 @@ async def handle_read_resource(uri: AnyUrl) -> str | bytes:
             raise ValueError(f"Unknown resource: {uri}")
 
         @self.list_tools()
-        async def handle_list_tools() -> list[Tool]:
+        async def handle_list_tools(request) -> list[Tool]:
             return [
                 Tool(
+                    uri="tool://test_tool",
                     name="test_tool",
                     description="A test tool",
                     inputSchema={"type": "object", "properties": {}},
                 ),
                 Tool(
+                    uri="tool://test_tool_with_standalone_notification",
                     name="test_tool_with_standalone_notification",
                     description="A test tool that sends a notification",
                     inputSchema={"type": "object", "properties": {}},
                 ),
                 Tool(
+                    uri="tool://long_running_with_checkpoints",
                     name="long_running_with_checkpoints",
                     description="A long-running tool that sends periodic notifications",
                     inputSchema={"type": "object", "properties": {}},
                 ),
                 Tool(
+                    uri="tool://test_sampling_tool",
                     name="test_sampling_tool",
                     description="A tool that triggers server-side sampling",
                     inputSchema={"type": "object", "properties": {}},
                 ),
                 Tool(
+                    uri="tool://wait_for_lock_with_notification",
                     name="wait_for_lock_with_notification",
                     description="A tool that sends a notification and waits for lock",
                     inputSchema={"type": "object", "properties": {}},
                 ),
                 Tool(
+                    uri="tool://release_lock",
                     name="release_lock",
                     description="A tool that releases the lock",
                     inputSchema={"type": "object", "properties": {}},
@@ -1277,14 +1283,16 @@ def __init__(self):
         super().__init__("ContextAwareServer")
 
         @self.list_tools()
-        async def handle_list_tools() -> list[Tool]:
+        async def handle_list_tools(request) -> list[Tool]:
             return [
                 Tool(
+                    uri="tool://echo_headers",
                     name="echo_headers",
                     description="Echo request headers from context",
                     inputSchema={"type": "object", "properties": {}},
                 ),
                 Tool(
+                    uri="tool://echo_context",
                     name="echo_context",
                     description="Echo request context with custom data",
                     inputSchema={
diff --git a/tests/shared/test_ws.py b/tests/shared/test_ws.py
@@ -57,9 +57,10 @@ async def handle_read_resource(uri: AnyUrl) -> str | bytes:
             raise McpError(error=ErrorData(code=404, message="OOPS! no resource with that URI was found"))
 
         @self.list_tools()
-        async def handle_list_tools() -> list[Tool]:
+        async def handle_list_tools(request) -> list[Tool]:
             return [
                 Tool(
+                    uri="tool://test_tool",
                     name="test_tool",
                     description="A test tool",
                     inputSchema={"type": "object", "properties": {}},
