diff --git a/internal/translator/gemini/openai/responses/gemini_openai-responses_request.go b/internal/translator/gemini/openai/responses/gemini_openai-responses_request.go index bdf59785..0cd50483 100644 --- a/internal/translator/gemini/openai/responses/gemini_openai-responses_request.go +++ b/internal/translator/gemini/openai/responses/gemini_openai-responses_request.go @@ -194,6 +194,9 @@ func ConvertOpenAIResponsesRequestToGemini(modelName string, inputRawJSON []byte switch contentType { case "input_text", "output_text": if text := contentItem.Get("text"); text.Exists() { + if text.String() == "" { + break + } partJSON = `{"text":""}` partJSON, _ = sjson.Set(partJSON, "text", text.String()) } diff --git a/internal/translator/gemini/openai/responses/gemini_openai-responses_response.go b/internal/translator/gemini/openai/responses/gemini_openai-responses_response.go index e08b265d..81ce496c 100644 --- a/internal/translator/gemini/openai/responses/gemini_openai-responses_response.go +++ b/internal/translator/gemini/openai/responses/gemini_openai-responses_response.go @@ -250,20 +250,26 @@ func ConvertGeminiResponseToOpenAIResponses(_ context.Context, modelName string, finalizeReasoning() // Close message output if opened if st.MsgOpened { + fullText := st.TextBuf.String() done := `{"type":"response.output_text.done","sequence_number":0,"item_id":"","output_index":0,"content_index":0,"text":"","logprobs":[]}` done, _ = sjson.Set(done, "sequence_number", nextSeq()) done, _ = sjson.Set(done, "item_id", st.CurrentMsgID) done, _ = sjson.Set(done, "output_index", st.MsgIndex) + done, _ = sjson.Set(done, "content_index", 0) + done, _ = sjson.Set(done, "text", fullText) out = append(out, emitEvent("response.output_text.done", done)) partDone := `{"type":"response.content_part.done","sequence_number":0,"item_id":"","output_index":0,"content_index":0,"part":{"type":"output_text","annotations":[],"logprobs":[],"text":""}}` partDone, _ = sjson.Set(partDone, "sequence_number", nextSeq()) partDone, _ = sjson.Set(partDone, "item_id", st.CurrentMsgID) partDone, _ = sjson.Set(partDone, "output_index", st.MsgIndex) + partDone, _ = sjson.Set(partDone, "content_index", 0) + partDone, _ = sjson.Set(partDone, "part.text", fullText) out = append(out, emitEvent("response.content_part.done", partDone)) final := `{"type":"response.output_item.done","sequence_number":0,"output_index":0,"item":{"id":"","type":"message","status":"completed","content":[{"type":"output_text","text":""}],"role":"assistant"}}` final, _ = sjson.Set(final, "sequence_number", nextSeq()) final, _ = sjson.Set(final, "output_index", st.MsgIndex) final, _ = sjson.Set(final, "item.id", st.CurrentMsgID) + final, _ = sjson.Set(final, "item.content.0.text", fullText) out = append(out, emitEvent("response.output_item.done", final)) } diff --git a/test/gemini_responses_request_skip_empty_assistant_text_test.go b/test/gemini_responses_request_skip_empty_assistant_text_test.go new file mode 100644 index 00000000..6d9ce6c5 --- /dev/null +++ b/test/gemini_responses_request_skip_empty_assistant_text_test.go @@ -0,0 +1,36 @@ +package test + +import ( + "testing" + + geminiresponses "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/openai/responses" + "github.com/tidwall/gjson" +) + +func TestGeminiResponsesRequest_SkipsEmptyAssistantTextMessage(t *testing.T) { + req := []byte(`{ + "model":"gemini-claude-sonnet-4-5-thinking", + "input":[ + {"type":"message","role":"user","content":[{"type":"input_text","text":"hi"}]}, + {"type":"message","role":"assistant","content":[{"type":"output_text","text":""}]}, + {"type":"function_call","call_id":"call_1","name":"shell","arguments":"{\"command\":[\"powershell.exe\",\"-Command\",\"echo hi\"]}"}, + {"type":"function_call_output","call_id":"call_1","output":"hi"}, + {"type":"message","role":"user","content":[{"type":"input_text","text":"ok"}]} + ], + "tools":[{"type":"function","name":"shell","description":"Runs a Powershell command","parameters":{"type":"object","properties":{"command":{"type":"array","items":{"type":"string"}}},"required":["command"]}}], + "tool_choice":"auto" +}`) + + out := geminiresponses.ConvertOpenAIResponsesRequestToGemini("gemini-claude-sonnet-4-5-thinking", req, false) + contents := gjson.GetBytes(out, "contents").Array() + + for _, c := range contents { + if c.Get("role").String() != "model" { + continue + } + parts := c.Get("parts").Array() + if len(parts) == 1 && parts[0].Get("text").Exists() && parts[0].Get("text").String() == "" && !parts[0].Get("functionCall").Exists() { + t.Fatalf("found unexpected empty model text part in contents: %s", c.Raw) + } + } +} diff --git a/test/gemini_responses_stream_done_text_test.go b/test/gemini_responses_stream_done_text_test.go new file mode 100644 index 00000000..a9907f72 --- /dev/null +++ b/test/gemini_responses_stream_done_text_test.go @@ -0,0 +1,48 @@ +package test + +import ( + "context" + "strings" + "testing" + + geminiresponses "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/openai/responses" + "github.com/tidwall/gjson" +) + +func TestGeminiResponsesStream_DoneEventsContainFullText(t *testing.T) { + var state any + ctx := context.Background() + + chunk1 := []byte(`{ + "responseId":"resp_1", + "candidates":[{"content":{"role":"model","parts":[{"text":"Hello"}]}}] +}`) + evs1 := geminiresponses.ConvertGeminiResponseToOpenAIResponses(ctx, "gemini-claude-sonnet-4-5-thinking", nil, nil, chunk1, &state) + if len(evs1) == 0 { + t.Fatalf("expected initial chunk to emit events") + } + + chunk2 := []byte(`{ + "responseId":"resp_1", + "candidates":[{"finishReason":"STOP","content":{"role":"model","parts":[]}}] +}`) + evs2 := geminiresponses.ConvertGeminiResponseToOpenAIResponses(ctx, "gemini-claude-sonnet-4-5-thinking", nil, nil, chunk2, &state) + + var itemDoneData string + for _, ev := range evs2 { + if strings.Contains(ev, "event: response.output_item.done") { + parts := strings.SplitN(ev, "data: ", 2) + if len(parts) == 2 { + itemDoneData = parts[1] + break + } + } + } + if itemDoneData == "" { + t.Fatalf("expected finish chunk to emit response.output_item.done events, got: %v", evs2) + } + got := gjson.Get(itemDoneData, "item.content.0.text").String() + if got != "Hello" { + t.Fatalf("expected output_item.done content text to be %q, got %q (data=%s)", "Hello", got, itemDoneData) + } +}