Skip to content

Commit bd05adf

Browse files
geffzhanggeffzhang
authored
Merge branch 'SciSharp:master' into master
2 parents 505958f + 9d8a936 commit bd05adf

File tree

24 files changed

+322
-249
lines changed

24 files changed

+322
-249
lines changed

‎Directory.Packages.props‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<MSExtensionsVersion>8.0.0</MSExtensionsVersion>
4-
<AspNetCoreVersion>2.3.0</AspNetCoreVersion>
53
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
64
</PropertyGroup>
75
<ItemGroup>
@@ -10,15 +8,6 @@
108
<PackageVersion Include="EntityFramework" Version="6.4.4" />
119
<PackageVersion Include="Google_GenerativeAI" Version="3.4.1" />
1210
<PackageVersion Include="Google_GenerativeAI.Live" Version="3.4.1" />
13-
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
14-
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
15-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
16-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
17-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
18-
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
19-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
20-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
21-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
2211
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
2312
<PackageVersion Include="SharpFuzz" Version="2.2.0" />
2413
<PackageVersion Include="SharpHook" Version="5.3.9" />
@@ -38,8 +27,6 @@
3827
<PackageVersion Include="EntityFrameworkCore.BootKit" Version="8.9.0" />
3928
<PackageVersion Include="Fluid.Core" Version="2.11.1" />
4029
<PackageVersion Include="Nanoid" Version="3.1.0" />
41-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.2" />
42-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
4330
<PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
4431
<PackageVersion Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
4532
<PackageVersion Include="NAudio" Version="2.2.1" />
@@ -134,20 +121,63 @@
134121
<PackageVersion Include="BotSharp.Plugin.LLamaSharp" Version="$(BotSharpVersion)" />
135122
<PackageVersion Include="BotSharp.Plugin.ChatHub" Version="$(BotSharpVersion)" />
136123
</ItemGroup>
124+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
125+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.1" />
126+
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="10.0.0" />
127+
<PackageVersion Include="AspNet.Security.OAuth.Keycloak" Version="10.0.0" />
128+
<PackageVersion Include="AspNet.Security.OAuth.Weixin" Version="10.0.0" />
129+
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
130+
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
131+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
132+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
133+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
134+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
135+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
136+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
137+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
138+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0" />
139+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
140+
<PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="10.0.0" />
141+
<PackageVersion Include="Microsoft.OpenApi" Version="3.0.1" />
142+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.0" />
143+
</ItemGroup>
137144
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
138-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.16" />
145+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.4" />
139146
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.3.0" />
140147
<PackageVersion Include="AspNet.Security.OAuth.Keycloak" Version="8.3.0" />
141148
<PackageVersion Include="AspNet.Security.OAuth.Weixin" Version="8.3.0" />
149+
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
150+
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
151+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
152+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
153+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
154+
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
155+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
156+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
157+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
158+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.16" />
142159
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.16" />
143160
<PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.16" />
161+
<PackageVersion Include="Microsoft.OpenApi" Version="2.3.10" />
162+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
144163
</ItemGroup>
145164
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
146-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.27" />
165+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
147166
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="6.0.15" />
148167
<PackageVersion Include="AspNet.Security.OAuth.Keycloak" Version="6.0.15" />
149168
<PackageVersion Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
169+
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
170+
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
171+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.2" />
172+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.1" />
173+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
174+
<PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.1" />
175+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
176+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.1" />
177+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.3" />
178+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.27" />
150179
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.25" />
151180
<PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.26" />
181+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
152182
</ItemGroup>
153-
</Project>
183+
</Project>

‎src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/RoleFilter.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ namespace BotSharp.Abstraction.Repositories.Filters;
44

55
public class RoleFilter
66
{
7-
[JsonPropertyName("names")]
87
public IEnumerable<string>? Names { get; set; }
9-
10-
[JsonPropertyName("exclude_roles")]
118
public IEnumerable<string>? ExcludeRoles { get; set; } = UserConstant.AdminRoles;
129

1310

‎src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabService.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public async Task<List<CrontabItem>> GetCrontable()
4747
var crontable = await repo.GetCrontabItems(CrontabItemFilter.Empty());
4848

4949
// Add fixed crontab items from cronsources
50-
var fixedCrantabItems = crontable.Items.ToList();
51-
var cronsources = _services.GetServices<ICrontabSource>();
52-
foreach (var source in cronsources)
50+
var fixedCrontabItems = crontable.Items.ToList();
51+
var cronSources = _services.GetServices<ICrontabSource>();
52+
foreach (var source in cronSources)
5353
{
5454
if (source.IsRealTime)
5555
{
5656
continue;
5757
}
5858
var item = source.GetCrontabItem();
59-
fixedCrantabItems.Add(item);
59+
fixedCrontabItems.Add(item);
6060
}
6161

62-
return fixedCrantabItems;
62+
return fixedCrontabItems;
6363
}
6464

6565
public async Task<List<AgentTask>> GetTasks()

‎src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabWatcher.cs‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,22 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
3131

3232
while (!stoppingToken.IsCancellationRequested)
3333
{
34-
var isLocked = await locker.LockAsync(DIST_KEY, async () =>
34+
try
3535
{
36-
await RunCronChecker(scope.ServiceProvider);
37-
await Task.Delay(1000, stoppingToken);
38-
});
39-
40-
if (!isLocked)
41-
{
42-
await Task.Delay(1000, stoppingToken);
36+
var isLocked = await locker.LockAsync(DIST_KEY, async () =>
37+
{
38+
await RunCronChecker(scope.ServiceProvider);
39+
await Task.Delay(1000, stoppingToken);
40+
});
41+
if (!isLocked)
42+
{
43+
await Task.Delay(1000, stoppingToken);
44+
}
45+
}
46+
catch (Exception ex)
47+
{
48+
_logger.LogWarning($"Crontab Watcher background service error: {ex.Message}");
49+
await Task.Delay(3000, stoppingToken);
4350
}
4451
}
4552

0 commit comments

Comments
 (0)