Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
eb23dffa
authored
Jun 06, 2025
by
RedwindA
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复2.5-pro的预算范围
parent
84a9a54a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
4 deletions
+29
-4
relay/channel/gemini/relay-gemini.go
+29
-4
No files found.
relay/channel/gemini/relay-gemini.go
View file @
eb23dffa
...
...
@@ -78,17 +78,42 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest, info *relaycommon
}
}
else
{
budgetTokens
:=
model_setting
.
GetGeminiSettings
()
.
ThinkingAdapterBudgetTokensPercentage
*
float64
(
geminiRequest
.
GenerationConfig
.
MaxOutputTokens
)
if
budgetTokens
==
0
||
budgetTokens
>
24576
{
budgetTokens
=
24576
// 检查是否为新的2.5pro模型(支持ThinkingBudget但有特殊范围)
isNew25Pro
:=
strings
.
HasPrefix
(
info
.
OriginModelName
,
"gemini-2.5-pro"
)
&&
!
strings
.
HasPrefix
(
info
.
OriginModelName
,
"gemini-2.5-pro-preview-05-06"
)
&&
!
strings
.
HasPrefix
(
info
.
OriginModelName
,
"gemini-2.5-pro-preview-03-25"
)
if
isNew25Pro
{
// 新的2.5pro模型:ThinkingBudget范围为128-32768
if
budgetTokens
==
0
||
budgetTokens
<
128
{
budgetTokens
=
128
}
else
if
budgetTokens
>
32768
{
budgetTokens
=
32768
}
}
else
{
// 其他模型:ThinkingBudget范围为0-24576
if
budgetTokens
==
0
||
budgetTokens
>
24576
{
budgetTokens
=
24576
}
}
geminiRequest
.
GenerationConfig
.
ThinkingConfig
=
&
GeminiThinkingConfig
{
ThinkingBudget
:
common
.
GetPointer
(
int
(
budgetTokens
)),
IncludeThoughts
:
true
,
}
}
}
else
if
strings
.
HasSuffix
(
info
.
OriginModelName
,
"-nothinking"
)
{
geminiRequest
.
GenerationConfig
.
ThinkingConfig
=
&
GeminiThinkingConfig
{
ThinkingBudget
:
common
.
GetPointer
(
0
),
// 检查是否为新的2.5pro模型(不支持-nothinking,因为最低值只能为128)
isNew25Pro
:=
strings
.
HasPrefix
(
info
.
OriginModelName
,
"gemini-2.5-pro"
)
&&
!
strings
.
HasPrefix
(
info
.
OriginModelName
,
"gemini-2.5-pro-preview-05-06"
)
&&
!
strings
.
HasPrefix
(
info
.
OriginModelName
,
"gemini-2.5-pro-preview-03-25"
)
if
!
isNew25Pro
{
// 只有非新2.5pro模型才支持-nothinking
geminiRequest
.
GenerationConfig
.
ThinkingConfig
=
&
GeminiThinkingConfig
{
ThinkingBudget
:
common
.
GetPointer
(
0
),
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment