fix(frontend): always include usage, when configured to do so

[max-wittig]

Even when stream_options is not specified

This is a follow up from https://github.com/vllm-project/vllm/pull/19695/files where I didn't consider the fact that we also want to include the usage, when no stream options are specified

Essential Elements of an Effective PR Description Checklist

• The purpose of the PR, such as "Fix some issue (link existing issues this PR will resolve)".
• The test plan, such as providing test command.
• The test results, such as pasting the results comparison before and after, or e2e results
• (Optional) The necessary documentation update, such as updating supported_models.md and examples for a new model.

Purpose

Test Plan

1. Run vllm with --enable-force-include-usage
2. Send a normal streaming request to vLLM and observe the usage being included at the end

Test Result

(Optional) Documentation Update

[gemini-code-assist]

Summary of Changes

Hello @max-wittig, I'm Gemini Code Assist¹! 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 implements a fix to ensure that usage statistics are consistently included in the completion API's responses. It addresses a specific scenario where these statistics were omitted when stream_options were not explicitly provided, aligning the behavior with the intended functionality of always reporting usage. This is a follow-up to a previous change to cover this edge case.

Highlights

• Completion API: Ensured that usage statistics are always included in the completion response, even when stream_options are not specified, by leveraging the enable_force_include_usage flag.

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 is currently in preview and 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 to provide feedback.

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. ↩

[gemini-code-assist]

Code Review

This pull request correctly ensures that usage information is included in completion streams when stream_options is not specified, by respecting the enable_force_include_usage flag. The change is simple, well-contained, and directly addresses the issue described. The code is clear and I see no issues with it.

[github-actions]

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

[max-wittig]

@aarnphm maybe you could take a look. This is a fix for the contribution that I made in #19695. Thank you!

[NickLucche]

I think you need to edit at least serving_chat and serving_transcriptions too.
Which could make for an opportunity to group the logic into a util function

[max-wittig]

@NickLucche Thanks for the review. I will check it!

[mergify]

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @max-wittig.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

[mergify]

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @max-wittig.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

[max-wittig]

@NickLucche This is ready and passing again!

[NickLucche]

Thanks for your patience @max-wittig !

[max-wittig]

@NickLucche Thanks for the reviews and the merge!