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

refactor: remove redundant Codex instruction validation logic

Browse Source 
- Eliminated unnecessary calls to `misc.CodexInstructions` and corresponding checks in response processing.
- Streamlined instruction handling by directly updating "instructions" field from the original request payload.
This commit is contained in:
Luis Pater
2025-09-19 09:19:18 +08:00
parent d00604dd28
commit c0fbc1979e
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/translator/codex/openai/responses/codex_openai-responses_response.go
View File

@@ -6,7 +6,6 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/luispater/CLIProxyAPI/v5/internal/misc"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"github.com/tidwall/sjson" "github.com/tidwall/sjson"
) )
@@ -19,11 +18,7 @@ func ConvertCodexResponseToOpenAIResponses(ctx context.Context, modelName string
if typeResult := gjson.GetBytes(rawJSON, "type"); typeResult.Exists() { if typeResult := gjson.GetBytes(rawJSON, "type"); typeResult.Exists() {
typeStr := typeResult.String() typeStr := typeResult.String()
if typeStr == "response.created" || typeStr == "response.in_progress" || typeStr == "response.completed" { if typeStr == "response.created" || typeStr == "response.in_progress" || typeStr == "response.completed" {
instructions := misc.CodexInstructions(modelName) rawJSON, _ = sjson.SetBytes(rawJSON, "response.instructions", gjson.GetBytes(originalRequestRawJSON, "instructions").String())
instructionsResult := gjson.GetBytes(rawJSON, "response.instructions")
if instructionsResult.Raw == instructions {
rawJSON, _ = sjson.SetBytes(rawJSON, "response.instructions", gjson.GetBytes(originalRequestRawJSON, "instructions").String())
}
} }
} }
return []string{fmt.Sprintf("data: %s", string(rawJSON))} return []string{fmt.Sprintf("data: %s", string(rawJSON))}
@@ -54,11 +49,7 @@ func ConvertCodexResponseToOpenAIResponsesNonStream(_ context.Context, modelName
responseResult := rootResult.Get("response") responseResult := rootResult.Get("response")
template := responseResult.Raw template := responseResult.Raw
instructions := misc.CodexInstructions(modelName) template, _ = sjson.Set(template, "instructions", gjson.GetBytes(originalRequestRawJSON, "instructions").String())
instructionsResult := gjson.Get(template, "instructions")
if instructionsResult.Raw == instructions {
template, _ = sjson.Set(template, "instructions", gjson.GetBytes(originalRequestRawJSON, "instructions").String())
}
return template return template
} }
return "" return ""