Merge pull request #28 from cnblogs/upgrade-packages

ikesnowy · web-flow · commit 7a86f4eb68a5 · 2024-12-19T15:20:59.000+08:00
feat: upgrade packages
diff --git a/src/KernelMemory.DashScope/KernelMemory.DashScope.csproj b/src/KernelMemory.DashScope/KernelMemory.DashScope.csproj
@@ -19,8 +19,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DeepDev.TokenizerLib" Version="1.3.3" />
-    <PackageReference Include="Microsoft.KernelMemory.Abstractions" Version="0.93.241118.1" />
-    <PackageReference Include="Cnblogs.DashScope.Core" Version="0.4.0" />
+    <PackageReference Include="Microsoft.KernelMemory.Abstractions" Version="0.95.241216.2" />
+    <PackageReference Include="Cnblogs.DashScope.Core" Version="0.5.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SemanticKernel.DashScope/DashScopeChatCompletionService.cs b/src/SemanticKernel.DashScope/DashScopeChatCompletionService.cs
@@ -55,6 +55,7 @@ public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync
         var autoInvoke = kernel is not null && chatParameters.ToolCallBehavior?.MaximumAutoInvokeAttempts > 0;
         for (var it = 1; ; it++)
         {
+            var chatParametersTools = chatParameters.Tools?.ToList();
             var response = await _dashScopeClient.GetTextCompletionAsync(
                 new ModelRequest<TextGenerationInput, ITextGenerationParameters>
                 {
@@ -83,14 +84,14 @@ public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync
 
             foreach (var call in message.ToolCalls)
             {
-                if (call.Type is not ToolTypes.Function || call.Function is null)
+                if (call.Type is not ToolTypes.Function)
                 {
                     AddResponseMessage(chat, null, "Error: Tool call was not a function call.", call.Id);
                     continue;
                 }
 
                 // ensure not calling function that was not included in request list.
-                if (chatParameters.Tools?.Any(
+                if (chatParametersTools?.Any(
                         x => string.Equals(x.Function?.Name, call.Function.Name, StringComparison.OrdinalIgnoreCase))
                     != true)
                 {
@@ -133,7 +134,7 @@ public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync
                 AddResponseMessage(chat, stringResult, null, call.Id);
             }
 
-            chatParameters.Tools?.Clear();
+            chatParameters.Tools = [];
             chatParameters.ToolCallBehavior?.ConfigureOptions(kernel, chatParameters);
             if (it >= chatParameters.ToolCallBehavior!.MaximumAutoInvokeAttempts)
             {
@@ -273,7 +274,7 @@ private void LogToolCalls(IReadOnlyCollection<ToolCall>? calls)
         {
             _logger.LogTrace(
                 "Function call requests: {Requests}",
-                string.Join(", ", calls.Select(ftc => $"{ftc.Function?.Name}({ftc.Function?.Arguments})")));
+                string.Join(", ", calls.Select(ftc => $"{ftc.Function.Name}({ftc.Function.Arguments})")));
         }
     }
 
diff --git a/src/SemanticKernel.DashScope/DashScopeMapper.cs b/src/SemanticKernel.DashScope/DashScopeMapper.cs
@@ -5,17 +5,17 @@ namespace Cnblogs.SemanticKernel.Connectors.DashScope;
 
 internal static class DashScopeMapper
 {
-    public static List<ChatMessage> ToChatMessages(this ChatHistory history)
+    public static List<TextChatMessage> ToChatMessages(this ChatHistory history)
     {
         return history.Select(
             x =>
             {
                 if (x is DashScopeChatMessageContent d)
                 {
-                    return new ChatMessage(x.Role.Label, x.Content ?? string.Empty, d.Name, ToolCalls: d.ToolCalls);
+                    return new TextChatMessage(x.Role.Label, x.Content ?? string.Empty, d.Name, ToolCalls: d.ToolCalls);
                 }
 
-                return new ChatMessage(x.Role.Label, x.Content ?? string.Empty);
+                return new TextChatMessage(x.Role.Label, x.Content ?? string.Empty);
             }).ToList();
     }
 
diff --git a/src/SemanticKernel.DashScope/DashScopePromptExecutionSettings.cs b/src/SemanticKernel.DashScope/DashScopePromptExecutionSettings.cs
@@ -26,12 +26,18 @@ public class DashScopePromptExecutionSettings : PromptExecutionSettings, ITextGe
     /// <inheritdoc />
     public string? ResultFormat { get; set; }
 
+    /// <inheritdoc />
+    public DashScopeResponseFormat? ResponseFormat { get; }
+
     /// <inheritdoc />
     public int? MaxTokens { get; set; }
 
     /// <inheritdoc />
     public float? RepetitionPenalty { get; set; }
 
+    /// <inheritdoc />
+    public float? PresencePenalty { get; }
+
     /// <inheritdoc />
     public float? Temperature { get; set; }
 
@@ -42,7 +48,10 @@ public class DashScopePromptExecutionSettings : PromptExecutionSettings, ITextGe
     public bool? EnableSearch { get; set; }
 
     /// <inheritdoc />
-    public List<ToolDefinition>? Tools { get; internal set; }
+    public ToolChoice? ToolChoice { get; }
+
+    /// <inheritdoc />
+    public IEnumerable<ToolDefinition>? Tools { get; set; }
 
     /// <summary>
     /// Gets or sets the behavior for how tool calls are handled.
diff --git a/src/SemanticKernel.DashScope/SemanticKernel.DashScope.csproj b/src/SemanticKernel.DashScope/SemanticKernel.DashScope.csproj
@@ -19,9 +19,9 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Cnblogs.DashScope.Core" Version="0.4.0" />
-    <PackageReference Include="JsonSchema.Net.Generation" Version="4.5.1" />
-    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.30.0" />
+    <PackageReference Include="Cnblogs.DashScope.Core" Version="0.5.1" />
+    <PackageReference Include="JsonSchema.Net.Generation" Version="4.6.0" />
+    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.32.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/KernelMemory.DashScope.UnitTests/KernelMemory.DashScope.UnitTests.csproj b/test/KernelMemory.DashScope.UnitTests/KernelMemory.DashScope.UnitTests.csproj
@@ -14,14 +14,14 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.93.241118.1" />
+        <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.95.241216.2" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Update="FluentAssertions" Version="6.12.2" />
+        <PackageReference Update="FluentAssertions" Version="7.0.0" />
         <PackageReference Update="NSubstitute" Version="5.3.0" />
     </ItemGroup>
 
diff --git a/test/SemanticKernel.DashScope.UnitTest/Cases.cs b/test/SemanticKernel.DashScope.UnitTest/Cases.cs
@@ -95,6 +95,7 @@ public static ModelResponse<TextGenerationOutput, TextGenerationTokenUsage> ErrT
                                 (f, i) => new ToolCall(
                                     $"{i}",
                                     toolType,
+                                    i,
                                     new($"{pluginName}-{f.Name}", paramBody))).ToList())
                     }
                 ]
@@ -125,6 +126,7 @@ public static ModelResponse<TextGenerationOutput, TextGenerationTokenUsage>
                                 f => new ToolCall(
                                     "0",
                                     "function",
+                                    0,
                                     new($"MyPlugin-{f.Name}", "{\"location\": \"LA\"}"))).ToList())
                     }
                 ]
diff --git a/test/SemanticKernel.DashScope.UnitTest/SemanticKernel.DashScope.UnitTest.csproj b/test/SemanticKernel.DashScope.UnitTest/SemanticKernel.DashScope.UnitTest.csproj
@@ -6,11 +6,11 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Update="FluentAssertions" Version="6.12.2" />
+    <PackageReference Update="FluentAssertions" Version="7.0.0" />
     <PackageReference Update="NSubstitute" Version="5.3.0" />
   </ItemGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync`
`55`	`55`	`var autoInvoke = kernel is not null && chatParameters.ToolCallBehavior?.MaximumAutoInvokeAttempts > 0;`
`56`	`56`	`for (var it = 1; ; it++)`
`57`	`57`	`{`
	`58`	`+ var chatParametersTools = chatParameters.Tools?.ToList();`
`58`	`59`	`var response = await _dashScopeClient.GetTextCompletionAsync(`
`59`	`60`	`new ModelRequest<TextGenerationInput, ITextGenerationParameters>`
`60`	`61`	`{`
`@@ -83,14 +84,14 @@ public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync`
`83`	`84`
`84`	`85`	`foreach (var call in message.ToolCalls)`
`85`	`86`	`{`
`86`		`- if (call.Type is not ToolTypes.Function \|\| call.Function is null)`
	`87`	`+ if (call.Type is not ToolTypes.Function)`
`87`	`88`	`{`
`88`	`89`	`AddResponseMessage(chat, null, "Error: Tool call was not a function call.", call.Id);`
`89`	`90`	`continue;`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`// ensure not calling function that was not included in request list.`
`93`		`- if (chatParameters.Tools?.Any(`
	`94`	`+ if (chatParametersTools?.Any(`
`94`	`95`	`x => string.Equals(x.Function?.Name, call.Function.Name, StringComparison.OrdinalIgnoreCase))`
`95`	`96`	`!= true)`
`96`	`97`	`{`
`@@ -133,7 +134,7 @@ public async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsync`
`133`	`134`	`AddResponseMessage(chat, stringResult, null, call.Id);`
`134`	`135`	`}`
`135`	`136`
`136`		`- chatParameters.Tools?.Clear();`
	`137`	`+ chatParameters.Tools = [];`
`137`	`138`	`chatParameters.ToolCallBehavior?.ConfigureOptions(kernel, chatParameters);`
`138`	`139`	`if (it >= chatParameters.ToolCallBehavior!.MaximumAutoInvokeAttempts)`
`139`	`140`	`{`
`@@ -273,7 +274,7 @@ private void LogToolCalls(IReadOnlyCollection<ToolCall>? calls)`
`273`	`274`	`{`
`274`	`275`	`_logger.LogTrace(`
`275`	`276`	`"Function call requests: {Requests}",`
`276`		`- string.Join(", ", calls.Select(ftc => $"{ftc.Function?.Name}({ftc.Function?.Arguments})")));`
	`277`	`+ string.Join(", ", calls.Select(ftc => $"{ftc.Function.Name}({ftc.Function.Arguments})")));`
`277`	`278`	`}`
`278`	`279`	`}`
`279`	`280`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,17 @@ namespace Cnblogs.SemanticKernel.Connectors.DashScope;`
`5`	`5`
`6`	`6`	`internal static class DashScopeMapper`
`7`	`7`	`{`
`8`		`- public static List<ChatMessage> ToChatMessages(this ChatHistory history)`
	`8`	`+ public static List<TextChatMessage> ToChatMessages(this ChatHistory history)`
`9`	`9`	`{`
`10`	`10`	`return history.Select(`
`11`	`11`	`x =>`
`12`	`12`	`{`
`13`	`13`	`if (x is DashScopeChatMessageContent d)`
`14`	`14`	`{`
`15`		`- return new ChatMessage(x.Role.Label, x.Content ?? string.Empty, d.Name, ToolCalls: d.ToolCalls);`
	`15`	`+ return new TextChatMessage(x.Role.Label, x.Content ?? string.Empty, d.Name, ToolCalls: d.ToolCalls);`
`16`	`16`	`}`
`17`	`17`
`18`		`- return new ChatMessage(x.Role.Label, x.Content ?? string.Empty);`
	`18`	`+ return new TextChatMessage(x.Role.Label, x.Content ?? string.Empty);`
`19`	`19`	`}).ToList();`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ public static ModelResponse<TextGenerationOutput, TextGenerationTokenUsage> ErrT`
`95`	`95`	`(f, i) => new ToolCall(`
`96`	`96`	`$"{i}",`
`97`	`97`	`toolType,`
	`98`	`+ i,`
`98`	`99`	`new($"{pluginName}-{f.Name}", paramBody))).ToList())`
`99`	`100`	`}`
`100`	`101`	`]`
`@@ -125,6 +126,7 @@ public static ModelResponse<TextGenerationOutput, TextGenerationTokenUsage>`
`125`	`126`	`f => new ToolCall(`
`126`	`127`	`"0",`
`127`	`128`	`"function",`
	`129`	`+ 0,`
`128`	`130`	`new($"MyPlugin-{f.Name}", "{\"location\": \"LA\"}"))).ToList())`
`129`	`131`	`}`
`130`	`132`	`]`