Make System Prompt templates a Multi-Selector (#404)

Author: MikeAlhayek

Directory.Packages.props

@@ -20,7 +20,7 @@
     <PackageVersion Include="Microsoft.ML.Tokenizers.Data.O200kBase" Version="2.0.0" />
     <PackageVersion Include="MongoDB.Driver" Version="3.4.0" />
     <PackageVersion Include="NuGet.Versioning" Version="7.3.0" />
-    <PackageVersion Include="OllamaSharp" Version="5.4.24" />
+    <PackageVersion Include="OllamaSharp" Version="5.4.25" />
     <PackageVersion Include="SSH.NET" Version="2025.1.0" />
     <PackageVersion Include="ZString" Version="2.6.0" />
     <PackageVersion Include="YesSql.Abstractions" Version="5.4.7" />

src/Abstractions/CrestApps.OrchardCore.AI.Abstractions/Models/AICompletionContext.cs

@@ -6,8 +6,6 @@ public class AICompletionContext
 {
     public string ConnectionName { get; set; }
 
-    public bool UserMarkdownInResponse { get; set; } = true;
-
     public bool DisableTools { get; set; }
 
     public string SystemMessage { get; set; }

src/Common/CrestApps.Support/StreamExtensions.cs

@@ -1,6 +1,5 @@
-using System.IO;
-
 namespace CrestApps.Support;
+
 public static class StreamExtensions
 {
     public static byte[] ReadAllBytes(this Stream instream)

src/Core/CrestApps.OrchardCore.AI.Chat.Core/Hubs/AIChatHub.cs

@@ -399,7 +399,6 @@ private static async Task<string> GetGeneratedTitleAsync(IServiceProvider servic
             c.TopP = 1;
             c.Temperature = 0;
             c.MaxTokens = 64; // 64 token to generate about 255 characters.
-            c.UserMarkdownInResponse = false;
 
             // Avoid using tools or any data sources when generating title to reduce the used tokens.
             c.DataSourceId = null;
@@ -621,7 +620,6 @@ private static async Task ProcessGeneratedPromptAsync(ChannelWriter<CompletionPa
 
         var completionContext = await completionContextBuilder.BuildAsync(profile, c =>
         {
-            c.UserMarkdownInResponse = true;
         });
 
         var builder = ZString.CreateStringBuilder();
@@ -667,7 +665,6 @@ private static async Task ProcessUtilityAsync(ChannelWriter<CompletionPartialMes
 
         var completionContext = await completionContextBuilder.BuildAsync(profile, c =>
         {
-            c.UserMarkdownInResponse = true;
         });
 
         var references = new Dictionary<string, AICompletionReference>();
@@ -701,16 +698,16 @@ private static object CreateSessionPayload(AIChatSession chatSession, AIProfile
             },
             chatSession.Documents,
             Messages = prompts.Select(message => new AIChatResponseMessageDetailed
-                {
-                    Id = message.ItemId,
-                    Role = message.Role.Value,
-                    IsGeneratedPrompt = message.IsGeneratedPrompt,
-                    Title = message.Title,
-                    Content = message.Content,
-                    UserRating = message.UserRating,
-                    References = message.References,
-                    Appearance = message.As<AssistantMessageAppearance>(),
-                })
+            {
+                Id = message.ItemId,
+                Role = message.Role.Value,
+                IsGeneratedPrompt = message.IsGeneratedPrompt,
+                Title = message.Title,
+                Content = message.Content,
+                UserRating = message.UserRating,
+                References = message.References,
+                Appearance = message.As<AssistantMessageAppearance>(),
+            })
         };
 
     private static string BuildTitleUserPrompt(AIProfile profile, string userPrompt)

src/Core/CrestApps.OrchardCore.AI.Chat.Interactions.Core/Models/TabularBatch.cs

@@ -56,7 +56,7 @@ public string GetContent()
         }
 
         var allRows = new List<string>(1 + (DataRows?.Count ?? 0)) { HeaderRow };
-        
+
         if (DataRows is not null)
         {
             allRows.AddRange(DataRows);

src/Core/CrestApps.OrchardCore.AI.Chat.Interactions.Core/Services/TabularBatchProcessor.cs

@@ -266,7 +266,6 @@ private async Task<TabularBatchResult> ProcessSingleBatchAsync(
                 FrequencyPenalty = sourceContext.FrequencyPenalty,
                 PresencePenalty = sourceContext.PresencePenalty,
                 MaxTokens = sourceContext.MaxTokens,
-                UserMarkdownInResponse = false, // We want structured output
                 DisableTools = true, // Disable tools for batch processing
             };
 

src/Core/CrestApps.OrchardCore.AI.Core/Handlers/CompletionContextOrchestrationHandler.cs

@@ -22,7 +22,6 @@ public async Task BuildingAsync(OrchestrationContextBuildingContext context)
         var completionContext = await _completionContextBuilder.BuildAsync(context.Resource);
 
         context.Context.CompletionContext = completionContext;
-        context.Context.CompletionContext.UserMarkdownInResponse = true;
 
         // Propagate DisableTools from the completion context.
         context.Context.DisableTools = context.Context.CompletionContext.DisableTools;

src/Core/CrestApps.OrchardCore.AI.Core/Models/PromptTemplateMetadata.cs

@@ -3,12 +3,21 @@ namespace CrestApps.OrchardCore.AI.Core.Models;
 public sealed class PromptTemplateMetadata
 {
     /// <summary>
-    /// Gets or sets the identifier of the selected AI template.
+    /// Gets or sets the ordered list of selected prompt templates.
     /// </summary>
-    public string TemplateId { get; set; }
+    public List<PromptTemplateSelectionEntry> Templates { get; set; } = [];
 
-    /// <summary>
-    /// Gets or sets the template parameters as key-value pairs.
-    /// </summary>
-    public Dictionary<string, object> Parameters { get; set; }
+    public void SetSelections(IEnumerable<PromptTemplateSelectionEntry> selections)
+    {
+        Templates = selections?
+            .Where(selection => !string.IsNullOrWhiteSpace(selection.TemplateId))
+            .Select(selection => new PromptTemplateSelectionEntry
+            {
+                TemplateId = selection.TemplateId,
+                Parameters = selection.Parameters is { Count: > 0 }
+                    ? new Dictionary<string, object>(selection.Parameters, StringComparer.OrdinalIgnoreCase)
+                    : null,
+            })
+            .ToList() ?? [];
+    }
 }

src/Core/CrestApps.OrchardCore.AI.Core/Models/PromptTemplateSelectionEntry.cs

@@ -0,0 +1,8 @@
+namespace CrestApps.OrchardCore.AI.Core.Models;
+
+public sealed class PromptTemplateSelectionEntry
+{
+    public string TemplateId { get; set; }
+
+    public Dictionary<string, object> Parameters { get; set; }
+}

src/Core/CrestApps.OrchardCore.AI.Core/Services/AICompletionServiceBase.cs

@@ -100,22 +100,4 @@ protected virtual Task<AIDeployment> GetDeploymentAsync(AICompletionContext cont
     {
         return Task.FromResult<AIDeployment>(null);
     }
-
-    protected async Task<string> GetSystemMessageAsync(AICompletionContext context)
-    {
-        var systemMessage = string.Empty;
-
-        if (!string.IsNullOrEmpty(context.SystemMessage))
-        {
-            systemMessage = context.SystemMessage;
-        }
-
-        if (context.UserMarkdownInResponse)
-        {
-            var markdownInstruction = await AITemplateService.RenderAsync(AITemplateIds.UseMarkdownSyntax);
-            systemMessage += Environment.NewLine + markdownInstruction;
-        }
-
-        return systemMessage;
-    }
 }