Merge pull request #292 from hchen2020/master

Add hook of OnDialogRecordLoaded.

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Conversations/ConversationHookBase.cs

@@ -36,6 +36,11 @@ public virtual Task OnStateChanged(string name, string preValue, string currentV
         return Task.CompletedTask;
     }
 
+    public virtual Task OnDialogRecordLoaded(RoleDialogModel dialog)
+    {
+        return Task.CompletedTask;
+    }
+
     public virtual Task OnDialogsLoaded(List<RoleDialogModel> dialogs)
     {
         _dialogs = dialogs;

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationHook.cs

@@ -32,6 +32,14 @@ public interface IConversationHook
     /// <returns></returns>
     Task OnDialogsLoaded(List<RoleDialogModel> dialogs);
 
+    /// <summary>
+    /// Triggered when every dialog record is loaded
+    /// It can be used to populate extra data point before presenting to user.
+    /// </summary>
+    /// <param name="dialog"></param>
+    /// <returns></returns>
+    Task OnDialogRecordLoaded(RoleDialogModel dialog);
+
     Task OnStateLoaded(ConversationState state);
     Task OnStateChanged(string name, string preValue, string currentValue);
 

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs

@@ -67,6 +67,7 @@ public List<RoleDialogModel> GetDialogs(string conversationId)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
         var dialogs = db.GetConversationDialogs(conversationId);
+        var hooks = _services.GetServices<IConversationHook>();
 
         var results = new List<RoleDialogModel>();
         foreach (var dialog in dialogs)
@@ -79,16 +80,28 @@ public List<RoleDialogModel> GetDialogs(string conversationId)
             var function = role == AgentRole.Function ? meta.FunctionName : null;
             var senderId = role == AgentRole.Function ? currentAgentId : meta.SenderId;
             var createdAt = meta.CreateTime;
-            
-            results.Add(new RoleDialogModel(role, content)
+
+            var record = new RoleDialogModel(role, content)
             {
                 CurrentAgentId = currentAgentId,
                 MessageId = messageId,
                 CreatedAt = createdAt,
                 SenderId = senderId,
                 FunctionName = function
-            });
+            };
+            results.Add(record);
+
+            foreach(var hook in hooks)
+            {
+                hook.OnDialogRecordLoaded(record).Wait();
+            }
         }
+
+        foreach (var hook in hooks)
+        {
+            hook.OnDialogsLoaded(results).Wait();
+        }
+
         return results;
     }
 

src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/templates/planner_prompt.sequential.get_remaining_task.liquid

@@ -1,12 +1,12 @@
-Use will give you a task list with steps, which is going to be executed. 
+User will give you a task list with steps, which is going to be executed. 
 If a specific step has been exectued, you will get something indicates the result. 
 If there is no any result provided, it means all the steps have not been executed yet.
 You need to figure out which steps have not been completed.
 Tell me what is the first remaining step from user steps that have not been completed based on the context. 
 Output in JSON 
 { 
     "description": "step detail with arguments", 
-    "total_remaining_steps": 0, 
+    "total_remaining_steps": -1, 
     "should_stop": false, 
     "stop_reason": "the reason why it should total remaining steps is zero"
 }

src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs

@@ -83,6 +83,7 @@ public async Task<IEnumerable<ChatResponseModel>> GetDialogs([FromRoute] string
                     MessageId = message.MessageId,
                     CreatedAt = message.CreatedAt,
                     Text = message.Content,
+                    Data = message.Data,
                     Sender = UserViewModel.FromUser(user)
                 });
             }
@@ -95,6 +96,7 @@ public async Task<IEnumerable<ChatResponseModel>> GetDialogs([FromRoute] string
                     MessageId = message.MessageId,
                     CreatedAt = message.CreatedAt,
                     Text = message.Content,
+                    Data = message.Data,
                     Sender = new UserViewModel
                     {
                         FirstName = agent.Name,

src/Plugins/BotSharp.Plugin.Dashboard/DashboardPlugin.cs

@@ -25,8 +25,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
 
     public bool AttachMenu(List<PluginMenuDef> menu)
     {
-        var section = menu.First(x => x.Label == "Apps");
-        menu.Add(new PluginMenuDef("Dashboard", link: "page/dashboard", icon: "bx bx-home-circle", weight: section.Weight - 1));
+        menu.Add(new PluginMenuDef("Dashboard", link: "page/dashboard", icon: "bx bx-home-circle", weight: 1));
         return true;
     }
 }

src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightInstance.cs

@@ -36,11 +36,11 @@ public async Task InitInstance()
                 Channel = "chrome",
                 IgnoreDefaultArgs = new[]
                 {
-                    "enable-automation"
+                    "--disable-infobars"
                 },
                 Args = new[]
                 {
-                    "--disable-infobars"
+                    "--disable-infobars",
                     // "--start-maximized"
                 }
             });

src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.ChangeCheckbox.cs

@@ -68,11 +68,11 @@ public async Task<bool> ChangeCheckbox(BrowserActionParams actionParams)
         try
         {
             var isChecked = await elements.IsCheckedAsync();
-            if (actionParams.Context.UpdateValue == "checked" && !isChecked)
+            if (actionParams.Context.UpdateValue == "check" && !isChecked)
             {
                 await elements.ClickAsync();
             }
-            else if (actionParams.Context.UpdateValue == "unchecked" && isChecked)
+            else if (actionParams.Context.UpdateValue == "uncheck" && isChecked)
             {
                 await elements.ClickAsync();
             }

src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.Screenshot.cs

@@ -10,6 +10,6 @@ public async Task<string> ScreenshotAsync(string path)
             Path = path,
         });
 
-        return Convert.ToBase64String(bytes);
+        return "data:image/png;base64," + Convert.ToBase64String(bytes);
     }
 }

src/Plugins/BotSharp.Plugin.WebDriver/Functions/ChangeCheckboxFn.cs

@@ -22,10 +22,12 @@ public async Task<bool> Execute(RoleDialogModel message)
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
         var result = await _browser.ChangeCheckbox(new BrowserActionParams(agent, args, message.MessageId));
 
-        message.Content = result ? "Success" : "Failed";
+        message.Content = result ? 
+            $"{(args.UpdateValue == "check" ? "Checked" : "Unchecked")} checkbox of '{args.ElementText}' successfully" : 
+            "Failed";
 
         var webDriverService = _services.GetRequiredService<WebDriverService>();
-        var path = webDriverService.NewScreenshotFilePath(message.MessageId);
+        var path = webDriverService.GetScreenshotFilePath(message.MessageId);
 
         message.Data = await _browser.ScreenshotAsync(path);