Add usage.prompt_tokens_details.cached_tokens for prefix caching#4670
Open
lvhan028 wants to merge 5 commits into
Open
Add usage.prompt_tokens_details.cached_tokens for prefix caching#4670lvhan028 wants to merge 5 commits into
lvhan028 wants to merge 5 commits into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds end-to-end reporting for prefix-cache hit tokens (“cached tokens”) so that OpenAI-compatible responses can expose usage.prompt_tokens_details.cached_tokens, and internal metrics/benchmarks can track prefix caching effectiveness.
Changes:
- Add
PromptTokensDetails(cached_tokens)to the OpenAI protocol and centralize usage construction viabuild_usage_info(...). - Plumb
cached_tokensfrom prefix-cache matching (BlockTrie.match) through PyTorch engine messaging/metrics to server responses (GenOut.cached_tokens). - Add Prometheus metrics + benchmark support for cached token counts / cache hit ratio, and add unit tests for the new behavior.
Reviewed changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
lmdeploy/serve/openai/protocol.py |
Adds PromptTokensDetails and build_usage_info to include cached token details in UsageInfo. |
lmdeploy/serve/openai/api_server.py |
Switches usage construction to build_usage_info and forwards res.cached_tokens into OpenAI responses. |
lmdeploy/serve/core/async_engine.py |
Adds cached_tokens to GenOut and propagates it from engine outputs into responses. |
lmdeploy/pytorch/paging/scheduler.py |
Fixes migration scheduling to call block_trie.match(seq) correctly. |
lmdeploy/pytorch/paging/block_trie.py |
Records seq.prefix_cache_hit_tokens (and resets to 0 when prefix caching is disabled). |
lmdeploy/pytorch/messages.py |
Adds prefix_cache_hit_tokens to SchedulerSequence for prefix caching accounting. |
lmdeploy/pytorch/engine/engine_loop.py |
Emits cached_tokens in RequestMetrics based on msg.prefix_cache_hit_tokens. |
lmdeploy/pytorch/engine/engine_instance.py |
Extracts cached_tokens from req_metrics and forwards it via EngineOutput. |
lmdeploy/messages.py |
Adds cached_tokens fields to Response, RequestMetrics, and EngineOutput dataclasses. |
lmdeploy/metrics/stats.py |
Adds cached_tokens to per-request stats. |
lmdeploy/metrics/metrics_processor.py |
Copies outputs.cached_tokens into RequestStats.cached_tokens. |
lmdeploy/metrics/loggers.py |
Adds Prometheus histograms/counter for cached tokens and cache-hit ratio. |
benchmark/benchmark_chat_completion.py |
Forwards per-row tools/tool_choice and extracts cached_tokens from streamed usage payloads for reporting. |
tests/test_lmdeploy/test_prefix_cache_hit_tokens.py |
Adds a unit test ensuring disabled prefix caching sets hit tokens to 0. |
tests/test_lmdeploy/serve/openai/test_usage_info.py |
Adds unit tests verifying prompt_tokens_details.cached_tokens appears in built usage and dumps correctly. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ebe59b2 to
1d09d06
Compare
Comment on lines
+354
to
+357
| req_metrics = RequestMetrics(new_token_timestamp, | ||
| msg.engine_events, | ||
| spec_info=spec_info, | ||
| cached_tokens=msg.cached_tokens) |
Use SchedulerSequence.cached_tokens in engine_loop now that main owns prefix-cache hit accounting in the scheduler. Co-authored-by: Cursor <cursoragent@cursor.com>
bfaaee5 to
c227302
Compare
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.
Motivation
OpenAI reports prefix cache hits in
usage.prompt_tokens_details.cached_tokens, which clients use for cost estimation and observability (cache_hit_rate = cached_tokens / prompt_tokens).LMDeploy's supports prefix caching, but this hit count was not surfaced through the serving API. Without it, users cannot measure prefix cache effectiveness from chat completion responses or benchmark results.
Modification
PyTorch engine
BlockTrie.match()asSchedulerSequence.cached_tokens.RequestMetrics→GenOut/Response→ OpenAI usage.block_trie.match(migration_waiting)→block_trie.match(seq).Turbomind engine
TBD. After @lzhangzz refactor prefix caching
OpenAI API (
/v1/chat/completions)PromptTokensDetailsandUsageInfo.build()to always populateusage.prompt_tokens_details.cached_tokens(0when prefix caching is disabled).stream_options.include_usage) and non-streaming responses./v1/completions(deprecated by OpenAI).Other endpoints(v1/messages, v1/response)
TBD
Metrics
lmdeploy:request_cached_tokenslmdeploy:request_cache_hit_ratiolmdeploy:cached_tokens_totalBenchmark
cached_tokensfrom usage inbenchmark/benchmark_chat_completion.py.cached_tokensand aggregatetotal_cached_tokens/cache_hit_rateto summary output.tools/tool_choicefields from JSONL inputs.