Merge pull request #457 from iceljc/features/add-agent-user-role

Oceania2018 · web-flow · commit 5acc6c89e84d · 2024-05-28T20:55:25.000-05:00
Features/add agent user role
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentService.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentService.cs
@@ -48,5 +48,7 @@ public interface IAgentService
     string GetDataDir();
     string GetAgentDataDir(string agentId);
 
+    List<Agent> GetAgentsByUser(string userId);
+
     PluginDef GetPlugin(string agentId);
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Plugins/Models/PluginMenuDef.cs b/src/Infrastructure/BotSharp.Abstraction/Plugins/Models/PluginMenuDef.cs
@@ -19,6 +19,9 @@ public class PluginMenuDef
     [JsonIgnore]
     public int Weight { get; set; }
 
+    [JsonIgnore]
+    public List<string>? Roles { get; set; }
+
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<PluginMenuDef>? SubMenu {  get; set; }
 
diff --git a/src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs b/src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs
@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.MLTasks;
 using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Settings;
+using BotSharp.Abstraction.Users.Enums;
 using Microsoft.Extensions.Configuration;
 
 namespace BotSharp.Core.Agents;
@@ -43,8 +44,8 @@ public bool AttachMenu(List<PluginMenuDef> menu)
         {
             SubMenu = new List<PluginMenuDef>
             {
-                new PluginMenuDef("Routing", link: "page/agent/router"), // icon: "bx bx-map-pin"
-                new PluginMenuDef("Evaluating", link: "page/agent/evaluator"), // icon: "bx bx-task"
+                new PluginMenuDef("Routing", link: "page/agent/router") { Roles = new List<string> { UserRole.Admin } }, // icon: "bx bx-map-pin"
+                new PluginMenuDef("Evaluating", link: "page/agent/evaluator") { Roles = new List<string> { UserRole.Admin } }, // icon: "bx bx-task"
                 new PluginMenuDef("Agents", link: "page/agent"), // icon: "bx bx-bot"
             }
         });
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs
@@ -1,8 +1,4 @@
-using BotSharp.Abstraction.Agents.Models;
-using BotSharp.Abstraction.Functions.Models;
-using BotSharp.Abstraction.Repositories;
 using BotSharp.Abstraction.Tasks.Models;
-using BotSharp.Abstraction.Users.Models;
 using System.IO;
 using System.Text.RegularExpressions;
 
@@ -26,32 +22,13 @@ public async Task<Agent> CreateAgent(Agent agent)
 
         var dbSettings = _services.GetRequiredService<BotSharpDatabaseSettings>();
         var agentSettings = _services.GetRequiredService<AgentSettings>();
-        var filePath = Path.Combine(dbSettings.FileRepository, agentSettings.DataDir);
-        var foundAgent = FetchAgentFileByName(agent.Name, filePath);
-
-        if (foundAgent != null)
-        {
-            agentRecord.SetId(foundAgent.Id)
-                       .SetName(foundAgent.Name)
-                       .SetDescription(foundAgent.Description)
-                       .SetIsPublic(foundAgent.IsPublic)
-                       .SetDisabled(foundAgent.Disabled)
-                       .SetAgentType(foundAgent.Type)
-                       .SetProfiles(foundAgent.Profiles)
-                       .SetRoutingRules(foundAgent.RoutingRules)
-                       .SetInstruction(foundAgent.Instruction)
-                       .SetTemplates(foundAgent.Templates)
-                       .SetFunctions(foundAgent.Functions)
-                       .SetResponses(foundAgent.Responses)
-                       .SetLlmConfig(foundAgent.LlmConfig);
-        }
 
         var user = _db.GetUserById(_user.Id);
         var userAgentRecord = new UserAgent
         {
             Id = Guid.NewGuid().ToString(),
             UserId = user.Id,
-            AgentId = foundAgent?.Id ?? agentRecord.Id,
+            AgentId = agentRecord.Id,
             Editable = false,
             CreatedTime = DateTime.UtcNow,
             UpdatedTime = DateTime.UtcNow
@@ -65,7 +42,7 @@ public async Task<Agent> CreateAgent(Agent agent)
 
         Utilities.ClearCache();
 
-        return agentRecord;
+        return await Task.FromResult(agentRecord);
     }
 
     private Agent FetchAgentFileByName(string agentName, string filePath)
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.DeleteAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.DeleteAgent.cs
@@ -1,9 +1,20 @@
+using BotSharp.Abstraction.Users.Enums;
+
 namespace BotSharp.Core.Agents.Services;
 
 public partial class AgentService
 {
     public async Task<bool> DeleteAgent(string id)
     {
-        throw new NotImplementedException();
+        var user = _db.GetUserById(_user.Id);
+        var agent = _db.GetAgentsByUser(_user.Id).FirstOrDefault(x => x.Id.IsEqualTo(id));
+
+        if (user?.Role != UserRole.Admin && agent == null)
+        {
+            return false;
+        }
+
+        var deleted = _db.DeleteAgent(id);
+        return await Task.FromResult(deleted);
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs
@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Repositories.Enums;
 using BotSharp.Abstraction.Routing.Models;
+using BotSharp.Abstraction.Users.Enums;
 using System.IO;
 
 namespace BotSharp.Core.Agents.Services;
@@ -8,6 +9,10 @@ public partial class AgentService
 {
     public async Task UpdateAgent(Agent agent, AgentField updateField)
     {
+        var userService = _services.GetRequiredService<IUserService>();
+        var user = await userService.GetUser(_user.Id);
+        if (user?.Role != UserRole.Admin) return;
+
         if (agent == null || string.IsNullOrEmpty(agent.Id)) return;
 
         var record = _db.GetAgent(agent.Id);
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs
@@ -47,4 +47,10 @@ public string GetAgentDataDir(string agentId)
         }
         return dir;
     }
+
+    public List<Agent> GetAgentsByUser(string userId)
+    {
+        var agents = _db.GetAgentsByUser(userId);
+        return agents;
+    }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Plugins/PluginLoader.cs b/src/Infrastructure/BotSharp.Core/Plugins/PluginLoader.cs
@@ -269,4 +269,20 @@ public void Configure(IApplicationBuilder app)
             }
         });
     }
+
+    public List<PluginMenuDef> GetPluginMenuByRoles(List<PluginMenuDef> plugins, string userRole)
+    {
+        if (plugins.IsNullOrEmpty()) return plugins;
+
+        var filtered = new List<PluginMenuDef>();
+        foreach (var plugin in plugins)
+        {
+            if (plugin.Roles.IsNullOrEmpty() || plugin.Roles.Contains(userRole))
+            {
+                plugin.SubMenu = GetPluginMenuByRoles(plugin.SubMenu, userRole);
+                filtered.Add(plugin);
+            }
+        }
+        return filtered;
+    }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
@@ -436,7 +436,40 @@ public bool DeleteAgents()
 
         public bool DeleteAgent(string agentId)
         {
-            return false;
+            if (string.IsNullOrEmpty(agentId)) return false;
+
+            try
+            {
+                var agentDir = GetAgentDataDir(agentId);
+                if (string.IsNullOrEmpty(agentDir)) return false;
+
+                // Delete agent user relationships
+                var usersDir = Path.Combine(_dbSettings.FileRepository, "users");
+                if (Directory.Exists(usersDir))
+                {
+                    foreach (var userDir in Directory.GetDirectories(usersDir))
+                    {
+                        var userAgentFile = Directory.GetFiles(userDir).FirstOrDefault(x => Path.GetFileName(x) == USER_AGENT_FILE);
+                        if (string.IsNullOrEmpty(userAgentFile)) continue;
+
+                        var text = File.ReadAllText(userAgentFile);
+                        var userAgents = JsonSerializer.Deserialize<List<UserAgent>>(text, _options);
+                        if (userAgents.IsNullOrEmpty()) continue;
+
+                        userAgents = userAgents.Where(x => x.AgentId != agentId).ToList();
+                        File.WriteAllText(userAgentFile, JsonSerializer.Serialize(userAgents, _options));
+                    }
+                }
+
+                // Delete agent folder
+                Directory.Delete(agentDir, true);
+
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
         }
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Users.Enums;
 using BotSharp.Abstraction.Users.Models;
 using System.IO;
 
diff --git a/src/Infrastructure/BotSharp.Core/Tasks/TaskPlugin.cs b/src/Infrastructure/BotSharp.Core/Tasks/TaskPlugin.cs
@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Tasks;
+using BotSharp.Abstraction.Users.Enums;
 using BotSharp.Core.Tasks.Services;
 using Microsoft.Extensions.Configuration;
 
@@ -19,7 +20,10 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
     public bool AttachMenu(List<PluginMenuDef> menu)
     {
         var section = menu.First(x => x.Label == "Apps");
-        menu.Add(new PluginMenuDef("Task", link: "page/task", icon: "bx bx-task", weight: section.Weight + 8));
+        menu.Add(new PluginMenuDef("Task", link: "page/task", icon: "bx bx-task", weight: section.Weight + 8)
+        {
+            Roles = new List<string> { UserRole.Admin }
+        });
 
         return true;
     }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Agents.Models;
+using BotSharp.Abstraction.Users.Enums;
 
 namespace BotSharp.OpenAPI.Controllers;
 
@@ -7,11 +8,13 @@ namespace BotSharp.OpenAPI.Controllers;
 public class AgentController : ControllerBase
 {
     private readonly IAgentService _agentService;
+    private readonly IUserIdentity _user;
     private readonly IServiceProvider _services;
 
-    public AgentController(IAgentService agentService, IServiceProvider services)
+    public AgentController(IAgentService agentService, IUserIdentity user, IServiceProvider services)
     {
         _agentService = agentService;
+        _user = user;
         _services = services;
     }
 
@@ -23,14 +26,16 @@ public AgentSettings GetSettings()
     }
 
     [HttpGet("/agent/{id}")]
-    public async Task<AgentViewModel> GetAgent([FromRoute] string id)
+    public async Task<AgentViewModel?> GetAgent([FromRoute] string id)
     {
         var agents = await GetAgents(new AgentFilter
         {
             AgentIds = new List<string> { id }
         });
 
         var targetAgent = agents.Items.FirstOrDefault();
+        if (targetAgent == null) return null;
+
         var redirectAgentIds = targetAgent.RoutingRules
                                           .Where(x => !string.IsNullOrEmpty(x.RedirectTo))
                                           .Select(x => x.RedirectTo).ToList();
@@ -45,6 +50,17 @@ public async Task<AgentViewModel> GetAgent([FromRoute] string id)
             
             rule.RedirectToAgentName = found.Name;
         }
+
+        var editable = true;
+        var userService = _services.GetRequiredService<IUserService>();
+        var user = await userService.GetUser(_user.Id);
+        if (user?.Role != UserRole.Admin)
+        {
+            var userAgents = _agentService.GetAgentsByUser(user?.Id);
+            editable = userAgents?.Select(x => x.Id)?.Contains(targetAgent.Id) ?? false;
+        }
+
+        targetAgent.Editable = editable;
         return targetAgent;
     }
              
@@ -118,4 +134,10 @@ public async Task<string> PatchAgentTemplates([FromRoute] string agentId, [FromB
         model.Id = agentId;
         return await _agentService.PatchAgentTemplate(model);
     }
+
+    [HttpDelete("/agent/{agentId}")]
+    public async Task<bool> DeleteAgent([FromRoute] string agentId)
+    {
+        return await _agentService.DeleteAgent(agentId);
+    }
 }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Options;
 using BotSharp.Abstraction.Routing;
+using BotSharp.Abstraction.Users.Enums;
 
 namespace BotSharp.OpenAPI.Controllers;
 
@@ -41,20 +42,23 @@ public async Task<ConversationViewModel> NewConversation([FromRoute] string agen
     [HttpPost("/conversations")]
     public async Task<PagedItems<ConversationViewModel>> GetConversations([FromBody] ConversationFilter filter)
     {
-        var service = _services.GetRequiredService<IConversationService>();
-        var conversations = await service.GetConversations(filter);
-
+        var convService = _services.GetRequiredService<IConversationService>();
         var userService = _services.GetRequiredService<IUserService>();
+        var user = await userService.GetUser(_user.Id);
+        if (user == null)
+        {
+            return new PagedItems<ConversationViewModel>();
+        }
+
+        filter.UserId = user.Role != UserRole.Admin ? user.Id : null;
+        var conversations = await convService.GetConversations(filter);
         var agentService = _services.GetRequiredService<IAgentService>();
-        var list = conversations.Items
-            .Select(x => ConversationViewModel.FromSession(x))
-            .ToList();
+        var list = conversations.Items.Select(x => ConversationViewModel.FromSession(x)).ToList();
 
         foreach (var item in list)
         {
-            var user = await userService.GetUser(item.User.Id);
+            user = await userService.GetUser(item.User.Id);
             item.User = UserViewModel.FromUser(user);
-
             var agent = await agentService.GetAgent(item.AgentId);
             item.AgentName = agent?.Name;
         }
@@ -119,21 +123,30 @@ public async Task<IEnumerable<ChatResponseModel>> GetDialogs([FromRoute] string
     }
 
     [HttpGet("/conversation/{conversationId}")]
-    public async Task<ConversationViewModel> GetConversation([FromRoute] string conversationId)
+    public async Task<ConversationViewModel?> GetConversation([FromRoute] string conversationId)
     {
         var service = _services.GetRequiredService<IConversationService>();
-        var conversations = await service.GetConversations(new ConversationFilter
+        var userService = _services.GetRequiredService<IUserService>();
+        var user = await userService.GetUser(_user.Id);
+        if (user == null)
         {
-            Id = conversationId
-        });
+            return null;
+        }
 
-        var userService = _services.GetRequiredService<IUserService>();
+        var filter = new ConversationFilter
+        {
+            Id = conversationId,
+            UserId = user.Role != UserRole.Admin ? user.Id : null
+        };
+        var conversations = await service.GetConversations(filter);
+        if (conversations.Items.IsNullOrEmpty())
+        {
+            return null;
+        }
+        
         var result = ConversationViewModel.FromSession(conversations.Items.First());
-
         var state = _services.GetRequiredService<IConversationStateService>();
         result.States = state.Load(conversationId, isReadOnly: true);
-
-        var user = await userService.GetUser(result.User.Id);
         result.User = UserViewModel.FromUser(user);
 
         return result;
@@ -178,7 +191,22 @@ public async Task<UserViewModel> GetConversationUser([FromRoute] string conversa
     [HttpDelete("/conversation/{conversationId}")]
     public async Task<bool> DeleteConversation([FromRoute] string conversationId)
     {
+        var userService = _services.GetRequiredService<IUserService>();
         var conversationService = _services.GetRequiredService<IConversationService>();
+
+        var user = await userService.GetUser(_user.Id);
+        var filter = new ConversationFilter
+        {
+            Id = conversationId,
+            UserId = user.Role != UserRole.Admin ? user.Id : null
+        };
+        var conversations = await conversationService.GetConversations(filter);
+
+        if (conversations.Items.IsNullOrEmpty())
+        {
+            return false;
+        }
+
         var response = await conversationService.DeleteConversations(new List<string> { conversationId });
         return response;
     }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/PluginController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/PluginController.cs
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,7 @@ public interface IAgentService`
`48`	`48`	`string GetDataDir();`
`49`	`49`	`string GetAgentDataDir(string agentId);`
`50`	`50`
	`51`	`+ List<Agent> GetAgentsByUser(string userId);`
	`52`	`+`
`51`	`53`	`PluginDef GetPlugin(string agentId);`
`52`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using BotSharp.Abstraction.MLTasks;`
`2`	`2`	`using BotSharp.Abstraction.Plugins.Models;`
`3`	`3`	`using BotSharp.Abstraction.Settings;`
	`4`	`+using BotSharp.Abstraction.Users.Enums;`
`4`	`5`	`using Microsoft.Extensions.Configuration;`
`5`	`6`
`6`	`7`	`namespace BotSharp.Core.Agents;`
`@@ -43,8 +44,8 @@ public bool AttachMenu(List<PluginMenuDef> menu)`
`43`	`44`	`{`
`44`	`45`	`SubMenu = new List<PluginMenuDef>`
`45`	`46`	`{`
`46`		`- new PluginMenuDef("Routing", link: "page/agent/router"), // icon: "bx bx-map-pin"`
`47`		`- new PluginMenuDef("Evaluating", link: "page/agent/evaluator"), // icon: "bx bx-task"`
	`47`	`+ new PluginMenuDef("Routing", link: "page/agent/router") { Roles = new List<string> { UserRole.Admin } }, // icon: "bx bx-map-pin"`
	`48`	`+ new PluginMenuDef("Evaluating", link: "page/agent/evaluator") { Roles = new List<string> { UserRole.Admin } }, // icon: "bx bx-task"`
`48`	`49`	`new PluginMenuDef("Agents", link: "page/agent"), // icon: "bx bx-bot"`
`49`	`50`	`}`
`50`	`51`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,20 @@`
	`1`	`+using BotSharp.Abstraction.Users.Enums;`
	`2`	`+`
`1`	`3`	`namespace BotSharp.Core.Agents.Services;`
`2`	`4`
`3`	`5`	`public partial class AgentService`
`4`	`6`	`{`
`5`	`7`	`public async Task<bool> DeleteAgent(string id)`
`6`	`8`	`{`
`7`		`- throw new NotImplementedException();`
	`9`	`+ var user = _db.GetUserById(_user.Id);`
	`10`	`+ var agent = _db.GetAgentsByUser(_user.Id).FirstOrDefault(x => x.Id.IsEqualTo(id));`
	`11`	`+`
	`12`	`+ if (user?.Role != UserRole.Admin && agent == null)`
	`13`	`+ {`
	`14`	`+ return false;`
	`15`	`+ }`
	`16`	`+`
	`17`	`+ var deleted = _db.DeleteAgent(id);`
	`18`	`+ return await Task.FromResult(deleted);`
`8`	`19`	`}`
`9`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,10 @@ public string GetAgentDataDir(string agentId)`
`47`	`47`	`}`
`48`	`48`	`return dir;`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+ public List<Agent> GetAgentsByUser(string userId)`
	`52`	`+ {`
	`53`	`+ var agents = _db.GetAgentsByUser(userId);`
	`54`	`+ return agents;`
	`55`	`+ }`
`50`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using BotSharp.Abstraction.Users.Enums;`
`1`	`2`	`using BotSharp.Abstraction.Users.Models;`
`2`	`3`	`using System.IO;`
`3`	`4`