Merge pull request #85 from hchen2020/master

Oceania2018 · web-flow · commit 1ecb441ae8c0 · 2023-07-21T12:06:21.000-05:00
Fix IConversationCompletionHook
diff --git a/src/Infrastructure/BotSharp.Abstraction/BotSharp.Abstraction.csproj b/src/Infrastructure/BotSharp.Abstraction/BotSharp.Abstraction.csproj
@@ -8,6 +8,12 @@
     <PackageIcon>Icon.png</PackageIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Infrastructures\**" />
+    <EmbeddedResource Remove="Infrastructures\**" />
+    <None Remove="Infrastructures\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="..\..\..\arts\Icon.png">
       <Pack>True</Pack>
@@ -22,8 +28,4 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Infrastructures\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/ConversationCompletionHookBase.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/ConversationCompletionHookBase.cs
@@ -0,0 +1,53 @@
+using BotSharp.Abstraction.Conversations.Models;
+using BotSharp.Abstraction.MLTasks;
+
+namespace BotSharp.Abstraction.Conversations;
+
+public abstract class ConversationCompletionHookBase : IConversationCompletionHook
+{
+    protected Agent _agent;
+    public Agent Agent => _agent;
+
+    protected Conversation _conversation;
+    public Conversation Conversation => _conversation;
+
+    protected List<RoleDialogModel> _dialogs;
+    public List<RoleDialogModel> Dialogs => _dialogs;
+
+    protected IChatCompletion _chatCompletion;
+    public IChatCompletion ChatCompletion => _chatCompletion;
+
+    public IConversationCompletionHook SetAgent(Agent agent)
+    {
+        _agent = agent;
+        return this;
+    }
+
+    public IConversationCompletionHook SetConversation(Conversation conversation)
+    {
+        _conversation = conversation;
+        return this;
+    }
+
+    public IConversationCompletionHook SetDialogs(List<RoleDialogModel> dialogs)
+    {
+        _dialogs = dialogs;
+        return this;
+    }
+
+    public IConversationCompletionHook SetChatCompletion(IChatCompletion chatCompletion)
+    {
+        _chatCompletion = chatCompletion;
+        return this;
+    }
+
+    public virtual Task BeforeCompletion()
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task<string> AfterCompletion(string response)
+    {
+        return Task.FromResult(response);
+    }
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationCompletionHook.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationCompletionHook.cs
@@ -1,9 +1,22 @@
 using BotSharp.Abstraction.Conversations.Models;
+using BotSharp.Abstraction.MLTasks;
 
 namespace BotSharp.Abstraction.Conversations;
 
 public interface IConversationCompletionHook
 {
-    Task BeforeCompletion(Agent agent, List<RoleDialogModel> conversations);
-    Task<string> AfterCompletion(Agent agent, string response);
+    Agent Agent { get; }
+    IConversationCompletionHook SetAgent(Agent agent);
+
+    Conversation Conversation { get; }
+    IConversationCompletionHook SetConversation(Conversation conversation);
+
+    List<RoleDialogModel> Dialogs { get; }
+    IConversationCompletionHook SetDialogs(List<RoleDialogModel> dialogs);
+
+    IChatCompletion ChatCompletion { get; }
+    IConversationCompletionHook SetChatCompletion(IChatCompletion chatCompletion);
+    
+    Task BeforeCompletion();
+    Task<string> AfterCompletion(string response);
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs
@@ -5,6 +5,7 @@ namespace BotSharp.Abstraction.Conversations;
 public interface IConversationService
 {
     Task<Conversation> NewConversation(Conversation conversation);
+    Task<Conversation> GetConversation(string id);
     Task<List<Conversation>> GetConversations();
     Task DeleteConversation(string id);
     Task<string> SendMessage(string agentId, string conversationId, RoleDialogModel lastDalog);
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs
@@ -8,6 +8,12 @@ public class RoleDialogModel
     public string Role { get; set; }
     public string Text { get; set; }
 
+    public RoleDialogModel(string role, string text)
+    {
+        Role = role;
+        Text = text;
+    }
+
     public override string ToString()
     {
         return $"{Role}: {Text}";
diff --git a/src/Infrastructure/BotSharp.Abstraction/Utilities/StringExtensions.cs b/src/Infrastructure/BotSharp.Abstraction/Utilities/StringExtensions.cs
@@ -0,0 +1,7 @@
+namespace BotSharp.Abstraction.Utilities;
+
+public static class StringExtensions
+{
+    public static string IfNullOrEmptyAs(this string str, string defaultValue)
+        => string.IsNullOrEmpty(str) ? defaultValue : str;
+}
diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
@@ -34,14 +34,25 @@
     <PackageIconUrl>https://raw.githubusercontent.com/SciSharp/BotSharp/master/docs/static/logos/BotSharp.png</PackageIconUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/SciSharp/BotSharp/master/LICENSE</PackageLicenseUrl>
     <PackageIcon>Icon.png</PackageIcon>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <NoWarn>1701;1702</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE;</DefineConstants>
+    <NoWarn>1701;1702</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <NoWarn>1701;1702</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NoWarn>1701;1702</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ConversationController.cs b/src/Infrastructure/BotSharp.Core/Conversations/ConversationController.cs
@@ -26,6 +26,7 @@ public async Task<ConversationViewModel> NewConversation([FromRoute] string agen
         var service = _services.GetRequiredService<IConversationService>();
         var sess = new Conversation
         {
+            UserId = _user.Id,
             AgentId = agentId
         };
         sess = await service.NewConversation(sess);
@@ -45,15 +46,11 @@ public async Task<MessageResponseModel> SendMessage([FromRoute] string agentId,
     {
         var conv = _services.GetRequiredService<IConversationService>();
 
-        var result = await conv.SendMessage(agentId, conversationId, new RoleDialogModel
-        {
-            Role = "user",
-            Text = input.Text
-        });
+        var result = await conv.SendMessage(agentId, conversationId, new RoleDialogModel("user", input.Text));
 
         return new MessageResponseModel
         {
-            Content = result
+            Text = result
         };
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs
@@ -28,6 +28,16 @@ public Task DeleteConversation(string id)
         throw new NotImplementedException();
     }
 
+    public async Task<Conversation> GetConversation(string id)
+    {
+        var db = _services.GetRequiredService<AgentDbContext>();
+        var query = from sess in db.Conversation
+                    where sess.Id == id
+                    orderby sess.CreatedTime descending
+                    select sess.ToConversation();
+        return query.FirstOrDefault();
+    }
+
     public async Task<List<Conversation>> GetConversations()
     {
         var db = _services.GetRequiredService<AgentDbContext>();
@@ -43,8 +53,8 @@ public async Task<Conversation> NewConversation(Conversation sess)
         var db = _services.GetRequiredService<AgentDbContext>();
 
         var record = ConversationRecord.FromConversation(sess);
-        record.Id = Guid.NewGuid().ToString();
-        record.UserId = _user.Id;
+        record.Id = sess.Id.IfNullOrEmptyAs(Guid.NewGuid().ToString());
+        record.UserId = sess.UserId.IfNullOrEmptyAs(_user.Id);
         record.Title = "New Conversation";
 
         db.Transaction<IAgentTable>(delegate
@@ -65,18 +75,15 @@ public async Task<string> SendMessage(string agentId, string conversationId, Rol
 
         var response = await SendMessage(agentId, conversationId, wholeDialogs);
 
-        _storage.Append(agentId, conversationId, new RoleDialogModel
-        {
-            Role = "assistant",
-            Text = response
-        });
+        _storage.Append(agentId, conversationId, new RoleDialogModel("assistant", response));
 
         return response;
     }
 
     public async Task<string> SendMessage(string agentId, string conversationId, List<RoleDialogModel> wholeDialogs)
     {
         var agent = await _services.GetRequiredService<IAgentService>().GetAgent(agentId);
+        var converation = await GetConversation(conversationId);
 
         // Get relevant domain knowledge
         if (_settings.EnableKnowledgeBase)
@@ -94,14 +101,21 @@ public async Task<string> SendMessage(string agentId, string conversationId, Lis
         // Before chat completion hook
         var hooks = _services.GetServices<IConversationCompletionHook>().ToList();
 
-        hooks.ForEach(hook => hook.BeforeCompletion(agent, wholeDialogs));
+        hooks.ForEach(hook =>
+        {
+            hook.SetAgent(agent)
+                .SetConversation(converation)
+                .SetDialogs(wholeDialogs)
+                .SetChatCompletion(chatCompletion)
+                .BeforeCompletion();
+        });
         
         var response = await chatCompletion.GetChatCompletionsAsync(agent, wholeDialogs);
 
         // After chat completion hook
         hooks.ForEach(async hook =>
         {
-            response = await hook.AfterCompletion(agent, response);
+            response = await hook.AfterCompletion(response);
         });
 
         return response;
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
@@ -26,11 +26,7 @@ public List<RoleDialogModel> GetDialogs(string agentId, string conversationId)
             var pos = x.IndexOf(':');
             var role = x.Substring(0, pos);
             var text = x.Substring(pos + 1);
-            return new RoleDialogModel
-            {
-                Role = role,
-                Text = text
-            };
+            return new RoleDialogModel(role, text);
         }).ToList();
     }
 
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/MessageResponseModel.cs b/src/Infrastructure/BotSharp.Core/Conversations/ViewModels/MessageResponseModel.cs
@@ -2,5 +2,5 @@ namespace BotSharp.Core.Conversations.ViewModels;
 
 public class MessageResponseModel
 {
-    public string Content { get; set; }
+    public string Text { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Repository/DataContextHelper.cs b/src/Infrastructure/BotSharp.Core/Repository/DataContextHelper.cs
@@ -30,10 +30,10 @@ public static T GetDbContext<T>(MyDatabaseSettings settings, IServiceProvider se
             dc.BindDbContext<IAgentTable, DbContext4SqlServer2>(new DatabaseBind
             {
                 ServiceProvider = serviceProvider,
-                MasterConnection = new SqlConnection(settings.Agent.Master),
-                SlaveConnections = settings.Agent.Slavers.Length == 0 ?
-                    new List<DbConnection> { new SqlConnection(settings.Agent.Master) } :
-                    settings.Agent.Slavers.Select(x => new SqlConnection(x) as DbConnection).ToList(),
+                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
             });
         }
diff --git a/src/Infrastructure/BotSharp.Core/Repository/MyDatabaseSettings.cs b/src/Infrastructure/BotSharp.Core/Repository/MyDatabaseSettings.cs
@@ -1,10 +1,8 @@
-using EntityFrameworkCore.BootKit;
-
 namespace BotSharp.Core.Repository;
 
 public class MyDatabaseSettings : DatabaseSettings
 {
     public string[] Assemblies { get; set; }
     public DbConnectionSetting MongoDb { get; set; }
-    public DbConnectionSetting Agent { get; set; }
+    public DbConnectionSetting BotSharp { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Using.cs b/src/Infrastructure/BotSharp.Core/Using.cs
@@ -10,6 +10,7 @@
 global using BotSharp.Abstraction.Conversations;
 global using BotSharp.Abstraction.Knowledges;
 global using BotSharp.Abstraction.Users;
+global using BotSharp.Abstraction.Utilities;
 global using BotSharp.Core.Repository;
 global using BotSharp.Core.Repository.Abstraction;
 global using BotSharp.Core.Repository.DbTables;
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/AzureOpenAiPlugin.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/AzureOpenAiPlugin.cs
@@ -15,7 +15,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
         config.Bind("AzureOpenAi", settings);
         services.AddSingleton(x => settings);
 
-        services.AddSingleton<ITextCompletion, TextCompletionProvider>();
+        services.AddScoped<ITextCompletion, TextCompletionProvider>();
         services.AddScoped<IChatCompletion, ChatCompletionProvider>();
     }
 }
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/ChatCompletionProvider.cs
@@ -48,22 +48,31 @@ public ChatCompletionProvider(AzureOpenAiSettings settings)
     public List<RoleDialogModel> GetChatSamples(string sampleText)
     {
         var samples = new List<RoleDialogModel>();
-        if (!string.IsNullOrEmpty(sampleText))
+        if (string.IsNullOrEmpty(sampleText))
         {
-            var lines = sampleText.Split('\n');
-            for (int i = 0; i < lines.Length; i++)
+            return samples;
+        }
+
+        var lines = sampleText.Split('\n');
+        for (int i = 0; i < lines.Length; i++)
+        {
+            var line = lines[i];
+            if (string.IsNullOrEmpty(line.Trim()))
             {
-                var line = lines[i];
-                var role = line.Substring(0, line.IndexOf(' ') - 1);
-                var content = line.Substring(line.IndexOf(' ') + 1);
-
-                samples.Add(new RoleDialogModel
-                {
-                    Role = role,
-                    Text = content
-                });
+                continue;
             }
+            var role = line.Substring(0, line.IndexOf(' ') - 1).Trim();
+            var content = line.Substring(line.IndexOf(' ') + 1).Trim();
+
+            // comments
+            if (role == "##")
+            {
+                continue;
+            }
+
+            samples.Add(new RoleDialogModel(role, content));
         }
+
         return samples;
     }
 
@@ -104,8 +113,9 @@ private ChatCompletionsOptions PrepareOptions(Agent agent, List<RoleDialogModel>
         {
             chatCompletionsOptions.Messages.Add(new ChatMessage(ChatRole.System, agent.Knowledges));
         }
-        
-        foreach (var message in GetChatSamples(agent.Samples))
+
+        var samples = GetChatSamples(agent.Samples);
+        foreach (var message in samples)
         {
             chatCompletionsOptions.Messages.Add(new ChatMessage(message.Role, message.Text));
         }
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/OpenAiMessageInput.cs b/src/Plugins/BotSharp.Plugin.ChatbotUI/ViewModels/OpenAiMessageInput.cs

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ namespace BotSharp.Abstraction.Conversations;`
`5`	`5`	`public interface IConversationService`
`6`	`6`	`{`
`7`	`7`	`Task<Conversation> NewConversation(Conversation conversation);`
	`8`	`+ Task<Conversation> GetConversation(string id);`
`8`	`9`	`Task<List<Conversation>> GetConversations();`
`9`	`10`	`Task DeleteConversation(string id);`
`10`	`11`	`Task<string> SendMessage(string agentId, string conversationId, RoleDialogModel lastDalog);`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public async Task<ConversationViewModel> NewConversation([FromRoute] string agen`
`26`	`26`	`var service = _services.GetRequiredService<IConversationService>();`
`27`	`27`	`var sess = new Conversation`
`28`	`28`	`{`
	`29`	`+ UserId = _user.Id,`
`29`	`30`	`AgentId = agentId`
`30`	`31`	`};`
`31`	`32`	`sess = await service.NewConversation(sess);`
`@@ -45,15 +46,11 @@ public async Task<MessageResponseModel> SendMessage([FromRoute] string agentId,`
`45`	`46`	`{`
`46`	`47`	`var conv = _services.GetRequiredService<IConversationService>();`
`47`	`48`
`48`		`- var result = await conv.SendMessage(agentId, conversationId, new RoleDialogModel`
`49`		`- {`
`50`		`- Role = "user",`
`51`		`- Text = input.Text`
`52`		`- });`
	`49`	`+ var result = await conv.SendMessage(agentId, conversationId, new RoleDialogModel("user", input.Text));`
`53`	`50`
`54`	`51`	`return new MessageResponseModel`
`55`	`52`	`{`
`56`		`- Content = result`
	`53`	`+ Text = result`
`57`	`54`	`};`
`58`	`55`	`}`
`59`	`56`	`}`