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

Merge branch 'master' of https://github.com/SciSharp/BotSharp into features/add-chart-handler

Browse source
This commit is contained in:
Jicheng Lu 2025-07-11 14:20:13 -05:00
parent 7f7d4733e9 ea54988ec4
commit 180ffc5068
12 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Infrastructure/BotSharp.Abstraction/Browsing/IWebDriverHook.cs
View file

@ -4,5 +4,6 @@ namespace BotSharp.Abstraction.Browsing;
public interface IWebDriverHook
{
Task<List<string>> GetUploadFiles(MessageInfo message);
Task<List<string>> GetUploadFiles(MessageInfo message) => Task.FromResult(new List<string>());
Task OnLocateElement(MessageInfo message, string content) => Task.CompletedTask;
}

11
src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs
View file

@ -82,8 +82,8 @@ public class ChatStreamMiddleware
var (eventType, data) = MapEvents(conn, receivedText);
if (eventType == "start")
{
var states = InitStates(data);
await ConnectToModel(hub, webSocket, states);
var request = InitRequest(data);
await ConnectToModel(hub, webSocket, request?.States);
}
else if (eventType == "media")
{
@ -157,16 +157,15 @@ public class ChatStreamMiddleware
});
}
private List<MessageState> InitStates(string data)
private ChatStreamRequest? InitRequest(string data)
{
try
{
var states = JsonSerializer.Deserialize<List<MessageState>>(data, BotSharpOptions.defaultJsonOptions);
return states ?? [];
return JsonSerializer.Deserialize<ChatStreamRequest>(data, BotSharpOptions.defaultJsonOptions);
}
catch
{
return [];
return null;
}
}
}

10
src/Plugins/BotSharp.Plugin.ChatHub/Models/Stream/ChatStreamRequest.cs Normal file
View file

@ -0,0 +1,10 @@
using BotSharp.Abstraction.Models;
using System.Text.Json.Serialization;
namespace BotSharp.Plugin.ChatHub.Models.Stream;
public class ChatStreamRequest
{
[JsonPropertyName("states")]
public List<MessageState> States { get; set; } = [];
}

2
src/Plugins/BotSharp.Plugin.SqlDriver/Functions/ExecuteQueryFn.cs
View file

@ -33,7 +33,7 @@ public class ExecuteQueryFn : IFunctionCallback
var results = dbType.ToLower() switch
{
"mysql" => RunQueryInMySql(args.SqlStatements),
"sqlserver" => RunQueryInSqlServer(args.SqlStatements),
"sqlserver" or "mssql" => RunQueryInSqlServer(args.SqlStatements),
"redshift" => RunQueryInRedshift(args.SqlStatements),
_ => throw new NotImplementedException($"Database type {dbType} is not supported.")
};

2
src/Plugins/BotSharp.Plugin.SqlDriver/Functions/GetTableDefinitionFn.cs
View file

@ -37,7 +37,7 @@ public class GetTableDefinitionFn : IFunctionCallback
var tableDdls = dbType switch
{
"mysql" => GetDdlFromMySql(tables),
"sqlserver" => GetDdlFromSqlServer(tables),
"sqlserver" or "mssql" => GetDdlFromSqlServer(tables),
"redshift" => GetDdlFromRedshift(tables),
_ => throw new NotImplementedException($"Database type {dbType} is not supported.")
};

2
src/Plugins/BotSharp.Plugin.SqlDriver/Functions/SqlSelect.cs
View file

@ -32,7 +32,7 @@ public class SqlSelect : IFunctionCallback
var result = dbType switch
{
"mysql" => RunQueryInMySql(args),
"sqlserver" => RunQueryInSqlServer(args),
"sqlserver" or "mssql" => RunQueryInSqlServer(args),
"redshift" => RunQueryInRedshift(args),
_ => throw new NotImplementedException($"Database type {dbType} is not supported.")
};

2
src/Plugins/BotSharp.Plugin.SqlDriver/Functions/SqlValidateFn.cs
View file

@ -34,7 +34,7 @@ public class SqlValidateFn : IFunctionCallback
var validateSql = dbType.ToLower() switch
{
"mysql" => $"EXPLAIN\r\n{sql.Replace("SET ", "-- SET ", StringComparison.InvariantCultureIgnoreCase).Replace(";", "; EXPLAIN ").TrimEnd("EXPLAIN ".ToCharArray())}",
"sqlserver" => $"SET PARSEONLY ON;\r\n{sql}\r\nSET PARSEONLY OFF;",
"sqlserver" or "mssql" => $"SET PARSEONLY ON;\r\n{sql}\r\nSET PARSEONLY OFF;",
"redshift" => $"explain\r\n{sql}",
_ => throw new NotImplementedException($"Database type {dbType} is not supported.")
};

2
src/Plugins/BotSharp.Plugin.SqlDriver/UtilFunctions/GetTableDefinitionFn.cs
View file

@ -31,7 +31,7 @@ public class GetTableDefinitionFn : IFunctionCallback
var tableDdls = dbType switch
{
"mysql" => GetDdlFromMySql(tables),
"sqlserver" => GetDdlFromSqlServer(tables),
"sqlserver" or "mssql" => GetDdlFromSqlServer(tables),
"redshift" => GetDdlFromRedshift(tables,schema),
_ => throw new NotImplementedException($"Database type {dbType} is not supported.")
};

2
src/Plugins/BotSharp.Plugin.SqlDriver/UtilFunctions/SqlSelect.cs
View file

@ -30,7 +30,7 @@ public class SqlSelect : IFunctionCallback
var result = dbType switch
{
"mysql" => RunQueryInMySql(args),
"sqlserver" => RunQueryInSqlServer(args),
"sqlserver" or "mssql" => RunQueryInSqlServer(args),
"redshift" => RunQueryInRedshift(args),
_ => throw new NotImplementedException($"Database type {dbType} is not supported.")
};

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

@ -114,6 +114,11 @@ public partial class PlaywrightWebDriver
// fix if html has &
result.Body = HttpUtility.HtmlDecode(html);
result.IsSuccess = true;
var hooks = _services.GetServices<IWebDriverHook>();
foreach (var hook in hooks)
{
await hook.OnLocateElement(message, result.Body);
}
}
else if (count > 1)
{

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

@ -28,7 +28,7 @@ public class UtilWebCloseBrowserFn : IFunctionCallback
ContextId = webDriverService.GetMessageContext(message)
};
await browser.CloseBrowser(message.CurrentAgentId);
await browser.CloseBrowser(msg.ContextId);
message.Content = $"Browser closed.";

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

@ -30,6 +30,7 @@ public class UtilWebLocateElementFn : IFunctionCallback
MessageId = message.MessageId,
ContextId = webDriverService.GetMessageContext(message)
};
browser.SetServiceProvider(_services);
var result = await browser.LocateElement(msg, locatorArgs);
message.Content = $"Locating element {(result.IsSuccess ? "success" : "failed")}. ";