Mkulakow/fix output tokens#4282
Open
michalkulakowski wants to merge 5 commits into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes legacy streaming response generation so that token usage fields (prompt/completion/output tokens) are populated correctly in serialized streaming events—especially for the OpenAI Responses endpoint where usage is embedded in the response.completed / response.incomplete event payload.
Changes:
- Set prompt/completion token usage on the API handler before calling
serializeStreamingChunk()in legacy LM and VLM streaming finalization paths. - Add unit tests validating correct usage fields for Responses endpoint completed/incomplete events and for chat_completions usage SSE chunk behavior.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
src/test/http_openai_handler_test.cpp |
Adds legacy servable streaming tests to assert correct token usage serialization for Responses and chat_completions. |
src/llm/language_model/legacy/servable.cpp |
Moves set*TokensUsage() calls before final serializeStreamingChunk() so usage is available during serialization. |
src/llm/visual_language_model/legacy/servable.cpp |
Same ordering fix as LM legacy servable for VLM legacy streaming finalization. |
Comment on lines
+5681
to
+5684
| std::optional<uint32_t> maxTokensLimit; | ||
| const absl::Status parseStatus = apiHandler->parseRequest(maxTokensLimit, 0, std::nullopt); | ||
| ASSERT_TRUE(parseStatus.ok()) << parseStatus; | ||
| ctx->apiHandler = apiHandler; |
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
JIRA/Issue if applicable.
Describe the changes.
🧪 Checklist
``