Skip to content

Commit 404a3ed

Browse files
geffzhanggeffzhang
authored
Merge branch 'SciSharp:master' into master
2 parents 1d8c765 + cc6f4d6 commit 404a3ed

File tree

296 files changed

+4733
-1247
lines changed

Some content is hidden

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

296 files changed

+4733
-1247
lines changed

‎BotSharp.sln‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Core.Rules", "src\
127127
EndProject
128128
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.DeepSeekAI", "src\Plugins\BotSharp.Plugin.DeepSeekAI\BotSharp.Plugin.DeepSeekAI.csproj", "{AF329442-B48E-4B48-A18A-1C869D1BA6F5}"
129129
EndProject
130+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Core.Realtime", "src\Infrastructure\BotSharp.Core.Realtime\BotSharp.Core.Realtime.csproj", "{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}"
131+
EndProject
130132
Global
131133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
132134
Debug|Any CPU = Debug|Any CPU
@@ -519,6 +521,14 @@ Global
519521
{AF329442-B48E-4B48-A18A-1C869D1BA6F5}.Release|Any CPU.Build.0 = Release|Any CPU
520522
{AF329442-B48E-4B48-A18A-1C869D1BA6F5}.Release|x64.ActiveCfg = Release|Any CPU
521523
{AF329442-B48E-4B48-A18A-1C869D1BA6F5}.Release|x64.Build.0 = Release|Any CPU
524+
{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
525+
{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
526+
{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Debug|x64.ActiveCfg = Debug|Any CPU
527+
{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Debug|x64.Build.0 = Debug|Any CPU
528+
{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
529+
{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Release|Any CPU.Build.0 = Release|Any CPU
530+
{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Release|x64.ActiveCfg = Release|Any CPU
531+
{7ACD8C95-C66B-436A-80E7-541A57D8C3F4}.Release|x64.Build.0 = Release|Any CPU
522532
EndGlobalSection
523533
GlobalSection(SolutionProperties) = preSolution
524534
HideSolutionNode = FALSE
@@ -580,6 +590,7 @@ Global
580590
{F812BAAE-5A7D-4DF7-8E71-70696B51C61F} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749}
581591
{AFD64412-4D6A-452E-82A2-79E5D8842E29} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749}
582592
{AF329442-B48E-4B48-A18A-1C869D1BA6F5} = {D5293208-2BEF-42FC-A64C-5954F61720BA}
593+
{7ACD8C95-C66B-436A-80E7-541A57D8C3F4} = {E29DC6C4-5E57-48C5-BCB0-6B8F84782749}
583594
EndGlobalSection
584595
GlobalSection(ExtensibilityGlobals) = postSolution
585596
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>4.0.0</BotSharpVersion>
5+
<BotSharpVersion>4.1.0</BotSharpVersion>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
</PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 97 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<Project>
22
<PropertyGroup>
33
<MSExtensionsVersion>8.0.0</MSExtensionsVersion>
4+
<AspNetCoreVersion>2.3.0</AspNetCoreVersion>
5+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
46
</PropertyGroup>
57
<ItemGroup>
68
<PackageVersion Include="EntityFramework" Version="6.4.4" />
7-
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
8-
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
9-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(MSExtensionsVersion)" />
10-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MSExtensionsVersion)" />
11-
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(MSExtensionsVersion)" />
12-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MSExtensionsVersion)" />
13-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
9+
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
10+
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
11+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
12+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
13+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
14+
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
15+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
16+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
1417
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
1518
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
16-
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.1.2" />
19+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.0.0" />
1720
<PackageVersion Include="System.Memory.Data" Version="8.0.0" />
1821
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
19-
<PackageVersion Include="Serilog" Version="2.10.0" />
20-
<PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
21-
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
22+
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
23+
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
2224
<PackageVersion Include="Rougamo.Fody" Version="4.0.4" />
2325
<PackageVersion Include="Aspects.Cache" Version="2.0.4" />
2426
<PackageVersion Include="DistributedLock.Redis" Version="1.0.3" />
@@ -27,14 +29,96 @@
2729
<PackageVersion Include="Nanoid" Version="3.1.0" />
2830
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
2931
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
30-
<PackageVersion Include="Anthropic.SDK" Version="4.4.2" />
32+
<PackageVersion Include="Anthropic.SDK" Version="4.7.1" />
3133
<PackageVersion Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
3234
<PackageVersion Include="NAudio" Version="2.2.1" />
3335
<PackageVersion Include="NAudio.Core" Version="2.2.1" />
3436
<PackageVersion Include="Whisper.net" Version="1.5.0" />
3537
<PackageVersion Include="Whisper.net.Runtime" Version="1.5.0" />
38+
<PackageVersion Include="NCrontab" Version="3.3.3" />
39+
<PackageVersion Include="Azure.AI.OpenAI" Version="2.1.0" />
40+
<PackageVersion Include="OpenAI" Version="2.1.0" />
41+
<PackageVersion Include="MailKit" Version="4.7.0" />
42+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.8" />
43+
<PackageVersion Include="MySql.Data" Version="9.0.0" />
44+
<PackageVersion Include="NPOI" Version="2.7.1" />
45+
<PackageVersion Include="LLMSharp.Google.Palm" Version="1.0.2" />
46+
<PackageVersion Include="Mscc.GenerativeAI" Version="2.2.11" />
47+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
48+
<PackageVersion Include="Refit" Version="8.0.0" />
49+
<PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
50+
<PackageVersion Include="Jint" Version="4.1.0" />
51+
<PackageVersion Include="PdfPig" Version="0.1.8" />
52+
<PackageVersion Include="TensorFlow.Keras" Version="0.15.0" />
53+
<PackageVersion Include="LangChain.Providers.Google.VertexAI" Version="0.15.3-dev.58" />
54+
<PackageVersion Include="LLamaSharp" Version="0.20.0" />
55+
<PackageVersion Include="FaissMask" Version="0.2.0" />
56+
<PackageVersion Include="FastText.NetWrapper" Version="1.3.0" />
57+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25161.3" />
58+
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
59+
<PackageVersion Include="MongoDB.Driver" Version="3.1.0" />
60+
<PackageVersion Include="Docnet.Core" Version="2.7.0-alpha.1" />
61+
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="13.8.0" />
62+
<PackageVersion Include="Magick.NET.Core" Version="13.8.0" />
63+
<PackageVersion Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
64+
<PackageVersion Include="Sdcb.PaddleInference" Version="2.5.0.1" />
65+
<PackageVersion Include="Sdcb.PaddleInference.runtime.win64.mkl" Version="2.5.1" />
66+
<PackageVersion Include="Sdcb.PaddleOCR" Version="2.7.0.1" />
67+
<PackageVersion Include="Sdcb.PaddleOCR.Models.LocalV3" Version="2.7.0.1" />
68+
<PackageVersion Include="System.Drawing.Common" Version="8.0.7" />
69+
<PackageVersion Include="pythonnet" Version="3.0.4" />
70+
<PackageVersion Include="Qdrant.Client" Version="1.13.0" />
71+
<PackageVersion Include="Selenium.WebDriver" Version="4.27.0" />
72+
<PackageVersion Include="HtmlAgilityPack" Version="1.11.71" />
73+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.16.0" />
74+
<PackageVersion Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.16.0-alpha" />
75+
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
76+
<PackageVersion Include="Sdcb.SparkDesk" Version="3.1.0" />
77+
<PackageVersion Include="MySqlConnector" Version="2.3.7" />
78+
<PackageVersion Include="Npgsql" Version="8.0.5" />
79+
<PackageVersion Include="Tencent.QCloud.Cos.Sdk" Version="5.4.39" />
80+
<PackageVersion Include="StackExchange.Redis" Version="2.7.27" />
81+
<PackageVersion Include="StrongGrid" Version="0.108.0" />
82+
<PackageVersion Include="Twilio.AspNet.Common" Version="8.1.1" />
83+
<PackageVersion Include="Twilio.AspNet.Core" Version="8.1.1" />
84+
<PackageVersion Include="Microsoft.Playwright" Version="1.49.0" />
85+
<PackageVersion Include="Senparc.Weixin.MP.Middleware" Version="1.2.1" />
86+
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
87+
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" />
88+
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
89+
<PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
90+
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="3.0.0" />
91+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.3.0" />
92+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0" />
93+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
94+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
95+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
96+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
97+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
98+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="8.2.0" />
99+
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="8.0.1" />
100+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
101+
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.16.0" />
102+
<PackageVersion Include="Moq" Version="4.20.70" />
103+
<PackageVersion Include="xunit" Version="2.9.0" />
104+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
105+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
106+
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
107+
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
108+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
109+
</ItemGroup>
110+
<ItemGroup>
111+
<PackageVersion Include="BotSharp.Logger" Version="$(BotSharpVersion)" />
112+
<PackageVersion Include="BotSharp.OpenAPI" Version="$(BotSharpVersion)" />
113+
<PackageVersion Include="BotSharp.Plugin.Dashboard" Version="$(BotSharpVersion)" />
114+
<PackageVersion Include="BotSharp.Plugin.AzureOpenAI" Version="$(BotSharpVersion)" />
115+
<PackageVersion Include="BotSharp.Plugin.GoogleAI" Version="$(BotSharpVersion)" />
116+
<PackageVersion Include="BotSharp.Plugin.HuggingFace" Version="$(BotSharpVersion)" />
117+
<PackageVersion Include="BotSharp.Plugin.KnowledgeBase" Version="$(BotSharpVersion)" />
118+
<PackageVersion Include="BotSharp.Plugin.MetaAI" Version="$(BotSharpVersion)" />
119+
<PackageVersion Include="BotSharp.Plugin.LLamaSharp" Version="$(BotSharpVersion)" />
120+
<PackageVersion Include="BotSharp.Plugin.ChatHub" Version="$(BotSharpVersion)" />
36121
</ItemGroup>
37-
38122
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
39123
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.5" />
40124
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.0.0" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.0" />
14-
<PackageReference Include="Aspire.Hosting.NodeJs" Version="8.0.1" />
13+
<PackageReference Include="Aspire.Hosting.AppHost" />
14+
<PackageReference Include="Aspire.Hosting.NodeJs" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/BotSharp.ServiceDefaults/BotSharp.ServiceDefaults.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010
<ItemGroup>
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
12-
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
13-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
14-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
15-
<PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="3.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.3.0" />
17-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0" />
18-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
19-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
20-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
21-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
22-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
12+
<PackageReference Include="Serilog.Extensions.Hosting" />
13+
<PackageReference Include="Serilog.Sinks.Console" />
14+
<PackageReference Include="Serilog.Sinks.File" />
15+
<PackageReference Include="Serilog.Sinks.OpenTelemetry" />
16+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" />
17+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
18+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
19+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
20+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
21+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
22+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
2323
</ItemGroup>
2424

2525
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public interface IAgentService
1212
Task<Agent> CreateAgent(Agent agent);
1313
Task<string> RefreshAgents();
1414
Task<PagedItems<Agent>> GetAgents(AgentFilter filter);
15-
Task<List<IdName>> GetAgentOptions();
15+
Task<List<IdName>> GetAgentOptions(List<string>? agentIds = null);
1616

1717
/// <summary>
1818
/// Load agent configurations and trigger hooks

‎src/Infrastructure/BotSharp.Abstraction/BotSharp.Abstraction.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(TargetFramework)</TargetFramework>
@@ -8,7 +8,6 @@
88
<PackageIcon>Icon.png</PackageIcon>
99
<GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
1010
<OutputPath>$(SolutionDir)packages</OutputPath>
11-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1211
</PropertyGroup>
1312

1413
<ItemGroup>

‎src/Infrastructure/BotSharp.Abstraction/Browsing/Models/PageActionArgs.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ public class PageActionArgs
1616
/// <summary>
1717
/// This value has to be set to true if you want to get the page XHR/ Fetch responses
1818
/// </summary>
19-
public bool OpenNewTab { get; set; } = false;
19+
[JsonPropertyName("open_new_tab")]
20+
public bool OpenNewTab { get; set; } = true;
21+
[JsonPropertyName("open_blank_page")]
22+
public bool OpenBlankPage { get; set; } = true;
2023

2124
public bool EnableResponseCallback { get; set; } = false;
2225

@@ -47,4 +50,6 @@ public class PageActionArgs
4750
public int WaitTime { get; set; }
4851

4952
public bool ReadInnerHTMLAsBody { get; set; } = false;
53+
[JsonPropertyName("keep_browser_open")]
54+
public bool KeepBrowserOpen { get; set; } = false;
5055
}

‎src/Infrastructure/BotSharp.Abstraction/Browsing/Settings/WebBrowsingSettings.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@ namespace BotSharp.Abstraction.Browsing.Settings;
33
public class WebBrowsingSettings
44
{
55
public string Driver { get; set; } = "Playwright";
6+
public bool Headless { get; set; }
7+
// Default timeout in milliseconds
8+
public float DefaultTimeout { get; set; } = 30000;
9+
public bool IsEnableScreenshot { get; set; }
10+
// Default wait time in seconds after page is opened
11+
public int DefaultWaitTime { get; set; } = 5;
612
}

‎src/Infrastructure/BotSharp.Abstraction/Conversations/Enums/MessageTypeName.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ public static class MessageTypeName
66
public const string Notification = "notification";
77
public const string FunctionCall = "function";
88
public const string Audio = "audio";
9+
public const string Error = "error";
910
}

0 commit comments

Comments
 (0)