Fix tests for Pydantic 2.11

Author: medaminezghal

examples/clients/simple-chatbot/mcp_simple_chatbot/main.py

@@ -322,8 +322,7 @@ async def process_llm_response(self, llm_response: str) -> str:
                                 total = result["total"]
                                 percentage = (progress / total) * 100
                                 logging.info(
-                                    f"Progress: {progress}/{total} "
-                                    f"({percentage:.1f}%)"
+                                    f"Progress: {progress}/{total} ({percentage:.1f}%)"
                                 )
 
                             return f"Tool execution result: {result}"

src/mcp/server/fastmcp/server.py

@@ -652,9 +652,9 @@ async def read_resource(self, uri: str | AnyUrl) -> Iterable[ReadResourceContent
         Returns:
             The resource content as either text or bytes
         """
-        assert (
-            self._fastmcp is not None
-        ), "Context is not available outside of a request"
+        assert self._fastmcp is not None, (
+            "Context is not available outside of a request"
+        )
         return await self._fastmcp.read_resource(uri)
 
     async def log(

src/mcp/server/fastmcp/utilities/func_metadata.py

@@ -27,7 +27,7 @@ def model_dump_one_level(self) -> dict[str, Any]:
         That is, sub-models etc are not dumped - they are kept as pydantic models.
         """
         kwargs: dict[str, Any] = {}
-        for field_name in self.model_fields.keys():
+        for field_name in self.__class__.model_fields.keys():
             kwargs[field_name] = getattr(self, field_name)
         return kwargs
 

src/mcp/server/lowlevel/server.py

@@ -576,14 +576,12 @@ async def _handle_notification(self, notify: Any):
             assert type(notify) in self.notification_handlers
 
             handler = self.notification_handlers[type(notify)]
-            logger.debug(
-                f"Dispatching notification of type " f"{type(notify).__name__}"
-            )
+            logger.debug(f"Dispatching notification of type {type(notify).__name__}")
 
             try:
                 await handler(notify)
             except Exception as err:
-                logger.error(f"Uncaught exception in notification handler: " f"{err}")
+                logger.error(f"Uncaught exception in notification handler: {err}")
 
 
 async def _ping_handler(request: types.PingRequest) -> types.ServerResult:

src/mcp/shared/memory.py

@@ -27,9 +27,9 @@
 
 
 @asynccontextmanager
-async def create_client_server_memory_streams() -> (
-    AsyncGenerator[tuple[MessageStream, MessageStream], None]
-):
+async def create_client_server_memory_streams() -> AsyncGenerator[
+    tuple[MessageStream, MessageStream], None
+]:
     """
     Creates a pair of bidirectional memory streams for client-server communication.
 

tests/issues/test_100_tool_listing.py

@@ -30,6 +30,6 @@ def dummy_tool_func():
     # Verify each tool is unique and has the correct name
     tool_names = [tool.name for tool in tools]
     expected_names = [f"tool_{i}" for i in range(num_tools)]
-    assert sorted(tool_names) == sorted(
-        expected_names
-    ), "Tool names don't match expected names"
+    assert sorted(tool_names) == sorted(expected_names), (
+        "Tool names don't match expected names"
+    )

tests/issues/test_152_resource_mime_type.py

@@ -45,31 +45,31 @@ def get_image_as_bytes() -> bytes:
         bytes_resource = mapping["test://image_bytes"]
 
         # Verify mime types
-        assert (
-            string_resource.mimeType == "image/png"
-        ), "String resource mime type not respected"
-        assert (
-            bytes_resource.mimeType == "image/png"
-        ), "Bytes resource mime type not respected"
+        assert string_resource.mimeType == "image/png", (
+            "String resource mime type not respected"
+        )
+        assert bytes_resource.mimeType == "image/png", (
+            "Bytes resource mime type not respected"
+        )
 
         # Also verify the content can be read correctly
         string_result = await client.read_resource(AnyUrl("test://image"))
         assert len(string_result.contents) == 1
-        assert (
-            getattr(string_result.contents[0], "text") == base64_string
-        ), "Base64 string mismatch"
-        assert (
-            string_result.contents[0].mimeType == "image/png"
-        ), "String content mime type not preserved"
+        assert getattr(string_result.contents[0], "text") == base64_string, (
+            "Base64 string mismatch"
+        )
+        assert string_result.contents[0].mimeType == "image/png", (
+            "String content mime type not preserved"
+        )
 
         bytes_result = await client.read_resource(AnyUrl("test://image_bytes"))
         assert len(bytes_result.contents) == 1
         assert (
             base64.b64decode(getattr(bytes_result.contents[0], "blob")) == image_bytes
         ), "Bytes mismatch"
-        assert (
-            bytes_result.contents[0].mimeType == "image/png"
-        ), "Bytes content mime type not preserved"
+        assert bytes_result.contents[0].mimeType == "image/png", (
+            "Bytes content mime type not preserved"
+        )
 
 
 async def test_lowlevel_resource_mime_type():
@@ -119,28 +119,28 @@ async def handle_read_resource(uri: AnyUrl):
         bytes_resource = mapping["test://image_bytes"]
 
         # Verify mime types
-        assert (
-            string_resource.mimeType == "image/png"
-        ), "String resource mime type not respected"
-        assert (
-            bytes_resource.mimeType == "image/png"
-        ), "Bytes resource mime type not respected"
+        assert string_resource.mimeType == "image/png", (
+            "String resource mime type not respected"
+        )
+        assert bytes_resource.mimeType == "image/png", (
+            "Bytes resource mime type not respected"
+        )
 
         # Also verify the content can be read correctly
         string_result = await client.read_resource(AnyUrl("test://image"))
         assert len(string_result.contents) == 1
-        assert (
-            getattr(string_result.contents[0], "text") == base64_string
-        ), "Base64 string mismatch"
-        assert (
-            string_result.contents[0].mimeType == "image/png"
-        ), "String content mime type not preserved"
+        assert getattr(string_result.contents[0], "text") == base64_string, (
+            "Base64 string mismatch"
+        )
+        assert string_result.contents[0].mimeType == "image/png", (
+            "String content mime type not preserved"
+        )
 
         bytes_result = await client.read_resource(AnyUrl("test://image_bytes"))
         assert len(bytes_result.contents) == 1
         assert (
             base64.b64decode(getattr(bytes_result.contents[0], "blob")) == image_bytes
         ), "Bytes mismatch"
-        assert (
-            bytes_result.contents[0].mimeType == "image/png"
-        ), "Bytes content mime type not preserved"
+        assert bytes_result.contents[0].mimeType == "image/png", (
+            "Bytes content mime type not preserved"
+        )

tests/issues/test_176_progress_token.py

@@ -35,9 +35,9 @@ async def test_progress_token_zero_first_call():
     await ctx.report_progress(10, 10)  # Complete
 
     # Verify progress notifications
-    assert (
-        mock_session.send_progress_notification.call_count == 3
-    ), "All progress notifications should be sent"
+    assert mock_session.send_progress_notification.call_count == 3, (
+        "All progress notifications should be sent"
+    )
     mock_session.send_progress_notification.assert_any_call(
         progress_token=0, progress=0.0, total=10.0
     )

tests/issues/test_192_request_id.py

@@ -86,9 +86,9 @@ async def run_server():
         response = await server_reader.receive()
 
         # Verify response ID matches request ID
-        assert (
-            response.root.id == custom_request_id
-        ), "Response ID should match request ID"
+        assert response.root.id == custom_request_id, (
+            "Response ID should match request ID"
+        )
 
         # Cancel server task
         tg.cancel_scope.cancel()