From d4dc6454783f747120d407d0dc2cb78f53598d83 Mon Sep 17 00:00:00 2001
From: "Wei Sun (Jack)" <weisun@google.com>
Date: Tue, 21 Oct 2025 19:42:10 -0700
Subject: [PATCH] chore: Fixes MCPToolset --> McpToolset in various places

PiperOrigin-RevId: 822377517
---
 src/google/adk/agents/llm_agent_config.py     |  2 +-
 src/google/adk/tools/__init__.py              |  2 ++
 src/google/adk/tools/mcp_tool/mcp_toolset.py  | 20 +++++++++----------
 .../tools/mcp_tool/test_mcp_toolset.py        |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/google/adk/agents/llm_agent_config.py b/src/google/adk/agents/llm_agent_config.py
index 4203a592..7d249359 100644
--- a/src/google/adk/agents/llm_agent_config.py
+++ b/src/google/adk/agents/llm_agent_config.py
@@ -143,7 +143,7 @@ Examples:
 
     ```
     # tools.py
-    my_mcp_toolset = MCPToolset(
+    my_mcp_toolset = McpToolset(
         connection_params=StdioServerParameters(
             command="npx",
             args=["-y", "@notionhq/notion-mcp-server"],
diff --git a/src/google/adk/tools/__init__.py b/src/google/adk/tools/__init__.py
index 50d01dfe..f5250d0a 100644
--- a/src/google/adk/tools/__init__.py
+++ b/src/google/adk/tools/__init__.py
@@ -67,7 +67,9 @@ if sys.version_info < (3, 10):
   )
 else:
   from .mcp_tool.mcp_toolset import MCPToolset
+  from .mcp_tool.mcp_toolset import McpToolset
 
   __all__.extend([
       'MCPToolset',
+      'McpToolset',
   ])
diff --git a/src/google/adk/tools/mcp_tool/mcp_toolset.py b/src/google/adk/tools/mcp_tool/mcp_toolset.py
index 06c57a45..dff67eb6 100644
--- a/src/google/adk/tools/mcp_tool/mcp_toolset.py
+++ b/src/google/adk/tools/mcp_tool/mcp_toolset.py
@@ -16,8 +16,6 @@ from __future__ import annotations
 
 import logging
 import sys
-from typing import Any
-from typing import AsyncIterator
 from typing import Callable
 from typing import Dict
 from typing import List
@@ -73,7 +71,7 @@ class McpToolset(BaseToolset):
 
   Usage::
 
-    toolset = MCPToolset(
+    toolset = McpToolset(
         connection_params=StdioServerParameters(
             command='npx',
             args=["-y", "@modelcontextprotocol/server-filesystem"],
@@ -113,7 +111,7 @@ class McpToolset(BaseToolset):
           Callable[[ReadonlyContext], Dict[str, str]]
       ] = None,
   ):
-    """Initializes the MCPToolset.
+    """Initializes the McpToolset.
 
     Args:
       connection_params: The connection parameters to the MCP server. Can be:
@@ -141,7 +139,7 @@ class McpToolset(BaseToolset):
     super().__init__(tool_filter=tool_filter, tool_name_prefix=tool_name_prefix)
 
     if not connection_params:
-      raise ValueError("Missing connection params in MCPToolset.")
+      raise ValueError("Missing connection params in McpToolset.")
 
     self._connection_params = connection_params
     self._errlog = errlog
@@ -208,14 +206,14 @@ class McpToolset(BaseToolset):
       await self._mcp_session_manager.close()
     except Exception as e:
       # Log the error but don't re-raise to avoid blocking shutdown
-      print(f"Warning: Error during MCPToolset cleanup: {e}", file=self._errlog)
+      print(f"Warning: Error during McpToolset cleanup: {e}", file=self._errlog)
 
   @override
   @classmethod
   def from_config(
-      cls: type[MCPToolset], config: ToolArgsConfig, config_abs_path: str
-  ) -> MCPToolset:
-    """Creates an MCPToolset from a configuration object."""
+      cls: type[McpToolset], config: ToolArgsConfig, config_abs_path: str
+  ) -> McpToolset:
+    """Creates an McpToolset from a configuration object."""
     mcp_toolset_config = McpToolsetConfig.model_validate(config.model_dump())
 
     if mcp_toolset_config.stdio_server_params:
@@ -227,7 +225,7 @@ class McpToolset(BaseToolset):
     elif mcp_toolset_config.streamable_http_connection_params:
       connection_params = mcp_toolset_config.streamable_http_connection_params
     else:
-      raise ValueError("No connection params found in MCPToolsetConfig.")
+      raise ValueError("No connection params found in McpToolsetConfig.")
 
     return cls(
         connection_params=connection_params,
@@ -251,7 +249,7 @@ class MCPToolset(McpToolset):
 
 
 class McpToolsetConfig(BaseToolConfig):
-  """The config for MCPToolset."""
+  """The config for McpToolset."""
 
   stdio_server_params: Optional[StdioServerParameters] = None
 
diff --git a/tests/unittests/tools/mcp_tool/test_mcp_toolset.py b/tests/unittests/tools/mcp_tool/test_mcp_toolset.py
index 37b23d99..8f43a3d6 100644
--- a/tests/unittests/tools/mcp_tool/test_mcp_toolset.py
+++ b/tests/unittests/tools/mcp_tool/test_mcp_toolset.py
@@ -301,7 +301,7 @@ class TestMCPToolset:
 
     # Should log the error
     error_output = custom_errlog.getvalue()
-    assert "Warning: Error during MCPToolset cleanup" in error_output
+    assert "Warning: Error during McpToolset cleanup" in error_output
     assert "Cleanup error" in error_output
 
   @pytest.mark.asyncio