Skip to content

fix: handle unbound response_or_error in send_request timeout #2319

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
Bortlesboat wants to merge 1 commit into from
+10 −0
Closed

fix: handle unbound response_or_error in send_request timeout #2319

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/mcp/shared/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ async def send_request(
# request read timeout takes precedence over session read timeout
timeout = request_read_timeout_seconds or self._session_read_timeout_seconds

response_or_error: JSONRPCResponse | JSONRPCError | None = None
try:
with anyio.fail_after(timeout):
response_or_error = await response_stream_reader.receive()
Expand All @@ -278,6 +279,15 @@ async def send_request(
message = f"Timed out while waiting for response to {class_name}. Waited {timeout} seconds."
raise MCPError(code=REQUEST_TIMEOUT, message=message)

if response_or_error is None:
raise MCPError(
code=REQUEST_TIMEOUT,
message=(
f"Response not received for {request.__class__.__name__}. "
"This may indicate a race condition in the cancel scope."
),
)

if isinstance(response_or_error, JSONRPCError):
raise MCPError.from_jsonrpc_error(response_or_error)
else:
Expand Down
Loading