SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'SciSharp:master' into master

Browse source
This commit is contained in:
hchen2020 2025-03-24 15:34:51 -05:00 committed by GitHub
parent 8fa951bde3 6cfbe40b5d
commit 367425edb9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Plugins/BotSharp.Plugin.Twilio/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/functions/util-twilio-hangup_phone_call.json
View file

@ -11,7 +11,7 @@
},
"response_content": {
"type": "string",
"description": "A statement said to the user when politely ending a conversation."
"description": "A response statement said to the user to politely and gratefully ending a conversation before hanging up."
}
},
"required": [ "reason", "response_content" ]

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

@ -1,5 +1,3 @@
using BotSharp.Abstraction.Browsing.Settings;
namespace BotSharp.Plugin.WebDriver.Drivers.PlaywrightDriver;
public partial class PlaywrightWebDriver
@ -7,8 +5,7 @@ public partial class PlaywrightWebDriver
public async Task<BrowserActionResult> ScreenshotAsync(MessageInfo message, string path)
{
var result = new BrowserActionResult();
var _webDriver = _services.GetRequiredService<WebBrowsingSettings>();
if (_webDriver.IsEnableScreenshot)
if (_webBrowsingSettings.IsEnableScreenshot)
{
await _instance.Wait(message.ContextId, waitNetworkIdle: false);
var page = _instance.GetPage(message.ContextId);

8
src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.cs
View file

@ -1,4 +1,6 @@
using BotSharp.Abstraction.Browsing.Settings;
namespace BotSharp.Plugin.WebDriver.Drivers.PlaywrightDriver;
public partial class PlaywrightWebDriver : IWebBrowser
@ -6,17 +8,19 @@ public partial class PlaywrightWebDriver : IWebBrowser
private IServiceProvider _services => _instance.Services;
private readonly PlaywrightInstance _instance;
private readonly ILogger _logger;
private readonly WebBrowsingSettings _webBrowsingSettings;
public PlaywrightInstance Instance => _instance;
public Agent Agent => _agent;
private Agent _agent;
public PlaywrightWebDriver(IServiceProvider services, PlaywrightInstance instance, ILogger<PlaywrightWebDriver> logger)
public PlaywrightWebDriver(IServiceProvider services, PlaywrightInstance instance, ILogger<PlaywrightWebDriver> logger, WebBrowsingSettings webBrowsingSettings)
{
_instance = instance;
_logger = logger;
_instance.SetServiceProvider(services);
}
_webBrowsingSettings = webBrowsingSettings;
}
public void SetAgent(Agent agent)
{

3
src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebActionOnElementFn.cs
View file

@ -34,7 +34,8 @@ public class UtilWebActionOnElementFn : IFunctionCallback
var conv = _services.GetRequiredService<IConversationService>();
var browser = _services.GetRequiredService<IWebBrowser>();
var services = _services.CreateScope().ServiceProvider;
var browser = services.GetRequiredService<IWebBrowser>();
var webDriverService = _services.GetRequiredService<WebDriverService>();
var msg = new MessageInfo
{

3
src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebCloseBrowserFn.cs
View file

@ -19,7 +19,8 @@ public class UtilWebCloseBrowserFn : IFunctionCallback
{
var conv = _services.GetRequiredService<IConversationService>();
var webDriverService = _services.GetRequiredService<WebDriverService>();
var browser = _services.GetRequiredService<IWebBrowser>();
var services = _services.CreateScope().ServiceProvider;
var browser = services.GetRequiredService<IWebBrowser>();
var msg = new MessageInfo
{
AgentId = message.CurrentAgentId,

3
src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebGoToPageFn.cs
View file

@ -30,7 +30,8 @@ public class UtilWebGoToPageFn : IFunctionCallback
var conv = _services.GetRequiredService<IConversationService>();
var webDriverService = _services.GetRequiredService<WebDriverService>();
var browser = _services.GetRequiredService<IWebBrowser>();
var services = _services.CreateScope().ServiceProvider;
var browser = services.GetRequiredService<IWebBrowser>();
var msg = new MessageInfo
{
AgentId = message.CurrentAgentId,

3
src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebLocateElementFn.cs
View file

@ -21,7 +21,8 @@ public class UtilWebLocateElementFn : IFunctionCallback
var conv = _services.GetRequiredService<IConversationService>();
locatorArgs.Highlight = true;
var browser = _services.GetRequiredService<IWebBrowser>();
var services = _services.CreateScope().ServiceProvider;
var browser = services.GetRequiredService<IWebBrowser>();
var webDriverService = _services.GetRequiredService<WebDriverService>();
var msg = new MessageInfo
{