Skip to content

fix(xai): preserve prompt cache tokens in streaming responses #6145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stofancy wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −3
Open

fix(xai): preserve prompt cache tokens in streaming responses #6145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions relay/channel/xai/text.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,18 @@ func xAIStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Re
// 把 xAI 的usage转换为 OpenAI 的usage
if xAIResp.Usage != nil {
containStreamUsage = true
usage.PromptTokens = xAIResp.Usage.PromptTokens
usage.TotalTokens = xAIResp.Usage.TotalTokens
usage.CompletionTokens = usage.TotalTokens - usage.PromptTokens
// Keep the full upstream usage instead of rebuilding a bare
// *dto.Usage with only prompt/total/completion. xAI reports
// prompt-cache hits via the standard path
// usage.prompt_tokens_details.cached_tokens; copying the whole
// struct (like openai.handleLastResponse does) preserves it so
// that cache tokens are recorded for billing/logs. Rebuilding
// only the three scalars silently dropped CachedTokens for every
// streaming request.
*usage = *xAIResp.Usage
if usage.CompletionTokens == 0 && usage.TotalTokens > usage.PromptTokens {
usage.CompletionTokens = usage.TotalTokens - usage.PromptTokens
}
}

openaiResponse := streamResponseXAI2OpenAI(xAIResp, usage)
Expand Down