Skip to content

Commit 5fe6e6b

Browse files
geffzhanggeffzhang
authored
Merge pull request #8 from Ai4c-AI/master
merge latest code
2 parents b64b0db + 505958f commit 5fe6e6b

File tree

241 files changed

+5893
-2585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+5893
-2585
lines changed

‎BotSharp.sln‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.GiteeAI", "
151151
EndProject
152152
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.ImageHandler", "src\Plugins\BotSharp.Plugin.ImageHandler\BotSharp.Plugin.ImageHandler.csproj", "{242F2D93-FCCE-4982-8075-F3052ECCA92C}"
153153
EndProject
154+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.FuzzySharp", "src\Plugins\BotSharp.Plugin.FuzzySharp\BotSharp.Plugin.FuzzySharp.csproj", "{E7C243B9-E751-B3B4-8F16-95C76CA90D31}"
155+
EndProject
154156
Global
155157
GlobalSection(SolutionConfigurationPlatforms) = preSolution
156158
Debug|Any CPU = Debug|Any CPU
@@ -639,6 +641,14 @@ Global
639641
{242F2D93-FCCE-4982-8075-F3052ECCA92C}.Release|Any CPU.Build.0 = Release|Any CPU
640642
{242F2D93-FCCE-4982-8075-F3052ECCA92C}.Release|x64.ActiveCfg = Release|Any CPU
641643
{242F2D93-FCCE-4982-8075-F3052ECCA92C}.Release|x64.Build.0 = Release|Any CPU
644+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
645+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Debug|Any CPU.Build.0 = Debug|Any CPU
646+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Debug|x64.ActiveCfg = Debug|Any CPU
647+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Debug|x64.Build.0 = Debug|Any CPU
648+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Release|Any CPU.ActiveCfg = Release|Any CPU
649+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Release|Any CPU.Build.0 = Release|Any CPU
650+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Release|x64.ActiveCfg = Release|Any CPU
651+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Release|x64.Build.0 = Release|Any CPU
642652
EndGlobalSection
643653
GlobalSection(SolutionProperties) = preSolution
644654
HideSolutionNode = FALSE
@@ -712,6 +722,7 @@ Global
712722
{FC63C875-E880-D8BB-B8B5-978AB7B62983} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
713723
{50B57066-3267-1D10-0F72-D2F5CC494F2C} = {D5293208-2BEF-42FC-A64C-5954F61720BA}
714724
{242F2D93-FCCE-4982-8075-F3052ECCA92C} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
725+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
715726
EndGlobalSection
716727
GlobalSection(ExtensibilityGlobals) = postSolution
717728
SolutionGuid = {A9969D89-C98B-40A5-A12B-FC87E55B3A19}

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
44
<LangVersion>12.0</LangVersion>
5-
<BotSharpVersion>5.1.0</BotSharpVersion>
5+
<BotSharpVersion>5.2.0</BotSharpVersion>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
</PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 64 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,33 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
</PropertyGroup>
77
<ItemGroup>
8+
<PackageVersion Include="CsvHelper" Version="33.1.0" />
9+
<PackageVersion Include="FuzzySharp" Version="2.0.2" />
810
<PackageVersion Include="EntityFramework" Version="6.4.4" />
9-
<PackageVersion Include="Google_GenerativeAI" Version="3.3.0" />
10-
<PackageVersion Include="Google_GenerativeAI.Live" Version="3.3.0" />
11-
<PackageVersion Include="LLMSharp.Google.Palm" Version="1.0.2" />
11+
<PackageVersion Include="Google_GenerativeAI" Version="3.4.1" />
12+
<PackageVersion Include="Google_GenerativeAI.Live" Version="3.4.1" />
1213
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
1314
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
14-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
15+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
1516
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
16-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
1718
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
1819
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
19-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
2021
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
2122
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
23+
<PackageVersion Include="SharpFuzz" Version="2.2.0" />
2224
<PackageVersion Include="SharpHook" Version="5.3.9" />
23-
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
25+
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
2426
<PackageVersion Include="System.ClientModel" Version="1.3.0" />
2527
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
26-
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.0.0" />
28+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
2729
<PackageVersion Include="System.Memory.Data" Version="8.0.0" />
2830
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
2931
<PackageVersion Include="System.Reactive" Version="6.0.1" />
30-
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
31-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
32-
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
32+
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
33+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
34+
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
3335
<PackageVersion Include="Rougamo.Fody" Version="5.0.0" />
3436
<PackageVersion Include="Aspects.Cache" Version="2.0.4" />
3537
<PackageVersion Include="DistributedLock.Redis" Version="1.1.0" />
@@ -38,82 +40,82 @@
3840
<PackageVersion Include="Nanoid" Version="3.1.0" />
3941
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.2" />
4042
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
41-
<PackageVersion Include="Anthropic.SDK" Version="5.5.0" />
43+
<PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
4244
<PackageVersion Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
4345
<PackageVersion Include="NAudio" Version="2.2.1" />
4446
<PackageVersion Include="NAudio.Core" Version="2.2.1" />
4547
<PackageVersion Include="Whisper.net" Version="1.8.1" />
4648
<PackageVersion Include="Whisper.net.Runtime" Version="1.8.1" />
4749
<PackageVersion Include="NCrontab" Version="3.3.3" />
48-
<PackageVersion Include="Azure.AI.OpenAI" Version="2.3.0-beta.2" />
49-
<PackageVersion Include="OpenAI" Version="2.5.0" />
50-
<PackageVersion Include="MailKit" Version="4.11.0" />
51-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.8" />
52-
<PackageVersion Include="MySql.Data" Version="9.0.0" />
53-
<PackageVersion Include="NPOI" Version="2.7.1" />
50+
<PackageVersion Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" />
51+
<PackageVersion Include="OpenAI" Version="2.6.0" />
52+
<PackageVersion Include="MailKit" Version="4.14.1" />
53+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0" />
54+
<PackageVersion Include="MySql.Data" Version="9.5.0" />
55+
<PackageVersion Include="NPOI" Version="2.7.5" />
5456
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
5557
<PackageVersion Include="Refit" Version="8.0.0" />
5658
<PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
5759
<PackageVersion Include="Jint" Version="4.1.0" />
58-
<PackageVersion Include="PdfPig" Version="0.1.8" />
60+
<PackageVersion Include="PdfPig" Version="0.1.11" />
5961
<PackageVersion Include="TensorFlow.Keras" Version="0.15.0" />
60-
<PackageVersion Include="LangChain.Providers.Google.VertexAI" Version="0.15.3-dev.58" />
61-
<PackageVersion Include="LLamaSharp" Version="0.21.0" />
62+
<PackageVersion Include="LangChain.Providers.Google.VertexAI" Version="0.17.1-dev.48" />
63+
<PackageVersion Include="LLamaSharp" Version="0.25.0" />
6264
<PackageVersion Include="FaissMask" Version="0.4.2" />
6365
<PackageVersion Include="FastText.NetWrapper" Version="1.3.1" />
64-
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.5.0" />
65-
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
66-
<PackageVersion Include="MongoDB.Driver" Version="3.1.0" />
66+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.0.0" />
67+
<PackageVersion Include="System.Text.Encodings.Web" Version="10.0.0" />
68+
<PackageVersion Include="MongoDB.Driver" Version="3.5.0" />
6769
<PackageVersion Include="Docnet.Core" Version="2.7.0-alpha.1" />
68-
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="13.8.0" />
69-
<PackageVersion Include="Magick.NET.Core" Version="13.8.0" />
70-
<PackageVersion Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
71-
<PackageVersion Include="Sdcb.PaddleInference" Version="2.5.0.1" />
72-
<PackageVersion Include="Sdcb.PaddleInference.runtime.win64.mkl" Version="2.5.1" />
73-
<PackageVersion Include="Sdcb.PaddleOCR" Version="2.7.0.1" />
70+
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.9.1" />
71+
<PackageVersion Include="Magick.NET.Core" Version="14.9.1" />
72+
<PackageVersion Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
73+
<PackageVersion Include="Sdcb.PaddleInference" Version="3.0.1" />
74+
<PackageVersion Include="Sdcb.PaddleInference.runtime.win64.mkl" Version="3.1.0.54" />
75+
<PackageVersion Include="Sdcb.PaddleOCR" Version="3.0.1" />
7476
<PackageVersion Include="Sdcb.PaddleOCR.Models.LocalV3" Version="2.7.0.1" />
75-
<PackageVersion Include="System.Drawing.Common" Version="8.0.14" />
77+
<PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
7678
<PackageVersion Include="pythonnet" Version="3.0.5" />
77-
<PackageVersion Include="Qdrant.Client" Version="1.15.0" />
79+
<PackageVersion Include="Qdrant.Client" Version="1.15.1" />
7880
<PackageVersion Include="Selenium.WebDriver" Version="4.27.0" />
79-
<PackageVersion Include="HtmlAgilityPack" Version="1.12.0" />
80-
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.16.0" />
81+
<PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
82+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.67.1" />
8183
<PackageVersion Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.16.0-alpha" />
82-
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
84+
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.13.22" />
8385
<PackageVersion Include="Sdcb.SparkDesk" Version="3.1.0" />
84-
<PackageVersion Include="MySqlConnector" Version="2.4.0" />
85-
<PackageVersion Include="Npgsql" Version="8.0.7" />
86+
<PackageVersion Include="MySqlConnector" Version="2.5.0" />
87+
<PackageVersion Include="Npgsql" Version="9.0.4" />
8688
<PackageVersion Include="Tencent.QCloud.Cos.Sdk" Version="5.4.39" />
8789
<PackageVersion Include="StackExchange.Redis" Version="2.7.33" />
8890
<PackageVersion Include="StrongGrid" Version="0.108.0" />
8991
<PackageVersion Include="Twilio.AspNet.Common" Version="8.1.1" />
9092
<PackageVersion Include="Twilio.AspNet.Core" Version="8.1.1" />
91-
<PackageVersion Include="Microsoft.Playwright" Version="1.51.0" />
92-
<PackageVersion Include="Senparc.Weixin.MP.Middleware" Version="1.2.1" />
93-
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
93+
<PackageVersion Include="Microsoft.Playwright" Version="1.56.0" />
94+
<PackageVersion Include="Senparc.Weixin.MP.Middleware" Version="1.5.0" />
95+
<PackageVersion Include="System.Threading.Channels" Version="10.0.0" />
9496
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" />
95-
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
96-
<PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
97-
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="3.0.0" />
98-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.3.0" />
99-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0" />
100-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
101-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
102-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
103-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
104-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
105-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="8.2.0" />
106-
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="8.0.1" />
107-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
108-
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.16.0" />
109-
<PackageVersion Include="Moq" Version="4.20.70" />
110-
<PackageVersion Include="xunit" Version="2.9.0" />
111-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
112-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
113-
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
114-
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
115-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
116-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
97+
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
98+
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
99+
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0" />
100+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
101+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
102+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
103+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
104+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
105+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
106+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
107+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.2" />
108+
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="9.5.2" />
109+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
110+
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.67.1" />
111+
<PackageVersion Include="Moq" Version="4.20.72" />
112+
<PackageVersion Include="xunit" Version="2.9.3" />
113+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
114+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
115+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
116+
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
117+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
118+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
117119
<PackageVersion Include="Shouldly" Version="4.3.0" />
118120
<PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.11" />
119121
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.1.0-preview.11" />

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,11 @@ BotSharp uses component design, the kernel is kept to a minimum, and business fu
115115
- BotSharp.Plugin.Dashboard
116116
- BotSharp.Plugin.RoutingSpeeder
117117
- BotSharp.Plugin.AudioHandler
118+
- BotSharp.Plugin.ChartHandler
118119
- BotSharp.Plugin.EmailHandler
120+
- BotSharp.Plugin.ExcelHandler
119121
- BotSharp.Plugin.FileHandler
122+
- BotSharp.Plugin.ImageHandler
120123
- BotSharp.Plugin.HttpHandler
121124
- BotSharp.Plugin.SqlDriver
122125
- BotSharp.Plugin.WebDriver
@@ -130,7 +133,7 @@ BotSharp uses component design, the kernel is kept to a minimum, and business fu
130133
- [x] MCP
131134
- [x] Realtime
132135
- [ ] Computer Use
133-
- [x] Browser Use
136+
- [ ] Browser Use
134137
- [x] Database Assistant
135138
- [x] Code Interpreter
136139
- [x] Conversation Management

‎src/BotSharp.AppHost/BotSharp.AppHost.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
2+
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
34
<PropertyGroup>
45
<OutputType>Exe</OutputType>
56
<TargetFramework>net8.0</TargetFramework>

‎src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public virtual bool OnAgentLoading(ref string id)
2929
return true;
3030
}
3131

32-
public virtual bool OnInstructionLoaded(string template, Dictionary<string, object> dict)
32+
public virtual bool OnInstructionLoaded(string template, IDictionary<string, object> dict)
3333
{
3434
dict["current_date"] = $"{DateTime.Now:MMM dd, yyyy}";
3535
dict["current_time"] = $"{DateTime.Now:hh:mm tt}";

‎src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public interface IAgentHook : IHookBase
1616
/// <returns></returns>
1717
bool OnAgentLoading(ref string id);
1818

19-
bool OnInstructionLoaded(string template, Dictionary<string, object> dict);
19+
bool OnInstructionLoaded(string template, IDictionary<string, object> dict);
2020

2121
bool OnFunctionsLoaded(List<FunctionDef> functions);
2222

0 commit comments

Comments
 (0)