Skip to content

Commit 318b2ef

Browse files
alkampfergitalkampfergit
committed
updated everything
1 parent 83a6f19 commit 318b2ef

File tree

10 files changed

+34
-36
lines changed

10 files changed

+34
-36
lines changed

‎.github/workflows/build-and-publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
env:
4040
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
4141
ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
42+
LLAMA_API_KEY: ${{ secrets.LLAMA_API_KEY }}
4243
shell: pwsh
4344
run: |
4445
./build.ps1 -nugetPublish $true -nugetApiKey ${{ secrets.NUGET_API_KEY }}

‎Directory.Packages.props

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="Alkampfer.KernelMemory.ElasticSearch" Version="0.9.2" />
7-
<PackageVersion Include="Azure.AI.OpenAI" Version="2.1.0-beta.2" />
8-
<PackageVersion Include="CommandDotNet.Spectre" Version="3.0.2" />
9-
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
10-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.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.95.241216.2" />
14-
<PackageVersion Include="Microsoft.KernelMemory.AI.AzureOpenAI" Version="0.95.241216.2" />
15-
<PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.95.241216.2" />
16-
<PackageVersion Include="Microsoft.ML.Tokenizers" Version="1.0.0" />
17-
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.33.0" />
18-
<PackageVersion Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" Version="1.33.0" />
19-
<PackageVersion Include="Microsoft.SemanticKernel.Yaml" Version="1.33.0" />
20-
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.33.0" />
21-
<PackageVersion Include="Microsoft.SemanticKernel.Core" Version="1.33.0" />
22-
<PackageVersion Include="Polly.Core" Version="8.5.0" />
6+
<PackageVersion Include="Alkampfer.KernelMemory.ElasticSearch" Version="0.9.3" />
7+
<PackageVersion Include="Azure.AI.OpenAI" Version="2.2.0-beta.4" />
8+
<PackageVersion Include="CommandDotNet.Spectre" Version="4.1.0" />
9+
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.3" />
10+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.3.0" />
11+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
12+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
13+
<PackageVersion Include="Microsoft.KernelMemory.Abstractions" Version="0.98.250324.1" />
14+
<PackageVersion Include="Microsoft.KernelMemory.AI.AzureOpenAI" Version="0.98.250324.1" />
15+
<PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.98.250324.1" />
16+
<PackageVersion Include="Microsoft.ML.Tokenizers" Version="1.0.2" />
17+
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.45.0" />
18+
<PackageVersion Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" Version="1.45.0" />
19+
<PackageVersion Include="Microsoft.SemanticKernel.Yaml" Version="1.45.0" />
20+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.45.0" />
21+
<PackageVersion Include="Microsoft.SemanticKernel.Core" Version="1.45.0" />
22+
<PackageVersion Include="Polly.Core" Version="8.5.2" />
2323
<PackageVersion Include="TiktokenSharp" Version="1.1.4" />
2424
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2525
</ItemGroup>
2626
<!-- Test related assemblies -->
2727
<ItemGroup>
28-
<PackageVersion Include="coverlet.msbuild" Version="6.0.3" />
28+
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
2929
<PackageVersion Include="fasterflect" Version="3.0.0" />
30-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
31-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
32-
<PackageVersion Include="xunit" Version="2.9.2" />
30+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
31+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
32+
<PackageVersion Include="xunit" Version="2.9.3" />
3333
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
3434
<PackageVersion Include="Moq" Version="4.20.72" />
35-
<PackageVersion Include="Xunit.DependencyInjection" Version="9.7.1" />
36-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
37-
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
35+
<PackageVersion Include="Xunit.DependencyInjection" Version="10.3.0" />
36+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
37+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
3838
</ItemGroup>
3939
</Project>

‎src/KernelMemory.Extensions.ConsoleTest/Samples/SBertSample.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ public async Task RunSample(string bookPdf)
7676
})
7777
.WithCustomTextPartitioningOptions(new TextPartitioningOptions
7878
{
79-
// Max 150 tokens per sentence
80-
MaxTokensPerLine = 150,
8179
// When sentences are merged into paragraphs (aka partitions), stop at 384 tokens
8280
MaxTokensPerParagraph = 384,
8381
// Each paragraph contains the last 30 tokens from the previous one

‎src/KernelMemory.Extensions.FunctionalTests/KernelMemory.Extensions.FunctionalTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<PackageReference Include="xunit" />
2424
<PackageReference Include="xunit.abstractions" />
2525
<PackageReference Include="Moq" />
26-
<PackageReference Include="Xunit.DependencyInjection" />
2726
<PackageReference Include="xunit.runner.visualstudio">
2827
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2928
<PrivateAssets>all</PrivateAssets>

‎src/KernelMemory.Extensions.FunctionalTests/LLamaCloud/LLamaCloudTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ namespace KernelMemory.Extensions.FunctionalTests.LLamaCloud;
1212
public class LLamaCloudTests
1313
{
1414
private readonly ServiceProvider _serviceProvider;
15-
private readonly IHttpClientFactory _httpClientFactory;
1615

1716
public LLamaCloudTests()
1817
{
@@ -43,7 +42,6 @@ public LLamaCloudTests()
4342
services.AddSingleton(sp => sp.GetRequiredService<ILoggerFactory>().CreateLogger<LLamaCloudParserClient>());
4443

4544
_serviceProvider = services.BuildServiceProvider();
46-
_httpClientFactory = _serviceProvider.GetRequiredService<IHttpClientFactory>();
4745
}
4846

4947
[Fact]

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.KernelMemory.AI;
1+
using Microsoft.KernelMemory;
2+
using Microsoft.KernelMemory.AI;
23
using Microsoft.ML.Tokenizers;
34
using System.Collections.Generic;
45
using System.Linq;
@@ -43,7 +44,7 @@ public IReadOnlyList<string> GetTokens(string text)
4344
}
4445

4546
/// <inheritdoc />
46-
public async IAsyncEnumerable<string> GenerateTextAsync(
47+
public async IAsyncEnumerable<GeneratedTextContent> GenerateTextAsync(
4748
string prompt,
4849
TextGenerationOptions options,
4950
[EnumeratorCancellation] CancellationToken cancellationToken = default)

‎src/KernelMemory.Extensions/DocumentExtraction/StructuredUglyToadPdfDecoder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public FileContent DecodePdf(Stream stream)
5353
previous = word;
5454
}
5555

56-
result.Sections.Add(new FileSection(page.Number, sb.ToString(), false));
56+
result.Sections.Add(new Chunk(sb.ToString(), page.Number));
5757
sb.Clear();
5858
}
5959

‎src/KernelMemory.Extensions/LocalLlm/LmStudioTextGeneration.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using KernelMemory.Extensions.Helper;
22
using KernelMemory.Extensions.LocalLlm;
3+
using Microsoft.KernelMemory;
34
using Microsoft.KernelMemory.AI;
45
using System;
56
using System.Collections.Generic;
@@ -44,7 +45,7 @@ public IReadOnlyList<string> GetTokens(string text)
4445
}
4546

4647
/// <inheritdoc />
47-
public async IAsyncEnumerable<string> GenerateTextAsync(
48+
public async IAsyncEnumerable<GeneratedTextContent> GenerateTextAsync(
4849
string prompt,
4950
TextGenerationOptions options,
5051
[EnumeratorCancellation] CancellationToken cancellationToken = default)

‎src/KernelMemory.Extensions/QueryPipeline/StandardRagQueryExecutor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected override async IAsyncEnumerable<UserQuestionProgress> OnHandleStreamin
117117
await foreach (var x in this.GenerateAnswerAsync(userQuestion.Question, facts.ToString())
118118
.WithCancellation(cancellationToken).ConfigureAwait(false))
119119
{
120-
yield return new UserQuestionProgress(UserQuestionProgressType.AnswerPart, x);
120+
yield return new UserQuestionProgress(UserQuestionProgressType.AnswerPart, x.Text);
121121
text.Append(x);
122122

123123
if (this._log.IsEnabled(LogLevel.Trace) && text.Length - charsGenerated >= 30)
@@ -141,7 +141,7 @@ protected override async IAsyncEnumerable<UserQuestionProgress> OnHandleStreamin
141141
/// <param name="question"></param>
142142
/// <param name="facts"></param>
143143
/// <returns></returns>
144-
private IAsyncEnumerable<string> GenerateAnswerAsync(string question, string facts)
144+
private IAsyncEnumerable<GeneratedTextContent> GenerateAnswerAsync(string question, string facts)
145145
{
146146
var prompt = this._answerPrompt;
147147
prompt = prompt.Replace("{{$facts}}", facts.Trim(), StringComparison.OrdinalIgnoreCase);

‎src/KernelMemory.Extensions/llamaindex/LLamaCloudParserDocumentDecoder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public async Task<FileContent> DecodeAsync(Stream data, string? fileName, Cancel
116116
var markdown = await _client.GetJobRawMarkdownAsync(jobId);
117117

118118
var result = new FileContent(MimeTypes.MarkDown);
119-
result.Sections.Add(new FileSection(1, markdown, false));
119+
result.Sections.Add(new Chunk( markdown, 1));
120120

121121
return result;
122122
}

0 commit comments

Comments
 (0)