xinyin025/one-api
1
0
Fork 0
mirror of https://github.com/songquanpeng/one-api.git synced 2026-04-24 10:44:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge: resolve conflicts with main branch

Browse Source
This commit is contained in:
saikidev
2025-02-19 15:26:00 +08:00
parent 9721c0f478 7ac553541b
commit 564568e4bb
16 changed files with 712 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
relay/adaptor/openai/adaptor.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/songquanpeng/one-api/relay/adaptor/alibailian"
"github.com/songquanpeng/one-api/relay/adaptor/baiduv2"
"github.com/songquanpeng/one-api/relay/adaptor/doubao"
"github.com/songquanpeng/one-api/relay/adaptor/geminiv2"
"github.com/songquanpeng/one-api/relay/adaptor/minimax"
"github.com/songquanpeng/one-api/relay/adaptor/novita"
"github.com/songquanpeng/one-api/relay/channeltype"
@@ -60,6 +61,8 @@ func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
return baiduv2.GetRequestURL(meta)
case channeltype.AliBailian:
return alibailian.GetRequestURL(meta)
case channeltype.GeminiOpenAICompatible:
return geminiv2.GetRequestURL(meta)
case channeltype.PPIO:
return ppio.GetRequestURL(meta)
default:

3
relay/adaptor/openai/compatible.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/songquanpeng/one-api/relay/adaptor/baiduv2"
"github.com/songquanpeng/one-api/relay/adaptor/deepseek"
"github.com/songquanpeng/one-api/relay/adaptor/doubao"
"github.com/songquanpeng/one-api/relay/adaptor/geminiv2"
"github.com/songquanpeng/one-api/relay/adaptor/groq"
"github.com/songquanpeng/one-api/relay/adaptor/lingyiwanwu"
"github.com/songquanpeng/one-api/relay/adaptor/minimax"
@@ -84,6 +85,8 @@ func GetCompatibleChannelMeta(channelType int) (string, []string) {
return "openrouter", openrouter.ModelList
case channeltype.AliBailian:
return "alibailian", alibailian.ModelList
case channeltype.GeminiOpenAICompatible:
return "geminiv2", geminiv2.ModelList
case channeltype.PPIO:
return "ppio", ppio.ModelList
default:

3
relay/adaptor/openai/helper.go
View File

@@ -17,6 +17,9 @@ func ResponseText2Usage(responseText string, modelName string, promptTokens int)
}
func GetFullRequestURL(baseURL string, requestURL string, channelType int) string {
if channelType == channeltype.OpenAICompatible {
return fmt.Sprintf("%s%s", strings.TrimSuffix(baseURL, "/"), strings.TrimPrefix(requestURL, "/v1"))
}
fullRequestURL := fmt.Sprintf("%s%s", baseURL, requestURL)
if strings.HasPrefix(baseURL, "https://gateway.ai.cloudflare.com") {