Merge branch 'ihrpr/streamablehttp-server' into ihrpr/streamablehttp-stateless

Author: ihrpr

examples/servers/simple-streamablehttp/README.md

@@ -5,6 +5,7 @@ A simple MCP server example demonstrating the StreamableHttp transport, which en
 ## Features
 
 - Uses the StreamableHTTP transport for server-client communication
+- Supports REST API operations (POST, GET, DELETE) for `/mcp` endpoint
 - Task management with anyio task groups
 - Ability to send multiple notifications over time to the client
 - Proper resource cleanup and lifespan management

examples/servers/simple-streamablehttp/mcp_simple_streamablehttp/server.py

@@ -82,6 +82,11 @@ async def call_tool(
                 level="info",
                 data=f"Notification {i+1}/{count} from caller: {caller}",
                 logger="notification_stream",
+                # Associates this notification with the original request
+                # Ensures notifications are sent to the correct response stream
+                # Without this, notifications will either go to:
+                # - a standalone SSE stream (if GET request is supported)
+                # - nowhere (if GET request isn't supported)
                 related_request_id=ctx.request_id,
             )
             if i < count - 1:  # Don't wait after the last notification

src/mcp/server/fastmcp/server.py

@@ -466,6 +466,7 @@ async def run_stdio_async(self) -> None:
     async def run_sse_async(self) -> None:
         """Run the server using SSE transport."""
         import uvicorn
+
         starlette_app = self.sse_app()
 
         config = uvicorn.Config(
@@ -673,7 +674,10 @@ async def log(
             **extra: Additional structured data to include
         """
         await self.request_context.session.send_log_message(
-            level=level, data=message, logger=logger_name
+            level=level,
+            data=message,
+            logger=logger_name,
+            related_request_id=self.request_id,
         )
 
     @property

src/mcp/server/streamableHttp.py

@@ -577,11 +577,6 @@ async def connect(
         """
 
         # Create the memory streams for this connection
-        read_stream: MemoryObjectReceiveStream[JSONRPCMessage | Exception]
-        read_stream_writer: MemoryObjectSendStream[JSONRPCMessage | Exception]
-
-        write_stream: MemoryObjectSendStream[JSONRPCMessage]
-        write_stream_reader: MemoryObjectReceiveStream[JSONRPCMessage]
 
         read_stream_writer, read_stream = anyio.create_memory_object_stream[
             JSONRPCMessage | Exception
@@ -605,10 +600,13 @@ async def message_router():
                         if isinstance(
                             message.root, JSONRPCNotification | JSONRPCRequest
                         ):
-                            # Extract related_request_id from params if it exists
-                            if (params := getattr(message.root, "params", None)) and (
-                                related_id := params.get("related_request_id")
-                            ) is not None:
+                            # Extract related_request_id from meta if it exists
+                            if (
+                                (params := getattr(message.root, "params", None))
+                                and (meta := params.get("_meta"))
+                                and (related_id := meta.get("related_request_id"))
+                                is not None
+                            ):
                                 target_request_id = str(related_id)
                         else:
                             target_request_id = str(message.root.id)

src/mcp/shared/session.py

@@ -6,7 +6,6 @@
 from typing import Any, Generic, TypeVar
 
 import anyio
-import anyio.lowlevel
 import httpx
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import BaseModel
@@ -24,6 +23,7 @@
     JSONRPCNotification,
     JSONRPCRequest,
     JSONRPCResponse,
+    NotificationParams,
     RequestParams,
     ServerNotification,
     ServerRequest,
@@ -276,8 +276,19 @@ async def send_notification(
         Emits a notification, which is a one-way message that does not expect
         a response.
         """
+        # Some transport implementations may need to set the related_request_id
+        # to attribute to the notifications to the request that triggered them.
         if related_request_id is not None and notification.root.params is not None:
-            notification.root.params.related_request_id = related_request_id
+            # Create meta if it doesn't exist
+            if notification.root.params.meta is None:
+                meta_dict = {"related_request_id": related_request_id}
+
+            else:
+                meta_dict = notification.root.params.meta.model_dump(
+                    by_alias=True, mode="json", exclude_none=True
+                )
+                meta_dict["related_request_id"] = related_request_id
+            notification.root.params.meta = NotificationParams.Meta(**meta_dict)
         jsonrpc_notification = JSONRPCNotification(
             jsonrpc="2.0",
             **notification.model_dump(by_alias=True, mode="json", exclude_none=True),

src/mcp/types.py

@@ -58,7 +58,6 @@ class Meta(BaseModel):
         model_config = ConfigDict(extra="allow")
 
     meta: Meta | None = Field(alias="_meta", default=None)
-    related_request_id: RequestId | None = None
     """
     This parameter name is reserved by MCP to allow clients and servers to attach
     additional metadata to their notifications.

tests/client/test_logging_callback.py

@@ -9,6 +9,7 @@
 from mcp.shared.session import RequestResponder
 from mcp.types import (
     LoggingMessageNotificationParams,
+    NotificationParams,
     TextContent,
 )
 
@@ -78,6 +79,11 @@ async def message_handler(
         )
         assert log_result.isError is False
         assert len(logging_collector.log_messages) == 1
-        assert logging_collector.log_messages[0] == LoggingMessageNotificationParams(
-            level="info", logger="test_logger", data="Test log message"
-        )
+        # Create meta object with related_request_id added dynamically
+        meta = NotificationParams.Meta()
+        setattr(meta, "related_request_id", "2")
+        log = logging_collector.log_messages[0]
+        assert log.level == "info"
+        assert log.logger == "test_logger"
+        assert log.data == "Test log message"
+        assert log.meta == meta

tests/issues/test_188_concurrency.py

@@ -35,7 +35,7 @@ async def slow_resource():
         end_time = anyio.current_time()
 
         duration = end_time - start_time
-        assert duration < 3 * _sleep_time_seconds
+        assert duration < 6 * _sleep_time_seconds
         print(duration)
 
 

tests/server/fastmcp/servers/test_file_server.py

@@ -114,17 +114,13 @@ async def test_read_resource_file(mcp: FastMCP):
 
 @pytest.mark.anyio
 async def test_delete_file(mcp: FastMCP, test_dir: Path):
-    await mcp.call_tool(
-        "delete_file", arguments={"path": str(test_dir / "example.py")}
-    )
+    await mcp.call_tool("delete_file", arguments={"path": str(test_dir / "example.py")})
     assert not (test_dir / "example.py").exists()
 
 
 @pytest.mark.anyio
 async def test_delete_file_and_check_resources(mcp: FastMCP, test_dir: Path):
-    await mcp.call_tool(
-        "delete_file", arguments={"path": str(test_dir / "example.py")}
-    )
+    await mcp.call_tool("delete_file", arguments={"path": str(test_dir / "example.py")})
     res_iter = await mcp.read_resource("file://test_dir/example.py")
     res_list = list(res_iter)
     assert len(res_list) == 1

tests/server/fastmcp/test_server.py

@@ -544,14 +544,28 @@ async def logging_tool(msg: str, ctx: Context) -> str:
 
                 assert mock_log.call_count == 4
                 mock_log.assert_any_call(
-                    level="debug", data="Debug message", logger=None
+                    level="debug",
+                    data="Debug message",
+                    logger=None,
+                    related_request_id="1",
                 )
-                mock_log.assert_any_call(level="info", data="Info message", logger=None)
                 mock_log.assert_any_call(
-                    level="warning", data="Warning message", logger=None
+                    level="info",
+                    data="Info message",
+                    logger=None,
+                    related_request_id="1",
                 )
                 mock_log.assert_any_call(
-                    level="error", data="Error message", logger=None
+                    level="warning",
+                    data="Warning message",
+                    logger=None,
+                    related_request_id="1",
+                )
+                mock_log.assert_any_call(
+                    level="error",
+                    data="Error message",
+                    logger=None,
+                    related_request_id="1",
                 )
 
     @pytest.mark.anyio