Merge pull request #810 from hchen2020/master

Oceania2018 · web-flow · commit 7bb63bc44d5d · 2025-01-02T21:31:30.000Z
rules
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Enums/BuiltInAgentId.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Enums/BuiltInAgentId.cs
@@ -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";
 }
diff --git a/src/Infrastructure/BotSharp.Core.Crontab/BotSharp.Core.Crontab.csproj b/src/Infrastructure/BotSharp.Core.Crontab/BotSharp.Core.Crontab.csproj
@@ -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>
diff --git a/src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabWatcher.cs b/src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabWatcher.cs
@@ -24,7 +24,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
             var locker = scope.ServiceProvider.GetRequiredService<IDistributedLocker>();
 
-            while (!stoppingToken.IsCancellationRequested)
+            /*while (!stoppingToken.IsCancellationRequested)
             {
                 var delay = Task.Delay(1000, stoppingToken);
 
@@ -34,7 +34,7 @@ await locker.LockAsync("CrontabWatcher", async () =>
                 });
 
                 await delay;
-            }
+            }*/
 
             _logger.LogWarning("Crontab Watcher background service is stopped.");
         }
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Actions/IRuleAction.cs b/src/Infrastructure/BotSharp.Core.Rules/Actions/IRuleAction.cs
@@ -0,0 +1,5 @@
+namespace BotSharp.Core.Rules.Actions;
+
+public interface IRuleAction
+{
+}
diff --git a/src/Infrastructure/BotSharp.Core.Rules/BotSharp.Core.Rules.csproj b/src/Infrastructure/BotSharp.Core.Rules/BotSharp.Core.Rules.csproj
@@ -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>
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Criterias/IRuleCriteria.cs b/src/Infrastructure/BotSharp.Core.Rules/Criterias/IRuleCriteria.cs
@@ -0,0 +1,5 @@
+namespace BotSharp.Core.Rules.Criterias;
+
+public interface IRuleCriteria
+{
+}
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Engines/IRuleEngine.cs b/src/Infrastructure/BotSharp.Core.Rules/Engines/IRuleEngine.cs
@@ -0,0 +1,8 @@
+using BotSharp.Core.Rules.Triggers;
+
+namespace BotSharp.Core.Rules.Engines;
+
+public interface IRuleEngine
+{
+    Task Triggered(IRuleTrigger trigger, string data);
+}
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs b/src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs
@@ -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
+    }
+}
diff --git a/src/Infrastructure/BotSharp.Core.Rules/RulesPlugin.cs b/src/Infrastructure/BotSharp.Core.Rules/RulesPlugin.cs
@@ -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>();
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Triggers/IRuleTrigger.cs b/src/Infrastructure/BotSharp.Core.Rules/Triggers/IRuleTrigger.cs
@@ -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; }
+}
diff --git a/src/Infrastructure/BotSharp.Core.Rules/Using.cs b/src/Infrastructure/BotSharp.Core.Rules/Using.cs
@@ -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;
diff --git a/src/Infrastructure/BotSharp.Core.Rules/data/agents/201e49a2-40b3-4ccd-b8cc-2476565a1b40/agent.json b/src/Infrastructure/BotSharp.Core.Rules/data/agents/201e49a2-40b3-4ccd-b8cc-2476565a1b40/agent.json
@@ -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": []
+}
diff --git a/src/Infrastructure/BotSharp.Core.Rules/data/agents/201e49a2-40b3-4ccd-b8cc-2476565a1b40/instructions/instruction.liquid b/src/Infrastructure/BotSharp.Core.Rules/data/agents/201e49a2-40b3-4ccd-b8cc-2476565a1b40/instructions/instruction.liquid
@@ -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;
diff --git a/src/Infrastructure/BotSharp.Core.Rules/data/agents/201e49a2-40b3-4ccd-b8cc-2476565a1b40/templates/criteria_check.liquid b/src/Infrastructure/BotSharp.Core.Rules/data/agents/201e49a2-40b3-4ccd-b8cc-2476565a1b40/templates/criteria_check.liquid
@@ -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"
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs
@@ -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 async Task<Agent> CreateAgent(Agent agent)
         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();
 
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs
@@ -16,8 +16,9 @@ public async Task<string> RefreshAgents()
             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.";
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs
@@ -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
         {
diff --git a/src/Infrastructure/BotSharp.Core/Instructs/InstructService.Instruct.cs b/src/Infrastructure/BotSharp.Core/Instructs/InstructService.Instruct.cs
@@ -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,15 +31,16 @@ 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
             {
                 var text = response.Content.JsonContent();
                 if (!string.IsNullOrWhiteSpace(text))
                 {
-                    result = JsonSerializer.Deserialize<T>(text, _options.JsonSerializerOptions);
+                    result = JsonSerializer.Deserialize<T>(text, botsharpOptions.JsonSerializerOptions);
                 }
             }
         }
diff --git a/src/Infrastructure/BotSharp.Core/Instructs/InstructService.cs b/src/Infrastructure/BotSharp.Core/Instructs/InstructService.cs
@@ -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;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,5 @@ public class BuiltInAgentId`
`50`	`50`	`/// <summary>`
`51`	`51`	`/// Translates user-defined natural language rules into programmatic code`
`52`	`52`	`/// </summary>`
`53`		`- public const string RuleEncoder = "6acfb93c-3412-402e-9ba5-c5d3cd8f0161";`
	`53`	`+ public const string RulesInterpreter = "201e49a2-40b3-4ccd-b8cc-2476565a1b40";`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)`
`24`	`24`	`{`
`25`	`25`	`var locker = scope.ServiceProvider.GetRequiredService<IDistributedLocker>();`
`26`	`26`
`27`		`- while (!stoppingToken.IsCancellationRequested)`
	`27`	`+ /*while (!stoppingToken.IsCancellationRequested)`
`28`	`28`	`{`
`29`	`29`	`var delay = Task.Delay(1000, stoppingToken);`
`30`	`30`
`@@ -34,7 +34,7 @@ await locker.LockAsync("CrontabWatcher", async () =>`
`34`	`34`	`});`
`35`	`35`
`36`	`36`	`await delay;`
`37`		`- }`
	`37`	`+ }*/`
`38`	`38`
`39`	`39`	`_logger.LogWarning("Crontab Watcher background service is stopped.");`
`40`	`40`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +namespace BotSharp.Core.Rules.Actions;
++
 +public interface IRuleAction
 +{
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using BotSharp.Core.Rules.Engines;`
	`2`	`+`
`1`	`3`	`namespace BotSharp.Core.Rules;`
`2`	`4`
`3`	`5`	`public class RulesPlugin : IBotSharpPlugin`
`@@ -9,11 +11,11 @@ public class RulesPlugin : IBotSharpPlugin`
`9`	`11`
`10`	`12`	`public string[] AgentIds =`
`11`	`13`	`[`
`12`		`- BuiltInAgentId.RuleEncoder`
	`14`	`+ BuiltInAgentId.RulesInterpreter`
`13`	`15`	`];`
`14`	`16`
`15`	`17`	`public void RegisterDI(IServiceCollection services, IConfiguration config)`
`16`	`18`	`{`
`17`		`-`
	`19`	`+ services.AddScoped<IRuleEngine, RuleEngine>();`
`18`	`20`	`}`
`19`	`21`	`}`