A programming framework for agentic AI
mermory refactor
Kosta Petan31eaa4c3ce74
diff --git a/src/apps/cli/Program.cs b/src/apps/cli/Program.csindex 4b5ab7dac..e43c6609c 100644--- a/src/apps/cli/Program.cs+++ b/src/apps/cli/Program.cs@@ -3,10 +3,12 @@ using System.Text.Json;using Microsoft.AI.DevTeam.Skills;using Microsoft.Extensions.Logging;using Microsoft.SemanticKernel;+using Microsoft.SemanticKernel.Connectors.AI.OpenAI;using Microsoft.SemanticKernel.Connectors.AI.OpenAI.TextEmbedding;using Microsoft.SemanticKernel.Connectors.Memory.Qdrant;using Microsoft.SemanticKernel.Memory;using Microsoft.SemanticKernel.Orchestration;+using Microsoft.SemanticKernel.Plugins.Memory;class Program@@ -139,20 +141,27 @@ class Programvar embedingGeneration = new AzureTextEmbeddingGeneration(kernelSettings.EmbeddingDeploymentOrModelId, kernelSettings.Endpoint, kernelSettings.ApiKey);var semanticTextMemory = new SemanticTextMemory(memoryStore, embedingGeneration);+++ var memoryBuilder = new MemoryBuilder();+ var memory = memoryBuilder.WithLoggerFactory(loggerFactory)+ .WithQdrantMemoryStore("http://qdrant:6333", 1536)+ .WithAzureTextEmbeddingGenerationService(kernelSettings.EmbeddingDeploymentOrModelId, kernelSettings.Endpoint, kernelSettings.ApiKey)+ .Build();+var kernel = new KernelBuilder().WithLoggerFactory(loggerFactory).WithAzureChatCompletionService(kernelSettings.DeploymentOrModelId, kernelSettings.Endpoint, kernelSettings.ApiKey, true, kernelSettings.ServiceId, true)- .WithMemory(semanticTextMemory).Build();//Console.WriteLine($"Calling skill '{skillName}' function '{functionName}' with input '{input}'");- var interestingMemories = kernel.Memory.SearchAsync("waf-pages", input, 2);+ var interestingMemories = memory.SearchAsync("waf-pages", input, 2);var wafContext = "Consider the following architectural guidelines:";- await foreach (var memory in interestingMemories)+ await foreach (var m in interestingMemories){- wafContext += $"\n {memory.Metadata.Text}";+ wafContext += $"\n {m.Metadata.Text}";}var promptTemplate = Skills.ForSkillAndFunction(skillName, functionName);var function = kernel.CreateSemanticFunction(promptTemplate);diff --git a/src/apps/gh-flow/Program.cs b/src/apps/gh-flow/Program.csindex 851573e8d..5118598e7 100644--- a/src/apps/gh-flow/Program.cs+++ b/src/apps/gh-flow/Program.cs@@ -1,13 +1,13 @@-using System.Net;using System.Text.Json;using Azure;using Azure.AI.OpenAI;using Microsoft.AI.DevTeam;using Microsoft.Extensions.Options;using Microsoft.SemanticKernel;-using Microsoft.SemanticKernel.Connectors.AI.OpenAI.TextEmbedding;+using Microsoft.SemanticKernel.Connectors.AI.OpenAI;using Microsoft.SemanticKernel.Connectors.Memory.Qdrant;using Microsoft.SemanticKernel.Memory;+using Microsoft.SemanticKernel.Plugins.Memory;using Microsoft.SemanticKernel.Reliability.Basic;using Octokit.Webhooks;using Octokit.Webhooks.AspNetCore;@@ -16,6 +16,7 @@ using Orleans.Configuration;var builder = WebApplication.CreateBuilder(args);builder.Services.AddSingleton<WebhookEventProcessor, GithubWebHookProcessor>();builder.Services.AddTransient(CreateKernel);+builder.Services.AddTransient(CreateMemory);builder.Services.AddHttpClient();builder.Services.AddSingleton(s =>@@ -145,7 +146,7 @@ app.UseEndpoints(endpoints =>app.Run();-static IKernel CreateKernel(IServiceProvider provider)+static ISemanticTextMemory CreateMemory(IServiceProvider provider){var openAiConfig = provider.GetService<IOptions<OpenAIOptions>>().Value;var qdrantConfig = provider.GetService<IOptions<QdrantOptions>>().Value;@@ -158,10 +159,24 @@ static IKernel CreateKernel(IServiceProvider provider).AddDebug();});- var memoryStore = new QdrantMemoryStore(new QdrantVectorDbClient(qdrantConfig.Endpoint, qdrantConfig.VectorSize));- var embedingGeneration = new AzureTextEmbeddingGeneration(openAiConfig.EmbeddingDeploymentOrModelId, openAiConfig.Endpoint, openAiConfig.ApiKey);- var semanticTextMemory = new SemanticTextMemory(memoryStore, embedingGeneration);+ var memoryBuilder = new MemoryBuilder();+ return memoryBuilder.WithLoggerFactory(loggerFactory)+ .WithQdrantMemoryStore(qdrantConfig.Endpoint, qdrantConfig.VectorSize)+ .WithAzureTextEmbeddingGenerationService(openAiConfig.EmbeddingDeploymentOrModelId, openAiConfig.Endpoint, openAiConfig.ApiKey)+ .Build();+}++static IKernel CreateKernel(IServiceProvider provider)+{+ var openAiConfig = provider.GetService<IOptions<OpenAIOptions>>().Value;+ var loggerFactory = LoggerFactory.Create(builder =>+ {+ builder+ .SetMinimumLevel(LogLevel.Debug)+ .AddConsole()+ .AddDebug();+ });var clientOptions = new OpenAIClientOptions();clientOptions.Retry.NetworkTimeout = TimeSpan.FromMinutes(5);@@ -173,6 +188,5 @@ static IKernel CreateKernel(IServiceProvider provider).WithRetryBasic(new BasicRetryConfig {MaxRetryCount = 5,UseExponentialBackoff = true- })- .WithMemory(semanticTextMemory).Build();+ }).Build();}\ No newline at end of filediff --git a/src/apps/seed-memory/Program.cs b/src/apps/seed-memory/Program.csindex 94342ef18..79e11cb59 100644--- a/src/apps/seed-memory/Program.cs+++ b/src/apps/seed-memory/Program.cs@@ -1,13 +1,12 @@using UglyToad.PdfPig;using UglyToad.PdfPig.DocumentLayoutAnalysis.TextExtractor;using Microsoft.SemanticKernel;-using Microsoft.SemanticKernel.Text;using Microsoft.Extensions.Logging;-using System.Text;using Microsoft.SemanticKernel.Connectors.Memory.Qdrant;-using Microsoft.SemanticKernel.Connectors.AI.OpenAI.TextEmbedding;using Microsoft.SemanticKernel.Memory;using System.Reflection;+using Microsoft.SemanticKernel.Plugins.Memory;+using Microsoft.SemanticKernel.Connectors.AI.OpenAI;class Program{@@ -24,19 +23,15 @@ class Program.AddDebug();});- var memoryStore = new QdrantMemoryStore(new QdrantVectorDbClient(kernelSettings.QdrantEndpoint, 1536));- var embedingGeneration = new AzureTextEmbeddingGeneration(kernelSettings.EmbeddingDeploymentOrModelId, kernelSettings.Endpoint, kernelSettings.ApiKey);- var semanticTextMemory = new SemanticTextMemory(memoryStore, embedingGeneration);-- var kernel = new KernelBuilder()- .WithLoggerFactory(loggerFactory)- .WithAzureChatCompletionService(kernelSettings.DeploymentOrModelId, kernelSettings.Endpoint, kernelSettings.ApiKey, true, kernelSettings.ServiceId, true)- .WithMemory(semanticTextMemory)- .Build();- await ImportDocumentAsync(kernel, WafFileName);+ var memoryBuilder = new MemoryBuilder();+ var memory = memoryBuilder.WithLoggerFactory(loggerFactory)+ .WithQdrantMemoryStore(kernelSettings.QdrantEndpoint, 1536)+ .WithAzureTextEmbeddingGenerationService(kernelSettings.EmbeddingDeploymentOrModelId, kernelSettings.Endpoint, kernelSettings.ApiKey)+ .Build();+ await ImportDocumentAsync(memory, WafFileName);}- public static async Task ImportDocumentAsync(IKernel kernel, string filename)+ public static async Task ImportDocumentAsync(ISemanticTextMemory memory, string filename){var currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);var filePath = Path.Combine(currentDirectory, filename);@@ -48,7 +43,7 @@ class Program{var text = ContentOrderTextExtractor.GetText(page);var descr = text.Take(100);- await kernel.Memory.SaveInformationAsync(+ await memory.SaveInformationAsync(collection: "waf-pages",text: text,id: $"{Guid.NewGuid()}",diff --git a/src/libs/Microsoft.AI.DevTeam/Actors/DevLead/DeveloperLead.cs b/src/libs/Microsoft.AI.DevTeam/Actors/DevLead/DeveloperLead.csindex 46945c8ff..bad46c0bb 100644--- a/src/libs/Microsoft.AI.DevTeam/Actors/DevLead/DeveloperLead.cs+++ b/src/libs/Microsoft.AI.DevTeam/Actors/DevLead/DeveloperLead.cs@@ -2,6 +2,7 @@ using Microsoft.AI.DevTeam.Skills;using Microsoft.Extensions.Logging;using Microsoft.SemanticKernel;using Microsoft.SemanticKernel.Connectors.AI.OpenAI;+using Microsoft.SemanticKernel.Memory;using Microsoft.SemanticKernel.Orchestration;using Orleans.Runtime;using System.Text.Json;@@ -10,13 +11,15 @@ namespace Microsoft.AI.DevTeam;public class DeveloperLead : SemanticPersona, ILeadDevelopment{private readonly IKernel _kernel;+ private readonly ISemanticTextMemory _memory;private readonly ILogger<DeveloperLead> _logger;protected override string MemorySegment => "dev-lead-memory";- public DeveloperLead(IKernel kernel, [PersistentState("state", "messages")] IPersistentState<SemanticPersonaState> state, ILogger<DeveloperLead> logger) : base(state)+ public DeveloperLead([PersistentState("state", "messages")] IPersistentState<SemanticPersonaState> state,IKernel kernel, ISemanticTextMemory memory, ILogger<DeveloperLead> logger) : base(state){_kernel = kernel;+ _memory = memory;_logger = logger;}public async Task<string> CreatePlan(string ask)@@ -33,7 +36,7 @@ public class DeveloperLead : SemanticPersona, ILeadDevelopmentOrder = _state.State.History.Count + 1,UserType = ChatUserType.User});- await AddWafContext(_kernel, ask, context);+ await AddWafContext(_memory, ask, context);context.Set("input", ask);var result = await _kernel.RunAsync(context, function);diff --git a/src/libs/Microsoft.AI.DevTeam/Actors/Developer/Developer.cs b/src/libs/Microsoft.AI.DevTeam/Actors/Developer/Developer.csindex f9826d281..4e1d5afdc 100644--- a/src/libs/Microsoft.AI.DevTeam/Actors/Developer/Developer.cs+++ b/src/libs/Microsoft.AI.DevTeam/Actors/Developer/Developer.cs@@ -2,6 +2,7 @@ using Microsoft.AI.DevTeam.Skills;using Microsoft.Extensions.Logging;using Microsoft.SemanticKernel;using Microsoft.SemanticKernel.Connectors.AI.OpenAI;+using Microsoft.SemanticKernel.Memory;using Microsoft.SemanticKernel.Orchestration;using Orleans.Runtime;@@ -10,13 +11,15 @@ namespace Microsoft.AI.DevTeam;public class Dev : SemanticPersona, IDevelopCode{private readonly IKernel _kernel;+ private readonly ISemanticTextMemory _memory;private readonly ILogger<Dev> _logger;protected override string MemorySegment => "dev-memory";- public Dev(IKernel kernel, [PersistentState("state", "messages")] IPersistentState<SemanticPersonaState> state, ILogger<Dev> logger) : base(state)+ public Dev([PersistentState("state", "messages")] IPersistentState<SemanticPersonaState> state,IKernel kernel,ISemanticTextMemory memory, ILogger<Dev> logger) : base(state){_kernel = kernel;+ _memory = memory;_logger = logger;}@@ -33,7 +36,7 @@ public class Dev : SemanticPersona, IDevelopCodeOrder = _state.State.History.Count + 1,UserType = ChatUserType.User});- await AddWafContext(_kernel, ask, context);+ await AddWafContext(_memory, ask, context);context.Set("input", ask);var result = await _kernel.RunAsync(context, function);diff --git a/src/libs/Microsoft.AI.DevTeam/Actors/Ingester/Ingester.cs b/src/libs/Microsoft.AI.DevTeam/Actors/Ingester/Ingester.csindex f724a56e8..6fd2d003a 100644--- a/src/libs/Microsoft.AI.DevTeam/Actors/Ingester/Ingester.cs+++ b/src/libs/Microsoft.AI.DevTeam/Actors/Ingester/Ingester.cs@@ -1,4 +1,5 @@using Microsoft.SemanticKernel;+using Microsoft.SemanticKernel.Memory;using Octokit;using Orleans.Runtime;@@ -9,11 +10,13 @@ public class Ingester : SemanticPersona, IIngestRepoprotected override string MemorySegment => "code-analysis";private readonly IManageGithub _ghService;private readonly IKernel _kernel;+ private readonly ISemanticTextMemory _memory;private readonly IAnalyzeCode _codeAnalyzer;- public Ingester([PersistentState("state", "messages")] IPersistentState<SemanticPersonaState> state, IManageGithub ghService, IKernel kernel, IAnalyzeCode codeAnalyzer) : base(state)+ public Ingester([PersistentState("state", "messages")] IPersistentState<SemanticPersonaState> state, IManageGithub ghService, IKernel kernel, ISemanticTextMemory memory, IAnalyzeCode codeAnalyzer) : base(state){_ghService = ghService;_kernel = kernel;+ _memory = memory;_codeAnalyzer = codeAnalyzer;}@@ -29,7 +32,7 @@ public class Ingester : SemanticPersona, IIngestRepo{var codeAnalysis = await _codeAnalyzer.Analyze(file.Content);codeAnalysis.ToList().ForEach(async c =>- await _kernel.Memory.SaveInformationAsync(MemorySegment, c.CodeBlock, Guid.NewGuid().ToString(), c.Meaning));+ await _memory.SaveInformationAsync(MemorySegment, c.CodeBlock, Guid.NewGuid().ToString(), c.Meaning));await dev.BuildUnderstanding(file.Content);}diff --git a/src/libs/Microsoft.AI.DevTeam/Actors/ProductManager/ProductManager.cs b/src/libs/Microsoft.AI.DevTeam/Actors/ProductManager/ProductManager.csindex 055b4815e..231f24351 100644--- a/src/libs/Microsoft.AI.DevTeam/Actors/ProductManager/ProductManager.cs+++ b/src/libs/Microsoft.AI.DevTeam/Actors/ProductManager/ProductManager.cs@@ -2,6 +2,7 @@ using Microsoft.AI.DevTeam.Skills;using Microsoft.Extensions.Logging;using Microsoft.SemanticKernel;using Microsoft.SemanticKernel.Connectors.AI.OpenAI;+using Microsoft.SemanticKernel.Memory;using Microsoft.SemanticKernel.Orchestration;using Orleans.Runtime;@@ -9,13 +10,15 @@ namespace Microsoft.AI.DevTeam;public class ProductManager : SemanticPersona, IManageProduct{private readonly IKernel _kernel;+ private readonly ISemanticTextMemory _memory;private readonly ILogger<ProductManager> _logger;protected override string MemorySegment => "pm-memory";- public ProductManager(IKernel kernel, [PersistentState("state", "messages")] IPersistentState<SemanticPersonaState> state, ILogger<ProductManager> logger) : base(state)+ public ProductManager([PersistentState("state", "messages")] IPersistentState<SemanticPersonaState> state, IKernel kernel, ISemanticTextMemory memory, ILogger<ProductManager> logger) : base(state){_kernel = kernel;+ _memory = memory;_logger = logger;}public async Task<string> CreateReadme(string ask)@@ -32,7 +35,7 @@ public class ProductManager : SemanticPersona, IManageProductOrder = _state.State.History.Count + 1,UserType = ChatUserType.User});- await AddWafContext(_kernel, ask, context);+ await AddWafContext(_memory, ask, context);context.Set("input", ask);var result = await _kernel.RunAsync(context, function);diff --git a/src/libs/Microsoft.AI.DevTeam/Actors/SemanticPersona.cs b/src/libs/Microsoft.AI.DevTeam/Actors/SemanticPersona.csindex 9ed3313cb..392b02e2a 100644--- a/src/libs/Microsoft.AI.DevTeam/Actors/SemanticPersona.cs+++ b/src/libs/Microsoft.AI.DevTeam/Actors/SemanticPersona.cs@@ -1,4 +1,5 @@using Microsoft.SemanticKernel;+using Microsoft.SemanticKernel.Memory;using Microsoft.SemanticKernel.Orchestration;using Orleans.Runtime;@@ -20,13 +21,13 @@ public abstract class SemanticPersona : Grain, IChatHistoryreturn _state.State.History.Last().Message;}- protected async Task AddWafContext(IKernel kernel, string ask, ContextVariables context)+ protected async Task AddWafContext(ISemanticTextMemory memory, string ask, ContextVariables context){- var interestingMemories = kernel.Memory.SearchAsync("waf-pages", ask, 2);+ var interestingMemories = memory.SearchAsync("waf-pages", ask, 2);var wafContext = "Consider the following architectural guidelines:";- await foreach (var memory in interestingMemories)+ await foreach (var m in interestingMemories){- wafContext += $"\n {memory.Metadata.Text}";+ wafContext += $"\n {m.Metadata.Text}";}context.Set("wafContext", wafContext);