test: adds more tests

ikesnowy · ikesnowy · commit e3a417855abd · 2025-06-14T19:41:32.000+08:00
diff --git a/Cnblogs.DashScope.Sdk.sln.DotSettings b/Cnblogs.DashScope.Sdk.sln.DotSettings
@@ -1,6 +1,8 @@
 ﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Cnblogs_002EDashScope_002EAI_002EUnitTests_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Cnblogs_002EDashScope_002ESample_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Cnblogs_002EDashScope_002ESdk_002ESnapshotGenerator_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Cnblogs_002EDashScope_002ESdk_002EUnitTests_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Cnblogs_002EDashScope_002ETests_002EShared_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Cnblogs_002EDashScope_002EWebSample_002EClient_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Cnblogs_002EDashScope_002EWebSample_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/Cnblogs.DashScope.AI/Cnblogs.DashScope.AI.csproj b/src/Cnblogs.DashScope.AI/Cnblogs.DashScope.AI.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JsonSchema.Net.Generation" Version="5.0.2" />
+    <PackageReference Include="JsonSchema.Net.Generation" Version="5.0.3" />
     <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.5.0" />
   </ItemGroup>
 
diff --git a/src/Cnblogs.DashScope.AspNetCore/DashScopeClientAspNetCore.cs b/src/Cnblogs.DashScope.AspNetCore/DashScopeClientAspNetCore.cs
@@ -5,5 +5,16 @@ namespace Cnblogs.DashScope.AspNetCore;
 /// <summary>
 /// The <see cref="DashScopeClientCore"/> with DI and options pattern support.
 /// </summary>
-public class DashScopeClientAspNetCore(IHttpClientFactory factory, DashScopeClientWebSocketPool pool)
-    : DashScopeClientCore(factory.CreateClient(DashScopeAspNetCoreDefaults.DefaultHttpClientName), pool);
+public class DashScopeClientAspNetCore
+    : DashScopeClientCore
+{
+    /// <summary>
+    /// The <see cref="DashScopeClientCore"/> with DI and options pattern support.
+    /// </summary>
+    /// <param name="factory">The factory to create <see cref="HttpClient"/>.</param>
+    /// <param name="pool">The socket pool for WebSocket API calls.</param>
+    public DashScopeClientAspNetCore(IHttpClientFactory factory, DashScopeClientWebSocketPool pool)
+        : base(factory.CreateClient(DashScopeAspNetCoreDefaults.DefaultHttpClientName), pool)
+    {
+    }
+}
diff --git a/src/Cnblogs.DashScope.Core/DashScopeClientWebSocketPool.cs b/src/Cnblogs.DashScope.Core/DashScopeClientWebSocketPool.cs
@@ -5,11 +5,20 @@ namespace Cnblogs.DashScope.Core;
 /// <summary>
 /// Socket pool for DashScope API.
 /// </summary>
-/// <param name="options"></param>
-public sealed class DashScopeClientWebSocketPool(DashScopeOptions options) : IDisposable
+public sealed class DashScopeClientWebSocketPool : IDisposable
 {
     private readonly ConcurrentBag<DashScopeClientWebSocket> _available = new();
     private readonly ConcurrentBag<DashScopeClientWebSocket> _active = new();
+    private readonly DashScopeOptions _options;
+
+    /// <summary>
+    /// Socket pool for DashScope API.
+    /// </summary>
+    /// <param name="options">Options for DashScope sdk.</param>
+    public DashScopeClientWebSocketPool(DashScopeOptions options)
+    {
+        _options = options;
+    }
 
     internal void ReturnSocketAsync(DashScopeClientWebSocket socket)
     {
@@ -49,7 +58,7 @@ public async Task<DashScopeClientWebSocketWrapper> RentSocketAsync<TOutput>(
             }
             else
             {
-                socket = await InitializeNewSocketAsync<TOutput>(options.BaseWebsocketAddress, cancellationToken);
+                socket = await InitializeNewSocketAsync<TOutput>(_options.BaseWebsocketAddress, cancellationToken);
                 found = true;
             }
         }
@@ -68,12 +77,12 @@ private async Task<DashScopeClientWebSocket> InitializeNewSocketAsync<TOutput>(
         CancellationToken cancellationToken = default)
         where TOutput : class
     {
-        if (_available.Count + _active.Count >= options.SocketPoolSize)
+        if (_available.Count + _active.Count >= _options.SocketPoolSize)
         {
             throw new InvalidOperationException("[DashScopeSDK] Socket pool is full");
         }
 
-        var socket = new DashScopeClientWebSocket(options.ApiKey, options.WorkspaceId);
+        var socket = new DashScopeClientWebSocket(_options.ApiKey, _options.WorkspaceId);
         await socket.ConnectAsync<TOutput>(new Uri(url), cancellationToken);
         return socket;
     }
diff --git a/src/Cnblogs.DashScope.Core/DashScopeWebSocketRequest.cs b/src/Cnblogs.DashScope.Core/DashScopeWebSocketRequest.cs
@@ -12,10 +12,10 @@ public class DashScopeWebSocketRequest<TInput, TParameter>
     /// <summary>
     /// Metadata of the request.
     /// </summary>
-    public required DashScopeWebSocketRequestHeader Header { get; set; }
+    public DashScopeWebSocketRequestHeader Header { get; set; } = new();
 
     /// <summary>
     /// Payload of the request.
     /// </summary>
-    public required DashScopeWebSocketRequestPayload<TInput, TParameter> Payload { get; set; }
+    public DashScopeWebSocketRequestPayload<TInput, TParameter> Payload { get; set; } = new();
 }
diff --git a/src/Cnblogs.DashScope.Core/DashScopeWebSocketRequestHeader.cs b/src/Cnblogs.DashScope.Core/DashScopeWebSocketRequestHeader.cs
@@ -8,12 +8,12 @@ public class DashScopeWebSocketRequestHeader
     /// <summary>
     /// Action name.
     /// </summary>
-    public required string Action { get; set; }
+    public string Action { get; set; } = string.Empty;
 
     /// <summary>
     /// UUID for task.
     /// </summary>
-    public required string TaskId { get; set; }
+    public string TaskId { get; set; } = string.Empty;
 
     /// <summary>
     /// Streaming type.
diff --git a/src/Cnblogs.DashScope.Core/DashScopeWebSocketRequestPayload.cs b/src/Cnblogs.DashScope.Core/DashScopeWebSocketRequestPayload.cs
@@ -37,5 +37,5 @@ public class DashScopeWebSocketRequestPayload<TInput, TParameter>
     /// <summary>
     /// The input of the request.
     /// </summary>
-    public required TInput Input { get; set; }
+    public TInput Input { get; set; } = null!;
 }
diff --git a/src/Cnblogs.DashScope.Core/Internals/ClientWebSocketWrapper.cs b/src/Cnblogs.DashScope.Core/Internals/ClientWebSocketWrapper.cs
@@ -2,39 +2,46 @@
 
 namespace Cnblogs.DashScope.Core.Internals;
 
-internal sealed class ClientWebSocketWrapper(ClientWebSocket socket) : IClientWebSocket
+internal sealed class ClientWebSocketWrapper : IClientWebSocket
 {
+    private readonly ClientWebSocket _socket;
+
+    public ClientWebSocketWrapper(ClientWebSocket socket)
+    {
+        _socket = socket;
+    }
+
     /// <inheritdoc />
     public void Dispose()
     {
-        socket.Dispose();
+        _socket.Dispose();
     }
 
     /// <inheritdoc />
-    public ClientWebSocketOptions Options => socket.Options;
+    public ClientWebSocketOptions Options => _socket.Options;
 
     /// <inheritdoc />
-    public WebSocketCloseStatus? CloseStatus => socket.CloseStatus;
+    public WebSocketCloseStatus? CloseStatus => _socket.CloseStatus;
 
     /// <inheritdoc />
-    public Task ConnectAsync(Uri uri, CancellationToken cancellation) => socket.ConnectAsync(uri, cancellation);
+    public Task ConnectAsync(Uri uri, CancellationToken cancellation) => _socket.ConnectAsync(uri, cancellation);
 
     /// <inheritdoc />
     public Task SendAsync(
         ArraySegment<byte> buffer,
         WebSocketMessageType messageType,
         bool endOfMessage,
         CancellationToken cancellationToken)
-        => socket.SendAsync(buffer, messageType, endOfMessage, cancellationToken);
+        => _socket.SendAsync(buffer, messageType, endOfMessage, cancellationToken);
 
     /// <inheritdoc />
     public Task<WebSocketReceiveResult> ReceiveAsync(ArraySegment<byte> buffer, CancellationToken cancellationToken)
-        => socket.ReceiveAsync(buffer, cancellationToken);
+        => _socket.ReceiveAsync(buffer, cancellationToken);
 
     /// <inheritdoc />
     public Task CloseAsync(
         WebSocketCloseStatus closeStatus,
         string? statusDescription,
         CancellationToken cancellationToken)
-        => socket.CloseAsync(closeStatus, statusDescription, cancellationToken);
+        => _socket.CloseAsync(closeStatus, statusDescription, cancellationToken);
 }
diff --git a/src/Cnblogs.DashScope.Core/Internals/DashScopeDefaults.cs b/src/Cnblogs.DashScope.Core/Internals/DashScopeDefaults.cs
@@ -25,6 +25,6 @@ public static class DashScopeDefaults
         new()
         {
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-            PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
+            PropertyNamingPolicy = JsonSnakeCaseLowerNamingPolicy.SnakeCaseLower,
         };
 }
diff --git a/src/Cnblogs.DashScope.Core/SpeechSynthesizerParameters.cs b/src/Cnblogs.DashScope.Core/SpeechSynthesizerParameters.cs
@@ -13,7 +13,7 @@ public class SpeechSynthesizerParameters
     /// <summary>
     /// The voice to use.
     /// </summary>
-    public required string Voice { get; set; }
+    public string Voice { get; set; } = string.Empty;
 
     /// <summary>
     /// Output file format, can be pcm, wav or mp3.
diff --git a/src/Cnblogs.DashScope.Core/SpeechSynthesizerSocketSession.cs b/src/Cnblogs.DashScope.Core/SpeechSynthesizerSocketSession.cs
@@ -3,11 +3,23 @@
 /// <summary>
 /// Represents a socket-based TTS session.
 /// </summary>
-/// <param name="socket">Underlying websocket.</param>
-/// <param name="modelId">Model name to use.</param>
-public sealed class SpeechSynthesizerSocketSession(DashScopeClientWebSocketWrapper socket, string modelId)
+public sealed class SpeechSynthesizerSocketSession
     : IDisposable
 {
+    private readonly DashScopeClientWebSocketWrapper _socket;
+    private readonly string _modelId;
+
+    /// <summary>
+    /// Represents a socket-based TTS session.
+    /// </summary>
+    /// <param name="socket">Underlying websocket.</param>
+    /// <param name="modelId">Model name to use.</param>
+    public SpeechSynthesizerSocketSession(DashScopeClientWebSocketWrapper socket, string modelId)
+    {
+        _socket = socket;
+        _modelId = modelId;
+    }
+
     /// <summary>
     /// Send a run-task command, use random GUID as taskId.
     /// </summary>
@@ -49,13 +61,13 @@ public async Task<string> RunTaskAsync(
                 TaskGroup = "audio",
                 Task = "tts",
                 Function = "SpeechSynthesizer",
-                Model = modelId,
+                Model = _modelId,
                 Parameters = parameters
             }
         };
-        socket.ResetTask();
-        await socket.SendMessageAsync(command, cancellationToken);
-        await socket.TaskStarted;
+        _socket.ResetTask();
+        await _socket.SendMessageAsync(command, cancellationToken);
+        await _socket.TaskStarted;
         return taskId;
     }
 
@@ -78,7 +90,7 @@ public async Task ContinueTaskAsync(string taskId, string input, CancellationTok
                 Input = new SpeechSynthesizerInput() { Text = input }
             }
         };
-        await socket.SendMessageAsync(command, cancellationToken);
+        await _socket.SendMessageAsync(command, cancellationToken);
     }
 
     /// <summary>
@@ -96,7 +108,7 @@ public async Task FinishTaskAsync(string taskId, CancellationToken cancellationT
                 Input = new SpeechSynthesizerInput()
             }
         };
-        await socket.SendMessageAsync(command, cancellationToken);
+        await _socket.SendMessageAsync(command, cancellationToken);
     }
 
     /// <summary>
@@ -105,14 +117,14 @@ public async Task FinishTaskAsync(string taskId, CancellationToken cancellationT
     /// <returns></returns>
     public IAsyncEnumerable<byte> GetAudioAsync()
     {
-        return socket.BinaryOutput;
+        return _socket.BinaryOutput;
     }
 
     private void Dispose(bool disposing)
     {
         if (disposing)
         {
-            socket.Dispose();
+            _socket.Dispose();
         }
     }
 
diff --git a/test/Cnblogs.DashScope.Sdk.UnitTests/BaiChuanApiTests.cs b/test/Cnblogs.DashScope.Sdk.UnitTests/BaiChuanApiTests.cs
@@ -22,19 +22,32 @@ public async Task BaiChuanTextGeneration_UseEnum_SuccessAsync()
                 s => s.Model == "baichuan-7b-v1" && s.Input.Prompt == Cases.Prompt && s.Parameters == null));
     }
 
+    [Fact]
+    public async Task BaiChuanTextGeneration_UseInvalidEnum_SuccessAsync()
+    {
+        // Arrange
+        var client = Substitute.For<IDashScopeClient>();
+
+        // Act
+        var act = async () => await client.GetBaiChuanTextCompletionAsync((BaiChuanLlm)(-1), Cases.Prompt);
+
+        // Assert
+        await Assert.ThrowsAsync<ArgumentOutOfRangeException>(act);
+    }
+
     [Fact]
     public async Task BaiChuanTextGeneration_CustomModel_SuccessAsync()
     {
         // Arrange
         var client = Substitute.For<IDashScopeClient>();
 
         // Act
-        _ = await client.GetBaiChuanTextCompletionAsync(BaiChuanLlm.BaiChuan7B, Cases.Prompt);
+        _ = await client.GetBaiChuanTextCompletionAsync(Cases.CustomModelName, Cases.Prompt);
 
         // Assert
         _ = await client.Received().GetTextCompletionAsync(
             Arg.Is<ModelRequest<TextGenerationInput, ITextGenerationParameters>>(
-                s => s.Model == "baichuan-7b-v1" && s.Input.Prompt == Cases.Prompt && s.Parameters == null));
+                s => s.Model == Cases.CustomModelName && s.Input.Prompt == Cases.Prompt && s.Parameters == null));
     }
 
     [Fact]
@@ -43,6 +56,22 @@ public async Task BaiChuan2TextGeneration_UseEnum_SuccessAsync()
         // Arrange
         var client = Substitute.For<IDashScopeClient>();
 
+        // Act
+        var act = async () => await client.GetBaiChuanTextCompletionAsync(
+            (BaiChuan2Llm)(-1),
+            Cases.TextMessages,
+            ResultFormats.Message);
+
+        // Assert
+        await Assert.ThrowsAsync<ArgumentOutOfRangeException>(act);
+    }
+
+    [Fact]
+    public async Task BaiChuan2TextGeneration_UseInvalidEnum_SuccessAsync()
+    {
+        // Arrange
+        var client = Substitute.For<IDashScopeClient>();
+
         // Act
         _ = await client.GetBaiChuanTextCompletionAsync(
             BaiChuan2Llm.BaiChuan2_13BChatV1,
diff --git a/test/Cnblogs.DashScope.Sdk.UnitTests/Cnblogs.DashScope.Sdk.UnitTests.csproj b/test/Cnblogs.DashScope.Sdk.UnitTests/Cnblogs.DashScope.Sdk.UnitTests.csproj
@@ -11,7 +11,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="8.2.0"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
     <PackageReference Include="NSubstitute" Version="5.3.0"/>
     <PackageReference Include="xunit" Version="2.9.3"/>
diff --git a/test/Cnblogs.DashScope.Sdk.UnitTests/DashScopeClientWebSocketTests.cs b/test/Cnblogs.DashScope.Sdk.UnitTests/DashScopeClientWebSocketTests.cs
@@ -88,6 +88,7 @@ public async Task ResetOutput_WithInitialOutput_CompleteThenCreateNewOutputAsync
         // Arrange
         var socket = Substitute.For<IClientWebSocket>();
         var client = new DashScopeClientWebSocket(socket);
+        client.ResetOutput();
         var oldOutput = client.BinaryOutput;
         var oldSignal = client.TaskStarted;
 
diff --git a/test/Cnblogs.DashScope.Sdk.UnitTests/DeepSeekTextGenerationApiTests.cs b/test/Cnblogs.DashScope.Sdk.UnitTests/DeepSeekTextGenerationApiTests.cs
diff --git a/test/Cnblogs.DashScope.Sdk.UnitTests/Llama2TextGenerationApiTests.cs b/test/Cnblogs.DashScope.Sdk.UnitTests/Llama2TextGenerationApiTests.cs
diff --git a/test/Cnblogs.DashScope.Sdk.UnitTests/QWenMultimodalApiTests.cs b/test/Cnblogs.DashScope.Sdk.UnitTests/QWenMultimodalApiTests.cs
diff --git a/test/Cnblogs.DashScope.Sdk.UnitTests/QWenTextGenerationApiTests.cs b/test/Cnblogs.DashScope.Sdk.UnitTests/QWenTextGenerationApiTests.cs
diff --git a/test/Cnblogs.DashScope.Sdk.UnitTests/TextEmbeddingApiTests.cs b/test/Cnblogs.DashScope.Sdk.UnitTests/TextEmbeddingApiTests.cs
diff --git a/test/Cnblogs.DashScope.Sdk.UnitTests/WanxApiTests.cs b/test/Cnblogs.DashScope.Sdk.UnitTests/WanxApiTests.cs
diff --git a/test/Cnblogs.DashScope.Tests.Shared/Cnblogs.DashScope.Tests.Shared.csproj b/test/Cnblogs.DashScope.Tests.Shared/Cnblogs.DashScope.Tests.Shared.csproj

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,20 @@ namespace Cnblogs.DashScope.Core;`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Socket pool for DashScope API.`
`7`	`7`	`/// </summary>`
`8`		`-/// <param name="options"></param>`
`9`		`-public sealed class DashScopeClientWebSocketPool(DashScopeOptions options) : IDisposable`
	`8`	`+public sealed class DashScopeClientWebSocketPool : IDisposable`
`10`	`9`	`{`
`11`	`10`	`private readonly ConcurrentBag<DashScopeClientWebSocket> _available = new();`
`12`	`11`	`private readonly ConcurrentBag<DashScopeClientWebSocket> _active = new();`
	`12`	`+ private readonly DashScopeOptions _options;`
	`13`	`+`
	`14`	`+ /// <summary>`
	`15`	`+ /// Socket pool for DashScope API.`
	`16`	`+ /// </summary>`
	`17`	`+ /// <param name="options">Options for DashScope sdk.</param>`
	`18`	`+ public DashScopeClientWebSocketPool(DashScopeOptions options)`
	`19`	`+ {`
	`20`	`+ _options = options;`
	`21`	`+ }`
`13`	`22`
`14`	`23`	`internal void ReturnSocketAsync(DashScopeClientWebSocket socket)`
`15`	`24`	`{`
`@@ -49,7 +58,7 @@ public async Task<DashScopeClientWebSocketWrapper> RentSocketAsync<TOutput>(`
`49`	`58`	`}`
`50`	`59`	`else`
`51`	`60`	`{`
`52`		`- socket = await InitializeNewSocketAsync<TOutput>(options.BaseWebsocketAddress, cancellationToken);`
	`61`	`+ socket = await InitializeNewSocketAsync<TOutput>(_options.BaseWebsocketAddress, cancellationToken);`
`53`	`62`	`found = true;`
`54`	`63`	`}`
`55`	`64`	`}`
`@@ -68,12 +77,12 @@ private async Task<DashScopeClientWebSocket> InitializeNewSocketAsync<TOutput>(`
`68`	`77`	`CancellationToken cancellationToken = default)`
`69`	`78`	`where TOutput : class`
`70`	`79`	`{`
`71`		`- if (_available.Count + _active.Count >= options.SocketPoolSize)`
	`80`	`+ if (_available.Count + _active.Count >= _options.SocketPoolSize)`
`72`	`81`	`{`
`73`	`82`	`throw new InvalidOperationException("[DashScopeSDK] Socket pool is full");`
`74`	`83`	`}`
`75`	`84`
`76`		`- var socket = new DashScopeClientWebSocket(options.ApiKey, options.WorkspaceId);`
	`85`	`+ var socket = new DashScopeClientWebSocket(_options.ApiKey, _options.WorkspaceId);`
`77`	`86`	`await socket.ConnectAsync<TOutput>(new Uri(url), cancellationToken);`
`78`	`87`	`return socket;`
`79`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,5 @@ public class DashScopeWebSocketRequestPayload<TInput, TParameter>`
`37`	`37`	`/// <summary>`
`38`	`38`	`/// The input of the request.`
`39`	`39`	`/// </summary>`
`40`		`- public required TInput Input { get; set; }`
	`40`	`+ public TInput Input { get; set; } = null!;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ public static class DashScopeDefaults`
`25`	`25`	`new()`
`26`	`26`	`{`
`27`	`27`	`DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,`
`28`		`- PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,`
	`28`	`+ PropertyNamingPolicy = JsonSnakeCaseLowerNamingPolicy.SnakeCaseLower,`
`29`	`29`	`};`
`30`	`30`	`}`