Skip to content

Fix ADK Toolbox Tool Loading Bug#4378

Draft
kunnaall04 wants to merge 2 commits intogoogle:mainfrom
kunnaall04:fix/toolbox-tool-loading
Draft

Fix ADK Toolbox Tool Loading Bug#4378
kunnaall04 wants to merge 2 commits intogoogle:mainfrom
kunnaall04:fix/toolbox-tool-loading

Conversation

@kunnaall04
Copy link

@kunnaall04 kunnaall04 commented Feb 5, 2026

Please ensure you have read the contribution guide before creating a pull request.

Link to Issue or Description of Change

1. Link to an existing issue (if applicable):

  • Closes: #issue_number
  • Related: #issue_number

2. Or, if no issue exists, describe the change:

If applicable, please follow the issue templates to provide as much detail as
possible.

Problem:
A clear and concise description of what the problem is.

Solution:
A clear and concise description of what you want to happen and why you choose
this solution.

Testing Plan

Please describe the tests that you ran to verify your changes. This is required
for all PRs that are not small documentation or typo fixes.

Unit Tests:

  • I have added or updated unit tests for my change.
  • All unit tests pass locally.

Please include a summary of passed pytest results.

Manual End-to-End (E2E) Tests:

Please provide instructions on how to manually test your changes, including any
necessary setup or configuration. Please provide logs or screenshots to help
reviewers better understand the fix.

Checklist

  • I have read the CONTRIBUTING.md document.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes.
  • I have manually tested my changes end-to-end.
  • Any dependent changes have been merged and published in downstream modules.

Additional context

Add any other context or screenshots about the feature request here.

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @kunnaall04, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a bug in the ADK Toolbox's tool loading mechanism by enhancing tool compatibility. It introduces a flexible adaptation layer that ensures BaseTool instances correctly expose their function declarations, regardless of how they were originally defined. This change improves the system's ability to integrate diverse tools by standardizing their declaration access.

Highlights

  • Tool Compatibility Enhancement: Introduced a new private method, _adapt_tool, within ToolboxToolset to ensure that all BaseTool instances retrieved are compatible with the ADK's expected _get_declaration method. This addresses potential issues where tools might expose their declarations under different attribute names.
  • Dynamic Declaration Patching: Implemented logic to dynamically patch the _get_declaration method of BaseTool instances at runtime. If a tool's declaration is found under function_declaration or declaration attributes, a shim function is created and bound to _get_declaration to return the correct declaration, improving flexibility and robustness.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • src/google/adk/tools/toolbox_toolset.py
    • Added a new private method _adapt_tool to handle tool compatibility and declaration retrieval.
    • Modified the get_tools method to iterate through retrieved tools and apply the _adapt_tool logic to each.
    • Implemented dynamic patching of the _get_declaration method on BaseTool instances if function_declaration or declaration attributes are present.
Activity
  • The pull request was created by kunnaall04 with the title "Fix ADK Toolbox Tool Loading Bug".
  • The PR description includes standard contribution guidelines and checklists, but the specific 'Problem' and 'Solution' sections were left blank, indicating the intent is primarily conveyed by the title and code changes.
  • The changes focus on src/google/adk/tools/toolbox_toolset.py to improve tool loading and compatibility.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@google-cla
Copy link

google-cla bot commented Feb 5, 2026

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@adk-bot adk-bot added the tools [Component] This issue is related to tools label Feb 5, 2026
@adk-bot
Copy link
Collaborator

adk-bot commented Feb 5, 2026

Response from ADK Triaging Agent

Hello @kunnaall04, thank you for your contribution!

Before we can review this PR, could you please:

  1. Sign the Contributor License Agreement (CLA). The CLA check is currently failing.
  2. Fill out the PR template. Please provide a link to an existing issue or a description of the bug you are fixing, as well as a testing plan.

This information is important for the reviewers to understand and verify your changes. You can find more details in our contribution guidelines.

Thank you!

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces a compatibility layer to adapt tools from the ADK Toolbox by providing a _get_declaration method. The implementation monkey-patches tool instances at runtime to add this method if it's missing. The overall approach is sound. I've identified a potential bug in the logic for finding the tool declaration and provided a suggestion to fix it and make the code more robust and idiomatic.

Comment on lines 118 to 122
declaration = None
if hasattr(tool, "function_declaration"):
declaration = tool.function_declaration
elif hasattr(tool, "declaration"):
declaration = tool.declaration
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The current logic for finding the declaration has a potential bug. If tool has a function_declaration attribute that is None (or another falsy value), the code will not fall back to checking for the declaration attribute. This is because hasattr(tool, "function_declaration") will be true, declaration will be set to None, and the elif block will be skipped.

You can fix this and simplify the code by using getattr and the or operator's short-circuiting behavior. This makes the code more robust and idiomatic.

    declaration = (
        getattr(tool, "function_declaration", None)
        or getattr(tool, "declaration", None)
    )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

tools [Component] This issue is related to tools

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants