Skip to content

Conversation

nsalerni
Copy link
Contributor

@nsalerni nsalerni commented Sep 3, 2025

TLDR

Fixes issue where Google OAuth users saw incorrect token usage for failed API
calls. This was tested using the gemini-2.5-flash-image-preview model which does
not work in gemini-cli, however, it still reported token usage despite the API
error.

This PR fixes this by recording token usage metrics for successful API calls,
not failed ones.

Reviewer Test Plan

  1. Run current tip of main to expose the problem:
Screenshot 2025-09-03 at 10 47 47 AM
  1. Run the same test using this branch:
Screenshot 2025-09-03 at 10 48 34 AM

Testing Matrix

🍏 🪟 🐧
npm run
npx
Docker
Podman - -
Seatbelt - -

Linked issues / bugs

Resolves #7598

@nsalerni nsalerni requested a review from a team as a code owner September 3, 2025 17:49
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @nsalerni, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request resolves an issue where the system was incorrectly logging token usage for API calls that failed. The change ensures that token usage metrics are only recorded when an API call is successful, providing more accurate reporting and preventing misleading data for users, particularly those using Google OAuth.

Highlights

  • Accurate Token Usage Logging: Corrected an issue where token usage was recorded for failed API calls, leading to inaccurate metrics. The logging mechanism now only records usage for successful API responses.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request correctly fixes an issue where token usage was recorded for failed streaming API calls by moving the success logging logic into the try block. My review includes a suggestion to further improve the logic to ensure that successful API calls that return an empty stream are also logged for complete telemetry, which seems to be a pre-existing issue but is relevant to the changed code.

Copy link
Collaborator

@bdmorgan bdmorgan left a comment

Choose a reason for hiding this comment

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

LGTM

@gemini-cli gemini-cli bot added kind/bug Something isn't working area/ux Improves the CLI's usability, performance, interactive features, and documentation. labels Sep 3, 2025
@nsalerni nsalerni requested a review from bdmorgan September 3, 2025 21:54
@nsalerni
Copy link
Contributor Author

nsalerni commented Sep 5, 2025

@cornmander @bdmorgan are either of you able to help merge this?

@bdmorgan bdmorgan added this pull request to the merge queue Sep 5, 2025
@bdmorgan
Copy link
Collaborator

bdmorgan commented Sep 5, 2025

@nsalerni queued to merge - thanks!!

Merged via the queue into google-gemini:main with commit a7bfab4 Sep 5, 2025
20 checks passed
kiranani pushed a commit to kiranani/gemini-cli that referenced this pull request Sep 6, 2025
helldrum pushed a commit to helldrum/gemini-cli-no-sec that referenced this pull request Sep 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ux Improves the CLI's usability, performance, interactive features, and documentation. kind/bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inaccurate token count
3 participants