Merge pull request #16 from sdcb/dev

sdcb · web-flow · commit 1735bd509fde · 2024-12-20T09:39:45.000+08:00
fix the issue causing usage isn't reliable
diff --git a/src/BE/Services/ChatServices/Implementations/OpenAI/OpenAIChatService.cs b/src/BE/Services/ChatServices/Implementations/OpenAI/OpenAIChatService.cs
@@ -31,11 +31,11 @@ public override async IAsyncEnumerable<ChatSegment> ChatStreamed(IReadOnlyList<C
     {
         await foreach (StreamingChatCompletionUpdate delta in _chatClient.CompleteChatStreamingAsync(messages, options, cancellationToken))
         {
-            if (delta.ContentUpdate.Count == 0) continue;
+            if (delta.ContentUpdate.Count == 0 && delta.Usage == null) continue;
 
             yield return new ChatSegment
             {
-                TextSegment = delta.ContentUpdate[0].Text,
+                TextSegment = delta.ContentUpdate.FirstOrDefault()?.Text ?? "",
                 FinishReason = delta.FinishReason,
                 Usage = delta.Usage != null ? new Dtos.ChatTokenUsage()
                 {

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ public override async IAsyncEnumerable<ChatSegment> ChatStreamed(IReadOnlyList<C`
`31`	`31`	`{`
`32`	`32`	`await foreach (StreamingChatCompletionUpdate delta in _chatClient.CompleteChatStreamingAsync(messages, options, cancellationToken))`
`33`	`33`	`{`
`34`		`- if (delta.ContentUpdate.Count == 0) continue;`
	`34`	`+ if (delta.ContentUpdate.Count == 0 && delta.Usage == null) continue;`
`35`	`35`
`36`	`36`	`yield return new ChatSegment`
`37`	`37`	`{`
`38`		`- TextSegment = delta.ContentUpdate[0].Text,`
	`38`	`+ TextSegment = delta.ContentUpdate.FirstOrDefault()?.Text ?? "",`
`39`	`39`	`FinishReason = delta.FinishReason,`
`40`	`40`	`Usage = delta.Usage != null ? new Dtos.ChatTokenUsage()`
`41`	`41`	`{`