π The fast, Pythonic way to build MCP servers and clients.
Fix proxy dropping log messages whose data is not a msg/extra dict (#5501)
Asem ahmedf6f13a7fa096
diff --git a/fastmcp_slim/fastmcp/server/providers/proxy.py b/fastmcp_slim/fastmcp/server/providers/proxy.pyindex 33de8797c..9639a62f3 100644--- a/fastmcp_slim/fastmcp/server/providers/proxy.py+++ b/fastmcp_slim/fastmcp/server/providers/proxy.py@@ -9,6 +9,7 @@ from __future__ import annotationsimport base64import inspect+import jsonimport timeimport warningsfrom collections.abc import Awaitable, Callable, Sequence@@ -1589,8 +1590,13 @@ async def default_proxy_elicitation_handler(async def default_proxy_log_handler(message: LogMessage) -> None:"""Forward log notification from remote server to proxy's connected clients."""ctx = get_context()- msg = message.data.get("msg")- extra = message.data.get("extra")+ data = message.data+ # FastMCP servers send {"msg": ..., "extra": ...}; any other MCP server may+ # send any JSON value, which is forwarded as the message text.+ if isinstance(data, dict) and isinstance(data.get("msg"), str):+ msg, extra = data["msg"], data.get("extra")+ else:+ msg, extra = (data if isinstance(data, str) else json.dumps(data)), Noneawait ctx.log(msg, level=message.level, logger_name=message.logger, extra=extra)diff --git a/tests/server/providers/proxy/test_proxy_client.py b/tests/server/providers/proxy/test_proxy_client.pyindex 53b37129a..400765927 100644--- a/tests/server/providers/proxy/test_proxy_client.py+++ b/tests/server/providers/proxy/test_proxy_client.py@@ -1,5 +1,5 @@from dataclasses import dataclass-from typing import cast+from typing import Any, castimport pytestfrom anyio import create_task_group@@ -129,6 +129,17 @@ def fastmcp_server():) -> None:await context.log(message=message, level=level, logger_name=logger)+ @mcp.tool+ async def log_raw(data: Any, context: Context) -> None:+ # Unlike `context.log`, this sends the payload as-is, the way an MCP+ # server that is not built on FastMCP would.+ await context.session.send_log_message( # ty: ignore[deprecated]+ level="info",+ data=data,+ logger="raw",+ related_request_id=context.origin_request_id,+ )+@mcp.toolasync def report_progress(context: Context) -> int:for i in range(3):@@ -332,6 +343,35 @@ class TestProxyClient:assert log_handler_called+ @pytest.mark.parametrize(+ ("data", "expected_msg"),+ [+ ("plain string log", "plain string log"),+ ({"message": "no msg key", "n": 1}, '{"message": "no msg key", "n": 1}'),+ (["a", 2], '["a", 2]'),+ (42, "42"),+ ],+ )+ async def test_log_request_with_non_fastmcp_payload(+ self, proxy_server: FastMCP, data: Any, expected_msg: str+ ):+ """+ Test that the proxy forwards log data that is not FastMCP's `msg`/`extra` dict.+ """+ received: list[LogMessage] = []++ async def log_handler(message: LogMessage) -> None:+ received.append(message)++ async with Client(+ proxy_server, mode="legacy", log_handler=log_handler+ ) as client:+ await client.call_tool("log_raw", {"data": data})++ assert [(m.level, m.logger, m.data["msg"]) for m in received] == [+ ("info", "raw", expected_msg)+ ]+async def test_report_progress_request(self, proxy_server: FastMCP):"""Test that the proxy client correctly forwards the `report_progress` request.