-
Notifications
You must be signed in to change notification settings - Fork 11.1k
feat: support Tencent TokenHub API key via OpenAI-compatible protocol #6232
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package tencent | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "github.com/QuantumNous/new-api/constant" | ||
| "github.com/QuantumNous/new-api/relay/channel" | ||
| "github.com/QuantumNous/new-api/relay/channel/openai" | ||
| relaycommon "github.com/QuantumNous/new-api/relay/common" | ||
| ) | ||
|
|
||
| const tokenHubBaseURL = "https://tokenhub.tencentmaas.com" | ||
|
|
||
| // DispatchAdaptor 按密钥格式分流:三段式 ak/sk 走原生 TC3,单段 TokenHub key 走 OpenAI 兼容。 | ||
| type DispatchAdaptor struct { | ||
| channel.Adaptor | ||
| } | ||
|
|
||
| func (a *DispatchAdaptor) Init(info *relaycommon.RelayInfo) { | ||
| if strings.Contains(info.ApiKey, "|") { | ||
| a.Adaptor = &Adaptor{} | ||
| } else { | ||
| a.Adaptor = &openai.Adaptor{} | ||
| if info.ChannelBaseUrl == "" || info.ChannelBaseUrl == constant.ChannelBaseURLs[constant.ChannelTypeTencent] { | ||
| info.ChannelBaseUrl = tokenHubBaseURL | ||
| } | ||
| } | ||
| a.Adaptor.Init(info) | ||
| } | ||
|
|
||
| func (a *DispatchAdaptor) GetModelList() []string { | ||
| return ModelList | ||
| } | ||
|
|
||
| func (a *DispatchAdaptor) GetChannelName() string { | ||
| return ChannelName | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package tencent | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/QuantumNous/new-api/constant" | ||
| "github.com/QuantumNous/new-api/relay/channel/openai" | ||
| relaycommon "github.com/QuantumNous/new-api/relay/common" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestDispatchAdaptorInit(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| apiKey string | ||
| baseURL string | ||
| wantTC3 bool | ||
| wantBaseURL string | ||
| }{ | ||
| { | ||
| name: "legacy three-segment key selects TC3 adaptor and keeps base url", | ||
| apiKey: "1300000000|AKIDxxxxxxxx|secretxxxxxxxx", | ||
| baseURL: constant.ChannelBaseURLs[constant.ChannelTypeTencent], | ||
| wantTC3: true, | ||
| wantBaseURL: constant.ChannelBaseURLs[constant.ChannelTypeTencent], | ||
| }, | ||
| { | ||
| name: "tokenhub key with default base url rewrites to tokenhub", | ||
| apiKey: "sk-xxxxxxxxxxxxxxxx", | ||
| baseURL: constant.ChannelBaseURLs[constant.ChannelTypeTencent], | ||
| wantTC3: false, | ||
| wantBaseURL: tokenHubBaseURL, | ||
| }, | ||
| { | ||
| name: "tokenhub key with empty base url rewrites to tokenhub", | ||
| apiKey: "sk-xxxxxxxxxxxxxxxx", | ||
| baseURL: "", | ||
| wantTC3: false, | ||
| wantBaseURL: tokenHubBaseURL, | ||
| }, | ||
| { | ||
| name: "tokenhub key with custom base url is preserved", | ||
| apiKey: "sk-xxxxxxxxxxxxxxxx", | ||
| baseURL: "https://proxy.example.com", | ||
| wantTC3: false, | ||
| wantBaseURL: "https://proxy.example.com", | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| info := &relaycommon.RelayInfo{ChannelMeta: &relaycommon.ChannelMeta{ | ||
| ChannelType: constant.ChannelTypeTencent, | ||
| ApiKey: tt.apiKey, | ||
| ChannelBaseUrl: tt.baseURL, | ||
| }} | ||
|
|
||
| dispatch := &DispatchAdaptor{} | ||
| dispatch.Init(info) | ||
|
|
||
| require.NotNil(t, dispatch.Adaptor) | ||
| if tt.wantTC3 { | ||
| assert.IsType(t, &Adaptor{}, dispatch.Adaptor) | ||
| } else { | ||
| assert.IsType(t, &openai.Adaptor{}, dispatch.Adaptor) | ||
| } | ||
| assert.Equal(t, tt.wantBaseURL, info.ChannelBaseUrl) | ||
| }) | ||
| } | ||
| } |
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
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
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
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
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.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
🧩 Analysis chain
🏁 Script executed:
Repository: QuantumNous/new-api
Length of output: 4897
🏁 Script executed:
Repository: QuantumNous/new-api
Length of output: 17937
🏁 Script executed:
Repository: QuantumNous/new-api
Length of output: 50375
🏁 Script executed:
Repository: QuantumNous/new-api
Length of output: 7465
Gate stream options to TokenHub for Tencent.
SupportStreamOptionsis assigned beforeDispatchAdaptor.Init; enabling it for the wholeChannelTypeTencentlets legacy|TC3 keys passstream_optionsintorequestOpenAI2Tencent, and the TC3 request model has no such field. RemoveChannelTypeTencentfrom the global stream-supported set, add a per-key/format capability, or strip TC3 requests like the OpenAI adaptor does.🤖 Prompt for AI Agents
Source: Coding guidelines