Merge pull request #741 from iceljc/features/add-evaluation

resolve conflict

Author: iceljc

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Repositories.Enums;
+using BotSharp.Abstraction.Users.Enums;
 using System.IO;
 
 namespace BotSharp.Core.Agents.Services;
@@ -16,6 +17,12 @@ public async Task<string> RefreshAgents()
             return refreshResult;
         }
 
+        var user = _db.GetUserById(_user.Id);
+        if (!UserConstant.AdminRoles.Contains(user.Role))
+        {
+            return "Unauthorized user.";
+        }
+
         var agentDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
                                     dbSettings.FileRepository,
                                     _agentSettings.DataDir);
@@ -25,10 +32,8 @@ public async Task<string> RefreshAgents()
             refreshResult = $"Cannot find the directory: {agentDir}";
             return refreshResult;
         }
-
-        var user = _db.GetUserById(_user.Id);
+        
         var refreshedAgents = new List<string>();
-
         foreach (var dir in Directory.GetDirectories(agentDir))
         {
             try

src/Plugins/BotSharp.Plugin.MongoStorage/MongoStoragePlugin.cs

@@ -1,6 +1,4 @@
-using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Repositories.Enums;
-using BotSharp.Abstraction.Users.Enums;
 using BotSharp.Plugin.MongoStorage.Repository;
 
 namespace BotSharp.Plugin.MongoStorage;
@@ -31,14 +29,4 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
             services.AddScoped<IBotSharpRepository, MongoRepository>();
         }
     }
-
-    public bool AttachMenu(List<PluginMenuDef> menu)
-    {
-        var section = menu.First(x => x.Label == "Apps");
-        menu.Add(new PluginMenuDef("MongoDB", icon: "bx bx-data", link: "page/mongodb", weight: section.Weight + 10)
-        {
-            Roles = new List<string> { UserRole.Root, UserRole.Admin }
-        });
-        return true;
-    }
 }

src/Plugins/BotSharp.Plugin.Planner/Functions/SummaryPlanFn.cs

@@ -88,7 +88,7 @@ private async Task<string> GetSummaryPlanPrompt(RoleDialogModel message, string
         var additionalRequirements = new List<string>();
         await HookEmitter.Emit<IPlanningHook>(_services, async x =>
         {
-            var requirement = await x.GetSummaryAdditionalRequirements(nameof(TwoStageTaskPlanner));
+            var requirement = await x.GetSummaryAdditionalRequirements(nameof(TwoStageTaskPlanner), message);
             additionalRequirements.Add(requirement);
         });
 

src/Plugins/BotSharp.Plugin.SqlDriver/Functions/ExecuteQueryFn.cs

@@ -2,6 +2,7 @@
 using BotSharp.Abstraction.Repositories;
 using BotSharp.Abstraction.Routing;
 using BotSharp.Core.Infrastructures;
+using BotSharp.Plugin.SqlDriver.Interfaces;
 using BotSharp.Plugin.SqlDriver.Models;
 using Dapper;
 using Microsoft.Data.SqlClient;
@@ -30,7 +31,7 @@ public async Task<bool> Execute(RoleDialogModel message)
     {
         var args = JsonSerializer.Deserialize<ExecuteQueryArgs>(message.FunctionArgs);
         var refinedArgs = await RefineSqlStatement(message, args);
-        var dbHook = _services.GetRequiredService<IDatabaseHook>();
+        var dbHook = _services.GetRequiredService<ISqlDriverHook>();
         var dbType = dbHook.GetDatabaseType(message);
 
         try

src/Plugins/BotSharp.Plugin.SqlDriver/Hooks/SqlDriverPlanningHook.cs

@@ -58,10 +58,8 @@ await HookEmitter.Emit<ISqlDriverHook>(_services, async (hook) =>
         msg.FunctionArgs = response.FunctionArgs;
         msg.Content = response.Content;
         msg.StopCompletion = response.StopCompletion;
-
-        /*var routing = _services.GetRequiredService<IRoutingService>();
-        await routing.InvokeAgent(BuiltInAgentId.SqlDriver, wholeDialogs);*/
     }
+
     public async Task<string> GetSummaryAdditionalRequirements(string planner, RoleDialogModel message)
     {
         var settings = _services.GetRequiredService<SqlDriverSetting>();