Skip to content

feat: 完善格式转换,修复gemini渠道和openai渠道在claude code中使用的问题 - #1531

Merged
Calcium-Ion merged 1 commit into
alphafrom
claude-code
Aug 8, 2025
Merged

feat: 完善格式转换,修复gemini渠道和openai渠道在claude code中使用的问题#1531
Calcium-Ion merged 1 commit into
alphafrom
claude-code

Conversation

@Calcium-Ion

@Calcium-Ion Calcium-Ion commented Aug 8, 2025

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • New Features

    • Improved handling of tool call responses and finish reasons in Gemini chat streaming and final responses.
    • Enhanced support for multiple relay formats in non-streaming chat responses.
    • Added utility methods to inspect and modify chat completion streaming responses.
  • Bug Fixes

    • Tool names in tool result messages are now reliably resolved, ensuring accurate naming in OpenAI message conversions.
  • Chores

    • Added internal debug code (inactive by default) for easier troubleshooting and request inspection.

@coderabbitai

coderabbitai Bot commented Aug 8, 2025

Copy link
Copy Markdown
Contributor

Caution

Review failed

The pull request is closed.

Walkthrough

This update introduces new utility methods for request and response DTOs, enhances tool call and finish reason handling in Gemini chat relay logic, and improves tool name resolution in Claude-to-OpenAI request conversion. Additionally, debug print statements and file output blocks are added as commented-out code for troubleshooting, without affecting runtime behavior.

Changes

Cohort / File(s) Change Summary
Debug/Logging Additions
common/gin.go, relay/channel/openai/adaptor.go
Added commented-out debug print statements and file output blocks for inspecting request bodies and conversion results; these are inactive by default and do not alter logic.
Claude DTO Enhancements
dto/claude.go
Added SearchToolNameByToolCallId method to ClaudeRequest for resolving tool names by tool call ID within request messages.
OpenAI Response DTO Enhancements
dto/openai_response.go
Added IsFinished() method to check finish status and ClearToolCalls() method to clear tool call data in ChatCompletionsStreamResponse.
Gemini Chat Relay Logic
relay/channel/gemini/relay-gemini.go
Enhanced streaming and final response handling for Gemini chat: tracks and sets finish reasons for tool calls, clears tool call data, and supports multiple relay formats with appropriate marshaling and response writing.
Claude-to-OpenAI Conversion Improvements
service/convert.go
Improved handling of tool result messages: ensures tool names are resolved, tracks last message type for tool calls, and initializes input fields in streaming conversion.

Sequence Diagram(s)

Gemini Chat Streaming Tool Call Handling

sequenceDiagram
    participant Client
    participant GeminiRelay
    participant OpenAI/Claude Adapter

    Client->>GeminiRelay: Send chat request
    GeminiRelay->>OpenAI/Claude Adapter: Forward request
    OpenAI/Claude Adapter-->>GeminiRelay: Streamed response (may include tool calls)
    GeminiRelay->>GeminiRelay: Check for tool calls in response
    alt Tool call present
        GeminiRelay->>GeminiRelay: Set finishReason = "tool_calls"
        GeminiRelay->>GeminiRelay: Clear tool call arguments
        GeminiRelay->>Client: Send empty response with tool call info
    end
    GeminiRelay->>Client: Stream final response with dynamic finishReason
Loading

Claude Tool Name Resolution

sequenceDiagram
    participant ConvertService
    participant ClaudeRequest
    participant ClaudeMediaMessage

    ConvertService->>ClaudeRequest: SearchToolNameByToolCallId(toolCallId)
    ClaudeRequest->>ClaudeMediaMessage: Iterate messages, parse content
    ClaudeMediaMessage-->>ClaudeRequest: If Id matches, return Name
    ClaudeRequest-->>ConvertService: Return tool name or ""
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~18 minutes

Poem

A bunny hops through code so bright,
Debug prints hidden out of sight.
Tool names found, responses clear,
Gemini streams with finish near.
DTOs now smarter, conversions too—
With every hop, improvements 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 cda4790 and daa7a13.

📒 Files selected for processing (6)
  • common/gin.go (1 hunks)
  • dto/claude.go (1 hunks)
  • dto/openai_response.go (2 hunks)
  • relay/channel/gemini/relay-gemini.go (5 hunks)
  • relay/channel/openai/adaptor.go (1 hunks)
  • service/convert.go (2 hunks)
✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch claude-code

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.

@Calcium-Ion
Calcium-Ion merged commit 8b57da9 into alpha Aug 8, 2025
1 of 2 checks passed
@Calcium-Ion
Calcium-Ion deleted the claude-code branch August 9, 2025 10:27
x22x22 pushed a commit to x22x22/new-api that referenced this pull request Apr 24, 2026
feat: 完善格式转换,修复gemini渠道和openai渠道在claude code中使用的问题
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.

1 participant