.Net: Ollama Address PR Feedback

dotnet/Directory.Packages.props

@@ -39,7 +39,7 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
-    <PackageVersion Include="OllamaSharp" Version="2.1.1" />
+    <PackageVersion Include="OllamaSharp" Version="3.0.1" />
     <!-- Tokenizers -->
     <PackageVersion Include="Microsoft.ML.Tokenizers" Version="0.22.0-preview.24378.1" />
     <PackageVersion Include="Microsoft.DeepDev.TokenizerLib" Version="1.3.3" />

dotnet/samples/Concepts/ChatCompletion/Ollama_ChatCompletion.cs

@@ -28,49 +28,21 @@ public async Task ServicePromptAsync()
 
         // First user message
         chatHistory.AddUserMessage("Hi, I'm looking for book suggestions");
-        await MessageOutputAsync(chatHistory);
+        this.OutputLastMessage(chatHistory);
 
         // First assistant message
         var reply = await chatService.GetChatMessageContentAsync(chatHistory);
         chatHistory.Add(reply);
-        await MessageOutputAsync(chatHistory);
+        this.OutputLastMessage(chatHistory);
 
         // Second user message
         chatHistory.AddUserMessage("I love history and philosophy, I'd like to learn something new about Greece, any suggestion");
-        await MessageOutputAsync(chatHistory);
+        this.OutputLastMessage(chatHistory);
 
         // Second assistant message
         reply = await chatService.GetChatMessageContentAsync(chatHistory);
         chatHistory.Add(reply);
-        await MessageOutputAsync(chatHistory);
-
-        /* Output:
-
-        Chat content:
-        ------------------------
-        System: You are a librarian, expert about books
-        ------------------------
-        User: Hi, I'm looking for book suggestions
-        ------------------------
-        Assistant: Sure, I'd be happy to help! What kind of books are you interested in? Fiction or non-fiction? Any particular genre?
-        ------------------------
-        User: I love history and philosophy, I'd like to learn something new about Greece, any suggestion?
-        ------------------------
-        Assistant: Great! For history and philosophy books about Greece, here are a few suggestions:
-
-        1. "The Greeks" by H.D.F. Kitto - This is a classic book that provides an overview of ancient Greek history and culture, including their philosophy, literature, and art.
-
-        2. "The Republic" by Plato - This is one of the most famous works of philosophy in the Western world, and it explores the nature of justice and the ideal society.
-
-        3. "The Peloponnesian War" by Thucydides - This is a detailed account of the war between Athens and Sparta in the 5th century BCE, and it provides insight into the political and military strategies of the time.
-
-        4. "The Iliad" by Homer - This epic poem tells the story of the Trojan War and is considered one of the greatest works of literature in the Western canon.
-
-        5. "The Histories" by Herodotus - This is a comprehensive account of the Persian Wars and provides a wealth of information about ancient Greek culture and society.
-
-        I hope these suggestions are helpful!
-        ------------------------
-        */
+        this.OutputLastMessage(chatHistory);
     }
 
     [Fact]
@@ -98,17 +70,4 @@ public async Task ChatPromptAsync()
 
         Console.WriteLine(reply);
     }
-
-    /// <summary>
-    /// Outputs the last message of the chat history
-    /// </summary>
-    private Task MessageOutputAsync(ChatHistory chatHistory)
-    {
-        var message = chatHistory.Last();
-
-        Console.WriteLine($"{message.Role}: {message.Content}");
-        Console.WriteLine("------------------------");
-
-        return Task.CompletedTask;
-    }
 }

dotnet/samples/Concepts/ChatCompletion/Ollama_ChatCompletionStreaming.cs

@@ -94,18 +94,18 @@ private async Task StartStreamingChatAsync(IChatCompletionService chatCompletion
         Console.WriteLine("------------------------");
 
         var chatHistory = new ChatHistory("You are a librarian, expert about books");
-        OutputLastMessage(chatHistory);
+        this.OutputLastMessage(chatHistory);
 
         // First user message
         chatHistory.AddUserMessage("Hi, I'm looking for book suggestions");
-        OutputLastMessage(chatHistory);
+        this.OutputLastMessage(chatHistory);
 
         // First assistant message
         await StreamMessageOutputAsync(chatCompletionService, chatHistory, AuthorRole.Assistant);
 
         // Second user message
         chatHistory.AddUserMessage("I love history and philosophy, I'd like to learn something new about Greece, any suggestion?");
-        OutputLastMessage(chatHistory);
+        this.OutputLastMessage(chatHistory);
 
         // Second assistant message
         await StreamMessageOutputAsync(chatCompletionService, chatHistory, AuthorRole.Assistant);
@@ -158,15 +158,4 @@ private async Task<string> StreamMessageOutputFromKernelAsync(Kernel kernel, str
         Console.WriteLine("\n------------------------");
         return fullMessage;
     }
-
-    /// <summary>
-    /// Outputs the last message of the chat history
-    /// </summary>
-    private void OutputLastMessage(ChatHistory chatHistory)
-    {
-        var message = chatHistory.Last();
-
-        Console.WriteLine($"{message.Role}: {message.Content}");
-        Console.WriteLine("------------------------");
-    }
 }

dotnet/samples/Concepts/ChatCompletion/OpenAI_ChatCompletion.cs

@@ -89,33 +89,20 @@ private async Task StartChatAsync(IChatCompletionService chatGPT)
 
         // First user message
         chatHistory.AddUserMessage("Hi, I'm looking for book suggestions");
-        await MessageOutputAsync(chatHistory);
+        OutputLastMessage(chatHistory);
 
         // First bot assistant message
         var reply = await chatGPT.GetChatMessageContentAsync(chatHistory);
         chatHistory.Add(reply);
-        await MessageOutputAsync(chatHistory);
+        OutputLastMessage(chatHistory);
 
         // Second user message
         chatHistory.AddUserMessage("I love history and philosophy, I'd like to learn something new about Greece, any suggestion");
-        await MessageOutputAsync(chatHistory);
+        OutputLastMessage(chatHistory);
 
         // Second bot assistant message
         reply = await chatGPT.GetChatMessageContentAsync(chatHistory);
         chatHistory.Add(reply);
-        await MessageOutputAsync(chatHistory);
-    }
-
-    /// <summary>
-    /// Outputs the last message of the chat history
-    /// </summary>
-    private Task MessageOutputAsync(ChatHistory chatHistory)
-    {
-        var message = chatHistory.Last();
-
-        Console.WriteLine($"{message.Role}: {message.Content}");
-        Console.WriteLine("------------------------");
-
-        return Task.CompletedTask;
+        OutputLastMessage(chatHistory);
     }
 }

dotnet/samples/Concepts/ChatCompletion/OpenAI_ChatCompletionStreaming.cs

@@ -99,7 +99,7 @@ public async Task StreamFunctionCallContentAsync()
         OpenAIPromptExecutionSettings settings = new() { ToolCallBehavior = ToolCallBehavior.EnableKernelFunctions };
 
         // Create chat history with initial user question
-        ChatHistory chatHistory = new();
+        ChatHistory chatHistory = [];
         chatHistory.AddUserMessage("Hi, what is the current time?");
 
         // Start streaming chat based on the chat history
@@ -162,15 +162,4 @@ private async Task StreamMessageOutputAsync(IChatCompletionService chatCompletio
         Console.WriteLine("\n------------------------");
         chatHistory.AddMessage(authorRole, fullMessage);
     }
-
-    /// <summary>
-    /// Outputs the last message of the chat history
-    /// </summary>
-    private void OutputLastMessage(ChatHistory chatHistory)
-    {
-        var message = chatHistory.Last();
-
-        Console.WriteLine($"{message.Role}: {message.Content}");
-        Console.WriteLine("------------------------");
-    }
 }

dotnet/src/Connectors/Connectors.Ollama.UnitTests/Connectors.Ollama.UnitTests.csproj

@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <Compile Include="$(RepoRoot)/dotnet/src/InternalUtilities/test/AssertExtensions.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
+    <Compile Include="$(RepoRoot)/dotnet/src/InternalUtilities/test/HttpMessageHandlerStub.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>

dotnet/src/Connectors/Connectors.Ollama.UnitTests/OllamaKernelBuilderExtensionsTests.cs → dotnet/src/Connectors/Connectors.Ollama.UnitTests/Extensions/OllamaKernelBuilderExtensionsTests.cs

@@ -8,7 +8,7 @@
 using Microsoft.SemanticKernel.TextGeneration;
 using Xunit;
 
-namespace SemanticKernel.Connectors.Ollama.UnitTests;
+namespace SemanticKernel.Connectors.Ollama.UnitTests.Extensions;
 
 /// <summary>
 /// Unit tests of <see cref="OllamaKernelBuilderExtensions"/>.

dotnet/src/Connectors/Connectors.Ollama.UnitTests/OllamaServiceCollectionExtensionsTests.cs → dotnet/src/Connectors/Connectors.Ollama.UnitTests/Extensions/OllamaServiceCollectionExtensionsTests.cs

@@ -9,7 +9,7 @@
 using Microsoft.SemanticKernel.TextGeneration;
 using Xunit;
 
-namespace SemanticKernel.Connectors.Ollama.UnitTests;
+namespace SemanticKernel.Connectors.Ollama.UnitTests.Extensions;
 
 /// <summary>
 /// Unit tests of <see cref="OllamaServiceCollectionExtensions"/>.