Merge pull request #31 from cnblogs/update-sk-version

ikesnowy · web-flow · commit 60c7b4390ff7 · 2025-05-25T00:13:17.000+08:00
feat: update sk version
diff --git a/src/KernelMemory.DashScope/DashScopeTextGenerator.cs b/src/KernelMemory.DashScope/DashScopeTextGenerator.cs
@@ -1,6 +1,7 @@
 ﻿using System.Runtime.CompilerServices;
 using Cnblogs.DashScope.Core;
 using Microsoft.Extensions.Logging;
+using Microsoft.KernelMemory;
 using Microsoft.KernelMemory.AI;
 using Microsoft.KernelMemory.Diagnostics;
 
@@ -38,7 +39,7 @@ public IReadOnlyList<string> GetTokens(string text)
     }
 
     /// <inheritdoc />
-    public async IAsyncEnumerable<string> GenerateTextAsync(
+    public async IAsyncEnumerable<GeneratedTextContent> GenerateTextAsync(
         string prompt,
         TextGenerationOptions options,
         [EnumeratorCancellation] CancellationToken cancellationToken = new())
@@ -71,7 +72,9 @@ public async IAsyncEnumerable<string> GenerateTextAsync(
         var tokens = dashScopeClient.GetTextCompletionStreamAsync(request, cancellationToken);
         await foreach (var token in tokens)
         {
-            yield return token.Output.Text!;
+            yield return new GeneratedTextContent(
+                token.Output.Text ?? string.Empty,
+                token.Usage.ToKernelMemoryTokenUsage(modelId));
         }
     }
 
diff --git a/src/KernelMemory.DashScope/KernelMemory.DashScope.csproj b/src/KernelMemory.DashScope/KernelMemory.DashScope.csproj
@@ -18,8 +18,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.KernelMemory.Abstractions" Version="0.95.241216.2" />
-    <PackageReference Include="Cnblogs.DashScope.Core" Version="0.5.2" />
+    <PackageReference Include="Microsoft.KernelMemory.Abstractions" Version="0.98.250508.3" />
+    <PackageReference Include="Cnblogs.DashScope.Core" Version="0.7.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/KernelMemory.DashScope/TokenUsageMapper.cs b/src/KernelMemory.DashScope/TokenUsageMapper.cs
@@ -0,0 +1,22 @@
+﻿using Cnblogs.DashScope.Core;
+using Microsoft.KernelMemory;
+
+namespace Cnblogs.KernelMemory.AI.DashScope;
+
+internal static class TokenUsageMapper
+{
+    public static TokenUsage? ToKernelMemoryTokenUsage(this TextGenerationTokenUsage? usage, string? modelId)
+    {
+        if (usage == null)
+        {
+            return null;
+        }
+
+        return new TokenUsage()
+        {
+            ServiceTokensIn = usage.InputTokens,
+            ServiceTokensOut = usage.OutputTokens,
+            ModelName = modelId
+        };
+    }
+}
diff --git a/src/SemanticKernel.DashScope/DashScopePromptExecutionSettings.cs b/src/SemanticKernel.DashScope/DashScopePromptExecutionSettings.cs
@@ -50,6 +50,9 @@ public class DashScopePromptExecutionSettings : PromptExecutionSettings, ITextGe
     /// <inheritdoc />
     public ToolChoice? ToolChoice { get; }
 
+    /// <inheritdoc />
+    public bool? ParallelToolCalls { get; set; }
+
     /// <inheritdoc />
     public IEnumerable<ToolDefinition>? Tools { get; set; }
 
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.5.2" />
-    <PackageReference Include="JsonSchema.Net.Generation" Version="4.6.0" />
-    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.32.0" />
+    <PackageReference Include="Cnblogs.DashScope.Core" Version="0.7.3" />
+    <PackageReference Include="JsonSchema.Net.Generation" Version="5.0.2" />
+    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.54.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/KernelMemory.DashScope.UnitTests/DashScopeTextGeneratorTests.cs b/test/KernelMemory.DashScope.UnitTests/DashScopeTextGeneratorTests.cs
@@ -26,7 +26,7 @@ public async Task TextGenerator_GenerateText_IncrementalGenerateAsync()
         var response = await generator.GenerateTextAsync(Cases.Text, Cases.TextGenerationOptions).ToListAsync();
 
         // Assert
-        response[0].Should().BeSameAs(
+        response[0].Text.Should().BeSameAs(
             Cases.TextGenerationResponse.Output.Text,
             "generated text should mapped from output.text");
         captured.Should().BeEquivalentTo(
@@ -51,7 +51,7 @@ public async Task TextGenerator_DefaultsToZero_MapZeroToNullAsync()
         var response = await generator.GenerateTextAsync(Cases.Text, Cases.TextGenerationOptions).ToListAsync();
 
         // Assert
-        response[0].Should().BeSameAs(
+        response[0].Text.Should().BeSameAs(
             Cases.TextGenerationResponse.Output.Text,
             "generated text should mapped from output.text");
         captured.Should().BeEquivalentTo(
diff --git a/test/KernelMemory.DashScope.UnitTests/KernelMemory.DashScope.UnitTests.csproj b/test/KernelMemory.DashScope.UnitTests/KernelMemory.DashScope.UnitTests.csproj
@@ -10,18 +10,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <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="3.0.0">
+        <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.98.250508.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Update="FluentAssertions" Version="7.0.0" />
+        <PackageReference Update="FluentAssertions" Version="8.2.0" />
         <PackageReference Update="NSubstitute" Version="5.3.0" />
     </ItemGroup>
 
diff --git a/test/SemanticKernel.DashScope.UnitTest/SemanticKernel.DashScope.UnitTest.csproj b/test/SemanticKernel.DashScope.UnitTest/SemanticKernel.DashScope.UnitTest.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Update="FluentAssertions" Version="7.0.0" />
+    <PackageReference Update="FluentAssertions" Version="8.2.0" />
     <PackageReference Update="NSubstitute" Version="5.3.0" />
   </ItemGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Runtime.CompilerServices;`
`2`	`2`	`using Cnblogs.DashScope.Core;`
`3`	`3`	`using Microsoft.Extensions.Logging;`
	`4`	`+using Microsoft.KernelMemory;`
`4`	`5`	`using Microsoft.KernelMemory.AI;`
`5`	`6`	`using Microsoft.KernelMemory.Diagnostics;`
`6`	`7`
`@@ -38,7 +39,7 @@ public IReadOnlyList<string> GetTokens(string text)`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`/// <inheritdoc />`
`41`		`- public async IAsyncEnumerable<string> GenerateTextAsync(`
	`42`	`+ public async IAsyncEnumerable<GeneratedTextContent> GenerateTextAsync(`
`42`	`43`	`string prompt,`
`43`	`44`	`TextGenerationOptions options,`
`44`	`45`	`[EnumeratorCancellation] CancellationToken cancellationToken = new())`
`@@ -71,7 +72,9 @@ public async IAsyncEnumerable<string> GenerateTextAsync(`
`71`	`72`	`var tokens = dashScopeClient.GetTextCompletionStreamAsync(request, cancellationToken);`
`72`	`73`	`await foreach (var token in tokens)`
`73`	`74`	`{`
`74`		`- yield return token.Output.Text!;`
	`75`	`+ yield return new GeneratedTextContent(`
	`76`	`+ token.Output.Text ?? string.Empty,`
	`77`	`+ token.Usage.ToKernelMemoryTokenUsage(modelId));`
`75`	`78`	`}`
`76`	`79`	`}`
`77`	`80`