-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Fix token usage- total tokens #45202
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
Open
YoYoJa
wants to merge
2
commits into
main
Choose a base branch
from
jessli/FixTotalTokens
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -299,23 +299,29 @@ def _parse_eval_result(self, eval_result) -> Dict[str, T]: | |
|
|
||
| # Extract token counts from metrics | ||
| metrics = properties.get("metrics", {}) | ||
| prompt_tokens = metrics.get("promptTokens", "") | ||
| completion_tokens = metrics.get("completionTokens", "") | ||
| prompt_tokens = int(metrics.get("promptTokens", 0)) if metrics.get("promptTokens") else 0 | ||
| completion_tokens = ( | ||
| int(metrics.get("completionTokens", 0)) if metrics.get("completionTokens") else 0 | ||
| ) | ||
|
|
||
| # Calculate total tokens | ||
| try: | ||
| total_tokens = ( | ||
| str(int(prompt_tokens) + int(completion_tokens)) | ||
| int(prompt_tokens) + int(completion_tokens) | ||
| if prompt_tokens and completion_tokens | ||
| else "" | ||
| else 0 | ||
| ) | ||
| except (ValueError, TypeError): | ||
| total_tokens = "" | ||
| total_tokens = 0 | ||
|
|
||
| # Add token metadata (matching old format) | ||
| parsed_result[f"{self._eval_metric. value}_total_tokens"] = total_tokens | ||
| parsed_result[f"{self._eval_metric.value}_prompt_tokens"] = prompt_tokens | ||
| parsed_result[f"{self._eval_metric.value}_completion_tokens"] = completion_tokens | ||
| parsed_result[f"{self._eval_metric.value}_prompt_tokens"] = ( | ||
| int(prompt_tokens) if prompt_tokens else 0 | ||
| ) | ||
| parsed_result[f"{self._eval_metric.value}_completion_tokens"] = ( | ||
| int(completion_tokens) if completion_tokens else 0 | ||
| ) | ||
|
|
||
| # Add empty placeholders for fields that sync_evals doesn't provide | ||
| parsed_result[f"{self._eval_metric.value}_finish_reason"] = "" | ||
|
|
@@ -334,17 +340,17 @@ def _parse_eval_result(self, eval_result) -> Dict[str, T]: | |
|
|
||
| # Extract token counts | ||
| metrics = properties.get("metrics", {}) | ||
| prompt_tokens = metrics.get("promptTokens", "") | ||
| completion_tokens = metrics.get("completionTokens", "") | ||
| prompt_tokens = int(metrics.get("promptTokens", 0)) if metrics.get("promptTokens") else 0 | ||
| completion_tokens = ( | ||
| int(metrics.get("completionTokens", 0)) if metrics.get("completionTokens") else 0 | ||
| ) | ||
|
|
||
| try: | ||
| total_tokens = ( | ||
| str(int(prompt_tokens) + int(completion_tokens)) | ||
| if prompt_tokens and completion_tokens | ||
| else "" | ||
| int(prompt_tokens) + int(completion_tokens) if prompt_tokens and completion_tokens else 0 | ||
| ) | ||
|
Comment on lines
349
to
351
|
||
| except (ValueError, TypeError): | ||
| total_tokens = "" | ||
| total_tokens = 0 | ||
|
|
||
| # Return in the expected format matching parse_response output | ||
| return { | ||
|
|
||
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.
The condition on line 309 checks if both prompt_tokens and completion_tokens are truthy, which means if either value is 0, total_tokens will be set to 0 instead of the correct sum. Since prompt_tokens and completion_tokens are already guaranteed to be integers (defaulting to 0), this condition is incorrect. The calculation should be unconditional:
This bug causes total_tokens to be 0 when either prompt_tokens or completion_tokens is 0, even though the other might have a non-zero value.