Skip to content

Fix ADK Toolbox Tool Loading Bug #4378

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

Draft
kunnaall04 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix ADK Toolbox Tool Loading Bug #4378

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a497dd4
Fix ADK Toolbox Tool Loading Bug
Feb 5, 2026
0fe3e0b
Refactor _adapt_tool to robustly check both attributes
Feb 5, 2026
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
29 changes: 28 additions & 1 deletion src/google/adk/tools/toolbox_toolset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,34 @@ def __init__(
async def get_tools(
self, readonly_context: Optional[ReadonlyContext] = None
) -> list[BaseTool]:
return await self._delegate.get_tools(readonly_context)
tools = await self._delegate.get_tools(readonly_context)
return [self._adapt_tool(tool) for tool in tools]

def _adapt_tool(self, tool: BaseTool) -> BaseTool:
"""Adapts a tool to ensure it's compatible with ADK."""
# If the tool already has a working _get_declaration, return it as is.
if tool._get_declaration() is not None:
return tool

# Attempt to find the function declaration in other common attributes
# expected from toolbox libraries.
declaration = (
getattr(tool, "function_declaration", None)
or getattr(tool, "declaration", None)
)

# If we found a declaration, we need to ensure _get_declaration returns it.
if declaration:
# We can't easily subclass at runtime without potential issues,
# so we patch the instance method.
# Create a closure to capture the declaration
def _get_declaration_shim():
return declaration

# Bind the shim to the instance
tool._get_declaration = _get_declaration_shim

return tool

@override
async def close(self):
Expand Down
Loading