-
Notifications
You must be signed in to change notification settings - Fork 11.1k
feat(channel): add dual endpoint support for ali and minimax token plans #4639
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
Closed
+31
−1
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,9 +14,19 @@ func GetRequestURL(info *relaycommon.RelayInfo) (string, error) { | |
| if baseUrl == "" { | ||
| baseUrl = channelconstant.ChannelBaseURLs[channelconstant.ChannelTypeMiniMax] | ||
| } | ||
|
|
||
| if specialPlan, ok := channelconstant.ChannelSpecialBases[baseUrl]; ok { | ||
| switch info.RelayFormat { | ||
| case types.RelayFormatClaude: | ||
| return fmt.Sprintf("%s/v1/messages", specialPlan.ClaudeBaseURL), nil | ||
| default: | ||
| return fmt.Sprintf("%s/chat/completions", specialPlan.OpenAIBaseURL), nil | ||
| } | ||
|
Comment on lines
+18
to
+24
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Special-plan path drops relay-mode routing for non-Claude requests. At Line 23, all non-Claude traffic is forced to Suggested fix if specialPlan, ok := channelconstant.ChannelSpecialBases[baseUrl]; ok {
switch info.RelayFormat {
case types.RelayFormatClaude:
return fmt.Sprintf("%s/v1/messages", specialPlan.ClaudeBaseURL), nil
default:
- return fmt.Sprintf("%s/chat/completions", specialPlan.OpenAIBaseURL), nil
+ switch info.RelayMode {
+ case constant.RelayModeChatCompletions:
+ return fmt.Sprintf("%s/chat/completions", specialPlan.OpenAIBaseURL), nil
+ default:
+ return "", fmt.Errorf("relay mode %d is not supported for special base %q", info.RelayMode, baseUrl)
+ }
}
}🤖 Prompt for AI Agents |
||
| } | ||
|
|
||
| switch info.RelayFormat { | ||
| case types.RelayFormatClaude: | ||
| return fmt.Sprintf("%s/anthropic/v1/messages", info.ChannelBaseUrl), nil | ||
| return fmt.Sprintf("%s/anthropic/v1/messages", baseUrl), nil | ||
| default: | ||
| switch info.RelayMode { | ||
| case constant.RelayModeChatCompletions: | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Special-plan early return can mismatch URL with request/response format paths.
Line 98-101 forces Claude requests to anthropic URL and all non-Claude to chat-completions. That conflicts with existing model-gated conversion/response logic (Line 75-87, Line 255-263) and bypasses relay-mode routes (embeddings/rerank/images/responses), causing invalid upstream calls for reachable paths.
Suggested direction
baseURL := info.ChannelBaseUrl if specialPlan, ok := channelconstant.ChannelSpecialBases[baseURL]; ok { switch info.RelayFormat { case types.RelayFormatClaude: - return fmt.Sprintf("%s/v1/messages", specialPlan.ClaudeBaseURL), nil + if supportsAliAnthropicMessages(info.UpstreamModelName) { + return fmt.Sprintf("%s/v1/messages", specialPlan.ClaudeBaseURL), nil + } + // fallback to existing OpenAI-compatible routing path below default: - return fmt.Sprintf("%s/chat/completions", specialPlan.OpenAIBaseURL), nil + // only short-circuit chat-completions; keep other relay modes on existing switch below + if info.RelayMode == constant.RelayModeCompletions || info.RelayMode == constant.RelayModeChatCompletions { + return fmt.Sprintf("%s/chat/completions", specialPlan.OpenAIBaseURL), nil + } } }Also ensure
ConvertClaudeRequest/DoResponseuse the same special-plan rule so URL, payload shape, and response parser stay consistent.🤖 Prompt for AI Agents