change utility assistant id

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/BuiltInAgentId.cs

@@ -5,4 +5,5 @@ public class BuiltInAgentId
     public const string AIAssistant = "01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a";
     public const string Chatbot = "01e2fc5c-2c89-4ec7-8470-7688608b496c";
     public const string HumanSupport = "01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b";
+    public const string UtilityAssistant = "6745151e-6d46-4a02-8de4-1c4f21c7da95";
 }

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

@@ -1,5 +1,3 @@
-using BotSharp.Abstraction.Templating;
-
 namespace BotSharp.Core.Agents.Services;
 
 public partial class AgentService
@@ -7,7 +5,7 @@ public partial class AgentService
     [MemoryCache(10 * 60, perInstanceCache: true)]
     public async Task<Agent> LoadAgent(string id)
     {
-        if (string.IsNullOrEmpty(id))
+        if (string.IsNullOrEmpty(id) || id == Guid.Empty.ToString())
         {
             return null;
         }

src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj

@@ -46,12 +46,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\agent.json" />
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\functions\generate_image.json" />
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\functions\read_file.json" />
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\instruction.liquid" />
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\templates\generate_image.fn.liquid" />
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\templates\read_file.fn.liquid" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\agent.json" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\generate_image.json" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\read_file.json" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\instruction.liquid" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\generate_image.fn.liquid" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\read_file.fn.liquid" />
     <None Remove="data\agents\01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b\agent.json" />
     <None Remove="data\agents\01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b\functions.json" />
     <None Remove="data\agents\01dcc3e5-0af7-49e6-ad7a-a760bd12dc4b\functions\human_intervention_needed.json" />
@@ -153,22 +153,22 @@
     <Content Include="data\agents\01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a\templates\conversation.summary.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\agent.json">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\agent.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\instruction.liquid">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\instruction.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\functions\read_file.json">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\read_file.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\templates\read_file.fn.liquid">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\read_file.fn.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\functions\generate_image.json">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\generate_image.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\templates\generate_image.fn.liquid">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\generate_image.fn.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="data\plugins\config.json">

src/Infrastructure/BotSharp.Core/Files/Functions/GenerateImageFn.cs

@@ -9,7 +9,6 @@ public class GenerateImageFn : IFunctionCallback
 
     private readonly IServiceProvider _services;
     private readonly ILogger<GenerateImageFn> _logger;
-    private static string UTILITY_ASSISTANT = Guid.Empty.ToString();
     private string _conversationId;
     private string _messageId;
 
@@ -29,7 +28,7 @@ public class GenerateImageFn : IFunctionCallback
         SetImageOptions();
         
         var agentService = _services.GetRequiredService<IAgentService>();
-        var agent = await agentService.LoadAgent(UTILITY_ASSISTANT);
+        var agent = await agentService.LoadAgent(BuiltInAgentId.UtilityAssistant);
         var imageAgent = new Agent
         {
             Id = agent?.Id ?? Guid.Empty.ToString(),

src/Infrastructure/BotSharp.Core/Files/Functions/ReadFileFn.cs

@@ -12,7 +12,6 @@ public class ReadFileFn : IFunctionCallback
     private readonly ILogger<ReadFileFn> _logger;
     private readonly IEnumerable<string> _imageTypes = new List<string> { "image", "images", "png", "jpg", "jpeg" };
     private readonly IEnumerable<string> _pdfTypes = new List<string> { "pdf" };
-    private static string UTILITY_ASSISTANT = Guid.Empty.ToString();
 
     public ReadFileFn(
         IServiceProvider services,
@@ -31,7 +30,7 @@ public class ReadFileFn : IFunctionCallback
         var wholeDialogs = conv.GetDialogHistory();
         var fileTypes = args?.FileTypes?.Split(",", StringSplitOptions.RemoveEmptyEntries)?.ToList() ?? new List<string>();
         var dialogs = await AssembleFiles(conv.ConversationId, wholeDialogs, fileTypes);
-        var agent = await agentService.LoadAgent(UTILITY_ASSISTANT);
+        var agent = await agentService.LoadAgent(BuiltInAgentId.UtilityAssistant);
         var fileAgent = new Agent
         {
             Id = agent?.Id ?? Guid.Empty.ToString(),

src/Infrastructure/BotSharp.Core/Files/Hooks/FileReaderHook.cs

@@ -2,7 +2,6 @@ namespace BotSharp.Core.Files.Hooks;
 
 public class FileReaderHook : AgentHookBase
 {
-    private static string UTILITY_ASSISTANT = Guid.Empty.ToString();
     private static string FUNCTION_NAME = "read_file";
 
     public override string SelfId => string.Empty;
@@ -45,7 +44,7 @@ public class FileReaderHook : AgentHookBase
     private (string, FunctionDef?) GetPromptAndFunction()
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
-        var agent = db.GetAgent(UTILITY_ASSISTANT);
+        var agent = db.GetAgent(BuiltInAgentId.UtilityAssistant);
         var prompt = agent?.Templates?.FirstOrDefault(x => x.Name.IsEqualTo($"{FUNCTION_NAME}.fn"))?.Content ?? string.Empty;
         var loadAttachmentFn = agent?.Functions?.FirstOrDefault(x => x.Name.IsEqualTo(FUNCTION_NAME));
         return (prompt, loadAttachmentFn);

src/Infrastructure/BotSharp.Core/Files/Hooks/ImageGeneratorHook.cs

@@ -2,7 +2,6 @@ namespace BotSharp.Core.Files.Hooks;
 
 public class ImageGeneratorHook : AgentHookBase
 {
-    private static string UTILITY_ASSISTANT = Guid.Empty.ToString();
     private static string FUNCTION_NAME = "generate_image";
 
     public override string SelfId => string.Empty;
@@ -45,7 +44,7 @@ public class ImageGeneratorHook : AgentHookBase
     private (string, FunctionDef?) GetPromptAndFunction()
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
-        var agent = db.GetAgent(UTILITY_ASSISTANT);
+        var agent = db.GetAgent(BuiltInAgentId.UtilityAssistant);
         var prompt = agent?.Templates?.FirstOrDefault(x => x.Name.IsEqualTo($"{FUNCTION_NAME}.fn"))?.Content ?? string.Empty;
         var loadAttachmentFn = agent?.Functions?.FirstOrDefault(x => x.Name.IsEqualTo(FUNCTION_NAME));
         return (prompt, loadAttachmentFn);

src/Infrastructure/BotSharp.Core/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/agent.json

@@ -1,5 +1,5 @@
 {
-  "id": "00000000-0000-0000-0000-000000000000",
+  "id": "6745151e-6d46-4a02-8de4-1c4f21c7da95",
   "name": "Utility Assistant",
   "description": "Utility assistant that can be used to complete many different tasks",
   "type": "static",

src/Plugins/BotSharp.Plugin.HttpHandler/BotSharp.Plugin.HttpHandler.csproj

@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\functions\handle_http_request.json" />
-    <None Remove="data\agents\00000000-0000-0000-0000-000000000000\templates\handle_http_request.fn.liquid" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\handle_http_request.json" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\handle_http_request.fn.liquid" />
     <None Remove="data\agents\87c458fc-ec5f-40ae-8ed6-05dda8a07523\agent.json" />
     <None Remove="data\agents\87c458fc-ec5f-40ae-8ed6-05dda8a07523\functions.json" />
     <None Remove="data\agents\87c458fc-ec5f-40ae-8ed6-05dda8a07523\instruction.liquid" />
@@ -25,10 +25,10 @@
     <Content Include="data\agents\87c458fc-ec5f-40ae-8ed6-05dda8a07523\instruction.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\functions\handle_http_request.json">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\handle_http_request.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\00000000-0000-0000-0000-000000000000\templates\handle_http_request.fn.liquid">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\handle_http_request.fn.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

src/Plugins/BotSharp.Plugin.HttpHandler/Hooks/HttpHandlerHook.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Agents;
+using BotSharp.Abstraction.Agents.Enums;
 using BotSharp.Abstraction.Agents.Settings;
 using BotSharp.Abstraction.Functions.Models;
 using BotSharp.Abstraction.Repositories;
@@ -8,7 +9,6 @@ namespace BotSharp.Plugin.HttpHandler.Hooks;
 
 public class HttpHandlerHook : AgentHookBase
 {
-    private static string UTILITY_ASSISTANT = Guid.Empty.ToString();
     private static string FUNCTION_NAME = "handle_http_request";
 
     public override string SelfId => string.Empty;
@@ -51,7 +51,7 @@ public class HttpHandlerHook : AgentHookBase
     private (string, FunctionDef?) GetPromptAndFunction()
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
-        var agent = db.GetAgent(UTILITY_ASSISTANT);
+        var agent = db.GetAgent(BuiltInAgentId.UtilityAssistant);
         var prompt = agent?.Templates?.FirstOrDefault(x => x.Name.IsEqualTo($"{FUNCTION_NAME}.fn"))?.Content ?? string.Empty;
         var loadAttachmentFn = agent?.Functions?.FirstOrDefault(x => x.Name.IsEqualTo(FUNCTION_NAME));
         return (prompt, loadAttachmentFn);