chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-03 13:00:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(thinking): use static lookup to avoid alias issues

Browse Source
This commit is contained in:
hkfires
2026-01-14 15:44:08 +08:00
parent a75fb6af90
commit 40ee065eff
11 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/thinking/provider/claude/apply.go
View File

@@ -54,7 +54,7 @@ func init() {
// }
func (a *Applier) Apply(body []byte, config thinking.ThinkingConfig, modelInfo *registry.ModelInfo) ([]byte, error) {
if modelInfo == nil {
return body, nil
return applyCompatibleClaude(body, config)
}
if modelInfo.Thinking == nil {
if modelInfo.Type == "" {

2
internal/thinking/provider/codex/apply.go
View File

@@ -45,7 +45,7 @@ func init() {
// }
func (a *Applier) Apply(body []byte, config thinking.ThinkingConfig, modelInfo *registry.ModelInfo) ([]byte, error) {
if modelInfo == nil {
return body, nil
return applyCompatibleCodex(body, config)
}
if modelInfo.Thinking == nil {
if modelInfo.Type == "" {

2
internal/thinking/provider/gemini/apply.go
View File

@@ -60,7 +60,7 @@ func init() {
// }
func (a *Applier) Apply(body []byte, config thinking.ThinkingConfig, modelInfo *registry.ModelInfo) ([]byte, error) {
if modelInfo == nil {
return body, nil
return a.applyCompatible(body, config)
}
if modelInfo.Thinking == nil {
if modelInfo.Type == "" {

5
internal/thinking/provider/gemini/apply_test.go
View File

@@ -450,8 +450,9 @@ func TestGeminiApplyNilModelInfo(t *testing.T) {
if err != nil {
t.Fatalf("Apply() with nil modelInfo should not error, got: %v", err)
}
if string(result) != string(body) {
t.Fatalf("Apply() with nil modelInfo should return original body, got: %s", result)
// nil modelInfo now applies compatible config
if !gjson.GetBytes(result, "generationConfig.thinkingConfig.thinkingBudget").Exists() {
t.Fatalf("Apply() with nil modelInfo should apply thinking config, got: %s", result)
}
}

2
internal/thinking/provider/geminicli/apply.go
View File

@@ -30,7 +30,7 @@ func init() {
// Apply applies thinking configuration to Gemini CLI request body.
func (a *Applier) Apply(body []byte, config thinking.ThinkingConfig, modelInfo *registry.ModelInfo) ([]byte, error) {
if modelInfo == nil {
return body, nil
return a.applyCompatible(body, config)
}
if modelInfo.Thinking == nil {
if modelInfo.Type == "" {

11
internal/thinking/provider/geminicli/apply_test.go
View File

@@ -241,8 +241,9 @@ func TestGeminiCLIApplyNilModelInfo(t *testing.T) {
if err != nil {
t.Fatalf("Apply() with nil modelInfo should not error, got: %v", err)
}
if string(result) != string(body) {
t.Fatalf("Apply() with nil modelInfo should return original body, got: %s", result)
// nil modelInfo now applies compatible config
if !gjson.GetBytes(result, "request.generationConfig.thinkingConfig.thinkingBudget").Exists() {
t.Fatalf("Apply() with nil modelInfo should apply thinking config, got: %s", result)
}
}
@@ -277,9 +278,9 @@ func TestGeminiCLIApplyModeBudgetWithLevels(t *testing.T) {
if err != nil {
t.Fatalf("Apply() error = %v", err)
}
// ModeBudget with Levels model: Apply returns body unchanged (conversion is upper layer's job)
if string(result) != string(body) {
t.Fatalf("Apply() ModeBudget with Levels should return original body, got: %s", result)
// ModeBudget applies budget format directly without conversion to levels
if !gjson.GetBytes(result, "request.generationConfig.thinkingConfig.thinkingBudget").Exists() {
t.Fatalf("Apply() ModeBudget should apply budget format, got: %s", result)
}
}

2
internal/thinking/provider/openai/apply.go
View File

@@ -42,7 +42,7 @@ func init() {
// }
func (a *Applier) Apply(body []byte, config thinking.ThinkingConfig, modelInfo *registry.ModelInfo) ([]byte, error) {
if modelInfo == nil {
return body, nil
return applyCompatibleOpenAI(body, config)
}
if modelInfo.Thinking == nil {
if modelInfo.Type == "" {

8
internal/thinking/provider/openai/apply_test.go
View File

@@ -43,12 +43,14 @@ func TestApplierImplementsInterface(t *testing.T) {
func TestApplyNilModelInfo(t *testing.T) {
applier := NewApplier()
body := []byte(`{"model":"gpt-5.2"}`)
got, err := applier.Apply(body, thinking.ThinkingConfig{}, nil)
config := thinking.ThinkingConfig{Mode: thinking.ModeLevel, Level: thinking.LevelHigh}
got, err := applier.Apply(body, config, nil)
if err != nil {
t.Fatalf("expected nil error, got %v", err)
}
if string(got) != string(body) {
t.Fatalf("expected body unchanged, got %s", string(got))
// nil modelInfo now applies compatible config
if !gjson.GetBytes(got, "reasoning_effort").Exists() {
t.Fatalf("expected reasoning_effort applied, got %s", string(got))
}
}