fix: merge streamed tool results per call#8050
Open
he-yufeng wants to merge 1 commit intoAstrBotDevs:masterfrom
Open
fix: merge streamed tool results per call#8050he-yufeng wants to merge 1 commit intoAstrBotDevs:masterfrom
he-yufeng wants to merge 1 commit intoAstrBotDevs:masterfrom
Conversation
Contributor
There was a problem hiding this comment.
Code Review
This pull request updates the tool execution logic to aggregate multiple results from a single tool call into one message. By collecting partial results in a list and joining them before final processing, the runner now ensures that streamed or multi-yield tool outputs are associated with a single tool call ID. Additionally, a new test case and a mock executor were added to verify this aggregation behavior. I have no feedback to provide.
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.
Fixes #8028.
Modifications / 改动点
Collects multiple
CallToolResultchunks produced by an async-generator tool execution and appends a single tool result block for the originaltool_call_id.Keeps cached image handling and tool hook behavior in the existing flow.
Adds a regression test that yields two
CallToolResultvalues for one tool call and verifies AstrBot stores onetoolmessage with both partial results.This is NOT a breaking change. / 这不是一个破坏性变更。
Screenshots or Test Results / 运行截图或测试结果
Verification commands run locally on Windows:
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
Merge multiple streamed tool execution results for a single tool call into one consolidated tool message.
Bug Fixes:
Tests: