Browse Source

Update

tags/v0.5.1
Tim Miller 2 years ago
parent
commit
98bfbe1d50
4 changed files with 63 additions and 12 deletions
  1. +1
    -0
      LLama.Examples/LLama.Examples.csproj
  2. +21
    -10
      LLama.Examples/NewVersion/SemanticKernelMemorySkill.cs
  3. +40
    -0
      LLama.Examples/RepoUtils.cs
  4. +1
    -2
      LLama.SemanticKernel/TextEmbedding/LLamaSharpEmbeddingGeneration.cs

+ 1
- 0
LLama.Examples/LLama.Examples.csproj View File

@@ -27,6 +27,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.SemanticKernel" Version="0.21.230828.2-preview" />
</ItemGroup>



+ 21
- 10
LLama.Examples/NewVersion/SemanticKernelMemorySkill.cs View File

@@ -22,6 +22,7 @@ namespace LLama.Examples.NewVersion

public static async Task Run()
{
var loggerFactory = ConsoleLogger.LoggerFactory;
Console.WriteLine("Example from: https://github.com/microsoft/semantic-kernel/blob/main/dotnet/samples/KernelSyntaxExamples/Example15_MemorySkill.cs");
Console.Write("Please input your model path: ");
var modelPath = Console.ReadLine();
@@ -30,16 +31,18 @@ namespace LLama.Examples.NewVersion
var parameters = new ModelParams(modelPath)
{
Seed = RandomNumberGenerator.GetInt32(int.MaxValue),
EmbeddingMode = true
, GpuLayerCount = 50
};
using var model = LLamaWeights.LoadFromFile(parameters);
using var context = model.CreateContext(parameters);
var ex = new InteractiveExecutor(context);
var ex2 = new StatelessExecutor(model, parameters);
//var ex = new InteractiveExecutor(context);
var ex = new InstructExecutor(context);
var builder = new KernelBuilder();
builder.WithLoggerFactory(loggerFactory);
var embedding = new LLamaEmbedder(context);

builder.WithAIService<IChatCompletion>("local-llama", new LLamaSharpChatCompletion(ex), true);
//builder.WithAIService<IChatCompletion>("local-llama", new LLamaSharpChatCompletion(ex), true);
builder.WithAIService<ITextCompletion>("local-llama-text", new LLamaSharpTextCompletion(ex), true);
builder.WithAIService<ITextEmbeddingGeneration>("local-llama-embed", new LLamaSharpEmbeddingGeneration(embedding), true);
builder.WithMemoryStorage(new VolatileMemoryStore());
@@ -71,12 +74,20 @@ namespace LLama.Examples.NewVersion
// ========= Test memory remember =========
Console.WriteLine("========= Example: Recalling a Memory =========");

var answer = await memorySkill.RetrieveAsync(MemoryCollectionName, "info1", null);
var answer = await memorySkill.RetrieveAsync(MemoryCollectionName, "info1", loggerFactory);
Console.WriteLine("Memory associated with 'info1': {0}", answer);
/*
Output:
"Memory associated with 'info1': My name is Andrea
*/

answer = await memorySkill.RetrieveAsync(MemoryCollectionName, "info2", loggerFactory);
Console.WriteLine("Memory associated with 'info2': {0}", answer);

answer = await memorySkill.RetrieveAsync(MemoryCollectionName, "info3", loggerFactory);
Console.WriteLine("Memory associated with 'info3': {0}", answer);

answer = await memorySkill.RetrieveAsync(MemoryCollectionName, "info4", loggerFactory);
Console.WriteLine("Memory associated with 'info4': {0}", answer);

answer = await memorySkill.RetrieveAsync(MemoryCollectionName, "info5", loggerFactory);
Console.WriteLine("Memory associated with 'info5': {0}", answer);

// ========= Test memory recall =========
Console.WriteLine("========= Example: Recalling an Idea =========");
@@ -155,7 +166,7 @@ Answer:
My name is Andrea and my family is from New York. I work as a tourist operator.
*/

await memorySkill.RemoveAsync(MemoryCollectionName, "info1", null);
await memorySkill.RemoveAsync(MemoryCollectionName, "info1", loggerFactory);

result = await kernel.RunAsync(aboutMeOracle, new("Tell me a bit about myself"));



+ 40
- 0
LLama.Examples/RepoUtils.cs View File

@@ -0,0 +1,40 @@
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace LLama.Examples
{
/// <summary>
/// Basic logger printing to console
/// </summary>
internal static class ConsoleLogger
{
internal static ILogger Logger => LoggerFactory.CreateLogger<object>();

internal static ILoggerFactory LoggerFactory => s_loggerFactory.Value;

private static readonly Lazy<ILoggerFactory> s_loggerFactory = new(LogBuilder);

private static ILoggerFactory LogBuilder()
{
return Microsoft.Extensions.Logging.LoggerFactory.Create(builder =>
{
builder.SetMinimumLevel(LogLevel.Warning);

builder.AddFilter("Microsoft", LogLevel.Trace);
builder.AddFilter("Microsoft", LogLevel.Debug);
builder.AddFilter("Microsoft", LogLevel.Information);
builder.AddFilter("Microsoft", LogLevel.Warning);
builder.AddFilter("Microsoft", LogLevel.Error);

builder.AddFilter("Microsoft", LogLevel.Warning);
builder.AddFilter("System", LogLevel.Warning);

builder.AddConsole();
});
}
}
}

+ 1
- 2
LLama.SemanticKernel/TextEmbedding/LLamaSharpEmbeddingGeneration.cs View File

@@ -15,7 +15,6 @@ public sealed class LLamaSharpEmbeddingGeneration : ITextEmbeddingGeneration
/// <inheritdoc/>
public async Task<IList<ReadOnlyMemory<float>>> GenerateEmbeddingsAsync(IList<string> data, CancellationToken cancellationToken = default)
{
var result = data.Select(text => new ReadOnlyMemory<float>(_embedder.GetEmbeddings(text))).ToList();
return await Task.FromResult(result).ConfigureAwait(false);
return data.Select(text => new ReadOnlyMemory<float>(_embedder.GetEmbeddings(text))).ToList();
}
}

Loading…
Cancel
Save