fix: cannot use tools in siliconflow provider#6829
Conversation
Summary of ChangesHello, 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! This pull request addresses an issue preventing the proper use of tools within the Highlights
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. Footnotes
|
There was a problem hiding this comment.
Hey - I've found 1 issue, and left some high level feedback:
- Accessing
chunk.choices[0]before theif not chunk.choices: continueguard can raise anIndexErroron empty choices; move that guard above the newchoice = chunk.choices[0]line. - Consider whether changing the log level from
warningtoerrorforSaving chunk state erroris appropriate here, as this might flood error logs for recoverable or expected streaming issues. - The Siliconflow-specific
tool_callsworkaround is embedded directly in the generic OpenAI streaming path; it might be cleaner to encapsulate this provider-specific adjustment behind a feature flag or provider check so it doesn’t affect other providers.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Accessing `chunk.choices[0]` before the `if not chunk.choices: continue` guard can raise an `IndexError` on empty choices; move that guard above the new `choice = chunk.choices[0]` line.
- Consider whether changing the log level from `warning` to `error` for `Saving chunk state error` is appropriate here, as this might flood error logs for recoverable or expected streaming issues.
- The Siliconflow-specific `tool_calls` workaround is embedded directly in the generic OpenAI streaming path; it might be cleaner to encapsulate this provider-specific adjustment behind a feature flag or provider check so it doesn’t affect other providers.
## Individual Comments
### Comment 1
<location path="astrbot/core/provider/sources/openai_source.py" line_range="332-341" />
<code_context>
state = ChatCompletionStreamState()
async for chunk in stream:
+ choice = chunk.choices[0]
+ delta = choice.delta
+
+ # siliconflow workaround
+ if dtcs := delta.tool_calls:
+ for tc in dtcs:
+ if tc.function and tc.function.arguments:
+ tc.type = "function"
try:
state.handle_chunk(chunk)
except Exception as e:
- logger.warning("Saving chunk state error: " + str(e))
+ logger.error("Saving chunk state error: " + str(e))
if not chunk.choices:
continue
- choice = chunk.choices[0]
</code_context>
<issue_to_address>
**issue (bug_risk):** Accessing chunk.choices[0] before checking for emptiness can raise an IndexError.
The previous `if not chunk.choices: continue` guard ran before `chunk.choices[0]`. With the new ordering, `choice = chunk.choices[0]` can run when `chunk.choices` is empty (which does occur in some streaming scenarios), causing an `IndexError`. Move the emptiness check back before the indexing so empty chunks are skipped first.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
There was a problem hiding this comment.
Code Review
This pull request adds a workaround for the SiliconFlow provider to enable tool usage. While the core change for the workaround seems correct, the refactoring has introduced a critical bug that could cause an IndexError when processing streaming chunks. I've provided a review comment with a code suggestion that fixes this bug and also includes a minor improvement to the error logging.
#6439 also fixed this bug, but it introduces lots of variables, not that elegant.
Modifications / 改动点
Screenshots or Test Results / 运行截图或测试结果
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.
/ 我的更改没有引入恶意代码。