Remove circular import

Author: yurikunash

src/mcp/server/fastmcp/server.py

@@ -44,7 +44,7 @@
 from mcp.server.session import ServerSession, ServerSessionT
 from mcp.server.sse import SseServerTransport
 from mcp.server.stdio import stdio_server
-from mcp.server.streamable_http import EventStore, StreamableHTTPASGIApp
+from mcp.server.streamable_http import EventStore
 from mcp.server.streamable_http_manager import StreamableHTTPSessionManager
 from mcp.server.transport_security import TransportSecuritySettings
 from mcp.shared.context import LifespanContextT, RequestContext, RequestT
@@ -969,6 +969,16 @@ async def get_prompt(self, name: str, arguments: dict[str, Any] | None = None) -
             logger.exception(f"Error getting prompt {name}")
             raise ValueError(str(e))
 
+class StreamableHTTPASGIApp:
+    """
+    ASGI application for Streamable HTTP server transport.
+    """
+
+    def __init__(self, session_manager: StreamableHTTPSessionManager):
+        self.session_manager = session_manager
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
+        await self.session_manager.handle_request(scope, receive, send)
 
 class Context(BaseModel, Generic[ServerSessionT, LifespanContextT, RequestT]):
     """Context object providing access to MCP capabilities.

src/mcp/server/streamable_http.py

@@ -28,7 +28,6 @@
     TransportSecurityMiddleware,
     TransportSecuritySettings,
 )
-from mcp.server.streamable_http_manager import StreamableHTTPSessionManager
 from mcp.shared.message import ServerMessageMetadata, SessionMessage
 from mcp.shared.version import SUPPORTED_PROTOCOL_VERSIONS
 from mcp.types import (
@@ -901,16 +900,4 @@ async def message_router():
                     await write_stream.aclose()
                 except Exception as e:
                     # During cleanup, we catch all exceptions since streams might be in various states
-                    logger.debug(f"Error closing streams: {e}")
-
-
-class StreamableHTTPASGIApp:
-    """
-    ASGI application for StreamableHTTP server transport.
-    """
-
-    def __init__(self, session_manager: StreamableHTTPSessionManager):
-        self.session_manager = session_manager
-
-    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
-        await self.session_manager.handle_request(scope, receive, send)
+                    logger.debug(f"Error closing streams: {e}")