Skip to content

Commit ece722c

Browse files
alkampfergitalkampfergit
committed
Updated libraries (km and others)
1 parent 04fe123 commit ece722c

File tree

7 files changed

+26
-27
lines changed

7 files changed

+26
-27
lines changed

‎Directory.Packages.props‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageVersion Include="Alkampfer.KernelMemory.ElasticSearch" Version="0.9.1" />
7-
<PackageVersion Include="Azure.AI.OpenAI" Version="2.0.0-beta.5" />
7+
<PackageVersion Include="Azure.AI.OpenAI" Version="2.1.0-beta.1" />
88
<PackageVersion Include="CommandDotNet.Spectre" Version="3.0.2" />
9-
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
9+
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
1010
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
11-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
12-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
13-
<PackageVersion Include="Microsoft.KernelMemory.Abstractions" Version="0.77.241004.1" />
14-
<PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.77.241004.1" />
11+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
12+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
13+
<PackageVersion Include="Microsoft.KernelMemory.Abstractions" Version="0.94.241201.1" />
14+
<PackageVersion Include="Microsoft.KernelMemory.AI.AzureOpenAI" Version="0.94.241201.1" />
15+
<PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.94.241201.1" />
1516
<PackageVersion Include="Microsoft.ML.Tokenizers" Version="0.22.0-preview.24378.1" />
16-
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.21.1" />
17-
<PackageVersion Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" Version="1.21.1" />
18-
<PackageVersion Include="Microsoft.SemanticKernel.Yaml" Version="1.21.1" />
19-
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.21.1" />
20-
<PackageVersion Include="Microsoft.SemanticKernel.Core" Version="1.21.1" />
17+
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.26.0" />
18+
<PackageVersion Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" Version="1.26.0" />
19+
<PackageVersion Include="Microsoft.SemanticKernel.Yaml" Version="1.26.0" />
20+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.26.0" />
21+
<PackageVersion Include="Microsoft.SemanticKernel.Core" Version="1.26.0" />
2122
<PackageVersion Include="Polly.Core" Version="8.4.2" />
2223
<PackageVersion Include="TiktokenSharp" Version="1.1.4" />
2324
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
@@ -26,12 +27,12 @@
2627
<ItemGroup>
2728
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
2829
<PackageVersion Include="fasterflect" Version="3.0.0" />
29-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
30+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
3031
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
3132
<PackageVersion Include="xunit" Version="2.9.2" />
3233
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
3334
<PackageVersion Include="Moq" Version="4.20.72" />
34-
<PackageVersion Include="Xunit.DependencyInjection" Version="9.4.0" />
35+
<PackageVersion Include="Xunit.DependencyInjection" Version="9.7.0" />
3536
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
3637
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
3738
</ItemGroup>

‎src/KernelMemory.Extensions.ConsoleTest/Helper/TextCleanerHandler.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ public TextCleanerHandler(
2323

2424
public string StepName => _name;
2525

26-
public async Task<(bool success, DataPipeline updatedPipeline)> InvokeAsync(DataPipeline pipeline, CancellationToken cancellationToken = default)
26+
public async Task<(ReturnType returnType, DataPipeline updatedPipeline)> InvokeAsync(DataPipeline pipeline, CancellationToken cancellationToken)
2727
{
2828
_log.LogDebug("Partitioning text, pipeline '{0}/{1}'", pipeline.Index, pipeline.DocumentId);
2929

3030
if (pipeline.Files.Count == 0)
3131
{
3232
_log.LogWarning("Pipeline '{0}/{1}': there are no files to process, moving to next pipeline step.", pipeline.Index, pipeline.DocumentId);
33-
return (true, pipeline);
33+
return (ReturnType.Success, pipeline);
3434
}
3535

3636
foreach (DataPipeline.FileDetails uploadedFile in pipeline.Files)
@@ -81,6 +81,6 @@ public TextCleanerHandler(
8181
uploadedFile.GeneratedFiles.Add(file.Key, file.Value);
8282
}
8383
}
84-
return (true, pipeline);
84+
return (ReturnType.Success, pipeline);
8585
}
8686
}

‎src/KernelMemory.Extensions.ConsoleTest/KernelMemory.Extensions.ConsoleTest.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="CommandDotNet.Spectre" />
15+
<PackageReference Include="CommandDotNet.Spectre" />
1616
<PackageReference Include="Alkampfer.KernelMemory.ElasticSearch" />
17+
<PackageReference Include="Microsoft.KernelMemory.AI.AzureOpenAI" />
1718
</ItemGroup>
1819

1920
</Project>

‎src/KernelMemory.Extensions.FunctionalTests/Anthropic/AnthropicTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using KernelMemory.ElasticSearch.Anthropic;
22
using Microsoft.Extensions.DependencyInjection;
3-
using Microsoft.KernelMemory.AI.Anthropic;
43

54
namespace KernelMemory.Extensions.FunctionalTests;
65

‎src/KernelMemory.Extensions/Anthropic/AnthropicTextGeneration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal class AnthropicTextGeneration : ITextGenerator
1717
/// We do not have cohere tokenizer directly in C# - in this first version we use gpt4 tokenizer
1818
/// and we know that this is a raw approximation but we only need to count.
1919
/// </summary>
20-
private static readonly Tokenizer _tokenizer = TiktokenTokenizer.CreateForModel("gpt-4");
20+
private static readonly Tokenizer _tokenizer = Microsoft.ML.Tokenizers.TiktokenTokenizer.CreateForModel("gpt-4");
2121

2222
public AnthropicTextGeneration(
2323
RawAnthropicHttpClient rawAnthropicHttpClient,

‎src/KernelMemory.Extensions/Anthropic/ClaudeContextualRetrievalHandler.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
using KernelMemory.ElasticSearch.Anthropic;
22
using Microsoft.Extensions.Logging;
3-
using Microsoft.KernelMemory.AI.Anthropic;
43
using Microsoft.KernelMemory.Diagnostics;
54
using Microsoft.KernelMemory.Pipeline;
65
using System.Collections.Generic;
76
using System.Linq;
8-
using System.Text;
97
using System.Threading;
108
using System.Threading.Tasks;
119

@@ -30,16 +28,16 @@ public ClaudeContextualRetrievalHandler(
3028
_log = log ?? DefaultLogger<ClaudeContextualRetrievalHandler>.Instance; ;
3129
}
3230

33-
public string StepName => _name;
34-
35-
public async Task<(bool success, DataPipeline updatedPipeline)> InvokeAsync(DataPipeline pipeline, CancellationToken cancellationToken = default)
31+
public string StepName => _name;
32+
33+
public async Task<(ReturnType returnType, DataPipeline updatedPipeline)> InvokeAsync(DataPipeline pipeline, CancellationToken cancellationToken)
3634
{
3735
_log.LogDebug("Partitioning text, pipeline '{0}/{1}'", pipeline.Index, pipeline.DocumentId);
3836

3937
if (pipeline.Files.Count == 0)
4038
{
4139
_log.LogWarning("Pipeline '{0}/{1}': there are no files to process, moving to next pipeline step.", pipeline.Index, pipeline.DocumentId);
42-
return (true, pipeline);
40+
return (ReturnType.Success, pipeline);
4341
}
4442

4543
foreach (DataPipeline.FileDetails uploadedFile in pipeline.Files)
@@ -86,7 +84,7 @@ public ClaudeContextualRetrievalHandler(
8684
}
8785
}
8886
}
89-
return (true, pipeline);
87+
return (ReturnType.Success, pipeline);
9088
}
9189

9290
private async Task<string> EnrichTextAsync(

‎src/KernelMemory.Extensions/Helper/MicrosoftMlTiktokenTokenizer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class MicrosoftMlTiktokenTokenizer : ITextTokenizer
1717

1818
public MicrosoftMlTiktokenTokenizer(string baseModelName)
1919
{
20-
_tikToken = TiktokenTokenizer.CreateForModel(baseModelName);
20+
_tikToken = Microsoft.ML.Tokenizers.TiktokenTokenizer.CreateForModel(baseModelName);
2121
}
2222

2323
public int CountTokens(string text)

0 commit comments

Comments
 (0)