Merge pull request #1164 from iceljc/features/refine-model-settings

Features/refine model settings

Author: iceljc

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 renamed to 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; }
+}