feat: code clean up

Author: ikesnowy

src/Cnblogs.DashScope.AspNetCore/DashScopeClientAspNetCore.cs

@@ -1,5 +1,4 @@
 using Cnblogs.DashScope.Core;
-using Microsoft.Extensions.Options;
 
 namespace Cnblogs.DashScope.AspNetCore;
 

src/Cnblogs.DashScope.AspNetCore/ServiceCollectionInjector.cs

@@ -40,7 +40,7 @@ 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"] ?? DashScopeDefaults.DashScopeHttpApiBaseAddress;
+        var baseAddress = section["baseAddress"] ?? DashScopeDefaults.HttpApiBaseAddress;
         var workspaceId = section["workspaceId"];
         services.Configure<DashScopeOptions>(section);
         return services.AddDashScopeHttpClient(apiKey, baseAddress, workspaceId);
@@ -84,7 +84,7 @@ public static IHttpClientBuilder AddDashScopeClient(
     private static IHttpClientBuilder AddDashScopeHttpClient(
         this IServiceCollection services,
         string apiKey,
-        string baseAddress,
+        string? baseAddress,
         string? workspaceId)
     {
         services.AddSingleton<DashScopeClientWebSocketPool>(sp
@@ -100,7 +100,7 @@ private static IHttpClientBuilder AddDashScopeHttpClient(
                     h.DefaultRequestHeaders.Add("X-DashScope-WorkSpace", workspaceId);
                 }
 
-                h.BaseAddress = new Uri(baseAddress);
+                h.BaseAddress = new Uri(baseAddress ?? DashScopeDefaults.HttpApiBaseAddress);
             });
     }
 }

src/Cnblogs.DashScope.Core/DashScopeClient.cs

@@ -27,8 +27,8 @@ public class DashScopeClient : DashScopeClientCore
     public DashScopeClient(
         string apiKey,
         TimeSpan? timeout = null,
-        string baseAddress = DashScopeDefaults.DashScopeHttpApiBaseAddress,
-        string baseWebsocketAddress = DashScopeDefaults.DashScopeWebsocketApiBaseAddress,
+        string baseAddress = DashScopeDefaults.HttpApiBaseAddress,
+        string baseWebsocketAddress = DashScopeDefaults.WebsocketApiBaseAddress,
         string? workspaceId = null,
         int socketPoolSize = 5)
         : base(
@@ -75,7 +75,7 @@ private static HttpClient GetConfiguredClient(
         {
             client = new HttpClient
             {
-                BaseAddress = new Uri(baseAddress ?? DashScopeDefaults.DashScopeHttpApiBaseAddress),
+                BaseAddress = new Uri(baseAddress ?? DashScopeDefaults.HttpApiBaseAddress),
                 Timeout = timeout ?? TimeSpan.FromMinutes(2)
             };
 

src/Cnblogs.DashScope.Core/DashScopeClientWebSocketPool.cs

@@ -1,5 +1,4 @@
 using System.Collections.Concurrent;
-using System.Net.WebSockets;
 
 namespace Cnblogs.DashScope.Core;
 

src/Cnblogs.DashScope.Core/DashScopeClientWebSocketWrapper.cs

@@ -1,6 +1,4 @@
-using System.Threading.Channels;
-
-namespace Cnblogs.DashScope.Core;
+namespace Cnblogs.DashScope.Core;
 
 /// <summary>
 /// Represents a transient wrapper for rented websocket, should be transient.

src/Cnblogs.DashScope.Core/DashScopeOptions.cs

@@ -15,12 +15,12 @@ public class DashScopeOptions
     /// <summary>
     /// Base address for DashScope HTTP API.
     /// </summary>
-    public string BaseAddress { get; set; } = DashScopeDefaults.DashScopeHttpApiBaseAddress;
+    public string BaseAddress { get; set; } = DashScopeDefaults.HttpApiBaseAddress;
 
     /// <summary>
     /// Base address for DashScope websocket API.
     /// </summary>
-    public string BaseWebsocketAddress { get; set; } = DashScopeDefaults.DashScopeWebsocketApiBaseAddress;
+    public string BaseWebsocketAddress { get; set; } = DashScopeDefaults.WebsocketApiBaseAddress;
 
     /// <summary>
     /// Default workspace Id.

src/Cnblogs.DashScope.Core/DashScopeWebSocketRequestPayload.cs

@@ -3,6 +3,8 @@
 /// <summary>
 /// Payload for websocket request.
 /// </summary>
+/// <typeparam name="TInput">Type of the input.</typeparam>
+/// <typeparam name="TParameter">Type of the parameter.</typeparam>
 public class DashScopeWebSocketRequestPayload<TInput, TParameter>
     where TInput : class
     where TParameter : class

src/Cnblogs.DashScope.Core/Internals/DashScopeDefaults.cs

@@ -11,12 +11,12 @@ public static class DashScopeDefaults
     /// <summary>
     /// Base address for HTTP API.
     /// </summary>
-    public const string DashScopeHttpApiBaseAddress = "https://dashscope.aliyuncs.com/api/v1/";
+    public const string HttpApiBaseAddress = "https://dashscope.aliyuncs.com/api/v1/";
 
     /// <summary>
     /// Base address for websocket API.
     /// </summary>
-    public const string DashScopeWebsocketApiBaseAddress = "wss://dashscope.aliyuncs.com/api-ws/v1/inference/";
+    public const string WebsocketApiBaseAddress = "wss://dashscope.aliyuncs.com/api-ws/v1/inference/";
 
     /// <summary>
     /// Default json serializer options.