add render text

Author: Jicheng Lu

src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Audio.cs

@@ -9,9 +9,13 @@ public async Task<string> SpeechToText(InstructFileModel audio, string? text = n
         if (string.IsNullOrWhiteSpace(text))
         {
             var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
-            text = await GetAgentTemplate(innerAgentId, options?.TemplateName);
+            text = await RenderAgentTemplate(innerAgentId, options?.TemplateName, options?.Data);
         }
-
+        else
+        {
+            text = RenderText(text, options?.Data);
+        }
+        
         var completion = CompletionProvider.GetAudioTranscriber(_services, provider: options?.Provider, model: options?.Model);
         var audioBinary = await DownloadFile(audio);
         using var stream = audioBinary.ToStream();

src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Image.cs

@@ -10,7 +10,8 @@ public partial class FileInstructService
     public async Task<string> ReadImages(string text, IEnumerable<InstructFileModel> images, InstructOptions? options = null)
     {
         var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
-        var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
+        var instruction = await RenderAgentTemplate(innerAgentId, options?.TemplateName, options?.Data);
+        text = RenderText(text, options?.Data);
 
         var completion = CompletionProvider.GetChatCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-4o", multiModal: true);
         var message = await completion.GetChatCompletions(new Agent()
@@ -48,7 +49,8 @@ await hook.OnResponseGenerated(new InstructResponseModel
     public async Task<RoleDialogModel> GenerateImage(string text, InstructOptions? options = null)
     {
         var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
-        var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
+        var instruction = await RenderAgentTemplate(innerAgentId, options?.TemplateName, options?.Data);
+        text = RenderText(text, options?.Data);
 
         var textContent = text.IfNullOrEmptyAs(instruction).IfNullOrEmptyAs(string.Empty);
         var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
@@ -124,7 +126,8 @@ public async Task<RoleDialogModel> EditImage(string text, InstructFileModel imag
         }
 
         var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
-        var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
+        var instruction = await RenderAgentTemplate(innerAgentId, options?.TemplateName, options?.Data);
+        text = RenderText(text, options?.Data);
 
         var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
         var binary = await DownloadFile(image);
@@ -173,7 +176,8 @@ public async Task<RoleDialogModel> EditImage(string text, InstructFileModel imag
         }
 
         var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
-        var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
+        var instruction = await RenderAgentTemplate(innerAgentId, options?.TemplateName, options?.Data);
+        text = RenderText(text, options?.Data);
 
         var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
         var imageBinary = await DownloadFile(image);
@@ -225,7 +229,8 @@ await hook.OnResponseGenerated(new InstructResponseModel
     public async Task<RoleDialogModel> ComposeImages(string text, InstructFileModel[] images, InstructOptions? options = null)
     {
         var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
-        var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
+        var instruction = await RenderAgentTemplate(innerAgentId, options?.TemplateName, options?.Data);
+        text = RenderText(text, options?.Data);
 
         var completion = CompletionProvider.GetImageCompletion(_services, provider: options?.Provider ?? "openai", model: options?.Model ?? "gpt-image-1-mini");
 

src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Pdf.cs

@@ -40,7 +40,8 @@ public async Task<string> ReadPdf(string text, List<InstructFileModel> files, In
             }
 
             var innerAgentId = options?.AgentId ?? Guid.Empty.ToString();
-            var instruction = await GetAgentTemplate(innerAgentId, options?.TemplateName);
+            var instruction = await RenderAgentTemplate(innerAgentId, options?.TemplateName, options?.Data);
+            text = RenderText(text, options?.Data);
 
             var completion = CompletionProvider.GetChatCompletion(_services, provider: provider,
                 model: options?.Model ?? "gpt-5-mini", multiModal: true);

src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.cs

@@ -1,4 +1,6 @@
+using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Files.Converters;
+using BotSharp.Abstraction.Templating;
 
 namespace BotSharp.Core.Files.Services;
 
@@ -60,7 +62,7 @@ private async Task<BinaryData> DownloadFile(InstructFileModel file)
         }
     }
 
-    private async Task<string?> GetAgentTemplate(string agentId, string? templateName)
+    private async Task<string?> RenderAgentTemplate(string agentId, string? templateName, IDictionary<string, object>? data = null)
     {
         if (string.IsNullOrWhiteSpace(agentId) || string.IsNullOrWhiteSpace(templateName))
         {
@@ -74,10 +76,21 @@ private async Task<BinaryData> DownloadFile(InstructFileModel file)
             return null;
         }
 
-        var instruction = agentService.RenderTemplate(agent, templateName);
+        var instruction = agentService.RenderTemplate(agent, templateName, data);
         return instruction;
     }
 
+    private string RenderText(string text, IDictionary<string, object>? data = null)
+    {
+        var agentService = _services.GetRequiredService<IAgentService>();
+        var render = _services.GetRequiredService<ITemplateRender>();
+
+        var renderData = data != null
+                        ? new Dictionary<string, object>(data)
+                        : agentService.CollectRenderData(new Agent());
+        return render.Render(text, renderData);
+    }
+
     private string BuildFileName(string? name, string? extension, string defaultName, string defaultExtension)
     {
         var fname = name.IfNullOrEmptyAs(defaultName);