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

Merge pull request #810 from hchen2020/master

Browse source 
rules
This commit is contained in:
Haiping 2025-01-02 21:31:30 +00:00 committed by GitHub
parent a13f925916 2dbe6c4853
commit 7bb63bc44d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 124 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Infrastructure/BotSharp.Abstraction/Agents/Enums/BuiltInAgentId.cs
View file

@ -50,5 +50,5 @@ public class BuiltInAgentId
/// <summary>
/// Translates user-defined natural language rules into programmatic code
/// </summary>
public const string RuleEncoder = "6acfb93c-3412-402e-9ba5-c5d3cd8f0161";
public const string RulesInterpreter = "201e49a2-40b3-4ccd-b8cc-2476565a1b40";
}

8
src/Infrastructure/BotSharp.Core.Crontab/BotSharp.Core.Crontab.csproj
View file

@ -1,7 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>$(TargetFramework)</TargetFramework>
<LangVersion>$(LangVersion)</LangVersion>
<VersionPrefix>$(BotSharpVersion)</VersionPrefix>
<GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
<OutputPath>$(SolutionDir)packages</OutputPath>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

4
src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabWatcher.cs
View file

@ -24,7 +24,7 @@ public class CrontabWatcher : BackgroundService
{
var locker = scope.ServiceProvider.GetRequiredService<IDistributedLocker>();
while (!stoppingToken.IsCancellationRequested)
/*while (!stoppingToken.IsCancellationRequested)
{
var delay = Task.Delay(1000, stoppingToken);
@ -34,7 +34,7 @@ public class CrontabWatcher : BackgroundService
});
await delay;
}
}*/
_logger.LogWarning("Crontab Watcher background service is stopped.");
}

5
src/Infrastructure/BotSharp.Core.Rules/Actions/IRuleAction.cs Normal file
View file

@ -0,0 +1,5 @@
namespace BotSharp.Core.Rules.Actions;
public interface IRuleAction
{
}

20
src/Infrastructure/BotSharp.Core.Rules/BotSharp.Core.Rules.csproj
View file

@ -1,11 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>$(TargetFramework)</TargetFramework>
<LangVersion>$(LangVersion)</LangVersion>
<VersionPrefix>$(BotSharpVersion)</VersionPrefix>
<GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
<OutputPath>$(SolutionDir)packages</OutputPath>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<Content Include="data\agents\201e49a2-40b3-4ccd-b8cc-2476565a1b40\agent.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\agents\201e49a2-40b3-4ccd-b8cc-2476565a1b40\instructions\instruction.liquid">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\agents\201e49a2-40b3-4ccd-b8cc-2476565a1b40\templates\criteria_check.liquid">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Infrastructure\BotSharp.Abstraction\BotSharp.Abstraction.csproj" />
</ItemGroup>

5
src/Infrastructure/BotSharp.Core.Rules/Criterias/IRuleCriteria.cs Normal file
View file

@ -0,0 +1,5 @@
namespace BotSharp.Core.Rules.Criterias;
public interface IRuleCriteria
{
}

8
src/Infrastructure/BotSharp.Core.Rules/Engines/IRuleEngine.cs Normal file
View file

@ -0,0 +1,8 @@
using BotSharp.Core.Rules.Triggers;
namespace BotSharp.Core.Rules.Engines;
public interface IRuleEngine
{
Task Triggered(IRuleTrigger trigger, string data);
}

26
src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs Normal file
View file

@ -0,0 +1,26 @@
using BotSharp.Core.Rules.Triggers;
namespace BotSharp.Core.Rules.Engines;
public class RuleEngine : IRuleEngine
{
private readonly IServiceProvider _services;
public RuleEngine(IServiceProvider services)
{
_services = services;
}
public async Task Triggered(IRuleTrigger trigger, string data)
{
// Pull all user defined rules
var instructService = _services.GetRequiredService<IInstructService>();
var userSay = $"===Input data===\r\n{data}\r\n\r\nWhen WO NTE is greater than 100, notify resident.";
var result = await instructService.Execute(BuiltInAgentId.RulesInterpreter, new RoleDialogModel(AgentRole.User, data), "criteria_check", "#TEMPLATE#");
string[] rules = [];
// Check if meet the criteria
}
}

6
src/Infrastructure/BotSharp.Core.Rules/RulesPlugin.cs
View file

@ -1,3 +1,5 @@
using BotSharp.Core.Rules.Engines;
namespace BotSharp.Core.Rules;
public class RulesPlugin : IBotSharpPlugin
@ -9,11 +11,11 @@ public class RulesPlugin : IBotSharpPlugin
public string[] AgentIds =
[
BuiltInAgentId.RuleEncoder
BuiltInAgentId.RulesInterpreter
];
public void RegisterDI(IServiceCollection services, IConfiguration config)
{
services.AddScoped<IRuleEngine, RuleEngine>();
}
}

11
src/Infrastructure/BotSharp.Core.Rules/Triggers/IRuleTrigger.cs Normal file
View file

@ -0,0 +1,11 @@
namespace BotSharp.Core.Rules.Triggers;
public interface IRuleTrigger
{
string Channel => throw new NotImplementedException("Please set the channel of trigger");
string EventName { get; set; }
string EntityType { get; set; }
string EntityId { get; set; }
}

9
src/Infrastructure/BotSharp.Core.Rules/Using.cs
View file

@ -1,4 +1,9 @@
global using Microsoft.Extensions.Configuration;
global using Microsoft.Extensions.DependencyInjection;
global using BotSharp.Abstraction.Agents.Enums;
global using BotSharp.Abstraction.Plugins;
global using Microsoft.Extensions.Configuration;
global using Microsoft.Extensions.DependencyInjection;
global using BotSharp.Abstraction.Agents;
global using BotSharp.Abstraction.Conversations.Models;
global using BotSharp.Abstraction.Instructs;
global using BotSharp.Abstraction.Instructs.Models;

13
src/Infrastructure/BotSharp.Core.Rules/data/agents/201e49a2-40b3-4ccd-b8cc-2476565a1b40/agent.json Normal file
View file

@ -0,0 +1,13 @@
{
"id": "201e49a2-40b3-4ccd-b8cc-2476565a1b40",
"name": "Rules Agent",
"description": "Utility assistant that can be used to complete many different tasks",
"type": "static",
"createdDateTime": "2024-12-30T00:00:00Z",
"updatedDateTime": "2024-12-30T00:00:00Z",
"iconUrl": "https://cdn-icons-png.flaticon.com/512/3143/3143414.png",
"disabled": false,
"isPublic": true,
"profiles": [ "rules" ],
"routingRules": []
}

3
src/Infrastructure/BotSharp.Core.Rules/data/agents/201e49a2-40b3-4ccd-b8cc-2476565a1b40/instructions/instruction.liquid Normal file
View file

@ -0,0 +1,3 @@
You are a rule interpreter, analyze and respond according to the following steps:
1. Understand the rules customized by the user;
2. Determine whether the input data meets the user's action execution conditions;

4
src/Infrastructure/BotSharp.Core.Rules/data/agents/201e49a2-40b3-4ccd-b8cc-2476565a1b40/templates/criteria_check.liquid Normal file
View file

@ -0,0 +1,4 @@
You are a rule interpreter, analyze and respond according to the following steps:
1. Understand the rules customized by the user;
2. Determine whether the input data meets the user's action execution conditions;
3. If it meets the conditions, output "true", otherwise output "false"

5
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs
View file

@ -9,7 +9,8 @@ public partial class AgentService
{
public async Task<Agent> CreateAgent(Agent agent)
{
var userAgents = _db.GetUserAgents(_user.Id);
var userIdentity = _services.GetRequiredService<IUserIdentity>();
var userAgents = _db.GetUserAgents(userIdentity.Id);
var found = userAgents?.FirstOrDefault(x => x.Agent != null && x.Agent.Name.IsEqualTo(agent.Name));
if (found != null)
{
@ -24,7 +25,7 @@ public partial class AgentService
var dbSettings = _services.GetRequiredService<BotSharpDatabaseSettings>();
var agentSettings = _services.GetRequiredService<AgentSettings>();
var user = _db.GetUserById(_user.Id);
var user = _db.GetUserById(userIdentity.Id);
var userService = _services.GetRequiredService<IUserService>();
var auth = await userService.GetUserAuthorizations();

3
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs
View file

@ -16,8 +16,9 @@ public partial class AgentService
return refreshResult;
}
var userIdentity = _services.GetRequiredService<IUserIdentity>();
var userService = _services.GetRequiredService<IUserService>();
var isValid = await userService.IsAdminUser(_user.Id);
var isValid = await userService.IsAdminUser(userIdentity.Id);
if (!isValid)
{
return "Unauthorized user.";

3
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs
View file

@ -8,20 +8,17 @@ public partial class AgentService : IAgentService
private readonly IServiceProvider _services;
private readonly IBotSharpRepository _db;
private readonly ILogger _logger;
private readonly IUserIdentity _user;
private readonly AgentSettings _agentSettings;
private readonly JsonSerializerOptions _options;
public AgentService(IServiceProvider services,
IBotSharpRepository db,
ILogger<AgentService> logger,
IUserIdentity user,
AgentSettings agentSettings)
{
_services = services;
_db = db;
_logger = logger;
_user = user;
_agentSettings = agentSettings;
_options = new JsonSerializerOptions
{

8
src/Infrastructure/BotSharp.Core/Instructs/InstructService.Instruct.cs
View file

@ -1,4 +1,5 @@
using BotSharp.Abstraction.Instructs.Models;
using BotSharp.Abstraction.Options;
using BotSharp.Abstraction.Templating;
using System.Collections;
using System.Reflection;
@ -19,6 +20,8 @@ public partial class InstructService
try
{
var botsharpOptions = _services.GetRequiredService<BotSharpOptions>();
if (IsStringType(type))
{
result = response.Content as T;
@ -28,7 +31,8 @@ public partial class InstructService
var text = response.Content.JsonArrayContent();
if (!string.IsNullOrWhiteSpace(text))
{
result = JsonSerializer.Deserialize<T>(text, _options.JsonSerializerOptions);
result = JsonSerializer.Deserialize<T>(text, botsharpOptions.JsonSerializerOptions);
}
}
else
@ -36,7 +40,7 @@ public partial class InstructService
var text = response.Content.JsonContent();
if (!string.IsNullOrWhiteSpace(text))
{
result = JsonSerializer.Deserialize<T>(text, _options.JsonSerializerOptions);
result = JsonSerializer.Deserialize<T>(text, botsharpOptions.JsonSerializerOptions);
}
}
}

4
src/Infrastructure/BotSharp.Core/Instructs/InstructService.cs
View file

@ -1,21 +1,17 @@
using BotSharp.Abstraction.Instructs;
using BotSharp.Abstraction.Options;
namespace BotSharp.Core.Instructs;
public partial class InstructService : IInstructService
{
private readonly IServiceProvider _services;
private readonly BotSharpOptions _options;
private readonly ILogger<InstructService> _logger;
public InstructService(
IServiceProvider services,
BotSharpOptions options,
ILogger<InstructService> logger)
{
_services = services;
_options = options;
_logger = logger;
}
}