Merge branch 'main' into revert-172-fixAsyncLog

Author: dsp-ant

src/mcp/server/fastmcp/server.py

@@ -620,7 +620,7 @@ async def read_resource(self, uri: str | AnyUrl) -> str | bytes:
         ), "Context is not available outside of a request"
         return await self._fastmcp.read_resource(uri)
 
-    def log(
+    async def log(
         self,
         level: Literal["debug", "info", "warning", "error"],
         message: str,
@@ -635,7 +635,7 @@ def log(
             logger_name: Optional logger name
             **extra: Additional structured data to include
         """
-        self.request_context.session.send_log_message(
+        await self.request_context.session.send_log_message(
             level=level, data=message, logger=logger_name
         )
 
@@ -659,18 +659,18 @@ def session(self):
         return self.request_context.session
 
     # Convenience methods for common log levels
-    def debug(self, message: str, **extra: Any) -> None:
+    async def debug(self, message: str, **extra: Any) -> None:
         """Send a debug log message."""
-        self.log("debug", message, **extra)
+        await self.log("debug", message, **extra)
 
-    def info(self, message: str, **extra: Any) -> None:
+    async def info(self, message: str, **extra: Any) -> None:
         """Send an info log message."""
-        self.log("info", message, **extra)
+        await self.log("info", message, **extra)
 
-    def warning(self, message: str, **extra: Any) -> None:
+    async def warning(self, message: str, **extra: Any) -> None:
         """Send a warning log message."""
-        self.log("warning", message, **extra)
+        await self.log("warning", message, **extra)
 
-    def error(self, message: str, **extra: Any) -> None:
+    async def error(self, message: str, **extra: Any) -> None:
         """Send an error log message."""
-        self.log("error", message, **extra)
+        await self.log("error", message, **extra)

tests/server/fastmcp/test_server.py

@@ -521,11 +521,11 @@ async def test_context_logging(self):
         """Test that context logging methods work."""
         mcp = FastMCP()
 
-        def logging_tool(msg: str, ctx: Context) -> str:
-            ctx.debug("Debug message")
-            ctx.info("Info message")
-            ctx.warning("Warning message")
-            ctx.error("Error message")
+        async def logging_tool(msg: str, ctx: Context) -> str:
+            await ctx.debug("Debug message")
+            await ctx.info("Info message")
+            await ctx.warning("Warning message")
+            await ctx.error("Error message")
             return f"Logged messages for {msg}"
 
         mcp.add_tool(logging_tool)
@@ -563,8 +563,8 @@ def test_resource() -> str:
 
         @mcp.tool()
         async def tool_with_resource(ctx: Context) -> str:
-            data = await ctx.read_resource("test://data")
-            return f"Read resource: {data}"
+            data, mime_type = await ctx.read_resource("test://data")
+            return f"Read resource: {data} with mime type {mime_type}"
 
         async with client_session(mcp._mcp_server) as client:
             result = await client.call_tool("tool_with_resource", {})