feat: Add configurable timeout for tool execution #1685
+275
−16
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Implements baseline timeout behavior for MCP tool calls to prevent indefinite blocking.
Closes #1374
Changes
Server-Side Timeout
src/mcp/types.pyanyio.fail_after()to enforce timeoutsConfiguration
FastMCP(tool_timeout_seconds=60.0)FASTMCP_TOOL_TIMEOUT_SECONDS=120FastMCP(tool_timeout_seconds=None)Testing
test_tool_manager.py:Documentation
Design Decisions
Client-Side
Client-side timeout handling already exists in
BaseSession.send_request()and works correctly with the new server-side timeouts.Testing
All new tests pass:
Linting passes:
ruff check .Checklist