Merge pull request #980 from evan-cao-wb/master

Add UrlAfterAction into Content

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Browsing/Models/ElementActionArgs.cs

@@ -35,6 +35,12 @@ public class ElementActionArgs
     /// </summary>
     public int WaitTime { get; set; }
 
+    /// <summary>
+    /// Add current url to the content
+    /// </summary>
+    [JsonPropertyName("show_current_url")]
+    public bool ShowCurrentUrl { get; set; } = false;
+
     /// <summary>
     /// Required for deserialization
     /// </summary>

src/Plugins/BotSharp.Plugin.WebDriver/BotSharp.Plugin.WebDriver.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(TargetFramework)</TargetFramework>

src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebActionOnElementFn.cs

@@ -31,7 +31,7 @@ public async Task<bool> Execute(RoleDialogModel message)
         }
 
         actionArgs.WaitTime = 2;
-        
+
         var conv = _services.GetRequiredService<IConversationService>();
 
         var services = _services.CreateScope().ServiceProvider;
@@ -45,7 +45,13 @@ public async Task<bool> Execute(RoleDialogModel message)
         };
         var result = await browser.ActionOnElement(msg, locatorArgs, actionArgs);
 
-        message.Content = $"{actionArgs.Action} executed {(result.IsSuccess ? "success" : "failed")}";
+        message.Content = $"{actionArgs.Action} executed {(result.IsSuccess ? "success" : "failed")}.";
+
+        // Add Current Url info to the message
+        if (actionArgs.ShowCurrentUrl)
+        {
+            message.Content += $" Current page url: '{result.UrlAfterAction}'.";
+        }
 
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);
 

src/Plugins/BotSharp.Plugin.WebDriver/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/functions/util-web-action_on_element.json

@@ -16,16 +16,20 @@
       "content": {
         "type": "string",
         "description": "content to input in element"
-      },
-      "file_urls": {
+    },
+    "file_urls": {
         "type": "array",
         "description": "The output format must be string array of file urls.",
         "items": {
-          "type": "string",
-          "description": "file url"
+            "type": "string",
+            "description": "file url"
         }
+    },
+    "show_current_url": {
+        "type": "boolean",
+        "description": "check if need to extract the current url"
       },
-      "press_key": {
+    "press_key": {
         "type": "string",
         "enum": [ "Enter" ],
         "description": "press key after input text"