refine

Author: Jicheng Lu

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -88,7 +88,7 @@ Task<List<string>> GetAgentResponses(string agentId, string prefix, string inten
         => throw new NotImplementedException();
     Task<string> GetAgentTemplate(string agentId, string templateName)
         => throw new NotImplementedException();
-    Task<AgentTemplate> GetAgentTemplateDetail(string agentId, string templateName)
+    Task<AgentTemplate?> GetAgentTemplateDetail(string agentId, string templateName)
         => throw new NotImplementedException();
     Task<bool> PatchAgentTemplate(string agentId, AgentTemplate template)
         => throw new NotImplementedException();

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

@@ -116,7 +116,7 @@ private void AddDefaultInstruction(Agent agent, string instruction)
             return template;
         }
 
-        if (template.LlmConfig == null)
+        if (template.LlmConfig == null || !template.LlmConfig.IsValid)
         {
             var agent = await _db.GetAgent(agentId);
             if (!string.IsNullOrEmpty(agent?.LlmConfig?.Provider)

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs

@@ -723,23 +723,22 @@ public async Task<string> GetAgentTemplate(string agentId, string templateName)
             return string.Empty;
         }
 
-        public async Task<AgentTemplate> GetAgentTemplateDetail(string agentId, string templateName)
+        public async Task<AgentTemplate?> GetAgentTemplateDetail(string agentId, string templateName)
         {
-            var template = new AgentTemplate { Name = templateName };
-
             if (string.IsNullOrWhiteSpace(agentId)
             || string.IsNullOrWhiteSpace(templateName))
             {
-                return template;
+                return null;
             }
 
             var baseDir = Path.Combine(_dbSettings.FileRepository, _agentSettings.DataDir, agentId);
             var dir = Path.Combine(baseDir, AGENT_TEMPLATES_FOLDER);
             if (!Directory.Exists(dir))
             {
-                return template;
+                return null;
             }
 
+            AgentTemplate? template = null;
             // Get template content
             foreach (var file in Directory.EnumerateFiles(dir))
             {
@@ -749,19 +748,26 @@ public async Task<AgentTemplate> GetAgentTemplateDetail(string agentId, string t
                 var extension = fileName.Substring(splitIdx + 1);
                 if (name.IsEqualTo(templateName) && extension.IsEqualTo(_agentSettings.TemplateFormat))
                 {
-                    template.Content = await File.ReadAllTextAsync(file);
+                    template = new AgentTemplate
+                    {
+                        Name = templateName,
+                        Content = await File.ReadAllTextAsync(file)
+                    };
                     break;
                 }
             }
 
             // Get template configs
-            var (configs, _) = GetAgentTemplateConfigs(baseDir);
-            var configFile = Path.Combine(baseDir, AGENT_TEMPLATE_CONFIG_FILE);
-            var found = configs?.FirstOrDefault(x => x.Name.IsEqualTo(templateName));
-            if (found != null)
+            if (template != null)
             {
-                template.ResponseFormat = found.ResponseFormat;
-                template.LlmConfig = found.LlmConfig;
+                var (configs, _) = GetAgentTemplateConfigs(baseDir);
+                var configFile = Path.Combine(baseDir, AGENT_TEMPLATE_CONFIG_FILE);
+                var found = configs?.FirstOrDefault(x => x.Name.IsEqualTo(templateName));
+                if (found != null)
+                {
+                    template.ResponseFormat = found.ResponseFormat;
+                    template.LlmConfig = found.LlmConfig;
+                }
             }
 
             return template;

src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs

@@ -553,19 +553,19 @@ public async Task<string> GetAgentTemplate(string agentId, string templateName)
         return agent.Templates?.FirstOrDefault(x => x.Name.IsEqualTo(templateName))?.Content ?? string.Empty;
     }
 
-    public async Task<AgentTemplate> GetAgentTemplateDetail(string agentId, string templateName)
+    public async Task<AgentTemplate?> GetAgentTemplateDetail(string agentId, string templateName)
     {
         var filter = Builders<AgentDocument>.Filter.Eq(x => x.Id, agentId);
         var agent = await _dc.Agents.Find(filter).FirstOrDefaultAsync();
         if (agent == null)
         {
-            return new AgentTemplate { Name = templateName };
+            return null;
         }
 
         var foundTemplate = agent.Templates?.FirstOrDefault(x => x.Name.IsEqualTo(templateName));
         if (foundTemplate == null)
         {
-            return new AgentTemplate { Name = templateName };
+            return null;
         }
 
         return AgentTemplateMongoElement.ToDomainElement(foundTemplate);