oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat: update Usage struct to support dynamic token handling with ceil function #1503"

Browse Source 
This reverts commit 71c39c9893.
This commit is contained in:
CaIon
2025-08-07 16:22:40 +08:00
parent d9c1fb5244
commit 865bb7aad8
3 changed files with 11 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
relay/channel/openai/relay-openai.go
View File

@@ -570,11 +570,11 @@ func OpenaiHandlerWithUsage(c *gin.Context, info *relaycommon.RelayInfo, resp *h
// because the upstream has already consumed resources and returned content
// We should still perform billing even if parsing fails
// format
if usageResp.GetInputTokens() > 0 {
usageResp.PromptTokens += usageResp.GetInputTokens()
if usageResp.InputTokens > 0 {
usageResp.PromptTokens += usageResp.InputTokens
}
if usageResp.GetOutputTokens() > 0 {
usageResp.CompletionTokens += usageResp.GetOutputTokens()
if usageResp.OutputTokens > 0 {
usageResp.CompletionTokens += usageResp.OutputTokens
}
if usageResp.InputTokensDetails != nil {
usageResp.PromptTokensDetails.ImageTokens += usageResp.InputTokensDetails.ImageTokens

8
relay/channel/openai/relay_responses.go
View File

@@ -38,8 +38,8 @@ func OaiResponsesHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http
// compute usage
usage := dto.Usage{}
if responsesResponse.Usage != nil {
usage.PromptTokens = responsesResponse.Usage.GetInputTokens()
usage.CompletionTokens = responsesResponse.Usage.GetOutputTokens()
usage.PromptTokens = responsesResponse.Usage.InputTokens
usage.CompletionTokens = responsesResponse.Usage.OutputTokens
usage.TotalTokens = responsesResponse.Usage.TotalTokens
if responsesResponse.Usage.InputTokensDetails != nil {
usage.PromptTokensDetails.CachedTokens = responsesResponse.Usage.InputTokensDetails.CachedTokens
@@ -70,8 +70,8 @@ func OaiResponsesStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp
switch streamResponse.Type {
case "response.completed":
if streamResponse.Response.Usage != nil {
usage.PromptTokens = streamResponse.Response.Usage.GetInputTokens()
usage.CompletionTokens = streamResponse.Response.Usage.GetOutputTokens()
usage.PromptTokens = streamResponse.Response.Usage.InputTokens
usage.CompletionTokens = streamResponse.Response.Usage.OutputTokens
usage.TotalTokens = streamResponse.Response.Usage.TotalTokens
if streamResponse.Response.Usage.InputTokensDetails != nil {
usage.PromptTokensDetails.CachedTokens = streamResponse.Response.Usage.InputTokensDetails.CachedTokens