feat: support set workspace when injecting service or creating client

Author: ikesnowy

src/Cnblogs.DashScope.AspNetCore/ServiceCollectionInjector.cs

@@ -38,9 +38,8 @@ public static IHttpClientBuilder AddDashScopeClient(this IServiceCollection serv
         var apiKey = section["apiKey"]
                      ?? throw new InvalidOperationException("There is no apiKey provided in given section");
         var baseAddress = section["baseAddress"];
-        return string.IsNullOrEmpty(baseAddress)
-            ? services.AddDashScopeClient(apiKey)
-            : services.AddDashScopeClient(apiKey, baseAddress);
+        var workspaceId = section["workspaceId"];
+        return services.AddDashScopeClient(apiKey, baseAddress, workspaceId);
     }
 
     /// <summary>
@@ -49,16 +48,24 @@ public static IHttpClientBuilder AddDashScopeClient(this IServiceCollection serv
     /// <param name="services">The service collection to add service to.</param>
     /// <param name="apiKey">The DashScope api key.</param>
     /// <param name="baseAddress">The DashScope api base address, you may change this value if you are using proxy.</param>
+    /// <param name="workspaceId">Default workspace id to use.</param>
     /// <returns></returns>
     public static IHttpClientBuilder AddDashScopeClient(
         this IServiceCollection services,
         string apiKey,
-        string baseAddress = "https://dashscope.aliyuncs.com/api/v1/")
+        string? baseAddress = null,
+        string? workspaceId = null)
     {
+        baseAddress ??= "https://dashscope.aliyuncs.com/api/v1/";
         return services.AddHttpClient<IDashScopeClient, DashScopeClientCore>(
             h =>
             {
                 h.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", apiKey);
+                if (string.IsNullOrWhiteSpace(workspaceId) == false)
+                {
+                    h.DefaultRequestHeaders.Add("X-DashScope-WorkSpace", workspaceId);
+                }
+
                 h.BaseAddress = new Uri(baseAddress);
             });
     }

src/Cnblogs.DashScope.Core/ApplicationRagOptions.cs

@@ -1,6 +1,4 @@
-using System.Text.Json;
-
-namespace Cnblogs.DashScope.Core;
+namespace Cnblogs.DashScope.Core;
 
 /// <summary>
 /// Options for RAG application.

src/Cnblogs.DashScope.Core/DashScopeClient.cs

@@ -15,32 +15,43 @@ public class DashScopeClient : DashScopeClientCore
     /// </summary>
     /// <param name="apiKey">The DashScope api key.</param>
     /// <param name="timeout">The timeout for internal http client, defaults to 2 minute.</param>
+    /// <param name="baseAddress">The base address for dashscope api call.</param>
+    /// <param name="workspaceId">The workspace id.</param>
     /// <remarks>
-    ///     The underlying httpclient is cached by apiKey and timeout.
-    ///     Client created with same apiKey and timeout value will share same underlying <see cref="HttpClient"/> instance.
+    ///     The underlying httpclient is cached by constructor parameter list.
+    ///     Client created with same parameter value will share same underlying <see cref="HttpClient"/> instance.
     /// </remarks>
-    public DashScopeClient(string apiKey, TimeSpan? timeout = null)
-        : base(GetConfiguredClient(apiKey, timeout))
+    public DashScopeClient(
+        string apiKey,
+        TimeSpan? timeout = null,
+        string? baseAddress = null,
+        string? workspaceId = null)
+        : base(GetConfiguredClient(apiKey, timeout, baseAddress, workspaceId))
     {
     }
 
-    private static HttpClient GetConfiguredClient(string apiKey, TimeSpan? timeout)
+    private static HttpClient GetConfiguredClient(
+        string apiKey,
+        TimeSpan? timeout = null,
+        string? baseAddress = null,
+        string? workspaceId = null)
     {
         var client = ClientPools.GetValueOrDefault(GetCacheKey());
         if (client is null)
         {
             client = new HttpClient
             {
-                BaseAddress = new Uri(DashScopeDefaults.DashScopeApiBaseAddress),
+                BaseAddress = new Uri(baseAddress ?? DashScopeDefaults.DashScopeApiBaseAddress),
                 Timeout = timeout ?? TimeSpan.FromMinutes(2)
             };
 
             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", apiKey);
+            client.DefaultRequestHeaders.Add("X-DashScope-WorkSpace", workspaceId);
             ClientPools.Add(GetCacheKey(), client);
         }
 
         return client;
 
-        string GetCacheKey() => $"{apiKey}-{timeout?.TotalMilliseconds}";
+        string GetCacheKey() => $"{apiKey}-{timeout?.TotalMilliseconds}-{baseAddress}-{workspaceId}";
     }
 }

src/Cnblogs.DashScope.Core/DashScopeClientCore.cs

@@ -297,7 +297,8 @@ private static HttpRequestMessage BuildRequest<TPayload>(
         string url,
         TPayload? payload = null,
         bool sse = false,
-        bool isTask = false)
+        bool isTask = false,
+        string? workspaceId = null)
         where TPayload : class
     {
         var message = new HttpRequestMessage(method, url)
@@ -315,6 +316,11 @@ private static HttpRequestMessage BuildRequest<TPayload>(
             message.Headers.Add("X-DashScope-Async", "enable");
         }
 
+        if (string.IsNullOrWhiteSpace(workspaceId) == false)
+        {
+            message.Headers.Add("X-DashScope-WorkspaceId", workspaceId);
+        }
+
         return message;
     }
 

src/Cnblogs.DashScope.Core/IDashScopeClient.cs

@@ -1,6 +1,4 @@
-using System.Text.Json;
-
-namespace Cnblogs.DashScope.Core;
+namespace Cnblogs.DashScope.Core;
 
 /// <summary>
 /// DashScope APIs.