Fix crash when quota info is missing from completion response #189
Conversation
This file contains 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
… does not have usage.total_tokens set Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
janepie
reviewed
Feb 10, 2025
| @@ -324,7 +324,7 @@ public function createCompletion( | |||
| throw new Exception($this->l10n->t('Unknown text generation error'), Http::STATUS_INTERNAL_SERVER_ERROR); | |||
| } | |||
|
|
|||
| if (isset($response['usage'])) { | |||
| if (isset($response['usage'], $response['usage']['total_tokens'])) { | |||
There was a problem hiding this comment.
Suggested change
| if (isset($response['usage'], $response['usage']['total_tokens'])) { | |
| if (isset($response['usage']['total_tokens'])) { |
There was a problem hiding this comment.
I don't trust the behaviour of isset enough across all Php versions so I prefer to explicitly check each level separately.
But sure, I tried this in a Php console and it worked as expected:
$a = [];
echo $a['one']; // it crashed
echo isset($a['one']) ? 1 : 0; // prints 0
echo isset($a['one']['two']) ? 1 : 0; // does not crash and prints 0| @@ -461,9 +461,8 @@ public function createChatCompletion( | |||
| throw new Exception($this->l10n->t('Unknown text generation error'), Http::STATUS_INTERNAL_SERVER_ERROR); | |||
| } | |||
|
|
|||
| if (isset($response['usage'])) { | |||
| if (isset($response['usage'], $response['usage']['total_tokens'])) { | |||
There was a problem hiding this comment.
Suggested change
| if (isset($response['usage'], $response['usage']['total_tokens'])) { | |
| if (isset($response['usage']['total_tokens'])) { |
janepie
approved these changes
Feb 10, 2025
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.
Do not attempt to update local quota if chat/completion response does not have usage.total_tokens set