diff --git a/internal/translator/antigravity/openai/chat-completions/antigravity_openai_response.go b/internal/translator/antigravity/openai/chat-completions/antigravity_openai_response.go index 1b7866d0..9dae687a 100644 --- a/internal/translator/antigravity/openai/chat-completions/antigravity_openai_response.go +++ b/internal/translator/antigravity/openai/chat-completions/antigravity_openai_response.go @@ -8,6 +8,7 @@ package chat_completions import ( "bytes" "context" + "encoding/json" "fmt" "strings" "sync/atomic" @@ -87,15 +88,15 @@ func ConvertAntigravityResponseToOpenAI(_ context.Context, _ string, originalReq // Extract and set usage metadata (token counts). if usageResult := gjson.GetBytes(rawJSON, "response.usageMetadata"); usageResult.Exists() { - cachedTokenCount := usageResult.Get("cachedContentTokenCount").Int() if candidatesTokenCountResult := usageResult.Get("candidatesTokenCount"); candidatesTokenCountResult.Exists() { template, _ = sjson.Set(template, "usage.completion_tokens", candidatesTokenCountResult.Int()) } if totalTokenCountResult := usageResult.Get("totalTokenCount"); totalTokenCountResult.Exists() { template, _ = sjson.Set(template, "usage.total_tokens", totalTokenCountResult.Int()) } - promptTokenCount := usageResult.Get("promptTokenCount").Int() - cachedTokenCount + promptTokenCount := usageResult.Get("promptTokenCount").Int() thoughtsTokenCount := usageResult.Get("thoughtsTokenCount").Int() + cachedTokenCount := usageResult.Get("cachedContentTokenCount").Int() template, _ = sjson.Set(template, "usage.prompt_tokens", promptTokenCount+thoughtsTokenCount) if thoughtsTokenCount > 0 { template, _ = sjson.Set(template, "usage.completion_tokens_details.reasoning_tokens", thoughtsTokenCount) @@ -186,11 +187,18 @@ func ConvertAntigravityResponseToOpenAI(_ context.Context, _ string, originalReq template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`) } imageIndex := len(gjson.Get(template, "choices.0.delta.images").Array()) - imagePayload := `{"type":"image_url","image_url":{"url":""}}` - imagePayload, _ = sjson.Set(imagePayload, "index", imageIndex) - imagePayload, _ = sjson.Set(imagePayload, "image_url.url", imageURL) + imagePayload, err := json.Marshal(map[string]any{ + "index": imageIndex, + "type": "image_url", + "image_url": map[string]string{ + "url": imageURL, + }, + }) + if err != nil { + continue + } template, _ = sjson.Set(template, "choices.0.delta.role", "assistant") - template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", imagePayload) + template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", string(imagePayload)) } } } diff --git a/internal/translator/gemini-cli/openai/chat-completions/gemini-cli_openai_response.go b/internal/translator/gemini-cli/openai/chat-completions/gemini-cli_openai_response.go index a4d208bb..f02d3658 100644 --- a/internal/translator/gemini-cli/openai/chat-completions/gemini-cli_openai_response.go +++ b/internal/translator/gemini-cli/openai/chat-completions/gemini-cli_openai_response.go @@ -8,6 +8,7 @@ package chat_completions import ( "bytes" "context" + "encoding/json" "fmt" "strings" "sync/atomic" @@ -49,35 +50,20 @@ func ConvertCliResponseToOpenAI(_ context.Context, _ string, originalRequestRawJ } } - trimmed := bytes.TrimSpace(rawJSON) - if bytes.HasPrefix(trimmed, []byte("data:")) { - trimmed = bytes.TrimSpace(trimmed[len("data:"):]) - } - - if bytes.Equal(trimmed, []byte("[DONE]")) { + if bytes.Equal(rawJSON, []byte("[DONE]")) { return []string{} } - // Ignore non-JSON frames (e.g. keep-alives) instead of emitting empty chunks. - if len(trimmed) == 0 || !gjson.ValidBytes(trimmed) { - return []string{} - } - - payload := trimmed - if responseResult := gjson.GetBytes(trimmed, "response"); responseResult.Exists() && responseResult.IsObject() { - payload = []byte(responseResult.Raw) - } - // Initialize the OpenAI SSE template. template := `{"id":"","object":"chat.completion.chunk","created":12345,"model":"model","choices":[{"index":0,"delta":{"role":null,"content":null,"reasoning_content":null,"tool_calls":null},"finish_reason":null,"native_finish_reason":null}]}` // Extract and set the model version. - if modelVersionResult := gjson.GetBytes(payload, "modelVersion"); modelVersionResult.Exists() { + if modelVersionResult := gjson.GetBytes(rawJSON, "response.modelVersion"); modelVersionResult.Exists() { template, _ = sjson.Set(template, "model", modelVersionResult.String()) } // Extract and set the creation timestamp. - if createTimeResult := gjson.GetBytes(payload, "createTime"); createTimeResult.Exists() { + if createTimeResult := gjson.GetBytes(rawJSON, "response.createTime"); createTimeResult.Exists() { t, err := time.Parse(time.RFC3339Nano, createTimeResult.String()) if err == nil { (*param).(*convertCliResponseToOpenAIChatParams).UnixTimestamp = t.Unix() @@ -88,18 +74,18 @@ func ConvertCliResponseToOpenAI(_ context.Context, _ string, originalRequestRawJ } // Extract and set the response ID. - if responseIDResult := gjson.GetBytes(payload, "responseId"); responseIDResult.Exists() { + if responseIDResult := gjson.GetBytes(rawJSON, "response.responseId"); responseIDResult.Exists() { template, _ = sjson.Set(template, "id", responseIDResult.String()) } // Extract and set the finish reason. - if finishReasonResult := gjson.GetBytes(payload, "candidates.0.finishReason"); finishReasonResult.Exists() { + if finishReasonResult := gjson.GetBytes(rawJSON, "response.candidates.0.finishReason"); finishReasonResult.Exists() { template, _ = sjson.Set(template, "choices.0.finish_reason", strings.ToLower(finishReasonResult.String())) template, _ = sjson.Set(template, "choices.0.native_finish_reason", strings.ToLower(finishReasonResult.String())) } // Extract and set usage metadata (token counts). - if usageResult := gjson.GetBytes(payload, "usageMetadata"); usageResult.Exists() { + if usageResult := gjson.GetBytes(rawJSON, "response.usageMetadata"); usageResult.Exists() { if candidatesTokenCountResult := usageResult.Get("candidatesTokenCount"); candidatesTokenCountResult.Exists() { template, _ = sjson.Set(template, "usage.completion_tokens", candidatesTokenCountResult.Int()) } @@ -115,7 +101,7 @@ func ConvertCliResponseToOpenAI(_ context.Context, _ string, originalRequestRawJ } // Process the main content part of the response. - partsResult := gjson.GetBytes(payload, "candidates.0.content.parts") + partsResult := gjson.GetBytes(rawJSON, "response.candidates.0.content.parts") hasFunctionCall := false if partsResult.IsArray() { partResults := partsResult.Array() @@ -190,11 +176,18 @@ func ConvertCliResponseToOpenAI(_ context.Context, _ string, originalRequestRawJ template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`) } imageIndex := len(gjson.Get(template, "choices.0.delta.images").Array()) - imagePayload := `{"type":"image_url","image_url":{"url":""}}` - imagePayload, _ = sjson.Set(imagePayload, "index", imageIndex) - imagePayload, _ = sjson.Set(imagePayload, "image_url.url", imageURL) + imagePayload, err := json.Marshal(map[string]any{ + "index": imageIndex, + "type": "image_url", + "image_url": map[string]string{ + "url": imageURL, + }, + }) + if err != nil { + continue + } template, _ = sjson.Set(template, "choices.0.delta.role", "assistant") - template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", imagePayload) + template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", string(imagePayload)) } } } @@ -222,9 +215,8 @@ func ConvertCliResponseToOpenAI(_ context.Context, _ string, originalRequestRawJ // - string: An OpenAI-compatible JSON response containing all message content and metadata func ConvertCliResponseToOpenAINonStream(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) string { responseResult := gjson.GetBytes(rawJSON, "response") - payload := rawJSON - if responseResult.Exists() && responseResult.IsObject() { - payload = []byte(responseResult.Raw) + if responseResult.Exists() { + return ConvertGeminiResponseToOpenAINonStream(ctx, modelName, originalRequestRawJSON, requestRawJSON, []byte(responseResult.Raw), param) } - return ConvertGeminiResponseToOpenAINonStream(ctx, modelName, originalRequestRawJSON, requestRawJSON, payload, param) + return "" } diff --git a/internal/translator/gemini/openai/chat-completions/gemini_openai_response.go b/internal/translator/gemini/openai/chat-completions/gemini_openai_response.go index 52fbba43..b4c8416e 100644 --- a/internal/translator/gemini/openai/chat-completions/gemini_openai_response.go +++ b/internal/translator/gemini/openai/chat-completions/gemini_openai_response.go @@ -8,6 +8,7 @@ package chat_completions import ( "bytes" "context" + "encoding/json" "fmt" "strings" "sync/atomic" @@ -187,11 +188,18 @@ func ConvertGeminiResponseToOpenAI(_ context.Context, _ string, originalRequestR template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`) } imageIndex := len(gjson.Get(template, "choices.0.delta.images").Array()) - imagePayload := `{"type":"image_url","image_url":{"url":""}}` - imagePayload, _ = sjson.Set(imagePayload, "index", imageIndex) - imagePayload, _ = sjson.Set(imagePayload, "image_url.url", imageURL) + imagePayload, err := json.Marshal(map[string]any{ + "index": imageIndex, + "type": "image_url", + "image_url": map[string]string{ + "url": imageURL, + }, + }) + if err != nil { + continue + } template, _ = sjson.Set(template, "choices.0.delta.role", "assistant") - template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", imagePayload) + template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", string(imagePayload)) } } } @@ -323,11 +331,18 @@ func ConvertGeminiResponseToOpenAINonStream(_ context.Context, _ string, origina template, _ = sjson.SetRaw(template, "choices.0.message.images", `[]`) } imageIndex := len(gjson.Get(template, "choices.0.message.images").Array()) - imagePayload := `{"type":"image_url","image_url":{"url":""}}` - imagePayload, _ = sjson.Set(imagePayload, "index", imageIndex) - imagePayload, _ = sjson.Set(imagePayload, "image_url.url", imageURL) + imagePayload, err := json.Marshal(map[string]any{ + "index": imageIndex, + "type": "image_url", + "image_url": map[string]string{ + "url": imageURL, + }, + }) + if err != nil { + continue + } template, _ = sjson.Set(template, "choices.0.message.role", "assistant") - template, _ = sjson.SetRaw(template, "choices.0.message.images.-1", imagePayload) + template, _ = sjson.SetRaw(template, "choices.0.message.images.-1", string(imagePayload)) } } }