Content-Length: 4228 | pFad | http://github.com/modelcontextprotocol/python-sdk/pull/2357.patch

thub.com From 952c642b2e248a21347a640375476b6ce3471a66 Mon Sep 17 00:00:00 2001 From: Funan Zhou Date: Fri, 27 Mar 2026 05:06:06 +0800 Subject: [PATCH 1/2] fix(streamable-http): demote stateless termination log to debug --- src/mcp/server/streamable_http.py | 5 ++- tests/server/test_streamable_http_manager.py | 42 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/mcp/server/streamable_http.py b/src/mcp/server/streamable_http.py index aa99e7c88..ada9c6121 100644 --- a/src/mcp/server/streamable_http.py +++ b/src/mcp/server/streamable_http.py @@ -767,7 +767,10 @@ async def terminate(self) -> None: """ self._terminated = True - logger.info(f"Terminating session: {self.mcp_session_id}") + if self.mcp_session_id: + logger.info(f"Terminating session: {self.mcp_session_id}") + else: + logger.debug("Stateless request completed, cleaning up transport") # We need a copy of the keys to avoid modification during iteration request_stream_keys = list(self._request_streams.keys()) diff --git a/tests/server/test_streamable_http_manager.py b/tests/server/test_streamable_http_manager.py index 47cfbf14a..02f1a3dc5 100644 --- a/tests/server/test_streamable_http_manager.py +++ b/tests/server/test_streamable_http_manager.py @@ -269,6 +269,48 @@ async def mock_receive(): assert len(transport._request_streams) == 0, "Transport should have no active request streams" +@pytest.mark.anyio +async def test_stateless_termination_logs_debug_not_info(caplog: pytest.LogCaptureFixture): + """Stateless mode termination should use DEBUG logs and avoid INFO-level "None" session text.""" + app = Server("test-stateless-log-level") + manager = StreamableHTTPSessionManager(app=app, stateless=True) + + async with manager.run(): + app.run = AsyncMock(return_value=None) + + async def mock_send(message: Message): + del message + + scope = { + "type": "http", + "method": "POST", + "path": "/mcp", + "headers": [ + (b"content-type", b"application/json"), + (b"accept", b"application/json, text/event-stream"), + ], + } + + async def mock_receive(): + return { + "type": "http.request", + "body": b"", + "more_body": False, + } + + with caplog.at_level(logging.DEBUG, logger="mcp.server.streamable_http"): + await manager.handle_request(scope, mock_receive, mock_send) + + streamable_http_messages = [ + record.getMessage() + for record in caplog.records + if record.name == "mcp.server.streamable_http" + ] + + assert "Stateless request completed, cleaning up transport" in streamable_http_messages + assert "Terminating session: None" not in streamable_http_messages + + @pytest.mark.anyio async def test_unknown_session_id_returns_404(caplog: pytest.LogCaptureFixture): """Test that requests with unknown session IDs return HTTP 404 per MCP spec.""" From e39c16c2e0dac7adfc98c54f430feebfeb3b24b7 Mon Sep 17 00:00:00 2001 From: Funan Zhou Date: Sun, 29 Mar 2026 03:04:03 +0800 Subject: [PATCH 2/2] style: apply ruff format to test file --- tests/server/test_streamable_http_manager.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/server/test_streamable_http_manager.py b/tests/server/test_streamable_http_manager.py index 02f1a3dc5..06affec96 100644 --- a/tests/server/test_streamable_http_manager.py +++ b/tests/server/test_streamable_http_manager.py @@ -302,9 +302,7 @@ async def mock_receive(): await manager.handle_request(scope, mock_receive, mock_send) streamable_http_messages = [ - record.getMessage() - for record in caplog.records - if record.name == "mcp.server.streamable_http" + record.getMessage() for record in caplog.records if record.name == "mcp.server.streamable_http" ] assert "Stateless request completed, cleaning up transport" in streamable_http_messages

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!