diff --git a/constant/channel.go b/constant/channel.go index 023faea3d..6d3a5d928 100644 --- a/constant/channel.go +++ b/constant/channel.go @@ -180,3 +180,27 @@ func GetChannelTypeName(channelType int) string { } return "Unknown" } + +type ChannelSpecialBase struct { + ClaudeBaseURL string + OpenAIBaseURL string +} + +var ChannelSpecialBases = map[string]ChannelSpecialBase{ + "glm-coding-plan": { + ClaudeBaseURL: "https://open.bigmodel.cn/api/anthropic", + OpenAIBaseURL: "https://open.bigmodel.cn/api/coding/paas/v4", + }, + "glm-coding-plan-international": { + ClaudeBaseURL: "https://api.z.ai/api/anthropic", + OpenAIBaseURL: "https://api.z.ai/api/coding/paas/v4", + }, + "kimi-coding-plan": { + ClaudeBaseURL: "https://api.kimi.com/coding", + OpenAIBaseURL: "https://api.kimi.com/coding/v1", + }, + "doubao-coding-plan": { + ClaudeBaseURL: "https://ark.cn-beijing.volces.com/api/coding", + OpenAIBaseURL: "https://ark.cn-beijing.volces.com/api/coding/v3", + }, +} diff --git a/controller/channel.go b/controller/channel.go index 31c802d8c..809a2e932 100644 --- a/controller/channel.go +++ b/controller/channel.go @@ -11,7 +11,6 @@ import ( "github.com/QuantumNous/new-api/constant" "github.com/QuantumNous/new-api/dto" "github.com/QuantumNous/new-api/model" - "github.com/QuantumNous/new-api/relay/channel/volcengine" "github.com/QuantumNous/new-api/service" "github.com/gin-gonic/gin" @@ -192,10 +191,20 @@ func FetchUpstreamModels(c *gin.Context) { case constant.ChannelTypeAli: url = fmt.Sprintf("%s/compatible-mode/v1/models", baseURL) case constant.ChannelTypeZhipu_v4: - url = fmt.Sprintf("%s/api/paas/v4/models", baseURL) + if plan, ok := constant.ChannelSpecialBases[baseURL]; ok && plan.OpenAIBaseURL != "" { + url = fmt.Sprintf("%s/models", plan.OpenAIBaseURL) + } else { + url = fmt.Sprintf("%s/api/paas/v4/models", baseURL) + } case constant.ChannelTypeVolcEngine: - if baseURL == volcengine.DoubaoCodingPlan { - url = fmt.Sprintf("%s/v1/models", volcengine.DoubaoCodingPlanOpenAIBaseURL) + if plan, ok := constant.ChannelSpecialBases[baseURL]; ok && plan.OpenAIBaseURL != "" { + url = fmt.Sprintf("%s/v1/models", plan.OpenAIBaseURL) + } else { + url = fmt.Sprintf("%s/v1/models", baseURL) + } + case constant.ChannelTypeMoonshot: + if plan, ok := constant.ChannelSpecialBases[baseURL]; ok && plan.OpenAIBaseURL != "" { + url = fmt.Sprintf("%s/models", plan.OpenAIBaseURL) } else { url = fmt.Sprintf("%s/v1/models", baseURL) } diff --git a/relay/channel/moonshot/adaptor.go b/relay/channel/moonshot/adaptor.go index f02cb5e87..6591ee750 100644 --- a/relay/channel/moonshot/adaptor.go +++ b/relay/channel/moonshot/adaptor.go @@ -6,6 +6,7 @@ import ( "io" "net/http" + channelconstant "github.com/QuantumNous/new-api/constant" "github.com/QuantumNous/new-api/dto" "github.com/QuantumNous/new-api/relay/channel" "github.com/QuantumNous/new-api/relay/channel/claude" @@ -44,6 +45,16 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) { } func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { + baseURL := info.ChannelBaseUrl + if specialPlan, ok := channelconstant.ChannelSpecialBases[baseURL]; ok { + if info.RelayFormat == types.RelayFormatClaude { + return fmt.Sprintf("%s/v1/messages", specialPlan.ClaudeBaseURL), nil + } + if info.RelayFormat == types.RelayFormatOpenAI { + return fmt.Sprintf("%s/chat/completions", specialPlan.OpenAIBaseURL), nil + } + } + switch info.RelayFormat { case types.RelayFormatClaude: return fmt.Sprintf("%s/anthropic/v1/messages", info.ChannelBaseUrl), nil diff --git a/relay/channel/volcengine/adaptor.go b/relay/channel/volcengine/adaptor.go index 74cad439b..1d1199991 100644 --- a/relay/channel/volcengine/adaptor.go +++ b/relay/channel/volcengine/adaptor.go @@ -24,11 +24,8 @@ import ( ) const ( - contextKeyTTSRequest = "volcengine_tts_request" - contextKeyResponseFormat = "response_format" - DoubaoCodingPlan = "doubao-coding-plan" - DoubaoCodingPlanClaudeBaseURL = "https://ark.cn-beijing.volces.com/api/coding" - DoubaoCodingPlanOpenAIBaseURL = "https://ark.cn-beijing.volces.com/api/coding/v3" + contextKeyTTSRequest = "volcengine_tts_request" + contextKeyResponseFormat = "response_format" ) type Adaptor struct { @@ -40,7 +37,7 @@ func (a *Adaptor) ConvertGeminiRequest(*gin.Context, *relaycommon.RelayInfo, *dt } func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayInfo, req *dto.ClaudeRequest) (any, error) { - if info.ChannelBaseUrl == DoubaoCodingPlan { + if _, ok := channelconstant.ChannelSpecialBases[info.ChannelBaseUrl]; ok { adaptor := claude.Adaptor{} return adaptor.ConvertClaudeRequest(c, info, req) } @@ -243,11 +240,12 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { if baseUrl == "" { baseUrl = channelconstant.ChannelBaseURLs[channelconstant.ChannelTypeVolcEngine] } + specialPlan, hasSpecialPlan := channelconstant.ChannelSpecialBases[baseUrl] switch info.RelayFormat { case types.RelayFormatClaude: - if baseUrl == DoubaoCodingPlan { - return fmt.Sprintf("%s/v1/messages", DoubaoCodingPlanClaudeBaseURL), nil + if hasSpecialPlan && specialPlan.ClaudeBaseURL != "" { + return fmt.Sprintf("%s/v1/messages", specialPlan.ClaudeBaseURL), nil } if strings.HasPrefix(info.UpstreamModelName, "bot") { return fmt.Sprintf("%s/api/v3/bots/chat/completions", baseUrl), nil @@ -256,8 +254,8 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { default: switch info.RelayMode { case constant.RelayModeChatCompletions: - if baseUrl == DoubaoCodingPlan { - return fmt.Sprintf("%s/chat/completions", DoubaoCodingPlanOpenAIBaseURL), nil + if hasSpecialPlan && specialPlan.OpenAIBaseURL != "" { + return fmt.Sprintf("%s/chat/completions", specialPlan.OpenAIBaseURL), nil } if strings.HasPrefix(info.UpstreamModelName, "bot") { return fmt.Sprintf("%s/api/v3/bots/chat/completions", baseUrl), nil @@ -345,11 +343,13 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request } func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *types.NewAPIError) { - if info.RelayFormat == types.RelayFormatClaude && info.ChannelBaseUrl == DoubaoCodingPlan { - if info.IsStream { - return claude.ClaudeStreamHandler(c, resp, info, claude.RequestModeMessage) + if info.RelayFormat == types.RelayFormatClaude { + if _, ok := channelconstant.ChannelSpecialBases[info.ChannelBaseUrl]; ok { + if info.IsStream { + return claude.ClaudeStreamHandler(c, resp, info, claude.RequestModeMessage) + } + return claude.ClaudeHandler(c, resp, info, claude.RequestModeMessage) } - return claude.ClaudeHandler(c, resp, info, claude.RequestModeMessage) } if info.RelayMode == constant.RelayModeAudioSpeech { diff --git a/relay/channel/zhipu_4v/adaptor.go b/relay/channel/zhipu_4v/adaptor.go index 575da7cbf..4fd6956eb 100644 --- a/relay/channel/zhipu_4v/adaptor.go +++ b/relay/channel/zhipu_4v/adaptor.go @@ -6,6 +6,7 @@ import ( "io" "net/http" + channelconstant "github.com/QuantumNous/new-api/constant" "github.com/QuantumNous/new-api/dto" "github.com/QuantumNous/new-api/relay/channel" "github.com/QuantumNous/new-api/relay/channel/claude" @@ -43,15 +44,30 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) { } func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { + baseURL := info.ChannelBaseUrl + if baseURL == "" { + baseURL = channelconstant.ChannelBaseURLs[channelconstant.ChannelTypeZhipu_v4] + } + specialPlan, hasSpecialPlan := channelconstant.ChannelSpecialBases[baseURL] + switch info.RelayFormat { case types.RelayFormatClaude: - return fmt.Sprintf("%s/api/anthropic/v1/messages", info.ChannelBaseUrl), nil + if hasSpecialPlan && specialPlan.ClaudeBaseURL != "" { + return fmt.Sprintf("%s/v1/messages", specialPlan.ClaudeBaseURL), nil + } + return fmt.Sprintf("%s/api/anthropic/v1/messages", baseURL), nil default: switch info.RelayMode { case relayconstant.RelayModeEmbeddings: - return fmt.Sprintf("%s/api/paas/v4/embeddings", info.ChannelBaseUrl), nil + if hasSpecialPlan && specialPlan.OpenAIBaseURL != "" { + return fmt.Sprintf("%s/embeddings", specialPlan.OpenAIBaseURL), nil + } + return fmt.Sprintf("%s/api/paas/v4/embeddings", baseURL), nil default: - return fmt.Sprintf("%s/api/paas/v4/chat/completions", info.ChannelBaseUrl), nil + if hasSpecialPlan && specialPlan.OpenAIBaseURL != "" { + return fmt.Sprintf("%s/chat/completions", specialPlan.OpenAIBaseURL), nil + } + return fmt.Sprintf("%s/api/paas/v4/chat/completions", baseURL), nil } } } diff --git a/relay/channel/zhipu_4v/constants.go b/relay/channel/zhipu_4v/constants.go index 816fa536b..0d505373e 100644 --- a/relay/channel/zhipu_4v/constants.go +++ b/relay/channel/zhipu_4v/constants.go @@ -1,7 +1,7 @@ package zhipu_4v var ModelList = []string{ - "glm-4", "glm-4v", "glm-3-turbo", "glm-4-alltools", "glm-4-plus", "glm-4-0520", "glm-4-air", "glm-4-airx", "glm-4-long", "glm-4-flash", "glm-4v-plus", + "glm-4", "glm-4v", "glm-3-turbo", "glm-4-alltools", "glm-4-plus", "glm-4-0520", "glm-4-air", "glm-4-airx", "glm-4-long", "glm-4-flash", "glm-4v-plus", "glm-4.6", } var ChannelName = "zhipu_4v"