FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix: isolate streamable HTTP request errors by he-yufeng · Pull Request #2607 · modelcontextprotocol/python-sdk · GitHub

/ python-sdk Public

fix: isolate streamable HTTP request errors #2607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
he-yufeng wants to merge 1 commit into from
Conversation 7 Commits 1 Checks 27 Files changed
Closed

fix: isolate streamable HTTP request errors #2607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
17 changes: 13 additions & 4 deletions src/mcp/client/streamable_http.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,19 @@ async def _handle_message(session_message: SessionMessage) -> None:
)

async def handle_request_async():
if is_resumption:
await self._handle_resumption_request(ctx)
else:
await self._handle_post_request(ctx)
try:
if is_resumption:
await self._handle_resumption_request(ctx)
else:
await self._handle_post_request(ctx)
except httpx.HTTPError as exc:
if not isinstance(message, JSONRPCRequest):
raise

logger.exception("Error handling streamable HTTP request")
error_data = ErrorData(code=INTERNAL_ERROR, message=f"Request failed: {exc}")
error_msg = SessionMessage(JSONRPCError(jsonrpc="2.0", id=message.id, error=error_data))
await ctx.read_stream_writer.send(error_msg)

# If this is a request, start a new task to handle it
if isinstance(message, JSONRPCRequest):
Expand Down
57 changes: 57 additions & 0 deletions tests/shared/test_streamable_http.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@
CallToolRequestParams,
CallToolResult,
InitializeResult,
JSONRPCError,
JSONRPCNotification,
JSONRPCRequest,
JSONRPCResponse,
ListToolsResult,
PaginatedRequestParams,
ReadResourceRequestParams,
Expand Down Expand Up @@ -902,6 +905,60 @@ async def test_streamable_http_client_error_handling(initialized_client_session:
assert "Unknown resource: unknown://test-error" in exc_info.value.error.message


@pytest.mark.anyio
async def test_streamable_http_request_error_does_not_close_writer() -> None:
async def handler(request: httpx.Request) -> httpx.Response:
body = json.loads(request.content)
if body["method"] == "tools/list":
raise httpx.ConnectError("boom", request=request)

return httpx.Response(
200,
headers={"content-type": "application/json"},
json={"jsonrpc": "2.0", "id": body["id"], "result": {}},
request=request,
)

async with httpx.AsyncClient(transport=httpx.MockTransport(handler)) as client:
async with streamable_http_client("http://testserver/mcp", http_client=client) as (read_stream, write_stream):
await write_stream.send(SessionMessage(JSONRPCRequest(jsonrpc="2.0", id="bad", method="tools/list")))

with anyio.fail_after(1):
error_message = await read_stream.receive()

assert isinstance(error_message, SessionMessage)
assert isinstance(error_message.message, JSONRPCError)
assert error_message.message.id == "bad"
assert error_message.message.error.code == types.INTERNAL_ERROR

await write_stream.send(SessionMessage(JSONRPCRequest(jsonrpc="2.0", id="ok", method="ping")))

with anyio.fail_after(1):
response_message = await read_stream.receive()

assert isinstance(response_message, SessionMessage)
assert isinstance(response_message.message, JSONRPCResponse)
assert response_message.message.id == "ok"


@pytest.mark.anyio
async def test_streamable_http_notification_error_still_closes_writer() -> None:
request_seen = anyio.Event()

async def handler(request: httpx.Request) -> httpx.Response:
request_seen.set()
raise httpx.ConnectError("boom", request=request)

async with httpx.AsyncClient(transport=httpx.MockTransport(handler)) as client:
async with streamable_http_client("http://testserver/mcp", http_client=client) as (_, write_stream):
await write_stream.send(
SessionMessage(JSONRPCNotification(jsonrpc="2.0", method="notifications/cancelled"))
)

with anyio.fail_after(1): # pragma: no branch
await request_seen.wait()


@pytest.mark.anyio
async def test_streamable_http_client_session_persistence(basic_app: Starlette) -> None:
"""The session persists across multiple requests on one connection."""
Expand Down
Loading
Back | FazBrowse Home | New Git URL