-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Add unified cache usage metrics to Usage interface #5657
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
sobychacko
wants to merge
1
commit into
spring-projects:main
from
sobychacko:feature/unified-cache-usage-metrics
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,4 +67,28 @@ default Integer getTotalTokens() { | |
| */ | ||
| @Nullable Object getNativeUsage(); | ||
|
|
||
| /** | ||
| * Returns the number of input tokens read from the prompt cache, if the provider | ||
| * supports prompt caching. Cached tokens are tokens that were previously processed | ||
| * and stored by the provider, reducing cost and latency for repeated prompt prefixes. | ||
| * @return the number of cached input tokens read, or {@code null} if the provider | ||
| * does not support prompt caching or no cache hit occurred. | ||
| * @since 2.0.0 | ||
| */ | ||
| default @Nullable Long getCacheReadInputTokens() { | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the number of input tokens written to the prompt cache, if the provider | ||
| * supports prompt caching. Cache writes occur when new prompt content is cached for | ||
| * the first time. | ||
| * @return the number of input tokens written to cache, or {@code null} if the | ||
| * provider does not support prompt caching or no cache write occurred. | ||
| * @since 2.0.0 | ||
| */ | ||
| default @Nullable Long getCacheWriteInputTokens() { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same like above |
||
| return null; | ||
| } | ||
|
|
||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,7 +61,24 @@ public static Usage getCumulativeUsage(final Usage currentUsage, | |
| promptTokens += usageFromPreviousChatResponse.getPromptTokens(); | ||
| generationTokens += usageFromPreviousChatResponse.getCompletionTokens(); | ||
| totalTokens += usageFromPreviousChatResponse.getTotalTokens(); | ||
| return new DefaultUsage(promptTokens, generationTokens, totalTokens); | ||
| // Accumulate cache metrics, preserving null when neither side reports them. | ||
| Long cacheRead = null; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this might change if the null semantics change |
||
| if (currentUsage.getCacheReadInputTokens() != null | ||
| || usageFromPreviousChatResponse.getCacheReadInputTokens() != null) { | ||
| cacheRead = (currentUsage.getCacheReadInputTokens() != null ? currentUsage.getCacheReadInputTokens() | ||
| : 0L) | ||
| + (usageFromPreviousChatResponse.getCacheReadInputTokens() != null | ||
| ? usageFromPreviousChatResponse.getCacheReadInputTokens() : 0L); | ||
| } | ||
| Long cacheWrite = null; | ||
| if (currentUsage.getCacheWriteInputTokens() != null | ||
| || usageFromPreviousChatResponse.getCacheWriteInputTokens() != null) { | ||
| cacheWrite = (currentUsage.getCacheWriteInputTokens() != null ? currentUsage.getCacheWriteInputTokens() | ||
| : 0L) | ||
| + (usageFromPreviousChatResponse.getCacheWriteInputTokens() != null | ||
| ? usageFromPreviousChatResponse.getCacheWriteInputTokens() : 0L); | ||
| } | ||
| return new DefaultUsage(promptTokens, generationTokens, totalTokens, null, cacheRead, cacheWrite); | ||
| } | ||
| // When current usage is empty, return the usage from the previous chat response. | ||
| return usageFromPreviousChatResponse; | ||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if
nullis the right approach to express no-tokens.I can see that in
getTotalTokenswe default to0. Is it too bad to use 0 if there are no CachedReadInputTokens()? I was thinking of negative numbers (e.g. NO_OPTS = -123) but this could lead to wrong token subtraction if we miss to validate.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On second read, null has special and useful semantics in Json serialization (e.g. you can filter out null value fields)