LLM/CLIProxyAPIPlus
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPIPlus.git synced 2026-03-25 05:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: cover dated and nested codex web search aliases

Browse Source
This commit is contained in:
Junyi Du
2026-03-19 03:41:12 +08:00
parent 8f421de532
commit 793840cdb4
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
internal/translator/codex/openai/responses/codex_openai-responses_request.go
View File

@@ -94,19 +94,41 @@ func normalizeCodexBuiltinTools(rawJSON []byte) []byte {
toolArray := tools.Array()
for i := 0; i < len(toolArray); i++ {
typePath := fmt.Sprintf("tools.%d.type", i)
if gjson.GetBytes(result, typePath).String() == "web_search_preview" {
if updated, err := sjson.SetBytes(result, typePath, "web_search"); err == nil {
if normalized := normalizeCodexBuiltinToolType(gjson.GetBytes(result, typePath).String()); normalized != "" {
if updated, err := sjson.SetBytes(result, typePath, normalized); err == nil {
result = updated
}
}
}
}
if gjson.GetBytes(result, "tool_choice.type").String() == "web_search_preview" {
if updated, err := sjson.SetBytes(result, "tool_choice.type", "web_search"); err == nil {
if normalized := normalizeCodexBuiltinToolType(gjson.GetBytes(result, "tool_choice.type").String()); normalized != "" {
if updated, err := sjson.SetBytes(result, "tool_choice.type", normalized); err == nil {
result = updated
}
}
toolChoiceTools := gjson.GetBytes(result, "tool_choice.tools")
if toolChoiceTools.IsArray() {
toolArray := toolChoiceTools.Array()
for i := 0; i < len(toolArray); i++ {
typePath := fmt.Sprintf("tool_choice.tools.%d.type", i)
if normalized := normalizeCodexBuiltinToolType(gjson.GetBytes(result, typePath).String()); normalized != "" {
if updated, err := sjson.SetBytes(result, typePath, normalized); err == nil {
result = updated
}
}
}
}
return result
}
func normalizeCodexBuiltinToolType(toolType string) string {
switch toolType {
case "web_search_preview", "web_search_preview_2025_03_11":
return "web_search"
default:
return ""
}
}

30
internal/translator/codex/openai/responses/codex_openai-responses_request_test.go
View File

@@ -269,9 +269,15 @@ func TestConvertOpenAIResponsesRequestToCodex_NormalizesWebSearchPreview(t *test
"model": "gpt-5.4-mini",
"input": "find latest OpenAI model news",
"tools": [
{"type": "web_search_preview"}
{"type": "web_search_preview_2025_03_11"}
],
"tool_choice": {"type": "web_search_preview"}
"tool_choice": {
"type": "allowed_tools",
"tools": [
{"type": "web_search_preview"},
{"type": "web_search_preview_2025_03_11"}
]
}
}`)
output := ConvertOpenAIResponsesRequestToCodex("gpt-5.4-mini", inputJSON, false)
@@ -279,6 +285,26 @@ func TestConvertOpenAIResponsesRequestToCodex_NormalizesWebSearchPreview(t *test
if got := gjson.GetBytes(output, "tools.0.type").String(); got != "web_search" {
t.Fatalf("tools.0.type = %q, want %q: %s", got, "web_search", string(output))
}
if got := gjson.GetBytes(output, "tool_choice.type").String(); got != "allowed_tools" {
t.Fatalf("tool_choice.type = %q, want %q: %s", got, "allowed_tools", string(output))
}
if got := gjson.GetBytes(output, "tool_choice.tools.0.type").String(); got != "web_search" {
t.Fatalf("tool_choice.tools.0.type = %q, want %q: %s", got, "web_search", string(output))
}
if got := gjson.GetBytes(output, "tool_choice.tools.1.type").String(); got != "web_search" {
t.Fatalf("tool_choice.tools.1.type = %q, want %q: %s", got, "web_search", string(output))
}
}
func TestConvertOpenAIResponsesRequestToCodex_NormalizesTopLevelToolChoicePreviewAlias(t *testing.T) {
inputJSON := []byte(`{
"model": "gpt-5.4-mini",
"input": "find latest OpenAI model news",
"tool_choice": {"type": "web_search_preview_2025_03_11"}
}`)
output := ConvertOpenAIResponsesRequestToCodex("gpt-5.4-mini", inputJSON, false)
if got := gjson.GetBytes(output, "tool_choice.type").String(); got != "web_search" {
t.Fatalf("tool_choice.type = %q, want %q: %s", got, "web_search", string(output))
}