Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #5964: Prevents character loss in gemini-2.0-flash-thinking-exp-1219 responses #5965

Merged
merged 1 commit into from
Dec 28, 2024

Conversation

zmhuanf
Copy link
Contributor

@zmhuanf zmhuanf commented Dec 22, 2024

💻 变更类型 | Change Type

  • feat
  • fix
  • refactor
  • perf
  • style
  • test
  • docs
  • ci
  • chore
  • build

🔀 变更说明 | Description of Change

修复了在使用 gemini-2.0-flash-thinking-exp-1219 模型时,模型会意外吞掉一些正式回答开始时的字符的问题。该问题在 #5964 中被提出。

This pull request addresses the bug reported in issue #5964, where the gemini-2.0-flash-thinking-exp-1219 model would unexpectedly omit the initial characters of its formal responses.

📝 补充信息 | Additional Information

Summary by CodeRabbit

  • New Features

    • Introduced a new helper function to streamline text extraction from response parts.
  • Improvements

    • Enhanced the clarity and maintainability of the text extraction logic in the API.

Copy link

vercel bot commented Dec 22, 2024

@zmhuanf is attempting to deploy a commit to the NextChat Team on Vercel.

A member of the Team first needs to authorize it.

Copy link
Contributor

coderabbitai bot commented Dec 22, 2024

Walkthrough

The pull request modifies the GeminiProApi class in the Google platform file, introducing a new helper function getTextFromParts to improve text extraction logic. The changes centralize the text retrieval process by creating a dedicated method for processing response parts, which replaces previous inline extraction methods. The modification aims to enhance code readability and maintainability while preserving the existing functionality of message extraction.

Changes

File Change Summary
app/client/platforms/google.ts Added getTextFromParts helper method to process text parts in the GeminiProApi class

Possibly related PRs

Suggested reviewers

  • Dogtiti

Poem

🐰 A Rabbit's Ode to Code Refactoring 🔧

In Google's realm of text and parts,
A helper function now starts
Extracting messages with grace,
Simplifying code's embrace
Refactoring, oh what delight! 🌟

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request. We would love to hear your feedback on Discord.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ 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.
    • Generate unit testing code for this file.
    • 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 generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • 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 generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

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. (Beta)
  • @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.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
app/client/platforms/google.ts (2)

63-70: LGTM! Consider adding TypeScript types for better type safety.

The new helper function effectively centralizes text extraction logic with proper null checks and empty string filtering. This abstraction should help prevent the initial character omission issue.

Consider adding explicit TypeScript types:

-const getTextFromParts = (parts: any[]) => {
+interface Part {
+  text?: string;
+}
+const getTextFromParts = (parts: Part[]) => {

Line range hint 63-238: Good architectural approach with room for improvement.

The introduction of getTextFromParts is a good architectural decision that centralizes text extraction logic and adds proper null checks. However, to fully address the character omission issue:

  1. The streaming logic should be aligned with getTextFromParts to ensure consistent text extraction across all code paths.
  2. Consider adding unit tests to verify text extraction behavior, especially for edge cases with empty or whitespace-only parts.

Would you like me to help create unit tests for the text extraction logic?

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 1d15666 and 87b5e3b.

📒 Files selected for processing (1)
  • app/client/platforms/google.ts (2 hunks)
🔇 Additional comments (1)
app/client/platforms/google.ts (1)

73-74: LGTM! Clean and consistent error handling.

The modified extraction logic properly handles different response structures while maintaining good fallback behavior.

Comment on lines +235 to +238
return chunkJson?.candidates
?.at(0)
?.content.parts?.map((part: { text: string }) => part.text)
.join("\n\n");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Align streaming text extraction with getTextFromParts for consistency.

The streaming response handling uses a different approach for text extraction compared to getTextFromParts. This inconsistency could potentially lead to different handling of empty parts or whitespace.

Consider reusing the getTextFromParts function here:

-return chunkJson?.candidates
-  ?.at(0)
-  ?.content.parts?.map((part: { text: string }) => part.text)
-  .join("\n\n");
+return getTextFromParts(chunkJson?.candidates?.at(0)?.content?.parts || []);

Committable suggestion skipped: line range outside the PR's diff.

@zmhuanf zmhuanf changed the title 修复bug; Fix issue #5964: Prevents character loss in gemini-2.0-flash-thinking-exp-1219 responses Dec 22, 2024
@Leizhenpeng
Copy link
Member

I'll merge the code later. Thanks!

@Leizhenpeng Leizhenpeng merged commit 13430ea into ChatGPTNextWeb:main Dec 28, 2024
1 check failed
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.

2 participants