Skip to content

fix: use McpTool inside McpToolset #7472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
astrogilda wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −5
Open

fix: use McpTool inside McpToolset #7472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/google/adk/tools/mcp_tool/mcp_toolset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
from .mcp_session_manager import StreamableHTTPConnectionParams
from .mcp_tool import _dump_mcp_model
from .mcp_tool import _RESERVED_TOOL_NAMES
from .mcp_tool import MCPTool
from .mcp_tool import McpTool
from .mcp_tool import ProgressCallbackFactory
from .mcp_tool import ProgressFnT

Expand Down Expand Up @@ -535,7 +535,7 @@ async def get_tools(
)
continue

mcp_tool = MCPTool(
mcp_tool = McpTool(
mcp_tool=tool,
mcp_session_manager=self._mcp_session_manager,
auth_scheme=self._auth_scheme,
Expand Down
9 changes: 6 additions & 3 deletions tests/unittests/tools/mcp_tool/test_mcp_toolset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from unittest.mock import MagicMock
from unittest.mock import Mock
from unittest.mock import patch
import warnings

from fastapi.openapi.models import OAuth2
from fastapi.openapi.models import OAuthFlowAuthorizationCode
Expand All @@ -44,7 +45,7 @@
from google.adk.tools.mcp_tool.mcp_session_manager import SseConnectionParams
from google.adk.tools.mcp_tool.mcp_session_manager import StdioConnectionParams
from google.adk.tools.mcp_tool.mcp_session_manager import StreamableHTTPConnectionParams
from google.adk.tools.mcp_tool.mcp_tool import MCPTool
from google.adk.tools.mcp_tool.mcp_tool import McpTool
from google.adk.tools.mcp_tool.mcp_toolset import McpToolset
from google.adk.tools.mcp_tool.mcp_toolset import McpToolsetConfig
from google.adk.tools.set_model_response_tool import SetModelResponseTool
Expand Down Expand Up @@ -370,11 +371,13 @@ async def test_get_tools_basic(self):
)
toolset._mcp_session_manager = self.mock_session_manager

tools = await toolset.get_tools()
with warnings.catch_warnings():
warnings.simplefilter("error", DeprecationWarning)
tools = await toolset.get_tools()

assert len(tools) == 4
for tool in tools[:3]:
assert isinstance(tool, MCPTool)
assert type(tool) is McpTool
assert isinstance(tools[3], LoadMcpResourceTool)
assert tools[0].name == "tool1"
assert tools[1].name == "tool2"
Expand Down
Loading