Skip to content

fix(openai): use second-to-last SSE as fallback when last frame lacks valid usage #5788

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

Closed
duyiliu wants to merge 1 commit into from
Closed

fix(openai): use second-to-last SSE as fallback when last frame lacks valid usage #5788

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
32 changes: 16 additions & 16 deletions relay/channel/openai/relay-openai.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,7 @@ func OaiStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Re
var toolCount int
var usage = &dto.Usage{}
var lastStreamData string
var secondLastStreamData string // 存储倒数第二个stream data，用于音频模型

// 检查是否为音频模型
isAudioModel := strings.Contains(strings.ToLower(model), "audio")
var secondLastStreamData string // 存储倒数第二个stream data，用于最后一帧畸形时兜底

helper.StreamScannerHandler(c, resp, info, func(data string, sr *helper.StreamResult) {
if lastStreamData != "" {
Expand All @@ -130,8 +127,8 @@ func OaiStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Re
}
}
if len(data) > 0 {
// 对音频模型，保存倒数第二个stream data
if isAudioModel && lastStreamData != "" {
// 始终保存倒数第二个 stream data，用于最后一帧畸形时兜底
if lastStreamData != "" {
secondLastStreamData = lastStreamData
}

Expand All @@ -143,8 +140,18 @@ func OaiStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Re
}
})

// 对音频模型，从倒数第二个stream data中提取usage信息
if isAudioModel && secondLastStreamData != "" {
// 处理最后的响应
shouldSendLastResp := true
if err := handleLastResponse(lastStreamData, &responseId, &createAt, &systemFingerprint, &model, &usage,
&containStreamUsage, info, &shouldSendLastResp); err != nil {
logger.LogError(c, fmt.Sprintf("error handling last response: %s, lastStreamData: [%s]", err.Error(), lastStreamData))
}
Comment on lines +145 to +148

@coderabbitai coderabbitai Bot Jun 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔒 Security & Privacy | 🟠 Major | ⚡ Quick win

Avoid logging raw streamed payloads on parse errors.

lastStreamData can contain model output/tool data; logging it verbatim on malformed upstream frames can leak sensitive content. Log metadata such as length instead.

Proposed fix 
-		logger.LogError(c, fmt.Sprintf("error handling last response: %s, lastStreamData: [%s]", err.Error(), lastStreamData))
+		logger.LogError(c, fmt.Sprintf("error handling last response: %s, lastStreamDataLen: %d", err.Error(), len(lastStreamData)))
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if err := handleLastResponse(lastStreamData, &responseId, &createAt, &systemFingerprint, &model, &usage,
&containStreamUsage, info, &shouldSendLastResp); err != nil {
logger.LogError(c, fmt.Sprintf("error handling last response: %s, lastStreamData: [%s]", err.Error(), lastStreamData))
}
if err := handleLastResponse(lastStreamData, &responseId, &createAt, &systemFingerprint, &model, &usage,
&containStreamUsage, info, &shouldSendLastResp); err != nil {
logger.LogError(c, fmt.Sprintf("error handling last response: %s, lastStreamDataLen: %d", err.Error(), len(lastStreamData)))
}
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@relay/channel/openai/relay-openai.go` around lines 145 - 148, The error
handling in openai relay currently logs the raw lastStreamData payload when
handleLastResponse fails, which can leak sensitive streamed content. Update the
logging in relayOpenAI.go around handleLastResponse to remove the verbatim
payload and instead log safe metadata such as the payload length,
responseId/model context, and the error message. Keep the fix localized to the
error path in the response handling flow.


// 兼容兜底：仅当最后一帧没有有效 usage 时（畸形 SSE，例如末尾为 {"choices":[],"cost":"0"} + TCP EOF），
// 才尝试从倒数第二帧提取 usage，避免 fallback 到 ResponseText2Usage 本地计费导致 cache_tokens 丢失。
// 同时要求客户端显式请求 usage（与 handleLastResponse 对齐），避免在没有 stream_options.include_usage
// 的请求上"解锁"额外的 usage 元数据。
if !containStreamUsage && info.ShouldIncludeUsage && secondLastStreamData != "" {
var streamResp struct {
Usage *dto.Usage `json:"usage"`
}
Expand All @@ -154,20 +161,13 @@ func OaiStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Re
containStreamUsage = true

if common.DebugEnabled {
logger.LogDebug(c, "Audio model usage extracted from second last SSE: PromptTokens=%d, CompletionTokens=%d, TotalTokens=%d, InputTokens=%d, OutputTokens=%d",
logger.LogDebug(c, "Usage extracted from second last SSE (last frame had no valid usage): PromptTokens=%d, CompletionTokens=%d, TotalTokens=%d, InputTokens=%d, OutputTokens=%d",
usage.PromptTokens, usage.CompletionTokens, usage.TotalTokens,
usage.InputTokens, usage.OutputTokens)
}
}
}

// 处理最后的响应
shouldSendLastResp := true
if err := handleLastResponse(lastStreamData, &responseId, &createAt, &systemFingerprint, &model, &usage,
&containStreamUsage, info, &shouldSendLastResp); err != nil {
logger.LogError(c, fmt.Sprintf("error handling last response: %s, lastStreamData: [%s]", err.Error(), lastStreamData))
}

if info.RelayFormat == types.RelayFormatOpenAI {
if shouldSendLastResp {
_ = sendStreamData(c, info, lastStreamData, info.ChannelSetting.ForceFormat, info.ChannelSetting.ThinkingToContent)
Expand Down