fix: allow subagents to use web search tools#9357
Open
tokenicrat wants to merge 1 commit into
Open
Conversation
Contributor
|
Caution The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased. |
Contributor
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- The new
_get_web_search_toolsimplementation duplicates the logic already present inastr_main_agent._apply_web_search_tools; consider extracting a shared helper (e.g., in a separate module) to keep provider-specific logic in one place and avoid divergence over time. - In
_get_web_search_tools, whenwebsearch_provideris an unknown value the function silently returns an empty list; it may be safer to log or raise on unsupported providers so misconfigurations are easier to detect. - When matching web tools by name in
_build_handoff_toolset, you currently do a linear search overweb_search_toolsfor everytool_name_or_obj; if the tool list grows, consider building a{name: tool}map once to avoid repeated scans.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- The new `_get_web_search_tools` implementation duplicates the logic already present in `astr_main_agent._apply_web_search_tools`; consider extracting a shared helper (e.g., in a separate module) to keep provider-specific logic in one place and avoid divergence over time.
- In `_get_web_search_tools`, when `websearch_provider` is an unknown value the function silently returns an empty list; it may be safer to log or raise on unsupported providers so misconfigurations are easier to detect.
- When matching web tools by name in `_build_handoff_toolset`, you currently do a linear search over `web_search_tools` for every `tool_name_or_obj`; if the tool list grows, consider building a `{name: tool}` map once to avoid repeated scans.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
修复 #9354
Modifications / 改动点
移植
astrbot/core/astr_main_agent.py中_apply_web_search_tools方法到astrbot/core/astr_agent_tool_exec.py,调用这个方法添加配置中启用的网络搜索工具。这个 PR 引入了一些重复,因为原始的
_apply_web_search_tools需要event参数,astr_agent_tool_exec.py没有,为了复用创建一个假 event 太别扭了另外,这个 PR 没有实现其他由
_apply_*_tools提供的工具,涉及安全问题,我希望维护者来决定是否引入Screenshots or Test Results / 运行截图或测试结果
WebUI 对话询问:
改动前:
改动后:
Checklist / 检查清单
😊
If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.(不适用)/ 如果 PR 中有新加入的功能,已经通过 Issue / 邮件等方式和作者讨论过。
👀 My changes have been well-tested, and "Verification Steps" and "Screenshots" have been provided above.
/ 我的更改经过了良好的测试,并已在上方提供了“验证步骤”和“运行截图”。
🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in
requirements.txtandpyproject.toml./ 我确保没有引入新依赖库,或者引入了新依赖库的同时将其添加到
requirements.txt和pyproject.toml文件相应位置。😮 My changes do not introduce malicious code.
/ 我的更改没有引入恶意代码。
Summary by Sourcery
Bug Fixes: