Merge branch 'main' of https://github.com/modelcontextprotocol/python-sdk into feat/tasks

Author: LucaButBoring

src/mcp/client/session.py

@@ -7,7 +7,6 @@
 
 import anyio.lowlevel
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
-from jsonschema import SchemaError, ValidationError, validate
 from pydantic import AnyUrl, BaseModel, TypeAdapter
 from typing_extensions import deprecated
 
@@ -451,6 +450,8 @@ async def _validate_tool_result(self, name: str, result: types.CallToolResult) -
             logger.warning(f"Tool {name} not listed by server, cannot validate any structured content")
 
         if output_schema is not None:
+            from jsonschema import SchemaError, ValidationError, validate
+
             if result.structuredContent is None:
                 raise RuntimeError(
                     f"Tool {name} has an output schema but did not return structured content"

tests/client/test_output_schema_validation.py

@@ -19,9 +19,27 @@ def bypass_server_output_validation():
     This simulates a malicious or non-compliant server that doesn't validate
     its outputs, allowing us to test client-side validation.
     """
-    # Patch jsonschema.validate in the server module to disable all validation
-    with patch("mcp.server.lowlevel.server.jsonschema.validate"):
-        # The mock will simply return None (do nothing) for all validation calls
+    import jsonschema
+
+    # Save the original validate function
+    original_validate = jsonschema.validate
+
+    # Create a mock that tracks which module is calling it
+    def selective_mock(instance: Any = None, schema: Any = None, *args: Any, **kwargs: Any) -> None:
+        import inspect
+
+        # Check the call stack to see where this is being called from
+        for frame_info in inspect.stack():
+            # If called from the server module, skip validation
+            # TODO: fix this as it's a rather gross workaround and will eventually break
+            # Normalize path separators for cross-platform compatibility
+            normalized_path = frame_info.filename.replace("\\", "/")
+            if "mcp/server/lowlevel/server.py" in normalized_path:
+                return None
+        # Otherwise, use the real validation (for client-side)
+        return original_validate(instance=instance, schema=schema, *args, **kwargs)
+
+    with patch("jsonschema.validate", selective_mock):
         yield