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: enforce that the first message (excluding system messages) is a … #6311

Conversation

Kadxy
Copy link
Member

@Kadxy Kadxy commented Feb 28, 2025

…user message in the Deepseek API

💻 变更类型 | Change Type

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

🔀 变更说明 | Description of Change

📝 补充信息 | Additional Information

closes #6305

Summary by CodeRabbit

  • New Features
    • Enhanced the chat experience by improving message filtering. Now, key system notifications and the primary user input are prioritized, resulting in clearer and more focused conversation threads.

Copy link

vercel bot commented Feb 28, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
nextchat ✅ Ready (Inspect) Visit Preview 💬 Add feedback Feb 28, 2025 6:04am

Copy link
Contributor

coderabbitai bot commented Feb 28, 2025

Walkthrough

This pull request updates the DeepSeekApi class by introducing new logic in the chat method. The method now constructs a filteredMessages array by retaining all system messages, directly adding the first user message, and conditionally including subsequent messages based on whether they are non-system. Messages that do not meet these conditions are skipped. The new filtered array replaces the original messages array in the request payload when sending the chat request.

Changes

File Summary of Changes
app/client/.../deepseek.ts Updated the chat method in DeepSeekApi to build a filteredMessages array: retains all system messages, always adds the first user message, and conditionally adds subsequent messages.

Sequence Diagram(s)

sequenceDiagram
    participant Client as ChatClient
    participant DS as DeepSeekApi
    participant Server as ChatEngine

    Client->>DS: Initiate chat(messages)
    DS->>DS: Create filteredMessages array
    DS->>DS: Retain all system messages
    DS->>DS: Add the first user message directly
    DS->>DS: Conditionally add subsequent messages
    DS->>Server: Send requestPayload(filteredMessages)
    Server-->>Client: Return chat response
Loading

Poem

I'm the rabbit with a clever hop,
Filtering messages nonstop!
System words are safe and sound,
The first user message is found.
Subsequent chats hop along just fine,
In this code burrow, everything's divine! 🐇✨

✨ Finishing Touches
  • 📝 Generate Docstrings

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.
  • @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: 0

🧹 Nitpick comments (1)
app/client/platforms/deepseek.ts (1)

78-78: Translate the Chinese comment to English for codebase consistency.

The comment is in Chinese while the rest of the codebase appears to be in English. For consistency and to make the code accessible to all developers, please translate the comment.

-    // 检测并修复消息顺序,确保除system外的第一个消息是user
+    // Check and fix message order, ensure the first message (excluding system messages) is a user message
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 2167076 and 2d4180f.

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

79-95: The message filtering logic looks good.

The implementation correctly ensures that:

  1. All system messages are retained
  2. The first non-system message must be a user message
  3. Messages after the first user message are included as expected

This aligns perfectly with the PR objective to "enforce that the first message (excluding system messages) is a user message in the Deepseek API."

Consider adding a debug log statement showing how many messages were filtered out, which could be helpful for troubleshooting:

    // After filtering logic
+    console.log(`[Deepseek] Filtered ${messages.length - filteredMessages.length} messages to ensure proper ordering`);

107-107: LGTM: Correctly uses the filtered messages array.

The implementation properly replaces the original messages array with the filtered one in the request payload.

Copy link
Contributor

Your build has completed!

Preview deployment

@Leizhenpeng Leizhenpeng merged commit 7aa9ae0 into main Feb 28, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants