[Feature][Frontend]: Add support for stream_options in ChatCompletionRequest#5135
Conversation
Add StreamOptions Class Add stream_options validation in ChatCompletionRequest
- Introduced the `StreamOptions` class in `OpenAIBaseModel` with an optional `include_usage` attribute. - Added `stream_options` attribute to the `ChatCompletionRequest` class, defaulting to `None`.
…f `stream` is true.
- Updated `chat_completion_stream_generator` to include support for `stream_options` with an `include_usage` flag. - Modified the initial response generation to conditionally include `usage` field based on `stream_options.include_usage`. - Enhanced the token-by-token and finish responses to conditionally include `usage` field if `stream_options.include_usage` is set. - Added a final usage statistics message if `stream_options.include_usage` is set, including prompt tokens and completion tokens.
stream_options in ChatCompletionRequeststream_options in ChatCompletionRequest
|
The code looks good at first glance, but to verify this, let's add some unit tests:
Could you also update the Completions API handler with |
I will try to implement the tests today. |
Feel free to do so! |
- stream=True, stream_options=None
- stream=True, stream_options={"include_usage": True}
- stream=True, stream_options={"include_usage": False}
- stream=False, stream_options={"include_usage": None}
- stream=False, stream_options={"include_usage": False}
- stream=False, stream_options={"include_usage": True}
|
Added the unit tests. |
It seems that there is something wrong with the new schema definition, based on the failing tests. |
18ec2ac to
4a9f80a
Compare
- Duplicated Usage defenition in protocol.py. - Line too long in several files.
- Yapf formating.
- yapf in protocol file.
DarkLight1337
left a comment
There was a problem hiding this comment.
Looks good now, thanks for the hard work!
This PR introduces support for the
stream_optionsparameter in theChatCompletionRequestclass, addressing the feature request in issue #4967.Changes
StreamOptionsclass with an optionalinclude_usageattribute.ChatCompletionRequestclass to include thestream_optionsattribute.chat_completion_stream_generatormethod to handle thestream_optionsparameter, allowing optional inclusion of usage statistics in streaming responses.Fix #4967 (#4967)
BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE
PR Checklist (Click to Expand)
Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.
PR Title and Classification
Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:
[Bugfix]for bug fixes.[CI/Build]for build or continuous integration improvements.[Doc]for documentation fixes and improvements.[Model]for adding a new model or improving an existing model. Model name should appear in the title.[Frontend]For changes on the vLLM frontend (e.g., OpenAI API server,LLMclass, etc.)[Kernel]for changes affecting CUDA kernels or other compute kernels.[Core]for changes in the core vLLM logic (e.g.,LLMEngine,AsyncLLMEngine,Scheduler, etc.)[Hardware][Vendor]for hardware-specific changes. Vendor name should appear in the prefix (e.g.,[Hardware][AMD]).[Misc]for PRs that do not fit the above categories. Please use this sparingly.Note: If the PR spans more than one category, please include all relevant prefixes.
Code Quality
The PR needs to meet the following code quality standards:
format.shto format your code.docs/source/if the PR modifies the user-facing behaviors of vLLM. It helps vLLM users understand and utilize the new features or changes.Notes for Large Changes
Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with
rfc-requiredand might not go through the PR.What to Expect for the Reviews
The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feels confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:
action-requiredlabel on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.Thank You
Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!