modelcontextprotocol/python-sdk
Watch
1
0
Fork
You've already forked python-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add a timeout arguments on per-request basis (as per MCP specifications) (#601)

Browse source
This commit is contained in:
Guillaume Raille 2025-04-29 14:58:48 +02:00 • committed by GitHub
commit 96e5327110
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/mcp/client/session.py
View file

@ -254,7 +254,10 @@ class ClientSession(
) )
async def call_tool( async def call_tool(
self, name: str, arguments: dict[str, Any] | None = None self,
name: str,
arguments: dict[str, Any] | None = None,
read_timeout_seconds: timedelta | None = None,
) -> types.CallToolResult: ) -> types.CallToolResult:
"""Send a tools/call request.""" """Send a tools/call request."""
return await self.send_request( return await self.send_request(
@ -265,6 +268,7 @@ class ClientSession(
) )
), ),
types.CallToolResult, types.CallToolResult,
request_read_timeout_seconds=read_timeout_seconds,
) )
async def list_prompts(self) -> types.ListPromptsResult: async def list_prompts(self) -> types.ListPromptsResult:

21
src/mcp/shared/session.py
View file

@ -185,7 +185,7 @@ class BaseSession(
self._request_id = 0 self._request_id = 0
self._receive_request_type = receive_request_type self._receive_request_type = receive_request_type
self._receive_notification_type = receive_notification_type self._receive_notification_type = receive_notification_type
self._read_timeout_seconds = read_timeout_seconds self._session_read_timeout_seconds = read_timeout_seconds
self._in_flight = {} self._in_flight = {}
self._exit_stack = AsyncExitStack() self._exit_stack = AsyncExitStack()
@ -213,10 +213,12 @@ class BaseSession(
self, self,
request: SendRequestT, request: SendRequestT,
result_type: type[ReceiveResultT], result_type: type[ReceiveResultT],
request_read_timeout_seconds: timedelta | None = None,
) -> ReceiveResultT: ) -> ReceiveResultT:
""" """
Sends a request and wait for a response. Raises an McpError if the Sends a request and wait for a response. Raises an McpError if the
response contains an error. response contains an error. If a request read timeout is provided, it
will take precedence over the session read timeout.
Do not use this method to emit notifications! Use send_notification() Do not use this method to emit notifications! Use send_notification()
instead. instead.
@ -243,12 +245,15 @@ class BaseSession(
await self._write_stream.send(JSONRPCMessage(jsonrpc_request)) await self._write_stream.send(JSONRPCMessage(jsonrpc_request))
# request read timeout takes precedence over session read timeout
timeout = None
if request_read_timeout_seconds is not None:
timeout = request_read_timeout_seconds.total_seconds()
elif self._session_read_timeout_seconds is not None:
timeout = self._session_read_timeout_seconds.total_seconds()
try: try:
with anyio.fail_after( with anyio.fail_after(timeout):
None
if self._read_timeout_seconds is None
else self._read_timeout_seconds.total_seconds()
):
response_or_error = await response_stream_reader.receive() response_or_error = await response_stream_reader.receive()
except TimeoutError: except TimeoutError:
raise McpError( raise McpError(
@ -257,7 +262,7 @@ class BaseSession(
message=( message=(
f"Timed out while waiting for response to " f"Timed out while waiting for response to "
f"{request.__class__.__name__}. Waited " f"{request.__class__.__name__}. Waited "
f"{self._read_timeout_seconds} seconds." f"{timeout} seconds."
), ),
) )
) )