chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-28 17:25:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert: translator changes (path guard)

Browse Source 
CI blocks PRs that modify internal/translator. Revert translator edits and keep only the /v1/responses streaming error-chunk fix; file an issue for translator conformance work.
This commit is contained in:
canxin121
2026-02-23 13:30:43 +08:00
parent 5382764d8a
commit eb7571936c
6 changed files with 36 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
internal/translator/gemini/openai/responses/gemini_openai-responses_response.go
View File

@@ -212,7 +212,6 @@ func ConvertGeminiResponseToOpenAIResponses(_ context.Context, modelName string,
created, _ = sjson.Set(created, "sequence_number", nextSeq())
created, _ = sjson.Set(created, "response.id", st.ResponseID)
created, _ = sjson.Set(created, "response.created_at", st.CreatedAt)
created, _ = sjson.Set(created, "response.model", modelName)
out = append(out, emitEvent("response.created", created))
inprog := `{"type":"response.in_progress","sequence_number":0,"response":{"id":"","object":"response","created_at":0,"status":"in_progress"}}`
@@ -530,36 +529,31 @@ func ConvertGeminiResponseToOpenAIResponses(_ context.Context, modelName string,
completed, _ = sjson.SetRaw(completed, "response.output", gjson.Get(outputsWrapper, "arr").Raw)
}
input := int64(0)
cached := int64(0)
output := int64(0)
reasoning := int64(0)
total := int64(0)
// usage mapping
if um := root.Get("usageMetadata"); um.Exists() {
// input tokens = prompt + thoughts
input = um.Get("promptTokenCount").Int() + um.Get("thoughtsTokenCount").Int()
input := um.Get("promptTokenCount").Int() + um.Get("thoughtsTokenCount").Int()
completed, _ = sjson.Set(completed, "response.usage.input_tokens", input)
// cached token details: align with OpenAI "cached_tokens" semantics.
cached = um.Get("cachedContentTokenCount").Int()
completed, _ = sjson.Set(completed, "response.usage.input_tokens_details.cached_tokens", um.Get("cachedContentTokenCount").Int())
// output tokens
if v := um.Get("candidatesTokenCount"); v.Exists() {
output = v.Int()
completed, _ = sjson.Set(completed, "response.usage.output_tokens", v.Int())
} else {
completed, _ = sjson.Set(completed, "response.usage.output_tokens", 0)
}
if v := um.Get("thoughtsTokenCount"); v.Exists() {
reasoning = v.Int()
completed, _ = sjson.Set(completed, "response.usage.output_tokens_details.reasoning_tokens", v.Int())
} else {
completed, _ = sjson.Set(completed, "response.usage.output_tokens_details.reasoning_tokens", 0)
}
if v := um.Get("totalTokenCount"); v.Exists() {
total = v.Int()
completed, _ = sjson.Set(completed, "response.usage.total_tokens", v.Int())
} else {
total = input + output
completed, _ = sjson.Set(completed, "response.usage.total_tokens", 0)
}
}
completed, _ = sjson.Set(completed, "response.usage.input_tokens", input)
completed, _ = sjson.Set(completed, "response.usage.input_tokens_details.cached_tokens", cached)
completed, _ = sjson.Set(completed, "response.usage.output_tokens", output)
completed, _ = sjson.Set(completed, "response.usage.output_tokens_details.reasoning_tokens", reasoning)
completed, _ = sjson.Set(completed, "response.usage.total_tokens", total)
out = append(out, emitEvent("response.completed", completed))
}

31
internal/translator/gemini/openai/responses/gemini_openai-responses_response_test.go
View File

@@ -53,7 +53,6 @@ func TestConvertGeminiResponseToOpenAIResponses_UnwrapAndAggregateText(t *testin
textDone string
messageText string
responseID string
createdModel string
instructions string
cachedTokens int64
@@ -69,8 +68,6 @@ func TestConvertGeminiResponseToOpenAIResponses_UnwrapAndAggregateText(t *testin
for i, chunk := range out {
ev, data := parseSSEEvent(t, chunk)
switch ev {
case "response.created":
createdModel = data.Get("response.model").String()
case "response.output_text.done":
gotTextDone = true
if posTextDone == -1 {
@@ -135,9 +132,6 @@ func TestConvertGeminiResponseToOpenAIResponses_UnwrapAndAggregateText(t *testin
if responseID != "resp_req_vrtx_1" {
t.Fatalf("unexpected response id: got %q", responseID)
}
if createdModel != "test-model" {
t.Fatalf("unexpected response.created model: got %q", createdModel)
}
if instructions != "test instructions" {
t.Fatalf("unexpected instructions echo: got %q", instructions)
}
@@ -159,31 +153,6 @@ func TestConvertGeminiResponseToOpenAIResponses_UnwrapAndAggregateText(t *testin
}
}
func TestConvertGeminiResponseToOpenAIResponses_CompletedAlwaysHasUsage(t *testing.T) {
in := `data: {"response":{"candidates":[{"content":{"role":"model","parts":[{"text":"hi"}]},"finishReason":"STOP"}],"modelVersion":"test-model","responseId":"req_no_usage"},"traceId":"t1"}`
var param any
out := ConvertGeminiResponseToOpenAIResponses(context.Background(), "test-model", nil, nil, []byte(in), &param)
gotCompleted := false
for _, chunk := range out {
ev, data := parseSSEEvent(t, chunk)
if ev != "response.completed" {
continue
}
gotCompleted = true
if !data.Get("response.usage.input_tokens").Exists() {
t.Fatalf("response.completed missing usage.input_tokens: %s", data.Raw)
}
if !data.Get("response.usage.output_tokens").Exists() {
t.Fatalf("response.completed missing usage.output_tokens: %s", data.Raw)
}
}
if !gotCompleted {
t.Fatalf("missing response.completed event")
}
}
func TestConvertGeminiResponseToOpenAIResponses_ReasoningEncryptedContent(t *testing.T) {
sig := "RXE0RENrZ0lDeEFDR0FJcVFOZDdjUzlleGFuRktRdFcvSzNyZ2MvWDNCcDQ4RmxSbGxOWUlOVU5kR1l1UHMrMGdkMVp0Vkg3ekdKU0g4YVljc2JjN3lNK0FrdGpTNUdqamI4T3Z0VVNETzdQd3pmcFhUOGl3U3hXUEJvTVFRQ09mWTFyMEtTWGZxUUlJakFqdmFGWk83RW1XRlBKckJVOVpkYzdDKw=="
in := []string{