fix: timeout issues for mcpstdio server when mcp tools are incorrect.

google-genai-bot · copybara-github · commit 45ef6684352e · 2025-05-30T14:39:07.000-07:00
Fixes #643 PiperOrigin-RevId: 765342572
diff --git a/src/google/adk/tools/mcp_tool/mcp_session_manager.py b/src/google/adk/tools/mcp_tool/mcp_session_manager.py
@@ -149,7 +149,8 @@ def __init__(
     """Initializes the MCP session manager.
 
     Args:
-        connection_params: Parameters for the MCP connection (Stdio, SSE or Streamable HTTP).
+        connection_params: Parameters for the MCP connection (Stdio, SSE or
+          Streamable HTTP).
         errlog: (Optional) TextIO stream for error logging. Use only for
           initializing a local stdio MCP session.
     """
@@ -203,9 +204,23 @@ async def create_session(self) -> ClientSession:
       transports = await self._exit_stack.enter_async_context(client)
       # The streamable http client returns a GetSessionCallback in addition to the read/write MemoryObjectStreams
       # needed to build the ClientSession, we limit then to the two first values to be compatible with all clients.
-      session = await self._exit_stack.enter_async_context(
-          ClientSession(*transports[:2])
-      )
+      # The StdioServerParameters does not provide a timeout parameter for the
+      # session, so we need to set a default timeout for it. Other clients
+      # (SseServerParams and StreamableHTTPServerParams) already provide a
+      # timeout parameter in their configuration.
+      if isinstance(self._connection_params, StdioServerParameters):
+        # Default timeout for MCP session is 5 seconds, same as SseServerParams
+        # and StreamableHTTPServerParams.
+        session = await self._exit_stack.enter_async_context(
+            ClientSession(
+                *transports[:2],
+                read_timeout_seconds=timedelta(seconds=5),
+            )
+        )
+      else:
+        session = await self._exit_stack.enter_async_context(
+            ClientSession(*transports[:2])
+        )
       await session.initialize()
 
       self._session = session
diff --git a/src/google/adk/tools/mcp_tool/mcp_toolset.py b/src/google/adk/tools/mcp_tool/mcp_toolset.py
@@ -98,10 +98,10 @@ def __init__(
         `StdioServerParameters` for using local mcp server (e.g. using `npx` or
         `python3`); or `SseServerParams` for a local/remote SSE server; or
         `StreamableHTTPServerParams` for local/remote Streamable http server.
-      tool_filter: Optional filter to select specific tools. Can be either:
-            - A list of tool names to include
-            - A ToolPredicate function for custom filtering logic
-        errlog: TextIO stream for error logging.
+      tool_filter: Optional filter to select specific tools. Can be either: - A
+        list of tool names to include - A ToolPredicate function for custom
+        filtering logic
+      errlog: TextIO stream for error logging.
     """
     super().__init__(tool_filter=tool_filter)
 
