Merge pull request #86 from hchen2020/master

Oceania2018 · web-flow · commit 0989696d246c · 2023-07-21T17:50:21.000-05:00
Some fixes.
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Settings/AgentSettings.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Settings/AgentSettings.cs
@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Agents.Settings;
+
+public class AgentSettings
+{
+    public string DataDir { get; set; }
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs
@@ -6,16 +6,16 @@ public class RoleDialogModel
     /// user, system, assistant
     /// </summary>
     public string Role { get; set; }
-    public string Text { get; set; }
+    public string Content { get; set; }
 
     public RoleDialogModel(string role, string text)
     {
         Role = role;
-        Text = text;
+        Content = text;
     }
 
     public override string ToString()
     {
-        return $"{Role}: {Text}";
+        return $"{Role}: {Content}";
     }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/MLTasks/IChatCompletion.cs b/src/Infrastructure/BotSharp.Abstraction/MLTasks/IChatCompletion.cs
@@ -4,5 +4,6 @@ namespace BotSharp.Abstraction.MLTasks;
 
 public interface IChatCompletion
 {
-    Task<string> GetChatCompletionsAsync(Agent agent, List<RoleDialogModel> conversations);
+    string GetChatCompletions(Agent agent, List<RoleDialogModel> conversations);
+    Task<string> GetChatCompletionsStreamingAsync(Agent agent, List<RoleDialogModel> conversations);
 }
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs
@@ -6,7 +6,7 @@ public partial class AgentService
 {
     public async Task<Agent> CreateAgent(Agent agent)
     {
-        var db = _services.GetRequiredService<AgentDbContext>();
+        var db = _services.GetRequiredService<BotSharpDbContext>();
         var record = db.Agent.FirstOrDefault(x => x.OwnerId == _user.Id && x.Name == agent.Name);
         if (record != null)
         {
@@ -19,9 +19,9 @@ record = AgentRecord.FromAgent(agent);
         record.CreatedDateTime = DateTime.UtcNow;
         record.UpdatedDateTime = DateTime.UtcNow;
 
-        db.Transaction<IAgentTable>(delegate
+        db.Transaction<IBotSharpTable>(delegate
         {
-            db.Add<IAgentTable>(record);
+            db.Add<IBotSharpTable>(record);
         });
 
         return record.ToAgent();
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
@@ -7,7 +7,7 @@ public partial class AgentService
 {
     public async Task<List<Agent>> GetAgents()
     {
-        var db = _services.GetRequiredService<AgentDbContext>();
+        var db = _services.GetRequiredService<BotSharpDbContext>();
         var query = from agent in db.Agent
                     where agent.OwnerId == _user.Id
                     select agent.ToAgent();
@@ -16,7 +16,7 @@ public async Task<List<Agent>> GetAgents()
 
     public async Task<Agent> GetAgent(string id)
     {
-        var db = _services.GetRequiredService<AgentDbContext>();
+        var db = _services.GetRequiredService<BotSharpDbContext>();
         var query = from agent in db.Agent
                     where agent.Id == id
                     select agent.ToAgent();
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs
@@ -7,9 +7,9 @@ public partial class AgentService
 {
     public async Task UpdateAgent(Agent agent)
     {
-        var db = _services.GetRequiredService<AgentDbContext>();
+        var db = _services.GetRequiredService<BotSharpDbContext>();
 
-        db.Transaction<IAgentTable>(delegate
+        db.Transaction<IBotSharpTable>(delegate
         {
             var record = db.Agent.FirstOrDefault(x => x.OwnerId == agent.OwerId && x.Id == agent.Id);
 
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs
@@ -6,16 +6,18 @@ public partial class AgentService : IAgentService
 {
     private readonly IServiceProvider _services;
     private readonly IUserIdentity _user;
+    private readonly AgentSettings _settings;
 
-    public AgentService(IServiceProvider services, IUserIdentity user)
+    public AgentService(IServiceProvider services, IUserIdentity user, AgentSettings settings)
     {
         _services = services;
         _user = user;
+        _settings = settings;
     }
 
     public string GetAgentDataDir(string agentId)
     {
-        var dir = Path.Combine("data", agentId);
+        var dir = Path.Combine(_settings.DataDir, agentId);
         if (!Directory.Exists(dir))
         {
             Directory.CreateDirectory(dir);
diff --git a/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs b/src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs
@@ -1,4 +1,3 @@
-using BotSharp.Abstraction.Conversations.Settings;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 
@@ -13,22 +12,40 @@ public static IServiceCollection AddBotSharp(this IServiceCollection services, I
 
         services.AddScoped<IAgentService, AgentService>();
 
+        var agentSettings = new AgentSettings();
+        config.Bind("Agent", agentSettings);
+        services.AddSingleton((IServiceProvider x) => agentSettings);
+
         var convsationSettings = new ConversationSetting();
         config.Bind("Conversation", convsationSettings);
         services.AddSingleton((IServiceProvider x) => convsationSettings);
 
         services.AddScoped<IConversationStorage, ConversationStorage>();
         services.AddScoped<IConversationService, ConversationService>();
 
-        RegisterRepository(services, config);
-
         RegisterPlugins(services, config);
 
         return services;
     }
 
-    public static void ConfigureBotSharp(this IServiceCollection services)
+    public static IServiceCollection ConfigureBotSharpRepository<Tdb>(this IServiceCollection services, IConfiguration config)
+        where Tdb : DataContext
     {
+        var databaseSettings = new DatabaseSettings();
+        config.Bind("Database", databaseSettings);
+        services.AddSingleton((IServiceProvider x) => databaseSettings);
+
+        var myDatabaseSettings = new MyDatabaseSettings();
+        config.Bind("Database", myDatabaseSettings);
+        services.AddSingleton((IServiceProvider x) => databaseSettings);
+
+        services.AddScoped((IServiceProvider x) 
+            => DataContextHelper.GetDbContext<MongoDbContext, Tdb>(myDatabaseSettings, x));
+
+        services.AddScoped((IServiceProvider x) 
+            => DataContextHelper.GetDbContext<BotSharpDbContext, Tdb>(myDatabaseSettings, x));
+
+        return services;
     }
 
     public static IApplicationBuilder UseBotSharp(this IApplicationBuilder app)
@@ -43,27 +60,6 @@ public static IApplicationBuilder UseBotSharp(this IApplicationBuilder app)
         return app;
     }
 
-    public static void RegisterRepository(IServiceCollection services, IConfiguration config)
-    {
-        var databaseSettings = new DatabaseSettings();
-        config.Bind("Database", databaseSettings);
-        services.AddSingleton((IServiceProvider x) => databaseSettings);
-
-        var myDatabaseSettings = new MyDatabaseSettings();
-        config.Bind("Database", myDatabaseSettings);
-        services.AddSingleton((IServiceProvider x) => databaseSettings);
-
-        services.AddScoped((IServiceProvider x) =>
-        {
-            return DataContextHelper.GetDbContext<MongoDbContext>(myDatabaseSettings, x);
-        });
-
-        services.AddScoped((IServiceProvider x) =>
-        {
-            return DataContextHelper.GetDbContext<AgentDbContext>(myDatabaseSettings, x);
-        });
-    }
-
     public static void RegisterPlugins(IServiceCollection services, IConfiguration config)
     {
         var pluginSettings = new PluginLoaderSettings();
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
@@ -30,7 +30,7 @@ public Task DeleteConversation(string id)
 
     public async Task<Conversation> GetConversation(string id)
     {
-        var db = _services.GetRequiredService<AgentDbContext>();
+        var db = _services.GetRequiredService<BotSharpDbContext>();
         var query = from sess in db.Conversation
                     where sess.Id == id
                     orderby sess.CreatedTime descending
@@ -40,7 +40,7 @@ orderby sess.CreatedTime descending
 
     public async Task<List<Conversation>> GetConversations()
     {
-        var db = _services.GetRequiredService<AgentDbContext>();
+        var db = _services.GetRequiredService<BotSharpDbContext>();
         var query = from sess in db.Conversation
                     where sess.UserId == _user.Id
                     orderby sess.CreatedTime descending
@@ -50,16 +50,16 @@ orderby sess.CreatedTime descending
 
     public async Task<Conversation> NewConversation(Conversation sess)
     {
-        var db = _services.GetRequiredService<AgentDbContext>();
+        var db = _services.GetRequiredService<BotSharpDbContext>();
 
         var record = ConversationRecord.FromConversation(sess);
         record.Id = sess.Id.IfNullOrEmptyAs(Guid.NewGuid().ToString());
         record.UserId = sess.UserId.IfNullOrEmptyAs(_user.Id);
         record.Title = "New Conversation";
 
-        db.Transaction<IAgentTable>(delegate
+        db.Transaction<IBotSharpTable>(delegate
         {
-            db.Add<IAgentTable>(record);
+            db.Add<IBotSharpTable>(record);
         });
 
         _storage.InitStorage(sess.AgentId, record.Id);
@@ -92,7 +92,7 @@ public async Task<string> SendMessage(string agentId, string conversationId, Lis
             agent.Knowledges = await knowledge.GetKnowledges(new KnowledgeRetrievalModel
             {
                 AgentId = agentId,
-                Question = string.Join("\n", wholeDialogs.Select(x => x.Text))
+                Question = string.Join("\n", wholeDialogs.Select(x => x.Content))
             });
         }
 
@@ -110,7 +110,7 @@ public async Task<string> SendMessage(string agentId, string conversationId, Lis
                 .BeforeCompletion();
         });
         
-        var response = await chatCompletion.GetChatCompletionsAsync(agent, wholeDialogs);
+        var response = await chatCompletion.GetChatCompletionsStreamingAsync(agent, wholeDialogs);
 
         // After chat completion hook
         hooks.ForEach(async hook =>
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
@@ -14,7 +14,7 @@ public ConversationStorage(IAgentService agent)
     public void Append(string agentId, string conversationId, RoleDialogModel dialog)
     {
         var conversationFile = GetStorageFile(agentId, conversationId);
-        File.AppendAllText(conversationFile, $"{dialog.Role}: {dialog.Text}\n");
+        File.AppendAllText(conversationFile, $"{dialog.Role}: {dialog.Content}\n");
     }
 
     public List<RoleDialogModel> GetDialogs(string agentId, string conversationId)
diff --git a/src/Infrastructure/BotSharp.Core/Plugins/LLamaSharp/ChatCompletionProvider.cs b/src/Infrastructure/BotSharp.Core/Plugins/LLamaSharp/ChatCompletionProvider.cs
@@ -14,10 +14,15 @@ public ChatCompletionProvider(IServiceProvider services)
         _services = services;
     }
 
-    public Task<string> GetChatCompletionsAsync(Agent agent, List<RoleDialogModel> conversations)
+    public string GetChatCompletions(Agent agent, List<RoleDialogModel> conversations)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<string> GetChatCompletionsStreamingAsync(Agent agent, List<RoleDialogModel> conversations)
     {
         string totalResponse = "";
-        var content = string.Join("\n", conversations.Select(x => $"{x.Role}: {x.Text.Replace("user:", "")}")).Trim();
+        var content = string.Join("\n", conversations.Select(x => $"{x.Role}: {x.Content.Replace("user:", "")}")).Trim();
         content += "\nassistant: ";
 
         var llama = _services.GetRequiredService<LlamaAiModel>();
diff --git a/src/Infrastructure/BotSharp.Core/Repository/Abstraction/IBotSharpTable.cs b/src/Infrastructure/BotSharp.Core/Repository/Abstraction/IBotSharpTable.cs
@@ -1,5 +1,5 @@
 namespace BotSharp.Core.Repository.Abstraction;
 
-public interface IAgentTable
+public interface IBotSharpTable
 {
 }
diff --git a/src/Infrastructure/BotSharp.Core/Repository/BotSharpDbContext.cs b/src/Infrastructure/BotSharp.Core/Repository/BotSharpDbContext.cs
@@ -1,6 +1,6 @@
 namespace BotSharp.Core.Repository;
 
-public class AgentDbContext : Database
+public class BotSharpDbContext : Database
 {
     public IQueryable<UserRecord> User => Table<UserRecord>();
     public IQueryable<AgentRecord> Agent => Table<AgentRecord>();
diff --git a/src/Infrastructure/BotSharp.Core/Repository/DataContextHelper.cs b/src/Infrastructure/BotSharp.Core/Repository/DataContextHelper.cs
@@ -1,14 +1,14 @@
-using BotSharp.Core.Repository.Abstraction;
-using EntityFrameworkCore.BootKit;
 using Microsoft.Data.SqlClient;
+using MySqlConnector;
 using System.Data.Common;
 
 namespace BotSharp.Core.Repository;
 
 public static class DataContextHelper
 {
-    public static T GetDbContext<T>(MyDatabaseSettings settings, IServiceProvider serviceProvider)
+    public static T GetDbContext<T, Tdb>(MyDatabaseSettings settings, IServiceProvider serviceProvider)
         where T : Database, new()
+        where Tdb : DataContext
     {
         if (settings.Assemblies == null)
             throw new Exception("Please set assemblies.");
@@ -25,17 +25,33 @@ public static T GetDbContext<T>(MyDatabaseSettings settings, IServiceProvider se
                 IsRelational = false
             });
         }
-        else if (typeof(T) == typeof(AgentDbContext))
+        else if (typeof(T) == typeof(BotSharpDbContext))
         {
-            dc.BindDbContext<IAgentTable, DbContext4SqlServer2>(new DatabaseBind
+            if (typeof(Tdb).Name.StartsWith("DbContext4SqlServer"))
             {
-                ServiceProvider = serviceProvider,
-                MasterConnection = new SqlConnection(settings.BotSharp.Master),
-                SlaveConnections = settings.BotSharp.Slavers.Length == 0 ?
-                    new List<DbConnection> { new SqlConnection(settings.BotSharp.Master) } :
-                    settings.BotSharp.Slavers.Select(x => new SqlConnection(x) as DbConnection).ToList(),
-                CreateDbIfNotExist = true
-            });
+                dc.BindDbContext<IBotSharpTable, Tdb>(new DatabaseBind
+                {
+                    ServiceProvider = serviceProvider,
+                    MasterConnection = new SqlConnection(settings.BotSharp.Master),
+                    SlaveConnections = settings.BotSharp.Slavers.Length == 0 ?
+                        new List<DbConnection> { new SqlConnection(settings.BotSharp.Master) } :
+                        settings.BotSharp.Slavers.Select(x => new SqlConnection(x) as DbConnection)
+                            .ToList(),
+                    CreateDbIfNotExist = true
+                });
+            }
+            else if (typeof(Tdb).Name.StartsWith("DbContext4Aurora") ||
+                typeof(Tdb).Name.StartsWith("DbContext4MySql"))
+            {
+                dc.BindDbContext<IBotSharpTable, Tdb>(new DatabaseBind
+                {
+                    ServiceProvider = serviceProvider,
+                    MasterConnection = new MySqlConnection(settings.BotSharp.Master),
+                    SlaveConnections = settings.BotSharp.Slavers
+                        .Select(x => new MySqlConnection(x) as DbConnection).ToList(),
+                    CreateDbIfNotExist = true
+                });
+            }
         }
         return dc;
     }
diff --git a/src/Infrastructure/BotSharp.Core/Repository/DbTables/AgentRecord.cs b/src/Infrastructure/BotSharp.Core/Repository/DbTables/AgentRecord.cs
@@ -5,7 +5,7 @@
 namespace BotSharp.Core.Repository.DbTables;
 
 [Table("Agent")]
-public class AgentRecord : DbRecord, IAgentTable
+public class AgentRecord : DbRecord, IBotSharpTable
 {
     [Required]
     [MaxLength(64)]
diff --git a/src/Infrastructure/BotSharp.Core/Repository/DbTables/ConversationRecord.cs b/src/Infrastructure/BotSharp.Core/Repository/DbTables/ConversationRecord.cs
@@ -5,7 +5,7 @@
 namespace BotSharp.Core.Repository.DbTables;
 
 [Table("Conversation")]
-public class ConversationRecord : DbRecord, IAgentTable
+public class ConversationRecord : DbRecord, IBotSharpTable
 {
     [Required]
     [MaxLength(36)]
diff --git a/src/Infrastructure/BotSharp.Core/Repository/DbTables/UserRecord.cs b/src/Infrastructure/BotSharp.Core/Repository/DbTables/UserRecord.cs
@@ -5,7 +5,7 @@
 namespace BotSharp.Core.Repository.DbTables;
 
 [Table("User")]
-public class UserRecord : DbRecord, IAgentTable
+public class UserRecord : DbRecord, IBotSharpTable
 {
     [Required]
     [MaxLength(64)]
diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
diff --git a/src/Infrastructure/BotSharp.Core/Using.cs b/src/Infrastructure/BotSharp.Core/Using.cs
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj b/src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs
diff --git a/src/Plugins/BotSharp.Plugin.ChatbotUI/BotSharp.Plugin.ChatbotUI.csproj b/src/Plugins/BotSharp.Plugin.ChatbotUI/BotSharp.Plugin.ChatbotUI.csproj
diff --git a/src/Plugins/BotSharp.Plugin.ChatbotUI/ChatbotUiController.cs b/src/Plugins/BotSharp.Plugin.ChatbotUI/ChatbotUiController.cs
diff --git a/src/Plugins/BotSharp.Plugin.ChatbotUI/ViewModels/OpenAiChoice.cs b/src/Plugins/BotSharp.Plugin.ChatbotUI/ViewModels/OpenAiChoice.cs

Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,16 @@ public class RoleDialogModel`
`6`	`6`	`/// user, system, assistant`
`7`	`7`	`/// </summary>`
`8`	`8`	`public string Role { get; set; }`
`9`		`- public string Text { get; set; }`
	`9`	`+ public string Content { get; set; }`
`10`	`10`
`11`	`11`	`public RoleDialogModel(string role, string text)`
`12`	`12`	`{`
`13`	`13`	`Role = role;`
`14`		`- Text = text;`
	`14`	`+ Content = text;`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public override string ToString()`
`18`	`18`	`{`
`19`		`- return $"{Role}: {Text}";`
	`19`	`+ return $"{Role}: {Content}";`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ namespace BotSharp.Abstraction.MLTasks;`
`4`	`4`
`5`	`5`	`public interface IChatCompletion`
`6`	`6`	`{`
`7`		`- Task<string> GetChatCompletionsAsync(Agent agent, List<RoleDialogModel> conversations);`
	`7`	`+ string GetChatCompletions(Agent agent, List<RoleDialogModel> conversations);`
	`8`	`+ Task<string> GetChatCompletionsStreamingAsync(Agent agent, List<RoleDialogModel> conversations);`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public partial class AgentService`
`6`	`6`	`{`
`7`	`7`	`public async Task<Agent> CreateAgent(Agent agent)`
`8`	`8`	`{`
`9`		`- var db = _services.GetRequiredService<AgentDbContext>();`
	`9`	`+ var db = _services.GetRequiredService<BotSharpDbContext>();`
`10`	`10`	`var record = db.Agent.FirstOrDefault(x => x.OwnerId == _user.Id && x.Name == agent.Name);`
`11`	`11`	`if (record != null)`
`12`	`12`	`{`
`@@ -19,9 +19,9 @@ record = AgentRecord.FromAgent(agent);`
`19`	`19`	`record.CreatedDateTime = DateTime.UtcNow;`
`20`	`20`	`record.UpdatedDateTime = DateTime.UtcNow;`
`21`	`21`
`22`		`- db.Transaction<IAgentTable>(delegate`
	`22`	`+ db.Transaction<IBotSharpTable>(delegate`
`23`	`23`	`{`
`24`		`- db.Add<IAgentTable>(record);`
	`24`	`+ db.Add<IBotSharpTable>(record);`
`25`	`25`	`});`
`26`	`26`
`27`	`27`	`return record.ToAgent();`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public partial class AgentService`
`7`	`7`	`{`
`8`	`8`	`public async Task<List<Agent>> GetAgents()`
`9`	`9`	`{`
`10`		`- var db = _services.GetRequiredService<AgentDbContext>();`
	`10`	`+ var db = _services.GetRequiredService<BotSharpDbContext>();`
`11`	`11`	`var query = from agent in db.Agent`
`12`	`12`	`where agent.OwnerId == _user.Id`
`13`	`13`	`select agent.ToAgent();`
`@@ -16,7 +16,7 @@ public async Task<List<Agent>> GetAgents()`
`16`	`16`
`17`	`17`	`public async Task<Agent> GetAgent(string id)`
`18`	`18`	`{`
`19`		`- var db = _services.GetRequiredService<AgentDbContext>();`
	`19`	`+ var db = _services.GetRequiredService<BotSharpDbContext>();`
`20`	`20`	`var query = from agent in db.Agent`
`21`	`21`	`where agent.Id == id`
`22`	`22`	`select agent.ToAgent();`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ public partial class AgentService`
`7`	`7`	`{`
`8`	`8`	`public async Task UpdateAgent(Agent agent)`
`9`	`9`	`{`
`10`		`- var db = _services.GetRequiredService<AgentDbContext>();`
	`10`	`+ var db = _services.GetRequiredService<BotSharpDbContext>();`
`11`	`11`
`12`		`- db.Transaction<IAgentTable>(delegate`
	`12`	`+ db.Transaction<IBotSharpTable>(delegate`
`13`	`13`	`{`
`14`	`14`	`var record = db.Agent.FirstOrDefault(x => x.OwnerId == agent.OwerId && x.Id == agent.Id);`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,18 @@ public partial class AgentService : IAgentService`
`6`	`6`	`{`
`7`	`7`	`private readonly IServiceProvider _services;`
`8`	`8`	`private readonly IUserIdentity _user;`
	`9`	`+ private readonly AgentSettings _settings;`
`9`	`10`
`10`		`- public AgentService(IServiceProvider services, IUserIdentity user)`
	`11`	`+ public AgentService(IServiceProvider services, IUserIdentity user, AgentSettings settings)`
`11`	`12`	`{`
`12`	`13`	`_services = services;`
`13`	`14`	`_user = user;`
	`15`	`+ _settings = settings;`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`public string GetAgentDataDir(string agentId)`
`17`	`19`	`{`
`18`		`- var dir = Path.Combine("data", agentId);`
	`20`	`+ var dir = Path.Combine(_settings.DataDir, agentId);`
`19`	`21`	`if (!Directory.Exists(dir))`
`20`	`22`	`{`
`21`	`23`	`Directory.CreateDirectory(dir);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public ConversationStorage(IAgentService agent)`
`14`	`14`	`public void Append(string agentId, string conversationId, RoleDialogModel dialog)`
`15`	`15`	`{`
`16`	`16`	`var conversationFile = GetStorageFile(agentId, conversationId);`
`17`		`- File.AppendAllText(conversationFile, $"{dialog.Role}: {dialog.Text}\n");`
	`17`	`+ File.AppendAllText(conversationFile, $"{dialog.Role}: {dialog.Content}\n");`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public List<RoleDialogModel> GetDialogs(string agentId, string conversationId)`