refactor: use non-streaming chat API

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

THIRD-PARTY-LICENSES.md

@@ -36,14 +36,14 @@ The project uses the following third-party libraries or assets
 ### OpenAI .NET SDK
 
 - **Source**: https://github.com/openai/openai-dotnet
-- **Version**: 2.8.0
+- **Version**: 2.9.1
 - **License**: MIT License
 - **License Link**: https://github.com/openai/openai-dotnet/blob/main/LICENSE
 
 ### Azure.AI.OpenAI
 
 - **Source**: https://github.com/Azure/azure-sdk-for-net
-- **Version**: 2.8.0-beta.1
+- **Version**: 2.9.0-beta.1
 - **License**: MIT License
 - **License Link**: https://github.com/Azure/azure-sdk-for-net/blob/main/LICENSE.txt
 

src/AI/Service.cs

@@ -33,6 +33,7 @@ public async Task GenerateCommitMessage(string repo, string changeList, Action<s
             userMessageBuilder
                 .AppendLine("Generate a commit message (follow the rule of conventional commit message) for given git repository.")
                 .AppendLine("- Read all given changed files before generating. Do not skip any one file.")
+                .AppendLine("- Output the conventional commit message (with detail changes in list) directly. Do not explain your output nor introduce your answer.")
                 .AppendLine(string.IsNullOrEmpty(_ai.AdditionalPrompt) ? string.Empty : _ai.AdditionalPrompt)
                 .Append("Reposiory path: ").AppendLine(repo.Quoted())
                 .AppendLine("Changed files: ")
@@ -42,51 +43,38 @@ public async Task GenerateCommitMessage(string repo, string changeList, Action<s
 
             do
             {
+                ChatCompletion completion = await chatClient.CompleteChatAsync(messages, options, cancellation);
                 var inProgress = false;
-                var updates = chatClient.CompleteChatStreamingAsync(messages, options).WithCancellation(cancellation);
-                var toolCalls = new ToolCallsBuilder();
-                var contentBuilder = new StringBuilder();
 
-                await foreach (var update in updates)
+                switch (completion.FinishReason)
                 {
-                    foreach (var contentPart in update.ContentUpdate)
-                        contentBuilder.Append(contentPart.Text);
+                    case ChatFinishReason.Stop:
+                        onUpdate?.Invoke(string.Empty);
+                        onUpdate?.Invoke("[Assistant]:");
+                        if (completion.Content.Count > 0)
+                            onUpdate?.Invoke(completion.Content[0].Text);
+                        else
+                            onUpdate?.Invoke("[No content was generated.]");
+                        break;
+                    case ChatFinishReason.Length:
+                        throw new Exception("The response was cut off because it reached the maximum length. Consider increasing the max tokens limit.");
+                    case ChatFinishReason.ToolCalls:
+                        {
+                            messages.Add(new AssistantChatMessage(completion));
 
-                    foreach (var toolCall in update.ToolCallUpdates)
-                        toolCalls.Append(toolCall);
-
-                    switch (update.FinishReason)
-                    {
-                        case ChatFinishReason.Stop:
-                            onUpdate?.Invoke(string.Empty);
-                            onUpdate?.Invoke("[Assistant]:");
-                            onUpdate?.Invoke(contentBuilder.ToString());
-                            break;
-                        case ChatFinishReason.Length:
-                            throw new Exception("The response was cut off because it reached the maximum length. Consider increasing the max tokens limit.");
-                        case ChatFinishReason.ToolCalls:
+                            foreach (var call in completion.ToolCalls)
                             {
-                                var calls = toolCalls.Build();
-                                var assistantMessage = new AssistantChatMessage(calls);
-                                if (contentBuilder.Length > 0)
-                                    assistantMessage.Content.Add(ChatMessageContentPart.CreateTextPart(contentBuilder.ToString()));
-                                messages.Add(assistantMessage);
-
-                                foreach (var call in calls)
-                                {
-                                    var result = await ChatTools.Process(call, onUpdate);
-                                    messages.Add(result);
-                                }
-
-                                inProgress = true;
-                                break;
+                                var result = await ChatTools.Process(call, onUpdate);
+                                messages.Add(result);
                             }
-                        case ChatFinishReason.ContentFilter:
-                            throw new Exception("Ommitted content due to a content filter flag");
-                        default:
-                            break;
-                    }
 
+                            inProgress = true;
+                            break;
+                        }
+                    case ChatFinishReason.ContentFilter:
+                        throw new Exception("Ommitted content due to a content filter flag");
+                    default:
+                        break;
                 }
 
                 if (!inProgress)

src/AI/ToolCallsBuilder.cs

@@ -53,11 +53,11 @@
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.3.12" Condition="'$(Configuration)' == 'Debug'" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.8.0-beta.1" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.9.0-beta.1" />
     <PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.660" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc6.1" />
-    <PackageReference Include="OpenAI" Version="2.8.0" />
+    <PackageReference Include="OpenAI" Version="2.9.1" />
     <PackageReference Include="Pfim" Version="0.11.4" />
 
     <ProjectReference Include="../depends/AvaloniaEdit/src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj" />