Skip to content

fix(billing): count tool call tokens when upstream omits usage #5255

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
mumingluan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(billing): count tool call tokens when upstream omits usage #5255

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
7 changes: 6 additions & 1 deletion relay/channel/openai/relay-openai.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,12 @@ func OpenaiHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Respo
completionTokens := simpleResponse.Usage.CompletionTokens
if completionTokens == 0 {
for _, choice := range simpleResponse.Choices {
ctkm := service.CountTextToken(choice.Message.StringContent()+choice.Message.GetReasoningContent(), info.UpstreamModelName)
textContent := choice.Message.StringContent() + choice.Message.GetReasoningContent()
// Count tool call name/arguments too, otherwise completion tokens are undercounted when upstream omits usage for tool-calling responses.
for _, tool := range choice.Message.ParseToolCalls() {
textContent += tool.Function.Name + tool.Function.Arguments
}
ctkm := service.CountTextToken(textContent, info.UpstreamModelName)
completionTokens += ctkm
}
}
Expand Down