feat: add image urls / paths support for subagents#5348
feat: add image urls / paths support for subagents#5348Soulter merged 4 commits intoAstrBotDevs:masterfrom
Conversation
dosubot
bot
added
the
size:XS
Summary of ChangesHello @a61995987, 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! 此拉取请求旨在修复一个问题，即子代理在执行后台任务时未能正确使用系统配置的流式或非流式请求设置。通过在关键的代理调用和配置构建中显式地从系统配置中获取并应用 Highlights
Changelog
Activity
Using Gemini Code AssistThe 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
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 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
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - 我在这里给出了一些总体反馈：
- 你现在在多个地方调用
ctx.get_config().get("provider_settings", {}).get("stream", False)；建议把这一调用结果存到一个局部变量（或抽成一个小的辅助函数），这样行为就集中在一处，如果配置结构以后有变更也更容易调整。 - 请确认
provider_settings.stream始终是一个布尔值；如果存在它可能是其它类型的情况（例如来自环境变量的字符串），那么在将其传给stream/streaming_response之前先做归一化处理会更安全，以避免一些细微的运行时问题。
给 AI 代理的提示
Please address the comments from this code review:
## Overall Comments
- You’re now calling `ctx.get_config().get("provider_settings", {}).get("stream", False)` in multiple places; consider storing this in a local variable (or a small helper) so the behavior is centralized and easier to adjust if the config structure changes.
- Confirm that `provider_settings.stream` is always a boolean; if there’s any chance it can be another type (e.g., string from env), it may be safer to normalize it before passing to `stream` / `streaming_response` to avoid subtle runtime issues.帮我变得更有用！请在每条评论上点击 👍 或 👎，我会根据这些反馈来改进后续的评审。
Original comment in English
Hey - I've left some high level feedback:
- You’re now calling
ctx.get_config().get("provider_settings", {}).get("stream", False)in multiple places; consider storing this in a local variable (or a small helper) so the behavior is centralized and easier to adjust if the config structure changes. - Confirm that
provider_settings.streamis always a boolean; if there’s any chance it can be another type (e.g., string from env), it may be safer to normalize it before passing tostream/streaming_responseto avoid subtle runtime issues.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- You’re now calling `ctx.get_config().get("provider_settings", {}).get("stream", False)` in multiple places; consider storing this in a local variable (or a small helper) so the behavior is centralized and easier to adjust if the config structure changes.
- Confirm that `provider_settings.stream` is always a boolean; if there’s any chance it can be another type (e.g., string from env), it may be safer to normalize it before passing to `stream` / `streaming_response` to avoid subtle runtime issues.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
|
Documentation Updates 1 document(s) were updated by changes in this PR: pr4697的改动View Changes@@ -1,20 +1,22 @@
## 主动代理（Proactive Agent）系统增强使用说明
-本说明基于 [PR #4697](https://github.com/AstrBotDevs/AstrBot/pull/4697) 的更新，涵盖 AstrBot 主动代理系统的最新特性，包括 SubAgent 架构、FutureTask（定时任务）机制、send_message_to_user 工具、工具注册与配置、以及 UI/API 支持等。
+本说明基于 [PR #4697](https://github.com/AstrBotDevs/AstrBot/pull/4697) 的更新，涵盖 AstrBot 主动代理系统的最新特性，包括 SubAgent 架构、FutureTask（定时任务）机制、send_message_to_user 工具、工具注册与配置、以及 UI/API 支持等。[PR #5348](https://github.com/AstrBotDevs/AstrBot/pull/5348) 进一步增强了子代理的多模态任务支持和流式响应配置。
---
### 1. SubAgent（子代理）架构
#### 架构说明
-主代理可以通过 `transfer_to_<subagent>` 工具将任务转交给指定子代理。现在该工具新增了 `background_task` 参数：
-
+主代理可以通过 `transfer_to_<subagent>` 工具将任务转交给指定子代理。该工具支持以下参数：
+
+- `input`: 转交给子代理的输入内容，应为清晰简洁的请求或任务描述。
+- `image_urls`（可选，[PR #5348](https://github.com/AstrBotDevs/AstrBot/pull/5348)）: 字符串数组，包含图片源（公开 HTTP URL 或本地文件路径），用作多模态任务（如视频生成）的参考图片。
- `background_task`: 若设置为 `true`，任务将以后台模式异步执行，主代理会立即返回任务 ID，任务完成后通过后台任务唤醒机制通知用户结果。适用于长时间或非紧急任务。
任务流转支持同步和异步两种模式：
- 同步模式（默认）：主代理等待子代理完成任务后返回结果。
- 异步模式（background_task=true）：主代理立即返回任务 ID，子代理后台执行，完成后自动通知用户。
-这样，主代理既可以自主处理，也可以灵活委派任务，并支持异步任务流转。
+这样，主代理既可以自主处理，也可以灵活委派任务，并支持异步任务流转和多模态任务引用。
#### 使用示例
假设有两个子代理：`DataAgent` 和 `ReportAgent`，分别负责数据处理和报告生成。主代理收到用户请求后，可以选择直接使用自身工具处理部分任务，或通过 `transfer_to_DataAgent` 工具将数据处理任务分配给 DataAgent，处理完成后再通过 `transfer_to_ReportAgent` 工具将结果交给 ReportAgent 生成报告。
@@ -31,15 +33,27 @@
#### 配置说明
SubAgent 的定义与 Persona 配置一致，需在配置文件中指定 tools、skills、name、description 等。
-transfer_to_* 工具现支持 `background_task` 参数：
-- 在调用时可传入 `background_task: true`，任务将以后台模式异步执行，主代理立即返回任务 ID，完成后通过后台任务唤醒机制通知用户。
-- 若未设置或为 `false`，则为同步模式，主代理等待子代理完成任务。
+transfer_to_* 工具现支持以下参数：
+- `input`：转交给子代理的任务输入
+- `image_urls`（可选）：图片 URL 或本地路径数组，用于多模态任务
+- `background_task`：设置任务执行模式
+ - 若为 `true`，任务将以后台模式异步执行，主代理立即返回任务 ID，完成后通过后台任务唤醒机制通知用户
+ - 若未设置或为 `false`，则为同步模式，主代理等待子代理完成任务
主代理在未启用 SubAgent 编排时，可直接挂载自身工具集（按 persona 规则，默认全部），并直接调用工具。
启用 SubAgent 编排后，主代理会保留自身工具，并自动挂载 transfer_to_* 委派工具。是否移除与子代理重复的工具由 `remove_main_duplicate_tools` 配置项控制：
- `remove_main_duplicate_tools: false`（默认）：主代理保留自身工具，即使与子代理重复。
- `remove_main_duplicate_tools: true`：主代理会移除与子代理重复的工具，仅保留独有工具和 handoff 工具。
+
+##### 流式响应配置（PR #5348）
+
+PR #5348 修复了子代理在执行任务时未正确使用系统配置的流式响应设置的问题（[Issue #5081](https://github.com/AstrBotDevs/AstrBot/issues/5081)）。修复后，子代理会自动从系统配置中获取流式响应设置：
+
+- 前台任务：调用 `ctx.tool_loop_agent` 时，`stream` 参数从系统配置 `provider_settings.stream` 获取
+- 后台任务：创建 `MainAgentBuildConfig` 时，`streaming_response` 参数同样从系统配置获取
+
+确保子代理在前台和后台任务执行时都遵循全局流式响应配置，而非使用硬编码的默认值。
工具分配可通过 UI 或配置文件完成。相关配置项说明已在配置文件注释中明确。
How did I do? Any feedback? |
dosubot
bot
added
the
area:core
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
The pull request addresses an issue where the system's streaming configuration was not correctly applied when executing background tasks involving sub-agents. The changes ensure that both ctx.tool_loop_agent calls and MainAgentBuildConfig initialization correctly retrieve and use the stream setting from provider_settings in the system configuration. This is a good fix for maintaining consistent behavior across different agent interactions.
| contexts=contexts, | ||
| max_steps=30, | ||
| run_hooks=tool.agent.run_hooks, | ||
| stream=ctx.get_config().get("provider_settings", {}).get("stream", False), |
There was a problem hiding this comment.
The addition of stream=ctx.get_config().get("provider_settings", {}).get("stream", False) correctly propagates the streaming setting to the tool_loop_agent call. This ensures that sub-agent execution respects the global streaming configuration.
astrbot/core/astr_agent_tool_exec.py
Outdated
| ) | ||
| cron_event.role = event.role | ||
| config = MainAgentBuildConfig(tool_call_timeout=3600) | ||
| config = MainAgentBuildConfig(tool_call_timeout=3600, streaming_response=ctx.get_config().get("provider_settings", {}).get("stream", False)) |
There was a problem hiding this comment.
The streaming_response parameter in MainAgentBuildConfig is now correctly initialized using the system's stream setting. This ensures that the main agent's response streaming behavior is consistent with the configured provider_settings when waking up for background task results.
dosubot
bot
added
size:S
a61995987
changed the title
…arify usage in multimodal tasks
Soulter
changed the title
|
Generated docs update PR (pending manual review): AI change summary:
Experimental bot notice:
|
2 participants
feat:为子代理增加远程图片URL参数支持
fix:修复5081号PR在子代理执行后台任务时,未正确使用系统配置的流式/非流请求的问题(#5081)
Modifications / 改动点
修改了astrbot\core\astr_agent_tool_exec.py文件
1.在调用ctx.tool_loop_agent时传入stream时 使用ctx.get_config().get("provider_settings", {}).get("stream", False)获取系统配置
2.在_wake_main_agent_for_background_result方法中 使用config = MainAgentBuildConfig(tool_call_timeout=3600, streaming_response=ctx.get_config().get("provider_settings", {}).get("stream", False))获取系统配置
3.为_execute_handoff方法添加image_urls = tool_args.get("image_urls")以获取传递的图片url
4.为await ctx.tool_loop_agent调用增加image_urls参数的传递
修改了D:\Codes\astrbot\astrbot\core\agent\handoff.py文件
1.为default_parameters方法添加image_urls参数及说明信息
Screenshots or Test Results / 运行截图或测试结果
Checklist / 检查清单
requirements.txt和pyproject.toml文件相应位置。/ I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations inrequirements.txtandpyproject.toml.Summary by Sourcery
确保后台工具执行流程在调用子代理以及唤醒主代理以处理后台结果时，遵守系统的流式传输配置。
Bug Fixes:
ctx.tool_loop_agent时使用系统配置的“流式/非流式”设置。Original summary in English
Summary by Sourcery
Ensure background tool-execution flows respect the system’s streaming configuration when invoking sub-agents and waking the main agent for background results.
Bug Fixes: