Merge pull request #95 from ivatilca/main

Update to SK 1.0.1
microsoft · Feb 18, 2024 · 13ef8a8 · 13ef8a8
2 parents f3771ac + a663508
commit 13ef8a8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/sk-csharp-hello-world/Program.cs b/sk-csharp-hello-world/Program.cs
@@ -2,14 +2,14 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.SemanticKernel;
-using Microsoft.SemanticKernel.AI.ChatCompletion;
-using Microsoft.SemanticKernel.Connectors.AI.OpenAI;
-using Microsoft.SemanticKernel.PromptTemplate.Handlebars;
+using Microsoft.SemanticKernel.ChatCompletion;
+using Microsoft.SemanticKernel.Connectors.OpenAI;
+using Microsoft.SemanticKernel.PromptTemplates.Handlebars;
 using Plugins;
 
 var kernelSettings = KernelSettings.LoadSettings();
 
-KernelBuilder builder = new();
+var builder = Kernel.CreateBuilder();
 builder.Services.AddLogging(c => c.SetMinimumLevel(LogLevel.Information).AddDebug());
 builder.Services.AddChatCompletionService(kernelSettings);
 builder.Plugins.AddFromType<LightPlugin>();
@@ -36,7 +36,7 @@
     // Get the chat completions
     OpenAIPromptExecutionSettings openAIPromptExecutionSettings = new()
     {
-        FunctionCallBehavior = FunctionCallBehavior.AutoInvokeKernelFunctions
+        ToolCallBehavior = ToolCallBehavior.AutoInvokeKernelFunctions
     };
 
     var result = kernel.InvokeStreamingAsync<StreamingChatMessageContent>(
@@ -67,5 +67,8 @@
         }
     }
     System.Console.WriteLine();
-    chatMessages.AddMessage(chatMessageContent!);
+    if (chatMessageContent != null)
+    {
+        chatMessages.AddMessage(chatMessageContent.Role, chatMessageContent.Content!);
+    }
 }
diff --git a/sk-csharp-hello-world/config/ServiceCollectionExtensions.cs b/sk-csharp-hello-world/config/ServiceCollectionExtensions.cs
@@ -14,7 +14,7 @@ internal static IServiceCollection AddChatCompletionService(this IServiceCollect
         switch (kernelSettings.ServiceType.ToUpperInvariant())
         {
             case ServiceTypes.AzureOpenAI:
-                serviceCollection = serviceCollection.AddAzureOpenAIChatCompletion(kernelSettings.DeploymentId, kernelSettings.ModelId, endpoint: kernelSettings.Endpoint, apiKey: kernelSettings.ApiKey, serviceId: kernelSettings.ServiceId);
+                serviceCollection = serviceCollection.AddAzureOpenAIChatCompletion(kernelSettings.DeploymentId, endpoint: kernelSettings.Endpoint, apiKey: kernelSettings.ApiKey, serviceId: kernelSettings.ServiceId);
                 break;
 
             case ServiceTypes.OpenAI:

diff --git a/sk-csharp-hello-world/plugins/LightPlugin.cs b/sk-csharp-hello-world/plugins/LightPlugin.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using Microsoft.SemanticKernel;
-using Microsoft.SemanticKernel.AI.ChatCompletion;
+using Microsoft.SemanticKernel.ChatCompletion;
 
 namespace Plugins;
 

diff --git a/sk-csharp-hello-world/sk-csharp-hello-world.csproj b/sk-csharp-hello-world/sk-csharp-hello-world.csproj
@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-rc3" />
-    <PackageReference Include="Microsoft.SemanticKernel.PromptTemplate.Handlebars" Version="1.0.0-rc3" />
-    <PackageReference Include="Microsoft.SemanticKernel.Yaml" Version="1.0.0-rc3" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.0.1" />
+    <PackageReference Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" Version="1.0.1" />
+    <PackageReference Include="Microsoft.SemanticKernel.Yaml" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>