Skip to content

Commit 1029f95

Browse files
author
Wenbo Cao
committed
solve conflicts
2 parents 8af9552 + 1716ec0 commit 1029f95

File tree

112 files changed

+2882
-1028
lines changed

Some content is hidden

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

112 files changed

+2882
-1028
lines changed

BotSharp.sln

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.ExcelHandle
149149
EndProject
150150
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.ImageHandler", "src\Plugins\BotSharp.Plugin.ImageHandler\BotSharp.Plugin.ImageHandler.csproj", "{242F2D93-FCCE-4982-8075-F3052ECCA92C}"
151151
EndProject
152+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.FuzzySharp", "src\Plugins\BotSharp.Plugin.FuzzySharp\BotSharp.Plugin.FuzzySharp.csproj", "{E7C243B9-E751-B3B4-8F16-95C76CA90D31}"
153+
EndProject
152154
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.MMPEmbedding", "src\Plugins\BotSharp.Plugin.MMPEmbedding\BotSharp.Plugin.MMPEmbedding.csproj", "{394B858B-9C26-B977-A2DA-8CC7BE5914CB}"
153155
EndProject
154156
Global
@@ -631,6 +633,14 @@ Global
631633
{242F2D93-FCCE-4982-8075-F3052ECCA92C}.Release|Any CPU.Build.0 = Release|Any CPU
632634
{242F2D93-FCCE-4982-8075-F3052ECCA92C}.Release|x64.ActiveCfg = Release|Any CPU
633635
{242F2D93-FCCE-4982-8075-F3052ECCA92C}.Release|x64.Build.0 = Release|Any CPU
636+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
637+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Debug|Any CPU.Build.0 = Debug|Any CPU
638+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Debug|x64.ActiveCfg = Debug|Any CPU
639+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Debug|x64.Build.0 = Debug|Any CPU
640+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Release|Any CPU.ActiveCfg = Release|Any CPU
641+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Release|Any CPU.Build.0 = Release|Any CPU
642+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Release|x64.ActiveCfg = Release|Any CPU
643+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31}.Release|x64.Build.0 = Release|Any CPU
634644
{394B858B-9C26-B977-A2DA-8CC7BE5914CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
635645
{394B858B-9C26-B977-A2DA-8CC7BE5914CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
636646
{394B858B-9C26-B977-A2DA-8CC7BE5914CB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -711,6 +721,7 @@ Global
711721
{0428DEAA-E4FE-4259-A6D8-6EDD1A9D0702} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
712722
{FC63C875-E880-D8BB-B8B5-978AB7B62983} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
713723
{242F2D93-FCCE-4982-8075-F3052ECCA92C} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
724+
{E7C243B9-E751-B3B4-8F16-95C76CA90D31} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
714725
{394B858B-9C26-B977-A2DA-8CC7BE5914CB} = {2635EC9B-2E5F-4313-AC21-0B847F31F36C}
715726
EndGlobalSection
716727
GlobalSection(ExtensibilityGlobals) = postSolution

Directory.Packages.props

Lines changed: 56 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +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.4.0" />
10-
<PackageVersion Include="Google_GenerativeAI.Live" Version="3.4.0" />
11+
<PackageVersion Include="Google_GenerativeAI" Version="3.4.1" />
12+
<PackageVersion Include="Google_GenerativeAI.Live" Version="3.4.1" />
1113
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
1214
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
13-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
15+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
1416
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
15-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
1618
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
1719
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
18-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
1921
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
2022
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
23+
<PackageVersion Include="SharpFuzz" Version="2.2.0" />
2124
<PackageVersion Include="SharpHook" Version="5.3.9" />
22-
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
25+
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
2326
<PackageVersion Include="System.ClientModel" Version="1.3.0" />
2427
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
2528
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
2629
<PackageVersion Include="System.Memory.Data" Version="8.0.0" />
2730
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
2831
<PackageVersion Include="System.Reactive" Version="6.0.1" />
29-
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
30-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
31-
<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" />
3235
<PackageVersion Include="Rougamo.Fody" Version="5.0.0" />
3336
<PackageVersion Include="Aspects.Cache" Version="2.0.4" />
3437
<PackageVersion Include="DistributedLock.Redis" Version="1.1.0" />
@@ -46,73 +49,73 @@
4649
<PackageVersion Include="NCrontab" Version="3.3.3" />
4750
<PackageVersion Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" />
4851
<PackageVersion Include="OpenAI" Version="2.6.0" />
49-
<PackageVersion Include="MailKit" Version="4.11.0" />
50-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.8" />
51-
<PackageVersion Include="MySql.Data" Version="9.0.0" />
52-
<PackageVersion Include="NPOI" Version="2.7.1" />
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" />
5356
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
5457
<PackageVersion Include="Refit" Version="8.0.0" />
5558
<PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
5659
<PackageVersion Include="Jint" Version="4.1.0" />
57-
<PackageVersion Include="PdfPig" Version="0.1.8" />
60+
<PackageVersion Include="PdfPig" Version="0.1.11" />
5861
<PackageVersion Include="TensorFlow.Keras" Version="0.15.0" />
5962
<PackageVersion Include="LangChain.Providers.Google.VertexAI" Version="0.17.1-dev.48" />
60-
<PackageVersion Include="LLamaSharp" Version="0.21.0" />
63+
<PackageVersion Include="LLamaSharp" Version="0.25.0" />
6164
<PackageVersion Include="FaissMask" Version="0.4.2" />
6265
<PackageVersion Include="FastText.NetWrapper" Version="1.3.1" />
63-
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.0" />
64-
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
65-
<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" />
6669
<PackageVersion Include="Docnet.Core" Version="2.7.0-alpha.1" />
6770
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.9.1" />
6871
<PackageVersion Include="Magick.NET.Core" Version="14.9.1" />
69-
<PackageVersion Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
70-
<PackageVersion Include="Sdcb.PaddleInference" Version="2.5.0.1" />
71-
<PackageVersion Include="Sdcb.PaddleInference.runtime.win64.mkl" Version="2.5.1" />
72-
<PackageVersion Include="Sdcb.PaddleOCR" Version="2.7.0.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" />
7376
<PackageVersion Include="Sdcb.PaddleOCR.Models.LocalV3" Version="2.7.0.1" />
74-
<PackageVersion Include="System.Drawing.Common" Version="8.0.14" />
77+
<PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
7578
<PackageVersion Include="pythonnet" Version="3.0.5" />
7679
<PackageVersion Include="Qdrant.Client" Version="1.15.1" />
7780
<PackageVersion Include="Selenium.WebDriver" Version="4.27.0" />
78-
<PackageVersion Include="HtmlAgilityPack" Version="1.12.0" />
79-
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.66.0" />
81+
<PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
82+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.67.1" />
8083
<PackageVersion Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.16.0-alpha" />
81-
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
84+
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.13.22" />
8285
<PackageVersion Include="Sdcb.SparkDesk" Version="3.1.0" />
83-
<PackageVersion Include="MySqlConnector" Version="2.4.0" />
84-
<PackageVersion Include="Npgsql" Version="8.0.7" />
86+
<PackageVersion Include="MySqlConnector" Version="2.5.0" />
87+
<PackageVersion Include="Npgsql" Version="9.0.4" />
8588
<PackageVersion Include="Tencent.QCloud.Cos.Sdk" Version="5.4.39" />
8689
<PackageVersion Include="StackExchange.Redis" Version="2.7.33" />
8790
<PackageVersion Include="StrongGrid" Version="0.108.0" />
8891
<PackageVersion Include="Twilio.AspNet.Common" Version="8.1.1" />
8992
<PackageVersion Include="Twilio.AspNet.Core" Version="8.1.1" />
90-
<PackageVersion Include="Microsoft.Playwright" Version="1.51.0" />
91-
<PackageVersion Include="Senparc.Weixin.MP.Middleware" Version="1.2.1" />
92-
<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" />
9396
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" />
94-
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
95-
<PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
96-
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="3.0.0" />
97-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.3.0" />
98-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0" />
99-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
100-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
101-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
102-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
103-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
104-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="8.2.0" />
105-
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="8.0.1" />
106-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
107-
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.16.0" />
108-
<PackageVersion Include="Moq" Version="4.20.70" />
109-
<PackageVersion Include="xunit" Version="2.9.0" />
110-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
111-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
112-
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
113-
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
114-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
115-
<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" />
116119
<PackageVersion Include="Shouldly" Version="4.3.0" />
117120
<PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.11" />
118121
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.1.0-preview.11" />

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/IAgentService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ public interface IAgentService
7272
Task<List<AgentCodeScript>> GetAgentCodeScripts(string agentId, AgentCodeScriptFilter? filter = null)
7373
=> Task.FromResult(new List<AgentCodeScript>());
7474

75-
Task<string?> GetAgentCodeScript(string agentId, string scriptName, string scriptType = AgentCodeScriptType.Src)
76-
=> Task.FromResult(string.Empty);
75+
Task<AgentCodeScript?> GetAgentCodeScript(string agentId, string scriptName, string scriptType = AgentCodeScriptType.Src)
76+
=> Task.FromResult((AgentCodeScript?)null);
7777

7878
Task<bool> UpdateAgentCodeScripts(string agentId, List<AgentCodeScript> codeScripts, AgentCodeScriptUpdateOptions? options = null)
7979
=> Task.FromResult(false);
8080

8181
Task<bool> DeleteAgentCodeScripts(string agentId, List<AgentCodeScript>? codeScripts = null)
8282
=> Task.FromResult(false);
8383

84-
Task<CodeGenerationResult> GenerateCodeScript(string agentId, string text, CodeProcessOptions? options = null)
84+
Task<CodeGenerationResult> GenerateCodeScript(string agentId, string text, CodeGenHandleOptions? options = null)
8585
=> Task.FromResult(new CodeGenerationResult());
8686
}

src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentCodeScript.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ public class AgentCodeScript : AgentCodeScriptBase
55
public string Id { get; set; }
66
public string AgentId { get; set; } = null!;
77

8+
public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
9+
public DateTime UpdatedTime { get; set; } = DateTime.UtcNow;
10+
811
public AgentCodeScript() : base()
912
{
1013
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace BotSharp.Abstraction.Coding.Contexts;
2+
3+
public class CodeExecutionContext
4+
{
5+
public AgentCodeScript CodeScript { get; set; }
6+
public List<KeyValue> Arguments { get; set; } = [];
7+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace BotSharp.Abstraction.Coding.Enums;
2+
3+
public static class BuiltInCodeProcessor
4+
{
5+
public const string PyInterpreter = "botsharp-py-interpreter";
6+
}

src/Infrastructure/BotSharp.Abstraction/Coding/ICodeProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public interface ICodeProcessor
1717
/// <param name="cancellationToken">The cancellation token</param>
1818
/// <returns></returns>
1919
/// <exception cref="NotImplementedException"></exception>
20-
Task<CodeInterpretResponse> RunAsync(string codeScript, CodeInterpretOptions? options = null, CancellationToken cancellationToken = default)
20+
CodeInterpretResponse Run(string codeScript, CodeInterpretOptions? options = null, CancellationToken cancellationToken = default)
2121
=> throw new NotImplementedException();
2222

2323
/// <summary>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using BotSharp.Abstraction.Coding.Responses;
2+
3+
namespace BotSharp.Abstraction.Coding.Models;
4+
5+
public class CodeExecutionResponseModel
6+
{
7+
public string CodeProcessor { get; set; } = default!;
8+
public AgentCodeScript CodeScript { get; set; }
9+
public IDictionary<string, string>? Arguments { get; set; }
10+
public string Text { get; set; } = default!;
11+
public CodeInterpretResponse? ExecutionResult { get; set; }
12+
}

src/Infrastructure/BotSharp.Abstraction/Coding/Options/CodeProcessOptions.cs renamed to src/Infrastructure/BotSharp.Abstraction/Coding/Options/CodeGenHandleOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace BotSharp.Abstraction.Coding.Options;
22

3-
public class CodeProcessOptions : CodeGenerationOptions
3+
public class CodeGenHandleOptions : CodeGenerationOptions
44
{
55
/// <summary>
66
/// Code processor provider

0 commit comments

Comments
 (0)