feat: meter Gemini thinking tokens and grounding requests#3178
Open
Aaryan-Dadu wants to merge 1 commit into
Open
feat: meter Gemini thinking tokens and grounding requests#3178Aaryan-Dadu wants to merge 1 commit into
Aaryan-Dadu wants to merge 1 commit into
Conversation
- Thinking tokens: Extracted from standard completion tokens to ensure they are billed accurately at the correct model-specific rate. - Grounding requests: Added flat-fee metering for Google Search by tracking grounding_metadata across both streaming and non-streaming responses. - Pricing updates: Corrected stale rates for Gemini 2.5 Flash output, cached tokens, thinking tokens, and grounding requests.
|
|
Collaborator
|
are thinking tokens not already included in output tokens in the usage object? |
Author
Yes they are already included but we split them because they are billed at different rates, like this: |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates Gemini metering in the AI chat driver to correctly account for Gemini “thinking” tokens (billed at a distinct rate) and to add flat-fee metering for grounded Google Search requests by detecting grounding_metadata in both streaming and non-streaming responses.
Changes:
- Split Gemini
reasoning_tokens(“thinking tokens”) out ofcompletion_tokensand meter each at its own model-specific rate. - Add
grounding_requestsusage metering (1 per response whengrounding_metadatais present) for streaming and non-streaming Gemini completions. - Update Gemini model pricing entries to include
thinking_tokensandgrounding_requestsrates (and refresh some existing token rates).
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
src/backend/drivers/ai-chat/utils/OpenAIUtil.js |
Captures streamed extra_content and forwards it into the usage calculator for provider-specific metering. |
src/backend/drivers/ai-chat/providers/gemini/models.ts |
Adds/updates Gemini cost keys for thinking_tokens and grounding_requests (and adjusts some stale token rates). |
src/backend/drivers/ai-chat/providers/gemini/GeminiChatProvider.ts |
Implements Gemini-specific usage shaping: cached token exclusion, thinking token split, and grounding request detection. |
src/backend/drivers/ai-chat/providers/gemini/GeminiChatProvider.test.ts |
Updates expected usage shapes and adds unit tests for thinking-token and grounding-request metering (streaming + non-streaming). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+106
to
+109
| // Cast to access Gemini-specific extras passed alongside usage: | ||
| // - choices: non-stream grounding metadata lives in choices[0].message.extra_content | ||
| // - extra_content: streaming grounding metadata accumulated by the stream handler | ||
| const { usage, choices, extra_content } = args as { |
Comment on lines
285
to
+289
| // Gemini specific thing for metadata, we will basically be appending onto the current message by abusing .addText a little | ||
| // Apps have to choose to handle extra_content themselves, it doesn't seem like theres a way we can do it in a backwards | ||
| // compatible fashion since most streaming apps will handle chat history by continuously updating content themselves | ||
| // This doesn't present us a chance to add in an extra object for gemini's chat continuing features | ||
| last_extra_content = choice.delta.extra_content; |
Member
|
@ProgrammerIn-wonderland is this mergable? |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
grounding_metadataacross both streaming and non-streaming responses.Closes #3132
Test
thinking_tokens: 0andgrounding_requests: 0in the expected usage shapes