fix: support MCP 2 timeout values - #6940
Closed
mikemikimike wants to merge 1 commit into
Closed
Conversation
9 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Issue
Closes #6938.
Summary
MCP 2.x expects timeout values as float seconds, but
_read_timeout()always returneddatetime.timedelta, causinganyio.fail_after()to fail during MCP session initialization. This keeps the existing MCP 1.x conversion and returns the original float for MCP 2.x.Testing plan
python -m compileall -q src/google/adk/tools/mcp_tool/session_context.py tests/unittests/tools/mcp_tool/test_session_context.py— passedgit diff --check— passedtest_session_context.py(AsyncExitStackandClientSession); no new lint findings were introduced.The regression tests cover MCP 1.x timedelta behavior, MCP 2.x float behavior,
None, zero, and fractional values. No external service is required.