Merge pull request #8 from cnblogs/add-extensions-for-service-collection

refactor: add extensions for IServiceCollection

Author: cnblogs-dudu

src/SemanticKernel.DashScope/DashScopeServiceCollectionExtensions.cs

@@ -14,19 +14,30 @@ public static IKernelBuilder AddDashScopeChatCompletion(
         Action<DashScopeClientOptions>? configureOptions = null,
         Action<HttpClient>? configureClient = null,
         string configSectionPath = "dashscope")
+    {
+        builder.Services.AddDashScopeChatCompletion(serviceId, configureOptions, configureClient, configSectionPath);
+        return builder;
+    }
+
+    public static IServiceCollection AddDashScopeChatCompletion(
+        this IServiceCollection services,
+        string? serviceId = null,
+        Action<DashScopeClientOptions>? configureOptions = null,
+        Action<HttpClient>? configureClient = null,
+        string configSectionPath = "dashscope")
     {
         Func<IServiceProvider, object?, DashScopeChatCompletionService> factory = (serviceProvider, _) =>
             serviceProvider.GetRequiredService<DashScopeChatCompletionService>();
 
-        var optionsBuilder = builder.Services.AddOptions<DashScopeClientOptions>().BindConfiguration(configSectionPath);
+        var optionsBuilder = services.AddOptions<DashScopeClientOptions>().BindConfiguration(configSectionPath);
         if (configureOptions != null) optionsBuilder.PostConfigure(configureOptions);
 
         var httpClientBuilder = configureClient == null
-            ? builder.Services.AddHttpClient<DashScopeChatCompletionService>()
-            : builder.Services.AddHttpClient<DashScopeChatCompletionService>(configureClient);
+            ? services.AddHttpClient<DashScopeChatCompletionService>()
+            : services.AddHttpClient<DashScopeChatCompletionService>(configureClient);
 
-        builder.Services.AddKeyedSingleton<IChatCompletionService>(serviceId, factory);
-        return builder;
+        services.AddKeyedSingleton<IChatCompletionService>(serviceId, factory);
+        return services;
     }
 
     public static IKernelBuilder AddDashScopeChatCompletion<T>(
@@ -38,7 +49,20 @@ public static IKernelBuilder AddDashScopeChatCompletion<T>(
         Action<HttpClient>? configureClient = null,
         string configSectionPath = "dashscope") where T : class
     {
-        builder.Services.AddConfiguration<T>();
+        builder.Services.AddDashScopeChatCompletion<T>(modelId, apiKey, serviceId, configureOptions, configureClient);
+        return builder;
+    }
+
+    public static IServiceCollection AddDashScopeChatCompletion<T>(
+        this IServiceCollection services,
+        string? modelId = null,
+        string? apiKey = null,
+        string? serviceId = null,
+        Action<DashScopeClientOptions>? configureOptions = null,
+        Action<HttpClient>? configureClient = null,
+        string configSectionPath = "dashscope") where T : class
+    {
+        services.AddConfiguration<T>();
 
         void AggConfigureOptions(DashScopeClientOptions options)
         {
@@ -47,7 +71,7 @@ void AggConfigureOptions(DashScopeClientOptions options)
             configureOptions?.Invoke(options);
         }
 
-        return builder.AddDashScopeChatCompletion(serviceId, AggConfigureOptions, configureClient, configSectionPath);
+        return services.AddDashScopeChatCompletion(serviceId, AggConfigureOptions, configureClient, configSectionPath);
     }
 
     public static IKernelBuilder AddDashScopeChatCompletion(
@@ -56,6 +80,17 @@ public static IKernelBuilder AddDashScopeChatCompletion(
         string apiKey,
         string? serviceId = null,
         Action<HttpClient>? configureClient = null)
+    {
+        builder.Services.AddDashScopeChatCompletion(modelId, apiKey, serviceId, configureClient);
+        return builder;
+    }
+
+    public static IServiceCollection AddDashScopeChatCompletion(
+        this IServiceCollection services,
+        string modelId,
+        string apiKey,
+        string? serviceId = null,
+        Action<HttpClient>? configureClient = null)
     {
         Func<IServiceProvider, object?, DashScopeChatCompletionService> factory = (serviceProvider, _) =>
         {
@@ -65,9 +100,9 @@ public static IKernelBuilder AddDashScopeChatCompletion(
             return new DashScopeChatCompletionService(options, httpClient);
         };
 
-        builder.Services.AddHttpClient();
-        builder.Services.AddKeyedSingleton<IChatCompletionService>(serviceId, factory);
-        return builder;
+        services.AddHttpClient();
+        services.AddKeyedSingleton<IChatCompletionService>(serviceId, factory);
+        return services;
     }
 
     private static IServiceCollection AddConfiguration<T>(this IServiceCollection services) where T : class

…tionTest/DashScopeChatCompletionTests.cs …e.IntegrationTest/ChatCompletionTests.cstest/SemanticKernel.DashScope.IntegrationTest/DashScopeChatCompletionTests.cs renamed to test/SemanticKernel.DashScope.IntegrationTest/ChatCompletionTests.cs test/SemanticKernel.DashScope.IntegrationTest/DashScopeChatCompletionTests.cs renamed to test/SemanticKernel.DashScope.IntegrationTest/ChatCompletionTests.cs

@@ -4,14 +4,14 @@
 
 namespace SemanticKernel.DashScope.IntegrationTest;
 
-public class DashScopeChatCompletionTests
+public class ChatCompletionTests
 {
     [Fact]
     public async Task ChatCompletion_InvokePromptAsync_WorksCorrectly()
     {
         // Arrange
         var builder = Kernel.CreateBuilder();
-        builder.AddDashScopeChatCompletion<DashScopeChatCompletionTests>();
+        builder.Services.AddDashScopeChatCompletion<ChatCompletionTests>();
         var kernel = builder.Build();
 
         var prompt = @"<message role=""user"">博客园是什么网站</message>";
@@ -37,7 +37,7 @@ public async Task ChatCompletion_InvokePromptStreamingAsync_WorksCorrectly()
     {
         // Arrange
         var builder = Kernel.CreateBuilder();
-        builder.AddDashScopeChatCompletion<DashScopeChatCompletionTests>();
+        builder.Services.AddDashScopeChatCompletion<ChatCompletionTests>();
         var kernel = builder.Build();
 
         // Act