oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1130 from xqx121/main

Browse Source 
Fix: Gemini2.5pro ThinkingConfig
This commit is contained in:
Calcium-Ion
2025-05-31 18:43:57 +08:00
committed by GitHub
parent 361b0abec9 1c4d7fd84b
commit 74defce481
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
relay/channel/gemini/relay-gemini.go
View File

@@ -40,6 +40,12 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest, info *relaycommon
if model_setting.GetGeminiSettings().ThinkingAdapterEnabled { if model_setting.GetGeminiSettings().ThinkingAdapterEnabled {
if strings.HasSuffix(info.OriginModelName, "-thinking") { if strings.HasSuffix(info.OriginModelName, "-thinking") {
// 如果模型名以 gemini-2.5-pro 开头，不设置 ThinkingBudget
if strings.HasPrefix(info.OriginModelName, "gemini-2.5-pro") {
geminiRequest.GenerationConfig.ThinkingConfig = &GeminiThinkingConfig{
IncludeThoughts: true,
}
} else {
budgetTokens := model_setting.GetGeminiSettings().ThinkingAdapterBudgetTokensPercentage * float64(geminiRequest.GenerationConfig.MaxOutputTokens) budgetTokens := model_setting.GetGeminiSettings().ThinkingAdapterBudgetTokensPercentage * float64(geminiRequest.GenerationConfig.MaxOutputTokens)
if budgetTokens == 0 || budgetTokens > 24576 { if budgetTokens == 0 || budgetTokens > 24576 {
budgetTokens = 24576 budgetTokens = 24576
@@ -48,6 +54,7 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest, info *relaycommon
ThinkingBudget: common.GetPointer(int(budgetTokens)), ThinkingBudget: common.GetPointer(int(budgetTokens)),
IncludeThoughts: true, IncludeThoughts: true,
} }
}
} else if strings.HasSuffix(info.OriginModelName, "-nothinking") { } else if strings.HasSuffix(info.OriginModelName, "-nothinking") {
geminiRequest.GenerationConfig.ThinkingConfig = &GeminiThinkingConfig{ geminiRequest.GenerationConfig.ThinkingConfig = &GeminiThinkingConfig{
ThinkingBudget: common.GetPointer(0), ThinkingBudget: common.GetPointer(0),