From 09dbb372ede9547292e667779981660c918fdb03 Mon Sep 17 00:00:00 2001 From: sxjeru Date: Fri, 3 Apr 2026 11:27:02 +0800 Subject: [PATCH 1/3] feat(ratio-setting): add compatibility for gemma-4 model suffix handling --- setting/ratio_setting/model_ratio.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setting/ratio_setting/model_ratio.go b/setting/ratio_setting/model_ratio.go index 80702ee42ad2..40c38005e0e5 100644 --- a/setting/ratio_setting/model_ratio.go +++ b/setting/ratio_setting/model_ratio.go @@ -5,6 +5,7 @@ import ( "github.com/QuantumNous/new-api/common" "github.com/QuantumNous/new-api/setting/operation_setting" + "github.com/QuantumNous/new-api/setting/reasoning" "github.com/QuantumNous/new-api/types" ) @@ -730,6 +731,11 @@ func FormatMatchingModelName(name string) string { name = handleThinkingBudgetModel(name, "gemini-2.5-flash", "gemini-2.5-flash-thinking-*") } else if strings.HasPrefix(name, "gemini-2.5-pro") { name = handleThinkingBudgetModel(name, "gemini-2.5-pro", "gemini-2.5-pro-thinking-*") + } else if strings.HasPrefix(name, "gemma-4") { + // 兼容 gemma-4* 思考后缀(如 -minimal/-high) + if baseModel, level, ok := reasoning.TrimEffortSuffix(name); ok && level != "" { + name = baseModel + } } if strings.HasPrefix(name, "gpt-4-gizmo") { From 64d47b05e2d35b3749569443dfb6361041314b4d Mon Sep 17 00:00:00 2001 From: sxjeru Date: Wed, 8 Apr 2026 13:13:17 +0800 Subject: [PATCH 2/3] feat(ratio-setting): add normalization for gemma-4 effort model suffixes --- model/channel_cache.go | 10 +++++++++- setting/ratio_setting/model_ratio.go | 23 ++++++++++++++++++----- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/model/channel_cache.go b/model/channel_cache.go index c9c503576038..f5d6bc61b969 100644 --- a/model/channel_cache.go +++ b/model/channel_cache.go @@ -96,7 +96,15 @@ func SyncChannelCache(frequency int) { func GetRandomSatisfiedChannel(group string, model string, retry int) (*Channel, error) { // if memory cache is disabled, get channel directly from database if !common.MemoryCacheEnabled { - return GetChannel(group, model, retry) + channel, err := GetChannel(group, model, retry) + if err != nil || channel != nil { + return channel, err + } + normalizedModel := ratio_setting.FormatMatchingModelName(model) + if normalizedModel != "" && normalizedModel != model { + return GetChannel(group, normalizedModel, retry) + } + return nil, nil } channelSyncLock.RLock() diff --git a/setting/ratio_setting/model_ratio.go b/setting/ratio_setting/model_ratio.go index 40c38005e0e5..dad915cf83cc 100644 --- a/setting/ratio_setting/model_ratio.go +++ b/setting/ratio_setting/model_ratio.go @@ -4,6 +4,7 @@ import ( "strings" "github.com/QuantumNous/new-api/common" + "github.com/QuantumNous/new-api/setting/model_setting" "github.com/QuantumNous/new-api/setting/operation_setting" "github.com/QuantumNous/new-api/setting/reasoning" "github.com/QuantumNous/new-api/types" @@ -722,6 +723,21 @@ func GetAudioCompletionRatioCopy() map[string]float64 { return audioCompletionRatioMap.ReadAll() } +// NormalizeGemma4EffortModelName 在开启 Gemini thinking adapter 时, +// 将 gemma-4* 的 effort 后缀(如 -minimal/-high)归一化为基础模型名。 +func NormalizeGemma4EffortModelName(name string) string { + if !model_setting.GetGeminiSettings().ThinkingAdapterEnabled { + return name + } + if !strings.HasPrefix(name, "gemma-4") { + return name + } + if baseModel, level, ok := reasoning.TrimEffortSuffix(name); ok && level != "" { + return baseModel + } + return name +} + // 转换模型名,减少渠道必须配置各种带参数模型 func FormatMatchingModelName(name string) string { @@ -731,13 +747,10 @@ func FormatMatchingModelName(name string) string { name = handleThinkingBudgetModel(name, "gemini-2.5-flash", "gemini-2.5-flash-thinking-*") } else if strings.HasPrefix(name, "gemini-2.5-pro") { name = handleThinkingBudgetModel(name, "gemini-2.5-pro", "gemini-2.5-pro-thinking-*") - } else if strings.HasPrefix(name, "gemma-4") { - // 兼容 gemma-4* 思考后缀(如 -minimal/-high) - if baseModel, level, ok := reasoning.TrimEffortSuffix(name); ok && level != "" { - name = baseModel - } } + name = NormalizeGemma4EffortModelName(name) + if strings.HasPrefix(name, "gpt-4-gizmo") { name = "gpt-4-gizmo-*" } From 168eaf514fbf175bfa93857a73e771296aad27b2 Mon Sep 17 00:00:00 2001 From: sxjeru <20513115+sxjeru@users.noreply.github.com> Date: Wed, 8 Apr 2026 13:22:34 +0800 Subject: [PATCH 3/3] Update channel_cache.go --- model/channel_cache.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/model/channel_cache.go b/model/channel_cache.go index f5d6bc61b969..c9c503576038 100644 --- a/model/channel_cache.go +++ b/model/channel_cache.go @@ -96,15 +96,7 @@ func SyncChannelCache(frequency int) { func GetRandomSatisfiedChannel(group string, model string, retry int) (*Channel, error) { // if memory cache is disabled, get channel directly from database if !common.MemoryCacheEnabled { - channel, err := GetChannel(group, model, retry) - if err != nil || channel != nil { - return channel, err - } - normalizedModel := ratio_setting.FormatMatchingModelName(model) - if normalizedModel != "" && normalizedModel != model { - return GetChannel(group, normalizedModel, retry) - } - return nil, nil + return GetChannel(group, model, retry) } channelSyncLock.RLock()