Merge pull request #96 from cnblogs/try-make-library-compatible-with-net6

refactor: make library compatible with net6

Author: ikesnowy

.editorconfig

@@ -384,5 +384,5 @@ dotnet_naming_style.s_camelcase.capitalization = camel_case
 indent_size = 2
 tab_width = 2
 
-[*.{props,targets,config,nuspec,json}]
+[*.{props,targets,config,nuspec,json,yml}]
 indent_size = 2

.github/workflows/ci.yml

@@ -7,15 +7,25 @@ on:
     branches: [ "main" ]
 
 jobs:
-  test:
+  test-net6:
     runs-on: ubuntu-latest
-    container: mcr.microsoft.com/dotnet/sdk:8.0
+    container: mcr.microsoft.com/dotnet/sdk:6.0
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Build
-      run: dotnet build -c Release
-    - name: Test
-      run: dotnet test -c Release
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build
+        run: dotnet build src/Cnblogs.DashScope.AspNetCore -c Release
+      - name: Test
+        run: dotnet test test/Cnblogs.DashScope.Sdk.UnitTests -c Release
+  test-net8:
+    runs-on: ubuntu-latest
+    container: mcr.microsoft.com/dotnet/sdk:8.0
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build
+        run: dotnet build src/Cnblogs.DashScope.AI -c Release
+      - name: Test
+        run: dotnet test test/Cnblogs.DashScope.AI.UnitTests -c Release
 

Cnblogs.DashScope.Sdk.sln

@@ -20,6 +20,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.DashScope.Sdk.Snaps
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.DashScope.AI", "src\Cnblogs.DashScope.AI\Cnblogs.DashScope.AI.csproj", "{5D5AD75A-8084-4738-AC56-B8A23E649452}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.DashScope.AI.UnitTests", "test\Cnblogs.DashScope.AI.UnitTests\Cnblogs.DashScope.AI.UnitTests.csproj", "{25EE79E1-147B-42FD-AFEA-E1550EDD1D36}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.DashScope.Tests.Shared", "test\Cnblogs.DashScope.Tests.Shared\Cnblogs.DashScope.Tests.Shared.csproj", "{06F0AF23-445B-4C6F-9E19-570DA9B7435D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +37,8 @@ Global
 		{CC389455-A3EA-4F09-B524-4DC351A1E1AA} = {008988ED-0A3B-4272-BCC3-7B4110699345}
 		{5088DE77-1CE3-46FB-B9D0-27A6C9A5EED1} = {CFC8ECB3-5248-46CD-A56C-EC088F2A3804}
 		{5D5AD75A-8084-4738-AC56-B8A23E649452} = {008988ED-0A3B-4272-BCC3-7B4110699345}
+		{25EE79E1-147B-42FD-AFEA-E1550EDD1D36} = {CFC8ECB3-5248-46CD-A56C-EC088F2A3804}
+		{06F0AF23-445B-4C6F-9E19-570DA9B7435D} = {CFC8ECB3-5248-46CD-A56C-EC088F2A3804}
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FA6A118A-8D26-4B7A-9952-8504B8A0025B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -63,5 +69,13 @@ Global
 		{5D5AD75A-8084-4738-AC56-B8A23E649452}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D5AD75A-8084-4738-AC56-B8A23E649452}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D5AD75A-8084-4738-AC56-B8A23E649452}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25EE79E1-147B-42FD-AFEA-E1550EDD1D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25EE79E1-147B-42FD-AFEA-E1550EDD1D36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25EE79E1-147B-42FD-AFEA-E1550EDD1D36}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25EE79E1-147B-42FD-AFEA-E1550EDD1D36}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06F0AF23-445B-4C6F-9E19-570DA9B7435D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06F0AF23-445B-4C6F-9E19-570DA9B7435D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06F0AF23-445B-4C6F-9E19-570DA9B7435D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06F0AF23-445B-4C6F-9E19-570DA9B7435D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Authors>Cnblogs</Authors>

sample/Cnblogs.DashScope.Sample/Program.cs

@@ -177,7 +177,7 @@ async Task ChatWithToolsAsync()
                 "获得当前天气",
                 new JsonSchemaBuilder().FromType<WeatherReportParameters>().Build()))
     };
-    var chatParameters = new TextGenerationParameters() { ResultFormat = ResultFormats.Message, Tools = tools };
+    var chatParameters = new TextGenerationParameters { ResultFormat = ResultFormats.Message, Tools = tools };
     var question = TextChatMessage.User("请问现在杭州的天气如何？");
     history.Add(question);
     Console.WriteLine($"{question.Role} > {question.Content}");
@@ -214,18 +214,15 @@ async Task ChatWithMicrosoftExtensions()
     Console.WriteLine("Requesting model...");
     var chatClient = dashScopeClient.AsChatClient("qwen-max");
     List<ChatMessage> conversation =
-    [
-        new(ChatRole.System, "You are a helpful AI assistant"),
-        new(ChatRole.User, "What is AI?")
-    ];
+        new() { new(ChatRole.System, "You are a helpful AI assistant"), new(ChatRole.User, "What is AI?") };
     var response = await chatClient.GetResponseAsync(conversation);
     var serializerOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web) { WriteIndented = true };
     Console.WriteLine(JsonSerializer.Serialize(response, serializerOptions));
 }
 
 async Task ApplicationCallAsync(string applicationId, string prompt)
 {
-    var request = new ApplicationRequest() { Input = new ApplicationInput() { Prompt = prompt } };
+    var request = new ApplicationRequest { Input = new ApplicationInput { Prompt = prompt } };
     var response = await dashScopeClient.GetApplicationResponseAsync(applicationId, request);
     Console.WriteLine(response.Output.Text);
 }

sample/Cnblogs.DashScope.Sample/ToolCallWithExtensions.cs

@@ -12,7 +12,7 @@ public static async Task ToolCallWithExtensionAsync(this IDashScopeClient dashSc
         [Description("Gets the weather")]
         string GetWeather(string location) => Random.Shared.NextDouble() > 0.5 ? "It's sunny" : "It's raining";
 
-        var chatOptions = new ChatOptions { Tools = [AIFunctionFactory.Create(GetWeather)] };
+        var chatOptions = new ChatOptions { Tools = new List<AITool> { AIFunctionFactory.Create(GetWeather) } };
 
         var client = dashScopeClient.AsChatClient("qwen-max").AsBuilder().UseFunctionInvocation().Build();
         await foreach (var message in client.GetStreamingResponseAsync("What is weather of LA today?", chatOptions))

src/Cnblogs.DashScope.AI/Cnblogs.DashScope.AI.csproj

@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
     <Product>Cnblogs.DashScope.AI</Product>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>Cnblogs;Dashscope;Microsoft.Extensions.AI;Sdk;Embedding;</PackageTags>
@@ -10,6 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JsonSchema.Net.Generation" Version="5.0.2" />
     <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.5.0" />
   </ItemGroup>
 

src/Cnblogs.DashScope.AI/DashScopeChatClient.cs

@@ -17,7 +17,7 @@ public sealed class DashScopeChatClient : IChatClient
     private readonly string _modelId;
 
     private static readonly JsonSchema EmptyObjectSchema =
-        JsonSchema.FromText("""{"type":"object","required":[],"properties":{}}""");
+        JsonSchema.FromText("{\"type\":\"object\",\"required\":[],\"properties\":{}}");
 
     private static readonly TextGenerationParameters
         DefaultTextGenerationParameter = new() { ResultFormat = "message" };
@@ -55,15 +55,15 @@ public async Task<ChatResponse> GetResponseAsync(
         if (useVl)
         {
             var response = await _dashScopeClient.GetMultimodalGenerationAsync(
-                new ModelRequest<MultimodalInput, IMultimodalParameters>()
+                new ModelRequest<MultimodalInput, IMultimodalParameters>
                 {
                     Input = new MultimodalInput { Messages = ToMultimodalMessages(chatMessages) },
                     Parameters = ToMultimodalParameters(options),
                     Model = modelId
                 },
                 cancellationToken);
 
-            var returnMessage = new ChatMessage()
+            var returnMessage = new ChatMessage
             {
                 RawRepresentation = response, Role = ToChatRole(response.Output.Choices[0].Message.Role),
             };
@@ -80,7 +80,7 @@ public async Task<ChatResponse> GetResponseAsync(
 
             if (response.Usage != null)
             {
-                completion.Usage = new UsageDetails()
+                completion.Usage = new UsageDetails
                 {
                     InputTokenCount = response.Usage.InputTokens, OutputTokenCount = response.Usage.OutputTokens,
                 };
@@ -92,7 +92,7 @@ public async Task<ChatResponse> GetResponseAsync(
         {
             var parameters = ToTextGenerationParameters(options) ?? DefaultTextGenerationParameter;
             var response = await _dashScopeClient.GetTextCompletionAsync(
-                new ModelRequest<TextGenerationInput, ITextGenerationParameters>()
+                new ModelRequest<TextGenerationInput, ITextGenerationParameters>
                 {
                     Input = new TextGenerationInput
                     {
@@ -116,7 +116,7 @@ public async Task<ChatResponse> GetResponseAsync(
 
             if (response.Usage != null)
             {
-                completion.Usage = new UsageDetails()
+                completion.Usage = new UsageDetails
                 {
                     InputTokenCount = response.Usage.InputTokens,
                     OutputTokenCount = response.Usage.OutputTokens,
@@ -147,7 +147,7 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
             var parameter = ToMultimodalParameters(options);
             parameter.IncrementalOutput = true;
             var stream = _dashScopeClient.GetMultimodalGenerationStreamAsync(
-                new ModelRequest<MultimodalInput, IMultimodalParameters>()
+                new ModelRequest<MultimodalInput, IMultimodalParameters>
                 {
                     Input = new MultimodalInput { Messages = ToMultimodalMessages(chatMessages) },
                     Parameters = parameter,
@@ -164,7 +164,7 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
                     : ToFinishReason(response.Output.Choices[0].FinishReason);
                 completionId ??= response.RequestId;
 
-                var update = new ChatResponseUpdate()
+                var update = new ChatResponseUpdate
                 {
                     ResponseId = completionId,
                     CreatedAt = DateTimeOffset.Now,
@@ -199,7 +199,7 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
             {
                 // qwen does not support streaming with function call, fallback to non-streaming
                 var completion = await GetResponseAsync(chatMessages, options, cancellationToken);
-                yield return new ChatResponseUpdate()
+                yield return new ChatResponseUpdate
                 {
                     ResponseId = completion.ResponseId,
                     Role = completion.Messages[0].Role,
@@ -216,7 +216,7 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
                 var parameters = ToTextGenerationParameters(options) ?? DefaultTextGenerationParameter;
                 parameters.IncrementalOutput = true;
                 var stream = _dashScopeClient.GetTextCompletionStreamAsync(
-                    new ModelRequest<TextGenerationInput, ITextGenerationParameters>()
+                    new ModelRequest<TextGenerationInput, ITextGenerationParameters>
                     {
                         Input = new TextGenerationInput
                         {
@@ -238,7 +238,7 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
                         : ToFinishReason(response.Output.Choices[0].FinishReason);
                     completionId ??= response.RequestId;
 
-                    var update = new ChatResponseUpdate()
+                    var update = new ChatResponseUpdate
                     {
                         ResponseId = completionId,
                         CreatedAt = DateTimeOffset.Now,
@@ -257,7 +257,7 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
                     {
                         update.Contents.Add(
                             new UsageContent(
-                                new UsageDetails()
+                                new UsageDetails
                                 {
                                     InputTokenCount = response.Usage.InputTokens,
                                     OutputTokenCount = response.Usage.OutputTokens,
@@ -299,7 +299,7 @@ public void Dispose()
 
     private static ChatMessage ToChatMessage(TextChatMessage message)
     {
-        var returnMessage = new ChatMessage()
+        var returnMessage = new ChatMessage
         {
             RawRepresentation = message, Role = ToChatRole(message.Role),
         };
@@ -485,7 +485,7 @@ private IEnumerable<TextChatMessage> ToTextChatMessages(
             format = "json_object";
         }
 
-        return new TextGenerationParameters()
+        return new TextGenerationParameters
         {
             ResultFormat = format,
             Temperature = options.Temperature,

src/Cnblogs.DashScope.AI/DashScopeTextEmbeddingGenerator.cs

@@ -44,7 +44,7 @@ public async Task<GeneratedEmbeddings<Embedding<float>>> GenerateAsync(
             e => new Embedding<float>(e.Embedding) { ModelId = _modelId, CreatedAt = DateTimeOffset.Now });
         var rawUsage = rawResponse.Usage;
         var usage = rawUsage != null
-            ? new UsageDetails() { InputTokenCount = rawUsage.TotalTokens, TotalTokenCount = rawUsage.TotalTokens }
+            ? new UsageDetails { InputTokenCount = rawUsage.TotalTokens, TotalTokenCount = rawUsage.TotalTokens }
             : null;
         return new GeneratedEmbeddings<Embedding<float>>(embeddings)
         {

src/Cnblogs.DashScope.Core/ApplicationInput.cs

@@ -44,4 +44,6 @@ public class ApplicationInput<TBizParams>
 /// <summary>
 /// Inputs for application call.
 /// </summary>
-public class ApplicationInput : ApplicationInput<Dictionary<string, object?>>;
+public class ApplicationInput : ApplicationInput<Dictionary<string, object?>>
+{
+}