MCP 2.x expects timeout values as float seconds, but _read_timeout() always returned datetime.timedelta, causing anyio.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.
Focused pytest — not run: the host has Pydantic 1.x while ADK requires Pydantic 2.x, so collection fails before tests execute.
Ruff on the two touched files — reports two pre-existing unused imports in test_session_context.py (AsyncExitStack and ClientSession); 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.
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
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 returned datetime.timedelta, causing anyio.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
The regression tests cover MCP 1.x timedelta behavior, MCP 2.x float behavior, None, zero, and fractional values. No external service is required.