self review

Author: nick-merrill

mcp_python/server/__init__.py

@@ -391,7 +391,7 @@ async def run(
                                     ErrorData(
                                         code=METHOD_NOT_FOUND,
                                         message="Method not found",
-                                    ),
+                                    )
                                 )
 
                             logger.debug("Response sent")

mcp_python/server/memory.py

@@ -3,7 +3,7 @@
 """
 
 from contextlib import asynccontextmanager
-from typing import AsyncGenerator, Tuple
+from typing import AsyncGenerator
 
 import anyio
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
@@ -12,23 +12,16 @@
 from mcp_python.server import Server
 from mcp_python.types import JSONRPCMessage
 
+MessageStream = tuple[
+    MemoryObjectReceiveStream[JSONRPCMessage | Exception],
+    MemoryObjectSendStream[JSONRPCMessage]
+]
 
 @asynccontextmanager
-async def create_client_server_memory_streams() -> (
-    AsyncGenerator[
-        Tuple[
-            Tuple[
-                MemoryObjectReceiveStream[JSONRPCMessage | Exception],
-                MemoryObjectSendStream[JSONRPCMessage],
-            ],
-            Tuple[
-                MemoryObjectReceiveStream[JSONRPCMessage | Exception],
-                MemoryObjectSendStream[JSONRPCMessage],
-            ],
-        ],
-        None,
-    ]
-):
+async def create_client_server_memory_streams() -> AsyncGenerator[
+    tuple[MessageStream, MessageStream],
+    None
+]:
     """
     Creates a pair of bidirectional memory streams for client-server communication.
 
@@ -44,7 +37,6 @@ async def create_client_server_memory_streams() -> (
         JSONRPCMessage | Exception
     ](1)
 
-    # Return streams grouped by client/server
     client_streams = (server_to_client_receive, client_to_server_send)
     server_streams = (client_to_server_receive, server_to_client_send)
 
@@ -66,10 +58,8 @@ async def create_connected_server_and_client_session(
         client_streams,
         server_streams,
     ):
-        # Unpack the streams
         client_read, client_write = client_streams
         server_read, server_write = server_streams
-        print("stream-1")
 
         # Create a cancel scope for the server task
         async with anyio.create_task_group() as tg:
@@ -80,8 +70,6 @@ async def create_connected_server_and_client_session(
                 server.create_initialization_options(),
             )
 
-            print("stream2")
-
             try:
                 # Client session could be created here using client_read and
                 # client_write This would allow testing the server with a client

mcp_python/shared/session.py

@@ -154,7 +154,6 @@ async def send_request(
             with anyio.fail_after(self._read_timeout_seconds):
                 response_or_error = await response_stream_reader.receive()
         except TimeoutError:
-            # TODO: make sure this response comes back correctly to the client
             raise McpError(
                 ErrorData(
                     code=408,

tests/conftest.py

@@ -15,7 +15,6 @@
 def mcp_server() -> Server:
     server = Server(name="test_server")
 
-    # Add a simple resource for testing
     @server.list_resources()
     async def handle_list_resources():
         return [

tests/test_memory.py

@@ -15,11 +15,8 @@
 async def client_connected_to_server(
     mcp_server: Server,
 ) -> AsyncGenerator[ClientSession, None]:
-    print("11111")
     async with create_connected_server_and_client_session(mcp_server) as client_session:
-        print("2222k")
         yield client_session
-        print("33")
 
 
 @pytest.mark.anyio
@@ -28,6 +25,4 @@ async def test_memory_server_and_client_connection(
 ):
     """Shows how a client and server can communicate over memory streams."""
     response = await client_connected_to_server.send_ping()
-    print("foo")
     assert isinstance(response, EmptyResult)
-    print("bar")