get channel from conversation

Jicheng Lu · Jicheng Lu · commit e3b0a7f075ca · 2023-11-26T21:04:48.000-06:00
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs
@@ -16,13 +16,15 @@ public interface IConversationService
     /// Send message to LLM
     /// </summary>
     /// <param name="agentId"></param>
+    /// <param name="channel"></param>
     /// <param name="conversationId"></param>
     /// <param name="lastDalog"></param>
     /// <param name="onMessageReceived"></param>
     /// <param name="onFunctionExecuting">This delegate is useful when you want to report progress on UI</param>
     /// <param name="onFunctionExecuted">This delegate is useful when you want to report progress on UI</param>
     /// <returns></returns>
-    Task<bool> SendMessage(string agentId, 
+    Task<bool> SendMessage(string agentId,
+        string channel,
         RoleDialogModel lastDalog, 
         Func<RoleDialogModel, Task> onMessageReceived, 
         Func<RoleDialogModel, Task> onFunctionExecuting,
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs
@@ -9,13 +9,14 @@ namespace BotSharp.Core.Conversations.Services;
 
 public partial class ConversationService
 {
-    public async Task<bool> SendMessage(string agentId, 
+    public async Task<bool> SendMessage(string agentId,
+        string channel,
         RoleDialogModel message,
         Func<RoleDialogModel, Task> onMessageReceived,
         Func<RoleDialogModel, Task> onFunctionExecuting,
         Func<RoleDialogModel, Task> onFunctionExecuted)
     {
-        var conversation = await GetConversationRecord(agentId);
+        var conversation = await GetConversationRecord(agentId, channel);
 
         var agentService = _services.GetRequiredService<IAgentService>();
         Agent agent = await agentService.LoadAgent(agentId);
@@ -69,16 +70,17 @@ await routing.InstructLoop(message) :
         return true;
     }
 
-    private async Task<Conversation> GetConversationRecord(string agentId)
+    private async Task<Conversation> GetConversationRecord(string agentId, string channel)
     {
         var converation = await GetConversation(_conversationId);
 
-        // Create conversation if this conversation not exists
+        // Create conversation if this conversation does not exist
         if (converation == null)
         {
             var sess = new Conversation
             {
                 Id = _conversationId,
+                Channel = channel,
                 AgentId = agentId
             };
             converation = await NewConversation(sess);
diff --git a/src/Infrastructure/BotSharp.Core/Evaluations/EvaluatingService.cs b/src/Infrastructure/BotSharp.Core/Evaluations/EvaluatingService.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Conversations.Enums;
 using BotSharp.Abstraction.Evaluations;
 using BotSharp.Abstraction.Evaluations.Models;
 using BotSharp.Abstraction.Evaluations.Settings;
@@ -92,7 +93,8 @@ private async Task<RoleDialogModel> SendMessage(string agentId, string conversat
         RoleDialogModel response = default;
 
         await conv.SendMessage(agentId,
-            new RoleDialogModel("user", text),
+            ConversationChannel.OpenAPI,
+            new RoleDialogModel(AgentRole.User, text),
             async msg => response = msg,
             fnExecuting => Task.CompletedTask,
             fnExecuted => Task.CompletedTask);
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository.cs
@@ -712,7 +712,7 @@ public void UpdateConversationStatus(string conversationId, string status)
     public Conversation GetConversation(string conversationId)
     {
         var convDir = FindConversationDirectory(conversationId);
-        if (!string.IsNullOrEmpty(convDir)) return null;
+        if (string.IsNullOrEmpty(convDir)) return null;
 
         var convFile = Path.Combine(convDir, "conversation.json");
         var content = File.ReadAllText(convFile);
diff --git a/src/Infrastructure/BotSharp.Core/Routing/RoutingService.cs b/src/Infrastructure/BotSharp.Core/Routing/RoutingService.cs
@@ -143,11 +143,12 @@ protected RoutingRule[] GetRoutingRecords()
 
         // Filter agents by profile
         var state = _services.GetRequiredService<IConversationStateService>();
-        var name = state.GetState("channel");
-        var specifiedProfile = agents.FirstOrDefault(x => x.Profiles.Contains(name));
+        var conversation = db.GetConversation(state.GetConversationId());
+        var channel = conversation?.Channel;
+        var specifiedProfile = agents.FirstOrDefault(x => x.Profiles.Contains(channel));
         if (specifiedProfile != null)
         {
-            records = records.Where(x => specifiedProfile.Profiles.Contains(name)).ToArray();
+            records = records.Where(x => specifiedProfile.Profiles.Contains(channel)).ToArray();
         }
 
         return records;
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.ApiAdapters;
+using BotSharp.Abstraction.Conversations.Enums;
 using BotSharp.Abstraction.Conversations.Models;
 using BotSharp.Abstraction.Models;
 using BotSharp.OpenAPI.ViewModels.Conversations;
@@ -30,6 +31,7 @@ public async Task<ConversationViewModel> NewConversation([FromRoute] string agen
         var conv = new Conversation
         {
             AgentId = agentId,
+            Channel = ConversationChannel.OpenAPI,
             UserId = _user.Id
         };
         conv = await service.NewConversation(conv);
@@ -97,15 +99,14 @@ public async Task<ChatResponseModel> SendMessage([FromRoute] string agentId,
     {
         var conv = _services.GetRequiredService<IConversationService>();
         conv.SetConversationId(conversationId, input.States);
-        conv.States.SetState("channel", input.Channel)
-            .SetState("provider", input.Provider)
-            .SetState("model", input.Model)
-            .SetState("temperature", input.Temperature)
-            .SetState("sampling_factor", input.SamplingFactor);
+        conv.States.SetState("provider", input.Provider)
+                   .SetState("model", input.Model)
+                   .SetState("temperature", input.Temperature)
+                   .SetState("sampling_factor", input.SamplingFactor);
 
         var response = new ChatResponseModel();
         var inputMsg = new RoleDialogModel("user", input.Text);
-        await conv.SendMessage(agentId, inputMsg,
+        await conv.SendMessage(agentId, input.Channel, inputMsg,
             async msg =>
             {
                 response.Text = msg.Content;
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/NewMessageModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/NewMessageModel.cs
@@ -1,8 +1,9 @@
+using BotSharp.Abstraction.Conversations.Enums;
 using BotSharp.Abstraction.Conversations.Models;
 
 namespace BotSharp.OpenAPI.ViewModels.Conversations;
 
 public class NewMessageModel : IncomingMessageModel
 {
-    public override string Channel { get; set; } = "openapi";
+    public override string Channel { get; set; } = ConversationChannel.OpenAPI;
 }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/InstructMessageModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/InstructMessageModel.cs
@@ -1,8 +1,9 @@
+using BotSharp.Abstraction.Conversations.Enums;
 using BotSharp.Abstraction.Conversations.Models;
 namespace BotSharp.OpenAPI.ViewModels.Instructs;
 
 public class InstructMessageModel : IncomingMessageModel
 {
-    public override string Channel { get; set; } = "openapi";
+    public override string Channel { get; set; } = ConversationChannel.OpenAPI;
     public string? Template { get; set; }
 }
diff --git a/src/Plugins/BotSharp.Plugin.ChatbotUI/ChatbotUiController.cs b/src/Plugins/BotSharp.Plugin.ChatbotUI/ChatbotUiController.cs
@@ -77,12 +77,12 @@ public async Task SendMessage([FromBody] OpenAiMessageInput input)
         var conv = _services.GetRequiredService<IConversationService>();
         conv.SetConversationId(input.ConversationId, input.States);
         conv.States.SetState("provider", input.Provider)
-            .SetState("model", input.Model)
-            .SetState("channel", input.Channel)
-            .SetState("temperature", input.Temperature)
-            .SetState("sampling_factor", input.SamplingFactor);
+                   .SetState("model", input.Model)
+                   .SetState("temperature", input.Temperature)
+                   .SetState("sampling_factor", input.SamplingFactor);
 
-        var result = await conv.SendMessage(input.AgentId, 
+        var result = await conv.SendMessage(input.AgentId,
+            input.Channel,
             message, 
             async msg => 
                 await OnChunkReceived(outputStream, msg),
diff --git a/src/Plugins/BotSharp.Plugin.ChatbotUI/ViewModels/OpenAiMessageInput.cs b/src/Plugins/BotSharp.Plugin.ChatbotUI/ViewModels/OpenAiMessageInput.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Conversations.Enums;
 using BotSharp.Abstraction.Conversations.Models;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +10,7 @@ public class OpenAiMessageInput : IncomingMessageModel
 {
     public string AgentId { get; set; } = string.Empty;
     public string ConversationId { get; set; } = string.Empty;
-    public override string Channel { get; set; } = "webchat";
+    public override string Channel { get; set; } = ConversationChannel.WebChat;
 
     public List<OpenAiMessageBody> Messages { get; set; } = new List<OpenAiMessageBody>();
 
diff --git a/src/Plugins/BotSharp.Plugin.MetaMessenger/Services/MessageHandleService.cs b/src/Plugins/BotSharp.Plugin.MetaMessenger/Services/MessageHandleService.cs
@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Agents.Enums;
+using BotSharp.Abstraction.Conversations.Enums;
 using BotSharp.Abstraction.Messaging.Models.RichContent;
 using BotSharp.Abstraction.Utilities;
 
@@ -46,60 +48,58 @@ await messenger.SendMessage(setting.ApiVersion, setting.PageId,
 
         // Go to LLM
         var conv = _services.GetRequiredService<IConversationService>();
-        conv.SetConversationId(sender, new List<string>
-        {
-            "channel=messenger"
-        });
+        conv.SetConversationId(sender, new List<string>());
 
         var replies = new List<IRichMessage>();
-        var result = await conv.SendMessage(agentId, new RoleDialogModel("user", message), async msg =>
-        {
-            if (msg.RichContent != null)
+        var result = await conv.SendMessage(agentId, ConversationChannel.Messenger, 
+            new RoleDialogModel(AgentRole.User, message), async msg =>
             {
-                // Official API doesn't support to show extra content above the products
-                if (!string.IsNullOrEmpty(msg.RichContent.Message.Text) &&
-                    // avoid duplicated text
-                    msg.RichContent.Message is not QuickReplyMessage)
+                if (msg.RichContent != null)
                 {
-                    replies.Add(new TextMessage(msg.RichContent.Message.Text));
-                }
+                    // Official API doesn't support to show extra content above the products
+                    if (!string.IsNullOrEmpty(msg.RichContent.Message.Text) &&
+                        // avoid duplicated text
+                        msg.RichContent.Message is not QuickReplyMessage)
+                    {
+                        replies.Add(new TextMessage(msg.RichContent.Message.Text));
+                    }
 
-                if (msg.RichContent.Message is GenericTemplateMessage genericTemplate)
-                {
-                    replies.Add(new AttachmentMessage
+                    if (msg.RichContent.Message is GenericTemplateMessage genericTemplate)
                     {
-                        Attachment = new AttachmentBody
+                        replies.Add(new AttachmentMessage
                         {
-                            Payload = genericTemplate
-                        }
-                    });
-                }
-                else if (msg.RichContent.Message is CouponTemplateMessage couponTemplate)
-                {
-                    replies.Add(new AttachmentMessage
+                            Attachment = new AttachmentBody
+                            {
+                                Payload = genericTemplate
+                            }
+                        });
+                    }
+                    else if (msg.RichContent.Message is CouponTemplateMessage couponTemplate)
                     {
-                        Attachment = new AttachmentBody
+                        replies.Add(new AttachmentMessage
                         {
-                            Payload = couponTemplate
-                        }
-                    });
-                }
-                else if (msg.RichContent.Message is QuickReplyMessage quickReplyMessage)
-                {
-                    replies.Add(quickReplyMessage);
+                            Attachment = new AttachmentBody
+                            {
+                                Payload = couponTemplate
+                            }
+                        });
+                    }
+                    else if (msg.RichContent.Message is QuickReplyMessage quickReplyMessage)
+                    {
+                        replies.Add(quickReplyMessage);
+                    }
+                    else
+                    {
+                        replies.Add(msg.RichContent.Message);
+                    }
                 }
                 else
                 {
-                    replies.Add(msg.RichContent.Message);
+                    replies.Add(new TextMessage(msg.Content));
                 }
-            }
-            else
-            {
-                replies.Add(new TextMessage(msg.Content));
-            }
-        },
-        _ => Task.CompletedTask,
-        _ => Task.CompletedTask);
+            },
+            _ => Task.CompletedTask,
+            _ => Task.CompletedTask);
 
         // Response to user
         foreach(var reply in replies)
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs b/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs
@@ -15,6 +15,7 @@
 using Twilio.TwiML.Messaging;
 using BotSharp.Abstraction.Agents.Enums;
 using BotSharp.Abstraction.Conversations.Models;
+using BotSharp.Abstraction.Conversations.Enums;
 
 namespace BotSharp.Plugin.Twilio.Controllers;
 
@@ -46,20 +47,22 @@ public async Task<TwiMLResult> ReceivedVoiceMessage([FromRoute] string agentId,
         var conv = _services.GetRequiredService<IConversationService>();
         conv.SetConversationId(sessionId, new List<string>
         {
-            "channel=phone",
             $"calling_phone={input.DialCallSid}"
         });
 
         VoiceResponse response = default;
 
-        var result = await conv.SendMessage(agentId, new RoleDialogModel(AgentRole.User, input.SpeechResult), async msg =>
-        {
-            response = HangUp(msg.Content);
-        }, async functionExecuting =>
-        {
-        }, async functionExecuted =>
-        {
-        });
+        var result = await conv.SendMessage(agentId,
+            ConversationChannel.Phone,
+            new RoleDialogModel(AgentRole.User, input.SpeechResult),
+            async msg =>
+            {
+                response = HangUp(msg.Content);
+            }, async functionExecuting =>
+            {
+            }, async functionExecuted =>
+            {
+            });
 
         return TwiML(response);
     }

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,14 @@ namespace BotSharp.Core.Conversations.Services;`
`9`	`9`
`10`	`10`	`public partial class ConversationService`
`11`	`11`	`{`
`12`		`- public async Task<bool> SendMessage(string agentId,`
	`12`	`+ public async Task<bool> SendMessage(string agentId,`
	`13`	`+ string channel,`
`13`	`14`	`RoleDialogModel message,`
`14`	`15`	`Func<RoleDialogModel, Task> onMessageReceived,`
`15`	`16`	`Func<RoleDialogModel, Task> onFunctionExecuting,`
`16`	`17`	`Func<RoleDialogModel, Task> onFunctionExecuted)`
`17`	`18`	`{`
`18`		`- var conversation = await GetConversationRecord(agentId);`
	`19`	`+ var conversation = await GetConversationRecord(agentId, channel);`
`19`	`20`
`20`	`21`	`var agentService = _services.GetRequiredService<IAgentService>();`
`21`	`22`	`Agent agent = await agentService.LoadAgent(agentId);`
`@@ -69,16 +70,17 @@ await routing.InstructLoop(message) :`
`69`	`70`	`return true;`
`70`	`71`	`}`
`71`	`72`
`72`		`- private async Task<Conversation> GetConversationRecord(string agentId)`
	`73`	`+ private async Task<Conversation> GetConversationRecord(string agentId, string channel)`
`73`	`74`	`{`
`74`	`75`	`var converation = await GetConversation(_conversationId);`
`75`	`76`
`76`		`- // Create conversation if this conversation not exists`
	`77`	`+ // Create conversation if this conversation does not exist`
`77`	`78`	`if (converation == null)`
`78`	`79`	`{`
`79`	`80`	`var sess = new Conversation`
`80`	`81`	`{`
`81`	`82`	`Id = _conversationId,`
	`83`	`+ Channel = channel,`
`82`	`84`	`AgentId = agentId`
`83`	`85`	`};`
`84`	`86`	`converation = await NewConversation(sess);`
Original file line number	Diff line number	Diff line change
`@@ -712,7 +712,7 @@ public void UpdateConversationStatus(string conversationId, string status)`
`712`	`712`	`public Conversation GetConversation(string conversationId)`
`713`	`713`	`{`
`714`	`714`	`var convDir = FindConversationDirectory(conversationId);`
`715`		`- if (!string.IsNullOrEmpty(convDir)) return null;`
	`715`	`+ if (string.IsNullOrEmpty(convDir)) return null;`
`716`	`716`
`717`	`717`	`var convFile = Path.Combine(convDir, "conversation.json");`
`718`	`718`	`var content = File.ReadAllText(convFile);`
Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,12 @@ protected RoutingRule[] GetRoutingRecords()`
`143`	`143`
`144`	`144`	`// Filter agents by profile`
`145`	`145`	`var state = _services.GetRequiredService<IConversationStateService>();`
`146`		`- var name = state.GetState("channel");`
`147`		`- var specifiedProfile = agents.FirstOrDefault(x => x.Profiles.Contains(name));`
	`146`	`+ var conversation = db.GetConversation(state.GetConversationId());`
	`147`	`+ var channel = conversation?.Channel;`
	`148`	`+ var specifiedProfile = agents.FirstOrDefault(x => x.Profiles.Contains(channel));`
`148`	`149`	`if (specifiedProfile != null)`
`149`	`150`	`{`
`150`		`- records = records.Where(x => specifiedProfile.Profiles.Contains(name)).ToArray();`
	`151`	`+ records = records.Where(x => specifiedProfile.Profiles.Contains(channel)).ToArray();`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`return records;`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
	`1`	`+using BotSharp.Abstraction.Conversations.Enums;`
`1`	`2`	`using BotSharp.Abstraction.Conversations.Models;`
`2`	`3`
`3`	`4`	`namespace BotSharp.OpenAPI.ViewModels.Conversations;`
`4`	`5`
`5`	`6`	`public class NewMessageModel : IncomingMessageModel`
`6`	`7`	`{`
`7`		`- public override string Channel { get; set; } = "openapi";`
	`8`	`+ public override string Channel { get; set; } = ConversationChannel.OpenAPI;`
`8`	`9`	`}`