Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

open_ai: Fix parsing response if token use info is unspecified (#55919)

marius85100053c910982caf
diff --git a/crates/open_ai/src/completion.rs b/crates/open_ai/src/completion.rs
index 3b62391678e..aac33387df1 100644
--- a/crates/open_ai/src/completion.rs
+++ b/crates/open_ai/src/completion.rs
@@ -552,10 +552,13 @@ impl OpenAiEventMapper {
event: ResponseStreamEvent,
) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
let mut events = Vec::new();
- if let Some(usage) = event.usage {
+ if let Some(usage) = event.usage
+ && let Some(prompt_tokens) = usage.prompt_tokens
+ && let Some(completion_tokens) = usage.completion_tokens
+ {
events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
- input_tokens: usage.prompt_tokens,
- output_tokens: usage.completion_tokens,
+ input_tokens: prompt_tokens,
+ output_tokens: completion_tokens,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
})));
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index b756e8a6122..1b4b4958f21 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -622,9 +622,9 @@ pub struct FunctionChunk {
#[derive(Clone, Serialize, Deserialize, Debug)]
pub struct Usage {
- pub prompt_tokens: u64,
- pub completion_tokens: u64,
- pub total_tokens: u64,
+ pub prompt_tokens: Option<u64>,
+ pub completion_tokens: Option<u64>,
+ pub total_tokens: Option<u64>,
}
#[derive(Serialize, Deserialize, Debug)]