Repository navigation
Conversation
wcqqq1214
marked this pull request as ready for review
August 21, 2026 10:36
buyun14
pushed a commit
to buyun14/AstrBot
that referenced
this pull request
Sep 3, 2026
buyun14
added a commit
to buyun14/AstrBot
that referenced
this pull request
Sep 3, 2026
- PluginPagePage.vue: drop import of usePluginSidebarItems removed by AstrBotDevs#9823 (broke production build); remove dead sidebar heal writes from AstrBotDevs#9917 - test_session_waiter_cross_user.py: stub astrbot.core logger required by AstrBotDevs#9442; update default-filter guards to shipped sender-scoped semantics - test_tool_calls_result_cross_provider.py: await async _prepare_conversation; assert AstrBotDevs#9761 functionResponse name/id pairing
kilisamemarisaaa
approved these changes
Sep 15, 2026
kilisamemarisaaa
left a comment
Contributor
There was a problem hiding this comment.
Reviewed the latest head 21358a8 against issue #9760. The implementation pre-indexes assistant tool_calls so opaque tool_call_id values resolve back to the actual function name, preserves distinct IDs on both functionCall and functionResponse for strict Gemini-compatible gateways, omits IDs when they equal the function name, and skips empty assistant text parts. The diff is limited to conversation serialization, and the focused Gemini tests plus the full cross-platform CI matrix are green. I found no remaining correctness blocker.
buyun14
pushed a commit
to buyun14/AstrBot
that referenced
this pull request
Sep 17, 2026
buyun14
added a commit
to buyun14/AstrBot
that referenced
this pull request
Sep 17, 2026
- PluginPagePage.vue: drop import of usePluginSidebarItems removed by AstrBotDevs#9823 (broke production build); remove dead sidebar heal writes from AstrBotDevs#9917 - test_session_waiter_cross_user.py: stub astrbot.core logger required by AstrBotDevs#9442; update default-filter guards to shipped sender-scoped semantics - test_tool_calls_result_cross_provider.py: await async _prepare_conversation; assert AstrBotDevs#9761 functionResponse name/id pairing
buyun14
pushed a commit
to buyun14/AstrBot
that referenced
this pull request
Sep 17, 2026
buyun14
added a commit
to buyun14/AstrBot
that referenced
this pull request
Sep 17, 2026
- PluginPagePage.vue: drop import of usePluginSidebarItems removed by AstrBotDevs#9823 (broke production build); remove dead sidebar heal writes from AstrBotDevs#9917 - test_session_waiter_cross_user.py: stub astrbot.core logger required by AstrBotDevs#9442; update default-filter guards to shipped sender-scoped semantics - test_tool_calls_result_cross_provider.py: await async _prepare_conversation; assert AstrBotDevs#9761 functionResponse name/id pairing
This branch has not been deployed
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 #9760.
Gemini tool-result messages only carry
tool_call_id, so_prepare_conversationwas using that id asfunctionResponse.name. Strict Gemini backends then reject the follow-up request (functionResponse.name "call_176130" does not match functionCall.name "gemini_search"), and they also requirefunctionResponse.idwhen the matchingfunctionCallhas a distinct id.A second failure showed up on the same follow-up path: an empty assistant
contentwas serialized as an emptytextpart (contents[n].parts[0].data: required oneof field 'data' must have one initialized field). Tool-only first turns hit this often.Modifications / 改动点
Index assistant
tool_callsbefore building Gemini contents sofunctionResponse.nameis the original function name, even if a tool message appears before its call in the payload.Round-trip
functionCall.id/functionResponse.idonly when the id is distinct from the function name, so official Gemini (which often omits id, or uses the function name as a fallback) does not receive the field that previously caused [Bug] Gemini 模型工具调用报错 400: Unknown name "id" at 'function_response' #7357 / fix: remove unsupported id field from Gemini FunctionResponse #7386.Skip empty assistant
textparts so a tool-only model turn does not produce an invalidPart.This is NOT a breaking change. / 这不是一个破坏性变更。
Verification Steps / 验证步骤
ruff format --checkandruff checkonastrbot/core/provider/sources/gemini_source.py.pytest tests/test_gemini_source.py(3 passed)._prepare_conversationlocally for:call_176130/gemini_searchpairingtool_callsid == name, which still omitsidgemini-3.7-flashon a backend that strictly validates function-call history:get_weatherwith a distinct id (call_1517).functionCall/functionResponseasname=get_weather,id=call_1517, with no emptytextpart.text_chatwith the tool result succeeded and used the tool output (30°C, sunny).Screenshots or Test Results / 运行截图或测试结果
Prepared Gemini contents for the reported shape:
When
tool_call_idequals the function name (get_weather), both parts omitid.Live
gemini-3.7-flashtool round-trip: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
Fix Gemini tool-call history serialization so function names and IDs remain correctly paired and tool-only turns are accepted.
Bug Fixes:
Tests: