jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-05-27 22:27:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

add cached token usage when converting openai to claude (#3766)

Browse Source 
Signed-off-by: 钰诚 <yucheng.lxr@alibaba-inc.com>
This commit is contained in:
rinfx
2026-05-06 10:53:08 +08:00
committed by GitHub
parent 4e0d691432
commit 4aba4a9860
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/wasm-go/extensions/ai-proxy/provider/claude_to_openai.go
View File

@@ -788,16 +788,21 @@ func (c *ClaudeToOpenAIConverter) buildClaudeStreamResponse(ctx wrapper.HttpCont
log.Debugf("[OpenAI->Claude] Processing usage info - input: %d, output: %d", log.Debugf("[OpenAI->Claude] Processing usage info - input: %d, output: %d",
openaiResponse.Usage.PromptTokens, openaiResponse.Usage.CompletionTokens) openaiResponse.Usage.PromptTokens, openaiResponse.Usage.CompletionTokens)
usage := &claudeTextGenUsage{
InputTokens: openaiResponse.Usage.PromptTokens,
OutputTokens: openaiResponse.Usage.CompletionTokens,
}
if openaiResponse.Usage.PromptTokensDetails != nil {
usage.CacheReadInputTokens = openaiResponse.Usage.PromptTokensDetails.CachedTokens
}
// Send message_delta with both stop_reason and usage (Claude protocol requirement) // Send message_delta with both stop_reason and usage (Claude protocol requirement)
messageDelta := &claudeTextGenStreamResponse{ messageDelta := &claudeTextGenStreamResponse{
Type: "message_delta", Type: "message_delta",
Delta: &claudeTextGenDelta{ Delta: &claudeTextGenDelta{
StopSequence: json.RawMessage("null"), // Explicit null per Claude spec StopSequence: json.RawMessage("null"), // Explicit null per Claude spec
}, },
Usage: &claudeTextGenUsage{ Usage: usage,
InputTokens: openaiResponse.Usage.PromptTokens,
OutputTokens: openaiResponse.Usage.CompletionTokens,
},
} }
// Include cached stop_reason if available // Include cached stop_reason if available

16
plugins/wasm-go/extensions/ai-proxy/provider/claude_to_openai_test.go
View File

@@ -859,6 +859,22 @@ func TestClaudeToOpenAIConverter_ConvertReasoningResponseToClaude(t *testing.T)
} }
} }
func TestClaudeToOpenAIConverter_ConvertOpenAIStreamResponseToClaude_WithCachedTokens(t *testing.T) {
converter := &ClaudeToOpenAIConverter{}
streamChunk := "data: {\"id\":\"chatcmpl-test\",\"model\":\"gpt-4o\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\"}}]}\n\n" +
"data: {\"id\":\"chatcmpl-test\",\"model\":\"gpt-4o\",\"choices\":[{\"index\":0,\"finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":100,\"completion_tokens\":20,\"total_tokens\":120,\"prompt_tokens_details\":{\"cached_tokens\":60}}}\n\n"
result, err := converter.ConvertOpenAIStreamResponseToClaude(nil, []byte(streamChunk))
require.NoError(t, err)
resultStr := string(result)
assert.Contains(t, resultStr, "\"type\":\"message_delta\"")
assert.Contains(t, resultStr, "\"input_tokens\":100")
assert.Contains(t, resultStr, "\"output_tokens\":20")
assert.Contains(t, resultStr, "\"cache_read_input_tokens\":60")
}
func TestClaudeToOpenAIConverter_StripCchFromSystemMessage(t *testing.T) { func TestClaudeToOpenAIConverter_StripCchFromSystemMessage(t *testing.T) {
converter := &ClaudeToOpenAIConverter{} converter := &ClaudeToOpenAIConverter{}