Merge pull request #7 from BLaZeKiLL/wip/ollama-chat-fix

Ollama Chat fix

Author: BLaZeKiLL

Codeblaze.SemanticKernel.Connectors.Ollama/ChatCompletion/OllamaChatCompletionService.cs

@@ -18,14 +18,12 @@ public class OllamaChatCompletionService(
     public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync(ChatHistory chatHistory, PromptExecutionSettings? executionSettings = null,
         Kernel? kernel = null, CancellationToken cancellationToken = new())
     {
-        var system = string.Join("\n", chatHistory.Where(x => x.Role == AuthorRole.System).Select(x => x.Content));
-        var user = chatHistory.Last(x => x.Role == AuthorRole.User);
+        var chat = string.Join("\n", chatHistory.Select(x => x.Content));
 
         var data = new
         {
             model = Attributes["model_id"] as string,
-            prompt = user.Content,
-            system,
+            prompt = chat,
             stream = false,
             options = executionSettings?.ExtensionData,
         };
@@ -43,14 +41,12 @@ public async IAsyncEnumerable<StreamingChatMessageContent> GetStreamingChatMessa
         PromptExecutionSettings? executionSettings = null, Kernel? kernel = null,
         [EnumeratorCancellation] CancellationToken cancellationToken = new())
     {
-        var system = string.Join("\n", chatHistory.Where(x => x.Role == AuthorRole.System).Select(x => x.Content));
-        var user = chatHistory.Last(x => x.Role == AuthorRole.User);
+        var chat = string.Join("\n", chatHistory.Select(x => x.Content));
 
         var data = new
         {
             model = Attributes["model_id"] as string,
-            prompt = user.Content,
-            system,
+            prompt = chat,
             stream = true,
             options = executionSettings?.ExtensionData,
         };

Codeblaze.SemanticKernel.Console/Program.cs

@@ -49,51 +49,34 @@ void Run()
 
 async Task Prompt()
 {
-    NeoKernelService kernel = null;
+    KernelService kernel = null;
 
     AnsiConsole.Status().Start("Initializing...", ctx =>
     {
         ctx.Spinner(Spinner.Known.Star);
         ctx.SpinnerStyle(Style.Parse("green"));
 
-        kernel = new NeoKernelService(config);
+        kernel = new KernelService(config);
 
         ctx.Status("Initialized");
     });
 
     var prompt = AnsiConsole.Prompt(new TextPrompt<string>("What are you looking to do today?\n").PromptStyle("teal"));
 
-    Neo4jResult result = null;
+    string result = null;
 
     await AnsiConsole.Status().StartAsync("Processing...", async ctx =>
     {
         ctx.Spinner(Spinner.Known.Star);
         ctx.SpinnerStyle(Style.Parse("green"));
 
         ctx.Status($"Processing input to generate cypher");
-        result = await kernel.Run(prompt);
+        result = await kernel.BasicPrompt(prompt);
     });
 
-    if (result.Success)
-    {
-        AnsiConsole.WriteLine("");
-        AnsiConsole.Write(new Rule("[cyan]Cypher[/]") { Justification = Justify.Center });
-        AnsiConsole.WriteLine(result.Cypher);
-        AnsiConsole.Write(new Panel(new JsonText(JsonSerializer.Serialize(result.Result)))
-            .Header("Cypher Result")
-            .Expand()
-            .RoundedBorder()
-            .BorderColor(Color.Green));
-        AnsiConsole.WriteLine("");
-    }
-    else
-    {
-        AnsiConsole.WriteLine("");
-        AnsiConsole.Write(new Rule("[red]Cypher[/]") { Justification = Justify.Center });
-        AnsiConsole.WriteLine(result.Cypher);
-        AnsiConsole.Write(new Rule("[red]Cypher Execution Error[/]") { Justification = Justify.Center });
-        AnsiConsole.WriteLine("");
-    }
+    AnsiConsole.Write(new Rule("[cyan][/]") { Justification = Justify.Center });
+    AnsiConsole.WriteLine($"Result: {result}");
+    AnsiConsole.Write(new Rule("[cyan][/]") { Justification = Justify.Center });
 }
 
 #pragma warning disable SKEXP0003

Codeblaze.SemanticKernel.Console/Services/KernelService.cs

@@ -16,8 +16,8 @@ public KernelService(IConfiguration config)
 
         builder.Services.AddTransient<HttpClient>();
 
-        builder
-            .AddOllamaTextGeneration(config["Ollama:Model"], config["Ollama:BaseUrlGeneration"]);
+        builder.AddOllamaChatCompletion(config["Ollama:Model"], config["Ollama:BaseUrlGeneration"]);
+        builder.AddOllamaTextGeneration(config["Ollama:Model"], config["Ollama:BaseUrlGeneration"]);
 
         _Kernel = builder.Build();
     }