Finalized chat templates (#475)

app/MindWork AI Studio/Chat/ChatRole.cs

@@ -1,5 +1,3 @@
-using AIStudio.Tools.PluginSystem;
-
 namespace AIStudio.Chat;
 
 /// <summary>
@@ -14,68 +12,4 @@ public enum ChatRole
     USER,
     AI,
     AGENT,
-}
-
-/// <summary>
-/// Extensions for the ChatRole enum.
-/// </summary>
-public static class ExtensionsChatRole
-{
-    private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(ChatRole).Namespace, nameof(ChatRole));
-    
-    /// <summary>
-    /// Returns the name of the role.
-    /// </summary>
-    /// <param name="role">The role.</param>
-    /// <returns>The name of the role.</returns>
-    public static string ToName(this ChatRole role) => role switch
-    {
-        ChatRole.SYSTEM => TB("System"),
-        ChatRole.USER => TB("You"),
-        ChatRole.AI => TB("AI"),
-        
-        _ => TB("Unknown"),
-    };
-    
-    /// <summary>
-    /// Returns the color of the role.
-    /// </summary>
-    /// <param name="role">The role.</param>
-    /// <returns>The color of the role.</returns>
-    public static Color ToColor(this ChatRole role) => role switch
-    {
-        ChatRole.SYSTEM => Color.Info,
-        ChatRole.USER => Color.Primary,
-        ChatRole.AI => Color.Tertiary,
-        
-        _ => Color.Error,
-    };
-    
-    /// <summary>
-    /// Returns the icon of the role.
-    /// </summary>
-    /// <param name="role">The role.</param>
-    /// <returns>The icon of the role.</returns>
-    public static string ToIcon(this ChatRole role) => role switch
-    {
-        ChatRole.SYSTEM => Icons.Material.Filled.Settings,
-        ChatRole.USER => Icons.Material.Filled.Person,
-        ChatRole.AI => Icons.Material.Filled.AutoAwesome,
-        
-        _ => Icons.Material.Filled.Help,
-    };
-    
-    /// <summary>
-    /// Returns the specific name of the role for the chat template.
-    /// </summary>
-    /// <param name="role">The role.</param>
-    /// <returns>The name of the role.</returns>
-    public static string ToChatTemplateName(this ChatRole role) => role switch
-    {
-        ChatRole.SYSTEM => TB("System"),
-        ChatRole.USER => TB("User"),
-        ChatRole.AI => TB("Assistant"),
-        
-        _ => TB("Unknown"),
-    };
 }

app/MindWork AI Studio/Chat/ChatRoleExtensions.cs

@@ -0,0 +1,75 @@
+using AIStudio.Tools.PluginSystem;
+
+namespace AIStudio.Chat;
+
+public static class ChatRoleExtensions
+{
+    private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(ChatRoleExtensions).Namespace, nameof(ChatRoleExtensions));
+    
+    /// <summary>
+    /// Returns the name of the role.
+    /// </summary>
+    /// <param name="role">The role.</param>
+    /// <returns>The name of the role.</returns>
+    public static string ToName(this ChatRole role) => role switch
+    {
+        ChatRole.SYSTEM => TB("System"),
+        ChatRole.USER => TB("You"),
+        ChatRole.AI => TB("AI"),
+        
+        _ => TB("Unknown"),
+    };
+    
+    /// <summary>
+    /// Returns the color of the role.
+    /// </summary>
+    /// <param name="role">The role.</param>
+    /// <returns>The color of the role.</returns>
+    public static Color ToColor(this ChatRole role) => role switch
+    {
+        ChatRole.SYSTEM => Color.Info,
+        ChatRole.USER => Color.Primary,
+        ChatRole.AI => Color.Tertiary,
+        
+        _ => Color.Error,
+    };
+    
+    /// <summary>
+    /// Returns the icon of the role.
+    /// </summary>
+    /// <param name="role">The role.</param>
+    /// <returns>The icon of the role.</returns>
+    public static string ToIcon(this ChatRole role) => role switch
+    {
+        ChatRole.SYSTEM => Icons.Material.Filled.Settings,
+        ChatRole.USER => Icons.Material.Filled.Person,
+        ChatRole.AI => Icons.Material.Filled.AutoAwesome,
+        
+        _ => Icons.Material.Filled.Help,
+    };
+
+    /// <summary>
+    /// Returns the specific name of the role for the chat template.
+    /// </summary>
+    /// <param name="role">The role.</param>
+    /// <returns>The name of the role.</returns>
+    public static string ToChatTemplateName(this ChatRole role) => role switch
+    {
+        ChatRole.SYSTEM => TB("System"),
+        ChatRole.USER => TB("User"),
+        ChatRole.AI => TB("Assistant"),
+
+        _ => TB("Unknown"),
+    };
+    
+    /// <summary>
+    /// Selects the next role for a chat template.
+    /// </summary>
+    /// <param name="currentRole">The current role.</param>
+    /// <returns>The next role for the chat template.</returns>
+    public static ChatRole SelectNextRoleForTemplate(this ChatRole currentRole) => currentRole switch
+    {
+        ChatRole.USER => ChatRole.AI,
+        _ => ChatRole.USER,
+    };
+}

app/MindWork AI Studio/Chat/ChatThread.cs

@@ -104,7 +104,7 @@ public sealed record ChatThread
                 systemPromptTextWithChatTemplate = chatThread.SystemPrompt;
             else
             {
-                if(chatThread.SelectedChatTemplate == ChatTemplate.NO_CHATTEMPLATE.Id || chatTeamplateId == Guid.Empty)
+                if(chatThread.SelectedChatTemplate == ChatTemplate.NO_CHAT_TEMPLATE.Id || chatTeamplateId == Guid.Empty)
                     systemPromptTextWithChatTemplate = chatThread.SystemPrompt;
                 else
                 {
@@ -115,13 +115,12 @@ public sealed record ChatThread
                     {
                         logMessage = $"Using chat template '{chatTemplate.Name}' for chat thread '{chatThread.Name}'.";
                         this.allowProfile = chatTemplate.AllowProfileUsage;
-                        systemPromptTextWithChatTemplate = $"""
-                                                            {chatTemplate.ToSystemPrompt()}
-                                                            """;
+                        systemPromptTextWithChatTemplate = chatTemplate.ToSystemPrompt();
                     }
                 }
             }
         }
+        
         logger.LogInformation(logMessage);
         
         //
@@ -146,11 +145,11 @@ public sealed record ChatThread
         
         
         //
-        // Add information from profile if available and allowed:
+        // Add information from the profile if available and allowed:
         //
         string systemPromptText;
         logMessage = $"Using no profile for chat thread '{chatThread.Name}'.";
-        if ((string.IsNullOrWhiteSpace(chatThread.SelectedProfile)) || (this.allowProfile is false))
+        if (string.IsNullOrWhiteSpace(chatThread.SelectedProfile) || this.allowProfile is false)
             systemPromptText = systemPromptWithAugmentedData;
         else
         {

app/MindWork AI Studio/Chat/ContentBlock.cs

@@ -28,17 +28,14 @@ public class ContentBlock
     /// <summary>
     /// Should the content block be hidden from the user?
     /// </summary>
-    public bool HideFromUser { get; set; }
+    public bool HideFromUser { get; init; }
 
-    public ContentBlock DeepClone()
+    public ContentBlock DeepClone() => new()
     {
-        return new()
-        {
-            Time = this.Time,
-            ContentType = this.ContentType,
-            Content = this.Content?.DeepClone(),
-            Role = this.Role,
-            HideFromUser = this.HideFromUser,
-        };
-    }
+        Time = this.Time,
+        ContentType = this.ContentType,
+        Content = this.Content?.DeepClone(),
+        Role = this.Role,
+        HideFromUser = this.HideFromUser,
+    };
 }

app/MindWork AI Studio/Chat/ContentImage.cs

@@ -13,11 +13,11 @@ public sealed class ContentImage : IContent, IImageSource
 
     /// <inheritdoc />
     [JsonIgnore]
-    public bool InitialRemoteWait { get; set; } = false;
+    public bool InitialRemoteWait { get; set; }
 
     /// <inheritdoc />
     [JsonIgnore]
-    public bool IsStreaming { get; set; } = false;
+    public bool IsStreaming { get; set; }
 
     /// <inheritdoc />
     [JsonIgnore]
@@ -34,16 +34,13 @@ public sealed class ContentImage : IContent, IImageSource
     }
     
     /// <inheritdoc />
-    public IContent DeepClone()
+    public IContent DeepClone() => new ContentImage
     {
-        return new ContentImage
-        {
-            Source = this.Source,
-            InitialRemoteWait = this.InitialRemoteWait,
-            IsStreaming = this.IsStreaming,
-            SourceType = this.SourceType,
-        };
-    }
+        Source = this.Source,
+        InitialRemoteWait = this.InitialRemoteWait,
+        IsStreaming = this.IsStreaming,
+        SourceType = this.SourceType,
+    };
 
     #endregion
 

app/MindWork AI Studio/Chat/ContentText.cs

@@ -126,15 +126,12 @@ public sealed class ContentText : IContent
     }
 
     /// <inheritdoc />
-    public IContent DeepClone()
+    public IContent DeepClone() => new ContentText
     {
-        return new ContentText
-        {
-            Text = this.Text,
-            InitialRemoteWait = this.InitialRemoteWait,
-            IsStreaming = this.IsStreaming,
-        };
-    }
+        Text = this.Text,
+        InitialRemoteWait = this.InitialRemoteWait,
+        IsStreaming = this.IsStreaming,
+    };
 
     #endregion