Skip to content

fix: ensure last message is sent successfully - #1524

Merged
Calcium-Ion merged 1 commit into
QuantumNous:alphafrom
feitianbubu:pr/fix-last-resp
Aug 8, 2025
Merged

fix: ensure last message is sent successfully#1524
Calcium-Ion merged 1 commit into
QuantumNous:alphafrom
feitianbubu:pr/fix-last-resp

Conversation

@feitianbubu

@feitianbubu feitianbubu commented Aug 8, 2025

Copy link
Copy Markdown
Member

修复gemini丢失消息的问题
gemini会在最后一条统计信息中夹带内容
image

Summary by CodeRabbit

  • Bug Fixes
    • Improved handling of streamed responses to ensure the last response is sent if it contains meaningful content, even when usage data is excluded.

@coderabbitai

coderabbitai Bot commented Aug 8, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

The update revises the logic for sending the last streamed response in a relay helper. Instead of always suppressing the last response when usage inclusion is disabled, the code now checks if any choice in the response contains non-empty content or reasoning content, and sends the response if such content is present.

Changes

Cohort / File(s) Change Summary
Relay Helper Logic Update
relay/channel/openai/helper.go
Adjusted logic for sending the last streamed response: now sends if any choice has non-empty content or reasoning content, instead of always suppressing when usage inclusion is disabled.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~7 minutes

Poem

In the warren of code, a clever new check,
The relay now listens for content to detect.
No longer suppressed, if meaning is found,
The last stream response will hop right around.
With logic refined and choices in view,
This bunny says, "Well done! The code grew!" 🐇✨

Note

🔌 MCP (Model Context Protocol) integration is now available in Early Access!

Pro users can now connect to remote MCP servers under the Integrations page to get reviews and chat conversations that understand additional development context.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d0fb54f and cf91cf1.

📒 Files selected for processing (1)
  • relay/channel/openai/helper.go (2 hunks)
🧰 Additional context used
🧠 Learnings (2)
📓 Common learnings
Learnt from: 9Ninety
PR: QuantumNous/new-api#1273
File: relay/channel/gemini/relay-gemini.go:97-116
Timestamp: 2025-06-21T03:37:41.726Z
Learning: In relay/channel/gemini/relay-gemini.go, the thinking budget calculation logic (including the MaxOutputTokens multiplication) was introduced in PR #1247. PR #1273 focused specifically on decoupling the thoughts summary feature from thinking budget settings and did not modify the existing thinking budget behavior.
📚 Learning: 2025-06-21T03:37:41.726Z
Learnt from: 9Ninety
PR: QuantumNous/new-api#1273
File: relay/channel/gemini/relay-gemini.go:97-116
Timestamp: 2025-06-21T03:37:41.726Z
Learning: In relay/channel/gemini/relay-gemini.go, the thinking budget calculation logic (including the MaxOutputTokens multiplication) was introduced in PR #1247. PR #1273 focused specifically on decoupling the thoughts summary feature from thinking budget settings and did not modify the existing thinking budget behavior.

Applied to files:

  • relay/channel/openai/helper.go
🔇 Additional comments (2)
relay/channel/openai/helper.go (2)

6-6: LGTM: Import addition is appropriate.

The github.com/samber/lo import is correctly added to support the new logic using lo.SomeBy function.


190-192: Excellent fix for preventing message loss.

This change effectively addresses the core issue where the last message containing actual content was being suppressed. Instead of blindly setting shouldSendLastResp to false when usage inclusion is disabled, the code now intelligently checks if any choice contains meaningful content (either regular content or reasoning content) before deciding whether to send the response.

This ensures that messages with actual content are preserved, directly solving the Gemini message loss problem described in the PR objectives.

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@dream2333

Copy link
Copy Markdown

Please merge this PR @Calcium-Ion,
This problem has exist for a very long time.

@Calcium-Ion
Calcium-Ion merged commit f8e1b08 into QuantumNous:alpha Aug 8, 2025
3 checks passed
x22x22 pushed a commit to x22x22/new-api that referenced this pull request Apr 24, 2026
fix: ensure last message is sent successfully
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants