Merge pull request #91 from matthewbolanos/main

Update to RC3
microsoft · Dec 6, 2023 · d1c629e · d1c629e
2 parents 429f610 + c57c344
commit d1c629e
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 57 deletions.
diff --git a/sk-csharp-console-chat/ConsoleChat.cs b/sk-csharp-console-chat/ConsoleChat.cs
@@ -39,7 +39,7 @@ public Task StartAsync(CancellationToken cancellationToken)
     private async Task ExecuteAsync(CancellationToken cancellationToken)
     {
         ChatHistory chatMessages = [];
-        IChatCompletionService chatCompletionService = this._kernel.GetService<IChatCompletionService>();
+        IChatCompletionService chatCompletionService = this._kernel.GetRequiredService<IChatCompletionService>();
 
         // Loop till we are cancelled
         while (!cancellationToken.IsCancellationRequested)

diff --git a/sk-csharp-console-chat/Program.cs b/sk-csharp-console-chat/Program.cs
@@ -25,16 +25,14 @@
     // Add kernel settings to the host builder
     services
         .AddSingleton<KernelSettings>(kernelSettings)
-        .AddTransient<Kernel>(serviceProvider => new KernelBuilder()
-            .WithServices(serviceCollection =>
-            {
-                serviceCollection
-                    .AddLogging(c => c.AddDebug().SetMinimumLevel(LogLevel.Information))
-                    .AddChatCompletionService(kernelSettings);
-            })
-            .WithPlugins(plugins => plugins.AddPluginFromObject<LightPlugin>())
-            .Build()
-        )
+        .AddTransient<Kernel>(serviceProvider => {
+            KernelBuilder builder = new();
+            builder.Services.AddLogging(c => c.AddDebug().SetMinimumLevel(LogLevel.Information));
+            builder.Services.AddChatCompletionService(kernelSettings);
+            builder.Plugins.AddFromType<LightPlugin>();
+
+            return builder.Build();
+        })
         .AddHostedService<ConsoleChat>();
 });
 

diff --git a/sk-csharp-console-chat/sk-csharp-console-chat.csproj b/sk-csharp-console-chat/sk-csharp-console-chat.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.0.0" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-rc2" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-rc3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sk-csharp-hello-world/Program.cs b/sk-csharp-hello-world/Program.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.SemanticKernel;
 using Microsoft.SemanticKernel.AI.ChatCompletion;
@@ -8,19 +9,12 @@
 
 var kernelSettings = KernelSettings.LoadSettings();
 
-using var loggerFactory = LoggerFactory.Create(b =>
-    {
-        b.SetMinimumLevel(kernelSettings.LogLevel ?? LogLevel.Warning)
-            .AddConsole()
-            .AddDebug();
-    });
-
-Kernel kernel = new KernelBuilder()
-    .WithLoggerFactory(loggerFactory)
-    .WithChatCompletionService(kernelSettings)
-    .WithPlugins(plugins => plugins.AddPluginFromObject<LightPlugin>())
-    .Build();
+KernelBuilder builder = new();
+builder.Services.AddLogging(c => c.SetMinimumLevel(LogLevel.Information).AddDebug());
+builder.Services.AddChatCompletionService(kernelSettings);
+builder.Plugins.AddFromType<LightPlugin>();
 
+Kernel kernel = builder.Build();
 
 // Load prompt from resource
 using StreamReader reader = new(Assembly.GetExecutingAssembly().GetManifestResourceStream("prompts.Chat.yaml")!);
@@ -29,8 +23,8 @@
     promptTemplateFactory: new HandlebarsPromptTemplateFactory()
 );
 
+// Create the chat history
 ChatHistory chatMessages = [];
-IChatCompletionService chatCompletionService = kernel.GetService<IChatCompletionService>();
 
 // Loop till we are cancelled
 while (true)

diff --git a/sk-csharp-hello-world/config/KernelBuilderExtensions.cs b/sk-csharp-hello-world/config/KernelBuilderExtensions.cs
diff --git a/sk-csharp-hello-world/config/ServiceCollectionExtensions.cs b/sk-csharp-hello-world/config/ServiceCollectionExtensions.cs
@@ -0,0 +1,30 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.SemanticKernel;
+
+internal static class ServiceCollectionExtensions
+{
+    /// <summary>
+    /// Adds a chat completion service to the list. It can be either an OpenAI or Azure OpenAI backend service.
+    /// </summary>
+    /// <param name="kernelBuilder"></param>
+    /// <param name="kernelSettings"></param>
+    /// <exception cref="ArgumentException"></exception>
+    internal static IServiceCollection AddChatCompletionService(this IServiceCollection serviceCollection, KernelSettings kernelSettings)
+    {
+        switch (kernelSettings.ServiceType.ToUpperInvariant())
+        {
+            case ServiceTypes.AzureOpenAI:
+                serviceCollection = serviceCollection.AddAzureOpenAIChatCompletion(kernelSettings.DeploymentId, kernelSettings.ModelId, endpoint: kernelSettings.Endpoint, apiKey: kernelSettings.ApiKey, serviceId: kernelSettings.ServiceId);
+                break;
+
+            case ServiceTypes.OpenAI:
+                serviceCollection = serviceCollection.AddOpenAIChatCompletion(modelId: kernelSettings.ModelId, apiKey: kernelSettings.ApiKey, orgId: kernelSettings.OrgId, serviceId: kernelSettings.ServiceId);
+                break;
+
+            default:
+                throw new ArgumentException($"Invalid service type value: {kernelSettings.ServiceType}");
+        }
+
+        return serviceCollection;
+    }
+}
diff --git a/sk-csharp-hello-world/sk-csharp-hello-world.csproj b/sk-csharp-hello-world/sk-csharp-hello-world.csproj
@@ -13,9 +13,9 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
     <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-rc2" />
-    <PackageReference Include="Microsoft.SemanticKernel.PromptTemplate.Handlebars" Version="1.0.0-rc2" />
-    <PackageReference Include="Microsoft.SemanticKernel.Yaml" Version="1.0.0-rc2" />
+    <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" />
   </ItemGroup>
 
   <ItemGroup>