mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-11-17 15:20:55 +08:00
fix(translator): map upstream MAX_TOKENS to OpenAI finish_reason length
- Map upstream MAX_TOKENS to finish_reason "length" in the Antigravity and Gemini OpenAI Chat Completions translators (streaming and non-streaming), since "max_tokens" is not a valid OpenAI finish_reason and strict clients reject it. - Keep native_finish_reason as the lowercased upstream value and preserve tool_calls precedence and content_filter handling, updating and adding regression test cases for each affected path. Closes: #7463 Co-authored-by: Dylan <1990016@gmail.com> Co-authored-by: lzt404 <2596933790@qq.com>
This commit is contained in:
@@ -287,7 +287,7 @@ func resolveOpenAIFinishReason(params *convertCliResponseToOpenAIChatParams) (fi
|
||||
case params.SawToolCall:
|
||||
finishReason = "tool_calls"
|
||||
case params.UpstreamFinishReason == "MAX_TOKENS":
|
||||
finishReason = "max_tokens"
|
||||
finishReason = "length"
|
||||
case isAntigravityContentFilterFinishReason(params.UpstreamFinishReason):
|
||||
finishReason = "content_filter"
|
||||
default:
|
||||
|
||||
@@ -77,10 +77,15 @@ func TestFinishReasonMaxTokens(t *testing.T) {
|
||||
chunk2 := []byte(`{"response":{"candidates":[{"finishReason":"MAX_TOKENS"}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":100,"totalTokenCount":110}}}`)
|
||||
result2 := ConvertAntigravityResponseToOpenAI(ctx, "model", nil, nil, chunk2, ¶m)
|
||||
|
||||
// Verify finish_reason is "max_tokens"
|
||||
// Verify finish_reason is "length" (the OpenAI value for an output token limit)
|
||||
fr := ojson.GetBytesNoCopy(result2[0], "choices.0.finish_reason").String()
|
||||
if fr != "max_tokens" {
|
||||
t.Errorf("Expected finish_reason 'max_tokens', got: %s", fr)
|
||||
if fr != "length" {
|
||||
t.Errorf("Expected finish_reason 'length', got: %s", fr)
|
||||
}
|
||||
// Verify native_finish_reason preserves the upstream value
|
||||
nfr := ojson.GetBytesNoCopy(result2[0], "choices.0.native_finish_reason").String()
|
||||
if nfr != "max_tokens" {
|
||||
t.Errorf("Expected native_finish_reason 'max_tokens', got: %s", nfr)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,7 +101,7 @@ func TestToolCallTakesPriorityOverMaxTokens(t *testing.T) {
|
||||
chunk2 := []byte(`{"response":{"candidates":[{"finishReason":"MAX_TOKENS"}],"usageMetadata":{"promptTokenCount":10,"candidatesTokenCount":100,"totalTokenCount":110}}}`)
|
||||
result2 := ConvertAntigravityResponseToOpenAI(ctx, "model", nil, nil, chunk2, ¶m)
|
||||
|
||||
// Verify finish_reason is "tool_calls" (takes priority over max_tokens)
|
||||
// Verify finish_reason is "tool_calls" (takes priority over upstream MAX_TOKENS)
|
||||
fr := ojson.GetBytesNoCopy(result2[0], "choices.0.finish_reason").String()
|
||||
if fr != "tool_calls" {
|
||||
t.Errorf("Expected finish_reason 'tool_calls', got: %s", fr)
|
||||
|
||||
@@ -513,7 +513,9 @@ func ConvertGeminiResponseToOpenAINonStream(_ context.Context, _ string, origina
|
||||
// Set finish reason.
|
||||
if finishReasonResult := candidate.Get("finishReason"); finishReasonResult.Exists() {
|
||||
finishReason := strings.ToLower(finishReasonResult.String())
|
||||
if isGeminiContentFilterFinishReason(finishReasonResult.String()) {
|
||||
if strings.EqualFold(strings.TrimSpace(finishReasonResult.String()), "MAX_TOKENS") {
|
||||
finishReason = "length"
|
||||
} else if isGeminiContentFilterFinishReason(finishReasonResult.String()) {
|
||||
finishReason = "content_filter"
|
||||
}
|
||||
_ = choiceDoc.Set("finish_reason", finishReason)
|
||||
@@ -639,7 +641,7 @@ func resolveGeminiOpenAIFinishReason(upstreamFinishReason string, sawToolCall bo
|
||||
case sawToolCall:
|
||||
finishReason = "tool_calls"
|
||||
case upstreamFinishReason == "MAX_TOKENS":
|
||||
finishReason = "max_tokens"
|
||||
finishReason = "length"
|
||||
case isGeminiContentFilterFinishReason(upstreamFinishReason):
|
||||
finishReason = "content_filter"
|
||||
default:
|
||||
|
||||
@@ -198,6 +198,12 @@ func TestConvertGeminiResponseToOpenAI_NonStopFinishReasonsMapToContentFilter(t
|
||||
wantFinishReason: "content_filter",
|
||||
wantNativeReason: "prohibited_content",
|
||||
},
|
||||
{
|
||||
name: "MAX_TOKENS",
|
||||
upstreamReason: "MAX_TOKENS",
|
||||
wantFinishReason: "length",
|
||||
wantNativeReason: "max_tokens",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range cases {
|
||||
|
||||
Reference in New Issue
Block a user