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

Features/refine model settings

Author: iceljc

Directory.Packages.props

@@ -6,8 +6,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="EntityFramework" Version="6.4.4" />
-    <PackageVersion Include="Google_GenerativeAI" Version="2.5.8" />
-    <PackageVersion Include="Google_GenerativeAI.Live" Version="2.5.8" />
+    <PackageVersion Include="Google_GenerativeAI" Version="3.2.0" />
+    <PackageVersion Include="Google_GenerativeAI.Live" Version="3.2.0" />
     <PackageVersion Include="LLMSharp.Google.Palm" Version="1.0.2" />
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
@@ -20,7 +20,7 @@
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="SharpHook" Version="5.3.9" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.7" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
     <PackageVersion Include="System.ClientModel" Version="1.3.0" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.0.0" />
@@ -45,8 +45,8 @@
     <PackageVersion Include="Whisper.net" Version="1.8.1" />
     <PackageVersion Include="Whisper.net.Runtime" Version="1.8.1" />
     <PackageVersion Include="NCrontab" Version="3.3.3" />
-    <PackageVersion Include="Azure.AI.OpenAI" Version="2.2.0-beta.5" />
-    <PackageVersion Include="OpenAI" Version="2.3.0" />
+    <PackageVersion Include="Azure.AI.OpenAI" Version="2.3.0-beta.2" />
+    <PackageVersion Include="OpenAI" Version="2.4.0" />
     <PackageVersion Include="MailKit" Version="4.11.0" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.8" />
     <PackageVersion Include="MySql.Data" Version="9.0.0" />

src/Infrastructure/BotSharp.Abstraction/Conversations/Dtos/ChatResponseDto.cs

@@ -46,9 +46,6 @@ public class ChatResponseDto : InstructResult
     [JsonPropertyName("is_streaming")]
     public bool IsStreaming { get; set; }
 
-    [JsonPropertyName("is_append")]
-    public bool IsAppend { get; set; }
-
     [JsonPropertyName("created_at")]
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 }

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

@@ -132,12 +132,6 @@ public class RoleDialogModel : ITrackableMessage
     [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public bool IsStreaming { get; set; }
 
-    /// <summary>
-    /// Additional messages that can be sent sequentially and save to db
-    /// </summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
-    public ChatMessageWrapper? AdditionalMessageWrapper { get; set; }
-
 
     public RoleDialogModel()
     {
@@ -184,26 +178,7 @@ public static RoleDialogModel From(RoleDialogModel source,
             Instruction = source.Instruction,
             Data = source.Data,
             IsStreaming = source.IsStreaming,
-            Annotations = source.Annotations,
-            AdditionalMessageWrapper = source.AdditionalMessageWrapper
+            Annotations = source.Annotations
         };
     }
-}
-
-public class ChatMessageWrapper
-{
-    /// <summary>
-    /// Messages sending interval in milliseconds
-    /// </summary>
-    public int SendingInterval { get; set; }
-
-    /// <summary>
-    /// Whether the Messages are saved to db
-    /// </summary>
-    public bool SaveToDb { get; set; }
-
-    /// <summary>
-    /// Messages to send or save
-    /// </summary>
-    public List<RoleDialogModel>? Messages { get; set; }
 }

src/Infrastructure/BotSharp.Abstraction/Conversations/Settings/ConversationSetting.cs

@@ -14,6 +14,7 @@ public class ConversationSetting
     public bool EnableTranslationMemory { get; set; }
     public CleanConversationSetting CleanSetting { get; set; } = new();
     public RateLimitSetting RateLimit { get; set; } = new();
+    public FileSelectSetting? FileSelect { get; set; }
 }
 
 public class CleanConversationSetting
@@ -24,3 +25,8 @@ public class CleanConversationSetting
     public int BufferHours { get; set; }
     public IEnumerable<string> ExcludeAgentIds { get; set; } = new List<string>();
 }
+
+public class FileSelectSetting : LlmConfigBase
+{
+    public int? MessageLimit { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Files/Converters/IImageConverter.cs

@@ -0,0 +1,24 @@
+namespace BotSharp.Abstraction.Files.Converters;
+
+public interface IImageConverter
+{
+    public string Provider { get; }
+
+    /// <summary>
+    /// Convert pdf pages to images, and return a list of image file paths
+    /// </summary>
+    /// <param name="pdfLocation">Pdf file location</param>
+    /// <param name="imageFolderLocation">Image folder location</param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    Task<IEnumerable<string>> ConvertPdfToImages(string pdfLocation, string imageFolderLocation) => throw new NotImplementedException();
+
+    /// <summary>
+    /// Convert an image to PNG with RGBA
+    /// </summary>
+    /// <param name="binary"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    Task<BinaryData> ConvertImage(BinaryData binary, ImageConvertOptions? options = null) => throw new NotImplementedException();
+}

src/Infrastructure/BotSharp.Abstraction/Files/Converters/IPdf2ImageConverter.cs

@@ -5,8 +5,9 @@ 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? Pdf2TextConverter { get; set; }
+    public SettingBase? Pdf2ImageConverter { get; set; }
+    public SettingBase? ImageConverter { get; set; }
 }
 
 public class SettingBase

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

@@ -1,4 +1,3 @@
-
 namespace BotSharp.Abstraction.Files.Models;
 
 public class BotSharpFile : FileInformation
@@ -9,4 +8,8 @@ public class BotSharpFile : FileInformation
     [JsonPropertyName("file_data")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? FileData { get; set; } = string.Empty;
+
+    [JsonPropertyName("file_index")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? FileIndex { get; set; } = string.Empty;
 }

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

@@ -42,4 +42,7 @@ public class FileInformation
     [JsonPropertyName("file_download_url")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? FileDownloadUrl { get; set; } = string.Empty;
+
+
+    public string FileFullName => $"{FileName}.{FileExtension}";
 }

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

@@ -2,7 +2,21 @@ namespace BotSharp.Abstraction.Files.Models;
 
 public class FileSelectContext
 {
-    [JsonPropertyName("selected_ids")]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public IEnumerable<int>? Selecteds { get; set; }
+    [JsonPropertyName("selected_files")]
+    public List<FileSelectItem>? SelectedFiles { get; set; }
 }
+
+public class FileSelectItem
+{
+    [JsonPropertyName("message_id")]
+    public string MessageId { get; set; }
+
+    [JsonPropertyName("file_index")]
+    public string FileIndex { get; set; }
+
+    [JsonPropertyName("file_source")]
+    public string FileSource { get; set; }
+
+    [JsonPropertyName("file_name")]
+    public string? FileName { get; set; }
+}