Merge pull request #293 from hchen2020/master

Oceania2018 · web-flow · commit b86bf024a3d3 · 2024-02-08T17:55:29.000-06:00
.net 8.0
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
- <PropertyGroup>
-   <TargetFramework>net6.0</TargetFramework>
-   <LangVersion>10.0</LangVersion>
-   <BotSharpVersion>0.22.0</BotSharpVersion>
-   <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-   <GenerateDocumentationFile>false</GenerateDocumentationFile>
- </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <LangVersion>10.0</LangVersion>
+        <BotSharpVersion>0.22.0</BotSharpVersion>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    </PropertyGroup>
 </Project>
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Planning/SequentialPlanner.cs b/src/Infrastructure/BotSharp.Core/Routing/Planning/SequentialPlanner.cs
@@ -30,24 +30,22 @@ public async Task<FunctionCallFromLlm> GetNextInstruction(Agent router, string m
         if (decomposation.TotalRemainingSteps > 0 && _lastInst != null)
         {
             _lastInst.Response = decomposation.Description;
-            _lastInst.Reason = $"{decomposation.TotalRemainingSteps} left.";
-            dialogs.Add(new RoleDialogModel(AgentRole.User, decomposation.Description)
-            {
-                CurrentAgentId = router.Id,
-                MessageId = messageId
-            });
+            _lastInst.Reason = $"Having {decomposation.TotalRemainingSteps} steps left.";
             return _lastInst;
         }
         else if (decomposation.TotalRemainingSteps == 0 || decomposation.ShouldStop)
         {
-            // Tell router all steps are done
-            dialogs.Add(new RoleDialogModel(AgentRole.Assistant,  decomposation.StopReason)
+            if (!string.IsNullOrEmpty(decomposation.StopReason))
             {
-                CurrentAgentId = router.Id,
-                MessageId = messageId
-            });
-            router.TemplateDict["conversation"] = router.TemplateDict["conversation"].ToString().TrimEnd() + 
-                $"\r\n{router.Name}: {decomposation.StopReason}";
+                // Tell router all steps are done
+                dialogs.Add(new RoleDialogModel(AgentRole.Assistant, decomposation.StopReason)
+                {
+                    CurrentAgentId = router.Id,
+                    MessageId = messageId
+                });
+                router.TemplateDict["conversation"] = router.TemplateDict["conversation"].ToString().TrimEnd() +
+                    $"\r\n{router.Name}: {decomposation.StopReason}";
+            }
         }
 
         var next = GetNextStepPrompt(router);
@@ -177,7 +175,6 @@ public async Task<DecomposedStep> GetDecomposedStepAsync(Agent router, string me
                 }, dialogs);
 
                 text = response.Content;
-                Console.WriteLine(text, Color.OrangeRed);
                 inst = response.Content.JsonContent<DecomposedStep>();
                 break;
             }
diff --git a/src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/templates/planner_prompt.sequential.get_remaining_task.liquid b/src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/templates/planner_prompt.sequential.get_remaining_task.liquid
@@ -6,7 +6,7 @@ Tell me what is the first remaining step from user steps that have not been comp
 Output in JSON 
 { 
     "description": "step detail with arguments", 
-    "total_remaining_steps": -1, 
+    "total_remaining_steps": 0, 
     "should_stop": false, 
-    "stop_reason": "the reason why it should total remaining steps is zero"
+    "stop_reason": "the reason why it should stop"
 }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj b/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFramework)</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>$(LangVersion)</LangVersion>
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/BotSharp.Plugin.ChatHub.csproj b/src/Plugins/BotSharp.Plugin.ChatHub/BotSharp.Plugin.ChatHub.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFramework)</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>$(LangVersion)</LangVersion>
diff --git a/src/Plugins/BotSharp.Plugin.ChatbotUI/BotSharp.Plugin.ChatbotUI.csproj b/src/Plugins/BotSharp.Plugin.ChatbotUI/BotSharp.Plugin.ChatbotUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFramework)</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>$(LangVersion)</LangVersion>
     <VersionPrefix>$(BotSharpVersion)</VersionPrefix>
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/BotSharp.Plugin.Twilio.csproj b/src/Plugins/BotSharp.Plugin.Twilio/BotSharp.Plugin.Twilio.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFramework)</TargetFramework>
     <LangVersion>$(LangVersion)</LangVersion>
     <VersionPrefix>$(BotSharpVersion)</VersionPrefix>
     <GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightInstance.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightInstance.cs
@@ -32,7 +32,7 @@ public async Task InitInstance()
             string tempFolderPath = $"{Path.GetTempPath()}\\playwright\\{Guid.NewGuid()}";
             _context = await _playwright.Chromium.LaunchPersistentContextAsync(tempFolderPath, new BrowserTypeLaunchPersistentContextOptions
             {
-                Headless = true,
+                Headless = false,
                 Channel = "chrome",
                 IgnoreDefaultArgs = new[]
                 {
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.ClickButton.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.ClickButton.cs
@@ -27,6 +27,12 @@ public async Task<bool> ClickButton(BrowserActionParams actionParams)
             count = await elements.CountAsync();
         }
 
+        if (count == 0)
+        {
+            elements = _instance.Page.GetByText(actionParams.Context.ElementName);
+            count = await elements.CountAsync();
+        }
+
         if (count == 0)
         {
             // Infer element if not found
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.ClickElement.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.ClickElement.cs
@@ -48,6 +48,12 @@ public async Task<bool> ClickElement(BrowserActionParams actionParams)
         else if (count > 1)
         {
             _logger.LogWarning($"Multiple elements are found by keyword {actionParams.Context.ElementText}");
+            var all = await elements.AllAsync();
+            foreach (var element in all)
+            {
+                var content = await element.TextContentAsync();
+                _logger.LogWarning(content);
+            }
         }
 
         return false;
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ChangeCheckboxFn.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ChangeCheckboxFn.cs
@@ -22,9 +22,10 @@ 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));
 
+        var content = $"{(args.UpdateValue == "check" ? "Check" : "Uncheck")} checkbox of '{args.ElementText}'";
         message.Content = result ? 
-            $"{(args.UpdateValue == "check" ? "Checked" : "Unchecked")} checkbox of '{args.ElementText}' successfully" : 
-            "Failed";
+            $"{content} successfully" : 
+            $"{content} failed";
 
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ChangeListValueFn.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ChangeListValueFn.cs
@@ -22,9 +22,10 @@ public async Task<bool> Execute(RoleDialogModel message)
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
         var result = await _browser.ChangeListValue(new BrowserActionParams(agent, args, message.MessageId));
 
+        var content = $"Change value to '{args.UpdateValue}' for {args.ElementName}";
         message.Content = result ? 
-            $"Changed value to '{args.UpdateValue}' for {args.ElementName} successfully" : 
-            "Failed";
+            $"{content} successfully" : 
+            $"{content} failed";
 
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/CheckRadioButtonFn.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/CheckRadioButtonFn.cs
@@ -22,9 +22,10 @@ public async Task<bool> Execute(RoleDialogModel message)
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
         var result = await _browser.CheckRadioButton(new BrowserActionParams(agent, args, message.MessageId));
 
-        message.Content = result ? 
-            $"Checked value of '{args.UpdateValue}' for radio button '{args.ElementName}' successfully" : 
-            "Failed";
+        var content = $"Check value of '{args.UpdateValue}' for radio button '{args.ElementName}'";
+        message.Content = result ?
+            $"{content} successfully" :
+            $"{content} failed";
 
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ClickButtonFn.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ClickButtonFn.cs
@@ -22,9 +22,10 @@ public async Task<bool> Execute(RoleDialogModel message)
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
         var result = await _browser.ClickButton(new BrowserActionParams(agent, args, message.MessageId));
 
+        var content = $"Click button of '{args.ElementName}'";
         message.Content = result ? 
-            $"Clicked button of '{args.ElementName}' successfully" : 
-            "Failed";
+            $"{content} successfully" : 
+            $"{content} failed";
 
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ClickElementFn.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ClickElementFn.cs
@@ -22,9 +22,10 @@ public async Task<bool> Execute(RoleDialogModel message)
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
         var result = await _browser.ClickElement(new BrowserActionParams(agent, args, message.MessageId));
 
+        var content = $"Click element {args.MatchRule} text '{args.ElementText}'";
         message.Content = result ? 
-            $"Clicked element {args.MatchRule} text '{args.ElementText}' successfully" : 
-            "Failed";
+            $"{content} successfully" : 
+            $"{content} failed";
 
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/InputUserPasswordFn.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/InputUserPasswordFn.cs
@@ -22,7 +22,7 @@ public async Task<bool> Execute(RoleDialogModel message)
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
         var result = await _browser.InputUserPassword(new BrowserActionParams(agent, args, message.MessageId));
 
-        message.Content = result ? "Input password successfully" : "Failed";
+        message.Content = result ? "Input password successfully" : "Input password failed";
 
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/InputUserTextFn.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/InputUserTextFn.cs
@@ -29,8 +29,8 @@ public async Task<bool> Execute(RoleDialogModel message)
         }
 
         message.Content = result ?
-            content + " successfully" : 
-            "Failed";
+            content + " successfully" :
+            content + " failed";
 
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);
diff --git a/src/WebStarter/WebStarter.csproj b/src/WebStarter/WebStarter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFramework)</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
diff --git a/tests/BotSharp.Plugin.SemanticKernel.UnitTests/BotSharp.Plugin.SemanticKernel.UnitTests.csproj b/tests/BotSharp.Plugin.SemanticKernel.UnitTests/BotSharp.Plugin.SemanticKernel.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFramework)</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
diff --git a/tests/UnitTest/UnitTest.csproj b/tests/UnitTest/UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFramework)</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ Tell me what is the first remaining step from user steps that have not been comp`
`6`	`6`	`Output in JSON`
`7`	`7`	`{`
`8`	`8`	`"description": "step detail with arguments",`
`9`		`- "total_remaining_steps": -1,`
	`9`	`+ "total_remaining_steps": 0,`
`10`	`10`	`"should_stop": false,`
`11`		`- "stop_reason": "the reason why it should total remaining steps is zero"`
	`11`	`+ "stop_reason": "the reason why it should stop"`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public async Task InitInstance()`
`32`	`32`	`string tempFolderPath = $"{Path.GetTempPath()}\\playwright\\{Guid.NewGuid()}";`
`33`	`33`	`_context = await _playwright.Chromium.LaunchPersistentContextAsync(tempFolderPath, new BrowserTypeLaunchPersistentContextOptions`
`34`	`34`	`{`
`35`		`- Headless = true,`
	`35`	`+ Headless = false,`
`36`	`36`	`Channel = "chrome",`
`37`	`37`	`IgnoreDefaultArgs = new[]`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,12 @@ public async Task<bool> ClickButton(BrowserActionParams actionParams)`
`27`	`27`	`count = await elements.CountAsync();`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ if (count == 0)`
	`31`	`+ {`
	`32`	`+ elements = _instance.Page.GetByText(actionParams.Context.ElementName);`
	`33`	`+ count = await elements.CountAsync();`
	`34`	`+ }`
	`35`	`+`
`30`	`36`	`if (count == 0)`
`31`	`37`	`{`
`32`	`38`	`// Infer element if not found`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,12 @@ public async Task<bool> ClickElement(BrowserActionParams actionParams)`
`48`	`48`	`else if (count > 1)`
`49`	`49`	`{`
`50`	`50`	`_logger.LogWarning($"Multiple elements are found by keyword {actionParams.Context.ElementText}");`
	`51`	`+ var all = await elements.AllAsync();`
	`52`	`+ foreach (var element in all)`
	`53`	`+ {`
	`54`	`+ var content = await element.TextContentAsync();`
	`55`	`+ _logger.LogWarning(content);`
	`56`	`+ }`
`51`	`57`	`}`
`52`	`58`
`53`	`59`	`return false;`