Skip to content

Commit 69b0b89

Browse files
committed
fix: revalidate request_timeout before opening the MCP session
1 parent 44a2c20 commit 69b0b89

2 files changed

Lines changed: 22 additions & 0 deletions

File tree

‎python/packages/core/agent_framework/_mcp.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,6 +2315,7 @@ async def _connect_on_owner(
23152315
reset_discovery: If True, removes state derived from the previous session after its transport closes.
23162316
23172317
Raises:
2318+
ValueError: If ``request_timeout`` was set to a non-positive value after construction.
23182319
ToolException: If connection or session initialization fails.
23192320
"""
23202321
log_level = _to_mcp_logging_level(logger.level)
@@ -2333,6 +2334,8 @@ async def _connect_on_owner(
23332334
self._exit_stack = AsyncExitStack()
23342335
connection = self._connection
23352336
if connection is None:
2337+
if self.request_timeout is not None and self.request_timeout <= 0:
2338+
raise ValueError("request_timeout must be positive or None.")
23362339
try:
23372340
try:
23382341
from mcp import Client, types

‎python/packages/core/tests/core/test_mcp.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5426,6 +5426,25 @@ async def test_connect_preserves_request_timeout_over_24_hours() -> None:
54265426
assert mock_client_class.call_args.kwargs["read_timeout_seconds"] == 90_000
54275427

54285428

5429+
async def test_connect_revalidates_request_timeout_cleared_after_construction() -> None:
5430+
tool = MCPStdioTool(
5431+
name="test",
5432+
command="test-command",
5433+
load_tools=False,
5434+
load_prompts=False,
5435+
request_timeout=60,
5436+
)
5437+
tool.request_timeout = 0
5438+
5439+
with patch("mcp.Client") as mock_client_class:
5440+
mock_client_class.return_value = _mock_sdk_client(protocol_version="2026-07-28")
5441+
5442+
with pytest.raises(ValueError, match="request_timeout must be positive or None."):
5443+
await tool.connect()
5444+
5445+
assert mock_client_class.call_count == 0
5446+
5447+
54295448
async def test_connect_retains_and_close_clears_sdk_client() -> None:
54305449
"""Test a framework-owned Client and its session share one lifecycle."""
54315450
tool = MCPStdioTool(name="test", command="test-command", load_tools=False, load_prompts=False)

0 commit comments

Comments
 (0)