[pull] main from google:main #72
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… register them Original codes use tool.__name__ to register streaming tools, this is problemetic, it only works with python function passed as tools directly, if they are wrapped in FunctionTool, then FunctionTool doesn't have "__name__" property. canonical_tools wrap python function in FunctionTool uniformly thus we can use tool.name uniformly Co-authored-by: Xiang (Sean) Zhou <seanzhougoogle@google.com> PiperOrigin-RevId: 856472936
…eature enabled Co-authored-by: Xuan Yang <xygoogle@google.com> PiperOrigin-RevId: 856508415
Merge #3988 ### Link to Issue or Description of Change **1. Link to an existing issue (if applicable):** - Closes: #3987 - Related: #3596 **2. Or, if no issue exists, describe the change:** **Problem:** Idea about my use case I'm building the report generation system using google-ask (1.18.0) and building multiple subagents here, I'm passing the one subagent Agent as a tool to another Parent Agent. Note: Sub-agent can do web search. here, parent agent triggers multiple sub-agent (same agent) multiple times according to use case or complexity of the user input Describe the bug here, the bug sometimes sub agents doesn't provide the proper output and resulted in the ``` merged_text = '\n'.join(p.text for p in last_content.parts if p.text) ^^^^^^^^^^^^^^^^^^ TypeError: 'NoneType' object is not iterable and it's breaking the system of Agents workflow ``` **Solution:** Creating fallback if there is no **last_content.parts** it will return the empty parts so we won't face the NoneType issue ### Testing Plan Created a unit test file for this issue test_google_search_agent_tool_repro.py **Unit Tests:** - [X] I have added or updated unit tests for my change. - [X] All unit tests pass locally. _Please include a summary of passed `pytest` results._ 3677 passed, 2208 warnings in 42.64s **Manual End-to-End (E2E) Tests:** N/A ### Checklist - [X] I have read the [CONTRIBUTING.md](https://github.com/google/adk-python/blob/main/CONTRIBUTING.md) document. - [X] I have performed a self-review of my own code. - [X] I have commented my code, particularly in hard-to-understand areas. - [X] I have added tests that prove my fix is effective or that my feature works. - [X] New and existing unit tests pass locally with my changes. - [X] I have manually tested my changes end-to-end. - [ ] Any dependent changes have been merged and published in downstream modules. ### Additional context N/A Co-authored-by: Liang Wu <wuliang@google.com> COPYBARA_INTEGRATE_REVIEW=#3988 from ananthanarayanan-28:none-type-issue e6ba948 PiperOrigin-RevId: 856515019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )