Unverified Commit 6032c82f authored by Zhongdongming Dai's avatar Zhongdongming Dai Committed by GitHub
Browse files

fix: fix usage.total_tokens count for OpenAI endpoints (#1649)

parent b4aa67a6
...@@ -150,6 +150,11 @@ impl DeltaGenerator { ...@@ -150,6 +150,11 @@ impl DeltaGenerator {
let choices = vec![choice]; let choices = vec![choice];
let mut usage = self.usage.clone();
if self.options.enable_usage {
usage.total_tokens = usage.prompt_tokens + usage.completion_tokens;
}
async_openai::types::CreateChatCompletionStreamResponse { async_openai::types::CreateChatCompletionStreamResponse {
id: self.id.clone(), id: self.id.clone(),
object: self.object.clone(), object: self.object.clone(),
...@@ -158,7 +163,7 @@ impl DeltaGenerator { ...@@ -158,7 +163,7 @@ impl DeltaGenerator {
system_fingerprint: self.system_fingerprint.clone(), system_fingerprint: self.system_fingerprint.clone(),
choices, choices,
usage: if self.options.enable_usage { usage: if self.options.enable_usage {
Some(self.usage.clone()) Some(usage)
} else { } else {
None None
}, },
......
...@@ -86,6 +86,11 @@ impl DeltaGenerator { ...@@ -86,6 +86,11 @@ impl DeltaGenerator {
) -> CompletionResponse { ) -> CompletionResponse {
// todo - update for tool calling // todo - update for tool calling
let mut usage = self.usage.clone();
if self.options.enable_usage {
usage.total_tokens = usage.prompt_tokens + usage.completion_tokens;
}
CompletionResponse { CompletionResponse {
id: self.id.clone(), id: self.id.clone(),
object: self.object.clone(), object: self.object.clone(),
...@@ -99,7 +104,7 @@ impl DeltaGenerator { ...@@ -99,7 +104,7 @@ impl DeltaGenerator {
logprobs: None, logprobs: None,
}], }],
usage: if self.options.enable_usage { usage: if self.options.enable_usage {
Some(self.usage.clone()) Some(usage)
} else { } else {
None None
}, },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment