mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-02-18 20:30:51 +08:00
fix(thinking): ensure includeThoughts is false for ModeNone in budget processing
This commit is contained in:
@@ -139,6 +139,24 @@ func (a *Applier) applyBudgetFormat(body []byte, config thinking.ThinkingConfig,
|
|||||||
|
|
||||||
budget := config.Budget
|
budget := config.Budget
|
||||||
|
|
||||||
|
// Apply Claude-specific constraints first to get the final budget value
|
||||||
|
if isClaude && modelInfo != nil {
|
||||||
|
budget, result = a.normalizeClaudeBudget(budget, result, modelInfo)
|
||||||
|
// Check if budget was removed entirely
|
||||||
|
if budget == -2 {
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// For ModeNone, always set includeThoughts to false regardless of user setting.
|
||||||
|
// This ensures that when user requests budget=0 (disable thinking output),
|
||||||
|
// the includeThoughts is correctly set to false even if budget is clamped to min.
|
||||||
|
if config.Mode == thinking.ModeNone {
|
||||||
|
result, _ = sjson.SetBytes(result, "request.generationConfig.thinkingConfig.thinkingBudget", budget)
|
||||||
|
result, _ = sjson.SetBytes(result, "request.generationConfig.thinkingConfig.includeThoughts", false)
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Determine includeThoughts: respect user's explicit setting from original body if provided
|
// Determine includeThoughts: respect user's explicit setting from original body if provided
|
||||||
// Support both camelCase and snake_case variants
|
// Support both camelCase and snake_case variants
|
||||||
var includeThoughts bool
|
var includeThoughts bool
|
||||||
@@ -154,8 +172,6 @@ func (a *Applier) applyBudgetFormat(body []byte, config thinking.ThinkingConfig,
|
|||||||
if !userSetIncludeThoughts {
|
if !userSetIncludeThoughts {
|
||||||
// No explicit setting, use default logic based on mode
|
// No explicit setting, use default logic based on mode
|
||||||
switch config.Mode {
|
switch config.Mode {
|
||||||
case thinking.ModeNone:
|
|
||||||
includeThoughts = false
|
|
||||||
case thinking.ModeAuto:
|
case thinking.ModeAuto:
|
||||||
includeThoughts = true
|
includeThoughts = true
|
||||||
default:
|
default:
|
||||||
@@ -163,15 +179,6 @@ func (a *Applier) applyBudgetFormat(body []byte, config thinking.ThinkingConfig,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply Claude-specific constraints
|
|
||||||
if isClaude && modelInfo != nil {
|
|
||||||
budget, result = a.normalizeClaudeBudget(budget, result, modelInfo)
|
|
||||||
// Check if budget was removed entirely
|
|
||||||
if budget == -2 {
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
result, _ = sjson.SetBytes(result, "request.generationConfig.thinkingConfig.thinkingBudget", budget)
|
result, _ = sjson.SetBytes(result, "request.generationConfig.thinkingConfig.thinkingBudget", budget)
|
||||||
result, _ = sjson.SetBytes(result, "request.generationConfig.thinkingConfig.includeThoughts", includeThoughts)
|
result, _ = sjson.SetBytes(result, "request.generationConfig.thinkingConfig.includeThoughts", includeThoughts)
|
||||||
return result, nil
|
return result, nil
|
||||||
|
|||||||
@@ -163,6 +163,15 @@ func (a *Applier) applyBudgetFormat(body []byte, config thinking.ThinkingConfig)
|
|||||||
|
|
||||||
budget := config.Budget
|
budget := config.Budget
|
||||||
|
|
||||||
|
// For ModeNone, always set includeThoughts to false regardless of user setting.
|
||||||
|
// This ensures that when user requests budget=0 (disable thinking output),
|
||||||
|
// the includeThoughts is correctly set to false even if budget is clamped to min.
|
||||||
|
if config.Mode == thinking.ModeNone {
|
||||||
|
result, _ = sjson.SetBytes(result, "generationConfig.thinkingConfig.thinkingBudget", budget)
|
||||||
|
result, _ = sjson.SetBytes(result, "generationConfig.thinkingConfig.includeThoughts", false)
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Determine includeThoughts: respect user's explicit setting from original body if provided
|
// Determine includeThoughts: respect user's explicit setting from original body if provided
|
||||||
// Support both camelCase and snake_case variants
|
// Support both camelCase and snake_case variants
|
||||||
var includeThoughts bool
|
var includeThoughts bool
|
||||||
@@ -177,13 +186,7 @@ func (a *Applier) applyBudgetFormat(body []byte, config thinking.ThinkingConfig)
|
|||||||
|
|
||||||
if !userSetIncludeThoughts {
|
if !userSetIncludeThoughts {
|
||||||
// No explicit setting, use default logic based on mode
|
// No explicit setting, use default logic based on mode
|
||||||
// ModeNone semantics:
|
|
||||||
// - ModeNone + Budget=0: completely disable thinking
|
|
||||||
// - ModeNone + Budget>0: forced to think but hide output (includeThoughts=false)
|
|
||||||
// When ZeroAllowed=false, ValidateConfig clamps Budget to Min while preserving ModeNone.
|
|
||||||
switch config.Mode {
|
switch config.Mode {
|
||||||
case thinking.ModeNone:
|
|
||||||
includeThoughts = false
|
|
||||||
case thinking.ModeAuto:
|
case thinking.ModeAuto:
|
||||||
includeThoughts = true
|
includeThoughts = true
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -124,6 +124,15 @@ func (a *Applier) applyBudgetFormat(body []byte, config thinking.ThinkingConfig)
|
|||||||
|
|
||||||
budget := config.Budget
|
budget := config.Budget
|
||||||
|
|
||||||
|
// For ModeNone, always set includeThoughts to false regardless of user setting.
|
||||||
|
// This ensures that when user requests budget=0 (disable thinking output),
|
||||||
|
// the includeThoughts is correctly set to false even if budget is clamped to min.
|
||||||
|
if config.Mode == thinking.ModeNone {
|
||||||
|
result, _ = sjson.SetBytes(result, "request.generationConfig.thinkingConfig.thinkingBudget", budget)
|
||||||
|
result, _ = sjson.SetBytes(result, "request.generationConfig.thinkingConfig.includeThoughts", false)
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Determine includeThoughts: respect user's explicit setting from original body if provided
|
// Determine includeThoughts: respect user's explicit setting from original body if provided
|
||||||
// Support both camelCase and snake_case variants
|
// Support both camelCase and snake_case variants
|
||||||
var includeThoughts bool
|
var includeThoughts bool
|
||||||
@@ -139,8 +148,6 @@ func (a *Applier) applyBudgetFormat(body []byte, config thinking.ThinkingConfig)
|
|||||||
if !userSetIncludeThoughts {
|
if !userSetIncludeThoughts {
|
||||||
// No explicit setting, use default logic based on mode
|
// No explicit setting, use default logic based on mode
|
||||||
switch config.Mode {
|
switch config.Mode {
|
||||||
case thinking.ModeNone:
|
|
||||||
includeThoughts = false
|
|
||||||
case thinking.ModeAuto:
|
case thinking.ModeAuto:
|
||||||
includeThoughts = true
|
includeThoughts = true
|
||||||
default:
|
default:
|
||||||
|
|||||||
Reference in New Issue
Block a user