Revert all changes

Author: Wenbo Cao

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

@@ -31,9 +31,6 @@
     <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\util-web-close_browser.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\util-web-extract_data_from_page.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\util-web-go_to_page.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -106,10 +103,4 @@
     <ProjectReference Include="..\..\Infrastructure\BotSharp.Core\BotSharp.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\util-web-extract-data.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

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

@@ -9,11 +9,8 @@ public async Task<string> ExtractData(BrowserActionParams actionParams)
         await Task.Delay(3000);
 
         // Retrieve the page raw html and infer the element path
-        var pageContent = _instance.GetPage(actionParams.ContextId);
-        var body = await pageContent.QuerySelectorAsync("body");
-        var pageUrl = pageContent.Url;
-        var pageBody = await body.InnerTextAsync();
-        string content = $"Page URL: `{pageUrl}` <br/> PageBody: {pageBody}";
+        var body = await _instance.GetPage(actionParams.ContextId).QuerySelectorAsync("body");
+        var content = await body.InnerTextAsync();
 
         var driverService = _services.GetRequiredService<WebDriverService>();
         var answer = await driverService.ExtraData(actionParams.Agent, content, actionParams.Context.Question, actionParams.MessageId);

src/Plugins/BotSharp.Plugin.WebDriver/Hooks/WebUtilityHook.cs

@@ -7,7 +7,6 @@ public class WebUtilityHook : IAgentUtilityHook
     private const string GO_TO_PAGE_FN = $"{PREFIX}go_to_page";
     private const string LOCATE_ELEMENT_FN = $"{PREFIX}locate_element";
     private const string ACTION_ON_ELEMENT_FN = $"{PREFIX}action_on_element";
-    private const string EXTRACT_DATA_FN = $"{PREFIX}extract_data_from_page";
 
     public void AddUtilities(List<AgentUtility> utilities)
     {
@@ -21,8 +20,7 @@ public void AddUtilities(List<AgentUtility> utilities)
                     new(CLOSE_BROWSER_FN),
                     new(GO_TO_PAGE_FN),
                     new(LOCATE_ELEMENT_FN),
-                    new(ACTION_ON_ELEMENT_FN),
-                    new(EXTRACT_DATA_FN)
+                    new(ACTION_ON_ELEMENT_FN)
                 ],
                 Templates = 
                 [

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

@@ -45,7 +45,7 @@ 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")}. Current page url: '{result.UrlAfterAction}'.";
 
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);