fix: count toolUsePrompt as input and normalize stream/chat usage #2947
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package gemini | ||
|
|
||
| import "github.com/QuantumNous/new-api/dto" | ||
|
|
||
| func hasGeminiUsageMetadata(meta dto.GeminiUsageMetadata) bool { | ||
| return meta.PromptTokenCount > 0 || | ||
| meta.CandidatesTokenCount > 0 || | ||
| meta.ThoughtsTokenCount > 0 || | ||
| meta.TotalTokenCount > 0 || | ||
| meta.ToolUsePromptTokenCount > 0 || | ||
| meta.CachedContentTokenCount > 0 || | ||
| len(meta.PromptTokensDetails) > 0 || | ||
| len(meta.ToolUsePromptDetails) > 0 | ||
| } | ||
|
|
||
| func buildUsageFromGeminiMetadata(meta dto.GeminiUsageMetadata, estimatedPromptTokens int) dto.Usage { | ||
| promptTokens := meta.PromptTokenCount | ||
| if promptTokens <= 0 { | ||
| promptTokens = estimatedPromptTokens | ||
| } | ||
|
|
||
| completionTokens := meta.CandidatesTokenCount + meta.ThoughtsTokenCount | ||
| if completionTokens <= 0 && meta.TotalTokenCount > 0 { | ||
| completionTokens = meta.TotalTokenCount - meta.PromptTokenCount - meta.ToolUsePromptTokenCount | ||
| } | ||
| if completionTokens < 0 { | ||
| completionTokens = 0 | ||
| } | ||
|
|
||
| totalTokens := meta.TotalTokenCount | ||
| if totalTokens <= 0 { | ||
| totalTokens = promptTokens + completionTokens | ||
| } | ||
|
|
||
| usage := dto.Usage{ | ||
| PromptTokens: promptTokens, | ||
| CompletionTokens: completionTokens, | ||
| TotalTokens: totalTokens, | ||
| InputTokens: promptTokens, | ||
| OutputTokens: completionTokens, | ||
| } | ||
|
|
||
| usage.CompletionTokenDetails.ReasoningTokens = meta.ThoughtsTokenCount | ||
| usage.PromptTokensDetails.CachedTokens = meta.CachedContentTokenCount | ||
|
|
||
| for _, detail := range meta.PromptTokensDetails { | ||
| switch detail.Modality { | ||
| case "AUDIO": | ||
| usage.PromptTokensDetails.AudioTokens = detail.TokenCount | ||
| case "TEXT": | ||
| usage.PromptTokensDetails.TextTokens = detail.TokenCount | ||
| } | ||
| } | ||
|
|
||
| if usage.PromptTokensDetails.TextTokens == 0 && usage.PromptTokens > 0 { | ||
| usage.PromptTokensDetails.TextTokens = usage.PromptTokens | ||
| } | ||
|
|
||
| return usage | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package gemini | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/QuantumNous/new-api/dto" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestBuildUsageFromGeminiMetadata_ExcludesToolUseFromCompletion(t *testing.T) { | ||
| meta := dto.GeminiUsageMetadata{ | ||
| PromptTokenCount: 151, | ||
| CandidatesTokenCount: 1089, | ||
| ThoughtsTokenCount: 1120, | ||
| TotalTokenCount: 20689, | ||
| ToolUsePromptTokenCount: 18329, | ||
| CachedContentTokenCount: 17, | ||
| PromptTokensDetails: []dto.GeminiPromptTokensDetails{ | ||
| {Modality: "TEXT", TokenCount: 151}, | ||
| }, | ||
| ToolUsePromptDetails: []dto.GeminiPromptTokensDetails{ | ||
| {Modality: "TEXT", TokenCount: 18329}, | ||
| }, | ||
| } | ||
|
|
||
| usage := buildUsageFromGeminiMetadata(meta, 0) | ||
|
|
||
| require.Equal(t, 18480, usage.PromptTokens) | ||
| require.Equal(t, 2209, usage.CompletionTokens) | ||
| require.Equal(t, 20689, usage.TotalTokens) | ||
| require.Equal(t, 1120, usage.CompletionTokenDetails.ReasoningTokens) | ||
| require.Equal(t, 17, usage.PromptTokensDetails.CachedTokens) | ||
| require.Equal(t, 18480, usage.PromptTokensDetails.TextTokens) | ||
|
Comment on lines
+26
to
+33
Contributor
There was a problem hiding this comment. Tests will fail: Tests 1–3 all expect Similarly, Line 33 expects The root cause is in 🤖 Prompt for AI Agents |
||
| } | ||
|
|
||
| func TestBuildUsageFromGeminiMetadata_FallsBackToTotalPromptAndToolUse(t *testing.T) { | ||
| meta := dto.GeminiUsageMetadata{ | ||
| PromptTokenCount: 100, | ||
| TotalTokenCount: 1000, | ||
| ToolUsePromptTokenCount: 700, | ||
| } | ||
|
|
||
| usage := buildUsageFromGeminiMetadata(meta, 0) | ||
|
|
||
| require.Equal(t, 800, usage.PromptTokens) | ||
| require.Equal(t, 200, usage.CompletionTokens) | ||
| require.Equal(t, 1000, usage.TotalTokens) | ||
| } | ||
|
|
||
| func TestBuildUsageFromGeminiMetadata_NegativeCompletionClampedToZero(t *testing.T) { | ||
| meta := dto.GeminiUsageMetadata{ | ||
| PromptTokenCount: 300, | ||
| TotalTokenCount: 200, | ||
| ToolUsePromptTokenCount: 50, | ||
| } | ||
|
|
||
| usage := buildUsageFromGeminiMetadata(meta, 0) | ||
|
|
||
| require.Equal(t, 350, usage.PromptTokens) | ||
| require.Equal(t, 0, usage.CompletionTokens) | ||
| require.Equal(t, 200, usage.TotalTokens) | ||
| } | ||
|
|
||
| func TestBuildUsageFromGeminiMetadata_UsesEstimatedPromptWhenMissing(t *testing.T) { | ||
| meta := dto.GeminiUsageMetadata{ | ||
| CandidatesTokenCount: 20, | ||
| } | ||
|
|
||
| usage := buildUsageFromGeminiMetadata(meta, 123) | ||
|
|
||
| require.Equal(t, 123, usage.PromptTokens) | ||
| require.Equal(t, 20, usage.CompletionTokens) | ||
| require.Equal(t, 143, usage.TotalTokens) | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Critical:
ToolUsePromptTokenCountis never added topromptTokens, defeating the purpose of this PR.The PR's stated objective is
input = promptTokenCount + toolUsePromptTokenCount, but line 17 only assignsmeta.PromptTokenCountwithout addingmeta.ToolUsePromptTokenCount. Additionally,meta.ToolUsePromptDetailsis never iterated, so tool-use modality breakdowns are lost.All three tests that include non-zero
ToolUsePromptTokenCountwill fail.🐛 Proposed fix
func buildUsageFromGeminiMetadata(meta dto.GeminiUsageMetadata, estimatedPromptTokens int) dto.Usage { promptTokens := meta.PromptTokenCount if promptTokens <= 0 { promptTokens = estimatedPromptTokens } + promptTokens += meta.ToolUsePromptTokenCount completionTokens := meta.CandidatesTokenCount + meta.ThoughtsTokenCount if completionTokens <= 0 && meta.TotalTokenCount > 0 { completionTokens = meta.TotalTokenCount - meta.PromptTokenCount - meta.ToolUsePromptTokenCount } if completionTokens < 0 { completionTokens = 0 } totalTokens := meta.TotalTokenCount if totalTokens <= 0 { totalTokens = promptTokens + completionTokens } usage := dto.Usage{ PromptTokens: promptTokens, CompletionTokens: completionTokens, TotalTokens: totalTokens, InputTokens: promptTokens, OutputTokens: completionTokens, } usage.CompletionTokenDetails.ReasoningTokens = meta.ThoughtsTokenCount usage.PromptTokensDetails.CachedTokens = meta.CachedContentTokenCount for _, detail := range meta.PromptTokensDetails { switch detail.Modality { case "AUDIO": usage.PromptTokensDetails.AudioTokens = detail.TokenCount case "TEXT": usage.PromptTokensDetails.TextTokens = detail.TokenCount } } + for _, detail := range meta.ToolUsePromptDetails { + switch detail.Modality { + case "AUDIO": + usage.PromptTokensDetails.AudioTokens += detail.TokenCount + case "TEXT": + usage.PromptTokensDetails.TextTokens += detail.TokenCount + } + } if usage.PromptTokensDetails.TextTokens == 0 && usage.PromptTokens > 0 { usage.PromptTokensDetails.TextTokens = usage.PromptTokens } return usage }🤖 Prompt for AI Agents