Merge pull request #325 from xbotter/deps/km-0.12

🔧 Update KernelMemory Package
SciSharp · Nov 24, 2023 · 14b7cce · 14b7cce
2 parents 597188c + d1e2a47
commit 14b7cce
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/LLama.Examples/Examples/KernelMemory.cs b/LLama.Examples/Examples/KernelMemory.cs
@@ -30,7 +30,7 @@ public static async Task Run()
                         MaxTokensPerLine = 100,
                         OverlappingTokens = 30
                     })
-                .BuildServerlessClient();
+                .Build();
 
             await memory.ImportDocumentAsync(@"./Assets/sample-SK-Readme.pdf", steps: Constants.PipelineWithoutSummary);
 

diff --git a/LLama.Examples/LLama.Examples.csproj b/LLama.Examples/LLama.Examples.csproj
@@ -29,6 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.12.231123.1-preview" />
     <PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-beta8" />
     <PackageReference Include="Spectre.Console" Version="0.47.0" />
   </ItemGroup>

diff --git a/LLama.KernelMemory/BuilderExtensions.cs b/LLama.KernelMemory/BuilderExtensions.cs
@@ -7,6 +7,7 @@
 using LLama;
 using LLama.Common;
 using Microsoft.KernelMemory.AI;
+using Microsoft.SemanticKernel.AI.Embeddings;
 
 namespace LLamaSharp.KernelMemory
 {
@@ -15,13 +16,27 @@ namespace LLamaSharp.KernelMemory
     /// </summary>
     public static class BuilderExtensions
     {
+
+        private static IKernelMemoryBuilder WithCustomEmbeddingGeneration(this IKernelMemoryBuilder builder, ITextEmbeddingGeneration embeddingGeneration)
+        {
+            builder.AddSingleton<ITextEmbeddingGeneration>(embeddingGeneration);
+            builder.AddIngestionEmbeddingGenerator(embeddingGeneration);
+            return builder;
+        }
+
+        private static IKernelMemoryBuilder WithCustomTextGeneration(this IKernelMemoryBuilder builder, ITextGeneration textGeneration)
+        {
+            builder.AddSingleton<ITextGeneration>(textGeneration);
+            return builder;
+        }
+
         /// <summary>
         /// Adds LLamaSharpTextEmbeddingGeneration to the KernelMemoryBuilder.
         /// </summary>
         /// <param name="builder">The KernelMemoryBuilder instance.</param>
         /// <param name="config">The LLamaSharpConfig instance.</param>
         /// <returns>The KernelMemoryBuilder instance with LLamaSharpTextEmbeddingGeneration added.</returns>
-        public static KernelMemoryBuilder WithLLamaSharpTextEmbeddingGeneration(this KernelMemoryBuilder builder, LLamaSharpConfig config)
+        public static IKernelMemoryBuilder WithLLamaSharpTextEmbeddingGeneration(this IKernelMemoryBuilder builder, LLamaSharpConfig config)
         {
             builder.WithCustomEmbeddingGeneration(new LLamaSharpTextEmbeddingGeneration(config));
             return builder;
@@ -33,7 +48,7 @@ public static KernelMemoryBuilder WithLLamaSharpTextEmbeddingGeneration(this Ker
         /// <param name="builder">The KernelMemoryBuilder instance.</param>
         /// <param name="textEmbeddingGeneration">The LLamaSharpTextEmbeddingGeneration instance.</param>
         /// <returns>The KernelMemoryBuilder instance with LLamaSharpTextEmbeddingGeneration added.</returns>
-        public static KernelMemoryBuilder WithLLamaSharpTextEmbeddingGeneration(this KernelMemoryBuilder builder, LLamaSharpTextEmbeddingGeneration textEmbeddingGeneration)
+        public static IKernelMemoryBuilder WithLLamaSharpTextEmbeddingGeneration(this IKernelMemoryBuilder builder, LLamaSharpTextEmbeddingGeneration textEmbeddingGeneration)
         {
             builder.WithCustomEmbeddingGeneration(textEmbeddingGeneration);
             return builder;
@@ -45,7 +60,7 @@ public static KernelMemoryBuilder WithLLamaSharpTextEmbeddingGeneration(this Ker
         /// <param name="builder">The KernelMemoryBuilder instance.</param>
         /// <param name="config">The LLamaSharpConfig instance.</param>
         /// <returns>The KernelMemoryBuilder instance with LLamaSharpTextGeneration added.</returns>
-        public static KernelMemoryBuilder WithLLamaSharpTextGeneration(this KernelMemoryBuilder builder, LLamaSharpConfig config)
+        public static IKernelMemoryBuilder WithLLamaSharpTextGeneration(this IKernelMemoryBuilder builder, LLamaSharpConfig config)
         {
             builder.WithCustomTextGeneration(new LlamaSharpTextGeneration(config));
             return builder;
@@ -57,7 +72,7 @@ public static KernelMemoryBuilder WithLLamaSharpTextGeneration(this KernelMemory
         /// <param name="builder">The KernelMemoryBuilder instance.</param>
         /// <param name="textGeneration">The LlamaSharpTextGeneration instance.</param>
         /// <returns>The KernelMemoryBuilder instance with LLamaSharpTextGeneration added.</returns>
-        public static KernelMemoryBuilder WithLLamaSharpTextGeneration(this KernelMemoryBuilder builder, LlamaSharpTextGeneration textGeneration)
+        public static IKernelMemoryBuilder WithLLamaSharpTextGeneration(this IKernelMemoryBuilder builder, LlamaSharpTextGeneration textGeneration)
         {
             builder.WithCustomTextGeneration(textGeneration);
             return builder;
@@ -69,7 +84,7 @@ public static KernelMemoryBuilder WithLLamaSharpTextGeneration(this KernelMemory
         /// <param name="builder">The KernelMemoryBuilder instance.</param>
         /// <param name="config">The LLamaSharpConfig instance.</param>
         /// <returns>The KernelMemoryBuilder instance with LLamaSharpTextEmbeddingGeneration and LLamaSharpTextGeneration added.</returns>
-        public static KernelMemoryBuilder WithLLamaSharpDefaults(this KernelMemoryBuilder builder, LLamaSharpConfig config)
+        public static IKernelMemoryBuilder WithLLamaSharpDefaults(this IKernelMemoryBuilder builder, LLamaSharpConfig config)
         {
             var parameters = new ModelParams(config.ModelPath)
             {

diff --git a/LLama.KernelMemory/LLamaSharp.KernelMemory.csproj b/LLama.KernelMemory/LLamaSharp.KernelMemory.csproj
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.10.231116.2-preview" />
+    <PackageReference Include="Microsoft.KernelMemory.Abstractions" Version="0.12.231123.1-preview" />
   </ItemGroup>
 
   <ItemGroup>