Features/refine model settings

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs

@@ -110,6 +110,7 @@ public class RoleDialogModel : ITrackableMessage
     /// <summary>
     /// Files to be used in conversation
     /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public List<BotSharpFile>? Files { get; set; }
 
     /// <summary>
@@ -133,6 +134,12 @@ public class RoleDialogModel : ITrackableMessage
     public bool IsStreaming { get; set; }
 
 
+    [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
+    public bool IsFromUser => Role == AgentRole.User;
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
+    public bool IsFromAssistant => Role == AgentRole.Assistant || Role == AgentRole.Model;
+
     public RoleDialogModel()
     {
     }

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/TokenStatsModel.cs

@@ -5,13 +5,19 @@ public class TokenStatsModel
     public string Provider { get; set; }
     public string Model { get; set; }
     public string Prompt { get; set; }
+
+    #region Input
     public int TextInputTokens { get; set; }
     public int CachedTextInputTokens { get; set; }
     public int AudioInputTokens { get; set; }
     public int CachedAudioInputTokens { get; set; }
+    #endregion
+
+    #region Output
     public int TextOutputTokens { get; set; }
     public int AudioOutputTokens { get; set; }
-    public AgentLlmConfig LlmConfig { get; set; }
+    #endregion
+
 
     public int TotalInputTokens => TextInputTokens + CachedTextInputTokens + AudioInputTokens + CachedAudioInputTokens;
     public int TotalOutputTokens => TextOutputTokens + AudioOutputTokens;

src/Infrastructure/BotSharp.Abstraction/Files/Enums/FileSourceType.cs → src/Infrastructure/BotSharp.Abstraction/Files/Enums/FileSource.cs

@@ -1,6 +1,6 @@
 namespace BotSharp.Abstraction.Files.Enums;
 
-public static class FileSourceType
+public static class FileSource
 {
     public const string User = "user";
     public const string Bot = "bot";

src/Infrastructure/BotSharp.Abstraction/Files/FileCoreSettings.cs

@@ -5,12 +5,5 @@ namespace BotSharp.Abstraction.Files;
 public class FileCoreSettings
 {
     public string Storage { get; set; } = FileStorageEnum.LocalFileStorage;
-    public SettingBase? Pdf2TextConverter { get; set; }
-    public SettingBase? Pdf2ImageConverter { get; set; }
     public SettingBase? ImageConverter { get; set; }
-}
-
-public class SettingBase
-{
-    public string Provider { get; set; }
 }

src/Infrastructure/BotSharp.Abstraction/Files/IFileStorageService.cs

@@ -19,24 +19,22 @@ public interface IFileStorageService
 
     #region Conversation
     /// <summary>
-    /// Get the message file screenshots for specific content types, e.g., pdf
+    /// Get the message file screenshots for pdf
     /// </summary>
     /// <param name="conversationId"></param>
     /// <param name="messageIds"></param>
     /// <returns></returns>
-    Task<IEnumerable<MessageFileModel>> GetMessageFileScreenshotsAsync(string conversationId, IEnumerable<string> messageIds);
+    Task<IEnumerable<MessageFileModel>> GetMessageFileScreenshotsAsync(string conversationId, IEnumerable<string> messageIds, MessageFileScreenshotOptions options);
 
     /// <summary>
     /// Get the files that have been uploaded in the chat. No screenshot images are included.
     /// </summary>
     /// <param name="conversationId"></param>
     /// <param name="messageIds"></param>
-    /// <param name="source"></param>
-    /// <param name="imageOnly"></param>
+    /// <param name="options"></param>
     /// <returns></returns>
-    IEnumerable<MessageFileModel> GetMessageFiles(string conversationId, IEnumerable<string> messageIds, string source, IEnumerable<string>? contentTypes = null);
+    IEnumerable<MessageFileModel> GetMessageFiles(string conversationId, IEnumerable<string> messageIds, MessageFileOptions? options = null);
     string GetMessageFile(string conversationId, string messageId, string source, string index, string fileName);
-    IEnumerable<MessageFileModel> GetMessagesWithFile(string conversationId, IEnumerable<string> messageIds);
     bool SaveMessageFiles(string conversationId, string messageId, string source, List<FileDataModel> files);
 
     /// <summary>

src/Infrastructure/BotSharp.Abstraction/Files/Models/MessageFileModel.cs

@@ -6,7 +6,7 @@ public class MessageFileModel : FileInformation
     public string MessageId { get; set; }
 
     [JsonPropertyName("file_source")]
-    public string FileSource { get; set; } = FileSourceType.User;
+    public string FileSource { get; set; } = Enums.FileSource.User;
 
     [JsonPropertyName("file_index")]
     public string FileIndex { get; set; } = string.Empty;

src/Infrastructure/BotSharp.Abstraction/Files/Models/MessageFileOptions.cs

@@ -0,0 +1,20 @@
+namespace BotSharp.Abstraction.Files.Models;
+
+public class MessageFileOptions
+{
+    /// <summary>
+    /// File sources: user, bot
+    /// </summary>
+    public IEnumerable<string>? Sources { get; set; }
+
+    /// <summary>
+    /// File content types
+    /// </summary>
+    public IEnumerable<string>? ContentTypes { get; set; }
+}
+
+
+public class MessageFileScreenshotOptions : MessageFileOptions
+{
+    public string ImageConvertProvider { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Knowledges/Settings/KnowledgeBaseSettings.cs

@@ -20,9 +20,4 @@ public class KnowledgeTextEmbeddingSetting : SettingBase
 {
     public string Model { get; set; }
     public int Dimension { get; set; }
-}
-
-public class SettingBase
-{
-    public string Provider { get; set; }
 }

src/Infrastructure/BotSharp.Abstraction/Models/LlmConfigBase.cs

@@ -1,24 +1,27 @@
 namespace BotSharp.Abstraction.Models;
 
-public class LlmConfigBase
+public class LlmConfigBase : LlmBase
 {
     /// <summary>
-    /// Llm provider
+    /// Llm maximum output tokens
     /// </summary>
-    public string? LlmProvider { get; set; }
+    public int? MaxOutputTokens { get; set; }
 
     /// <summary>
-    /// Llm model
+    /// Llm reasoning effort level
     /// </summary>
-    public string? LlmModel { get; set; }
+    public string? ReasoningEffortLevel { get; set; }
+}
 
+public class LlmBase
+{
     /// <summary>
-    /// Llm maximum output tokens
+    /// Llm provider
     /// </summary>
-    public int? MaxOutputTokens { get; set; }
+    public string? LlmProvider { get; set; }
 
     /// <summary>
-    /// Llm reasoning effort level
+    /// Llm model
     /// </summary>
-    public string? ReasoningEffortLevel { get; set; }
-}
+    public string? LlmModel { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Settings/SettingBase.cs

@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Settings;
+
+public class SettingBase
+{
+    public string Provider { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Using.cs

@@ -20,4 +20,5 @@
 global using BotSharp.Abstraction.Files.Enums;
 global using BotSharp.Abstraction.Knowledges.Models;
 global using BotSharp.Abstraction.Crontab.Models;
-global using BotSharp.Abstraction.MCP.Models;
+global using BotSharp.Abstraction.MCP.Models;
+global using BotSharp.Abstraction.Settings;

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

@@ -27,13 +27,13 @@ public async Task<IEnumerable<MessageFileModel>> SelectMessageFiles(string conve
             dialogs = dialogs.TakeLast(options.MessageLimit.Value).ToList();
         }
 
-        var messageIds = dialogs.Select(x => x.MessageId).Distinct().ToList();
-        var files = _fileStorage.GetMessageFiles(conversationId, messageIds, FileSourceType.User, options.ContentTypes);
-        if (options.IsIncludeBotFiles)
+        var messageIds = dialogs.Select(x => x.MessageId).Distinct().ToList(); 
+        var files = _fileStorage.GetMessageFiles(conversationId, messageIds, options: new()
         {
-            var botFiles = _fileStorage.GetMessageFiles(conversationId, messageIds, FileSourceType.Bot, options.ContentTypes);
-            files = MergeMessageFiles(messageIds, files, botFiles);
-        }
+            Sources = options.IsIncludeBotFiles ?[FileSource.User, FileSource.Bot] : [FileSource.User],
+            ContentTypes = options.ContentTypes
+        });
+        files = MergeMessageFiles(messageIds, files);
 
         if (files.IsNullOrEmpty())
         {
@@ -43,19 +43,31 @@ public async Task<IEnumerable<MessageFileModel>> SelectMessageFiles(string conve
         return await SelectFiles(files, dialogs, options);
     }
 
-    private IEnumerable<MessageFileModel> MergeMessageFiles(IEnumerable<string> messageIds, IEnumerable<MessageFileModel> userFiles, IEnumerable<MessageFileModel> botFiles)
+    private IEnumerable<MessageFileModel> MergeMessageFiles(IEnumerable<string> messageIds, IEnumerable<MessageFileModel> files)
     {
-        var files = new List<MessageFileModel>();
+        var mergedFiles = new List<MessageFileModel>();
 
-        if (messageIds.IsNullOrEmpty()) return files;
+        if (messageIds.IsNullOrEmpty())
+        {
+            return mergedFiles;
+        }
+
+        var userFiles = files.Where(x => x.FileSource.IsEqualTo(FileSource.User));
+        var botFiles = files.Where(x => x.FileSource.IsEqualTo(FileSource.Bot));
 
         foreach (var messageId in messageIds)
         {
             var users = userFiles.Where(x => x.MessageId == messageId).OrderBy(x => x.FileIndex, new MessageFileIndexComparer()).ToList();
             var bots = botFiles.Where(x => x.MessageId == messageId).OrderBy(x => x.FileIndex, new MessageFileIndexComparer()).ToList();
 
-            if (!users.IsNullOrEmpty()) files.AddRange(users);
-            if (!bots.IsNullOrEmpty()) files.AddRange(bots);
+            if (!users.IsNullOrEmpty())
+            {
+                mergedFiles.AddRange(users);
+            }
+            if (!bots.IsNullOrEmpty())
+            {
+                mergedFiles.AddRange(bots);
+            }
         }
 
         return files;
@@ -74,25 +86,24 @@ private async Task<IEnumerable<MessageFileModel>> SelectFiles(IEnumerable<Messag
         var render = _services.GetRequiredService<ITemplateRender>();
         var db = _services.GetRequiredService<IBotSharpRepository>();
 
-        try
-        {
-            // Handle dialogs and files
-            var innerDialogs = (dialogs ?? []).ToList();
-            var text = !string.IsNullOrWhiteSpace(options.Description) ? options.Description : "Please follow the instruction and select file(s).";
-            innerDialogs = innerDialogs.Concat([new RoleDialogModel(AgentRole.User, text)]).ToList();
-
-            if (options.IsAttachFiles)
-            {
-                AssembleMessageFiles(innerDialogs, files, options);
-            }
+        // Handle dialogs and files
+        var innerDialogs = (dialogs ?? []).ToList();
+        var text = !string.IsNullOrWhiteSpace(options.Description) ? options.Description : "Please follow the instruction and select file(s).";
+        innerDialogs = innerDialogs.Concat([new RoleDialogModel(AgentRole.User, text)]).ToList();
 
+        if (options.IsAttachFiles)
+        {
+            AssembleMessageFiles(innerDialogs, files, options);
+        }
 
+        try
+        {
             // Handle instruction
             var promptMessages = innerDialogs.Select(x =>
             {
                 var text = $"[Role] '{x.Role}': {x.RichContent?.Message?.Text ?? x.Payload ?? x.Content}";
                 var fileDescs = x.Files?.Select((f, fidx) => $"- message_id: '{x.MessageId}', file_index: '{f.FileIndex}', " +
-                              $"content_type: '{f.ContentType}', author: '{(x.Role == AgentRole.User ? FileSourceType.User : FileSourceType.Bot)}'");
+                              $"content_type: '{f.ContentType}', author: '{(x.Role == AgentRole.User ? FileSource.User : FileSource.Bot)}'");
 
                 var desc = string.Empty;
                 if (!fileDescs.IsNullOrEmpty())
@@ -164,6 +175,10 @@ private async Task<IEnumerable<MessageFileModel>> SelectFiles(IEnumerable<Messag
             _logger.LogWarning(ex, $"Error when selecting files.");
             return [];
         }
+        finally
+        {
+            innerDialogs.ForEach(x => x.Files = null);
+        }
     }
 
     private void AssembleMessageFiles(IEnumerable<RoleDialogModel> dialogs, IEnumerable<MessageFileModel> files, SelectFileOptions options)
@@ -184,10 +199,10 @@ private void AssembleMessageFiles(IEnumerable<RoleDialogModel> dialogs, IEnumera
                 continue;
             }
 
-            var userMsg = group.FirstOrDefault(x => x.Role == AgentRole.User);
+            var userMsg = group.FirstOrDefault(x => x.IsFromUser);
             if (userMsg != null)
             {
-                var userFiles = found.Where(x => x.FileSource == FileSourceType.User);
+                var userFiles = found.Where(x => x.FileSource == FileSource.User);
                 userMsg.Files = userFiles.Select(x => new BotSharpFile
                 {
                     ContentType = x.ContentType,
@@ -199,10 +214,10 @@ private void AssembleMessageFiles(IEnumerable<RoleDialogModel> dialogs, IEnumera
                 }).ToList();
             }
 
-            var botMsg = group.LastOrDefault(x => x.Role == AgentRole.Assistant);
+            var botMsg = group.LastOrDefault(x => x.IsFromAssistant);
             if (botMsg != null)
             {
-                var botFiles = found.Where(x => x.FileSource == FileSourceType.Bot);
+                var botFiles = found.Where(x => x.FileSource == FileSource.Bot);
                 botMsg.Files = botFiles.Select(x => new BotSharpFile
                 {
                     ContentType = x.ContentType,