mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-02-03 13:00:52 +08:00
fix(codex): only override instructions when upstream provides them
This commit is contained in:
@@ -19,8 +19,10 @@ 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 := selectInstructions(originalRequestRawJSON, requestRawJSON)
|
if gjson.GetBytes(rawJSON, "response.instructions").Exists() {
|
||||||
rawJSON, _ = sjson.SetBytes(rawJSON, "response.instructions", instructions)
|
instructions := selectInstructions(originalRequestRawJSON, requestRawJSON)
|
||||||
|
rawJSON, _ = sjson.SetBytes(rawJSON, "response.instructions", instructions)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
out := fmt.Sprintf("data: %s", string(rawJSON))
|
out := fmt.Sprintf("data: %s", string(rawJSON))
|
||||||
@@ -39,7 +41,9 @@ func ConvertCodexResponseToOpenAIResponsesNonStream(_ context.Context, modelName
|
|||||||
}
|
}
|
||||||
responseResult := rootResult.Get("response")
|
responseResult := rootResult.Get("response")
|
||||||
template := responseResult.Raw
|
template := responseResult.Raw
|
||||||
template, _ = sjson.Set(template, "instructions", selectInstructions(originalRequestRawJSON, requestRawJSON))
|
if responseResult.Get("instructions").Exists() {
|
||||||
|
template, _ = sjson.Set(template, "instructions", selectInstructions(originalRequestRawJSON, requestRawJSON))
|
||||||
|
}
|
||||||
return template
|
return template
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user