refine file storage

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/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/IFileStorageService.cs

@@ -31,12 +31,10 @@ public interface IFileStorageService
     /// </summary>
     /// <param name="conversationId"></param>
     /// <param name="messageIds"></param>
-    /// <param name="source"></param>
+    /// <param name="options"></param>
-    /// <param name="imageOnly"></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,14 @@
+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; }
+}

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

@@ -28,12 +28,12 @@ public partial class FileInstructService
         }
 
         var messageIds = dialogs.Select(x => x.MessageId).Distinct().ToList(); 
-        var files = _fileStorage.GetMessageFiles(conversationId, messageIds, FileSourceType.User, options.ContentTypes);
+        var files = _fileStorage.GetMessageFiles(conversationId, messageIds, options: new()
-        if (options.IsIncludeBotFiles)
         {
-            var botFiles = _fileStorage.GetMessageFiles(conversationId, messageIds, FileSourceType.Bot, options.ContentTypes);
+            Sources = options.IsIncludeBotFiles ?[FileSource.User, FileSource.Bot] : [FileSource.User],
-            files = MergeMessageFiles(messageIds, files, botFiles);
+            ContentTypes = options.ContentTypes
-        }
+        });
+        files = MergeMessageFiles(messageIds, files);
 
         if (files.IsNullOrEmpty())
         {
@@ -43,19 +43,31 @@ public partial class FileInstructService
         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 (!users.IsNullOrEmpty())
-            if (!bots.IsNullOrEmpty()) files.AddRange(bots);
+            {
+                mergedFiles.AddRange(users);
+            }
+            if (!bots.IsNullOrEmpty())
+            {
+                mergedFiles.AddRange(bots);
+            }
         }
 
         return files;
@@ -92,7 +104,7 @@ public partial class FileInstructService
             {
                 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())
@@ -187,7 +199,7 @@ public partial class FileInstructService
             var userMsg = group.FirstOrDefault(x => x.Role == AgentRole.User);
             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,
@@ -202,7 +214,7 @@ public partial class FileInstructService
             var botMsg = group.LastOrDefault(x => x.Role == AgentRole.Assistant);
             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,

src/Infrastructure/BotSharp.Core/Files/Services/Storage/LocalFileStorageService.Conversation.cs

@@ -14,7 +14,7 @@ public partial class LocalFileStorageService
             return files;
         }
 
-        var source = FileSourceType.User;
+        var source = FileSource.User;
         var pathPrefix = Path.Combine(_baseDir, CONVERSATION_FOLDER, conversationId, FILE_FOLDER);
 
         foreach (var messageId in messageIds)
@@ -24,7 +24,7 @@ public partial class LocalFileStorageService
                 continue;
             }
 
-            var dir = Path.Combine(pathPrefix, messageId, FileSourceType.User);
+            var dir = Path.Combine(pathPrefix, messageId, FileSource.User);
             if (!ExistDirectory(dir))
             {
                 continue;
@@ -51,8 +51,7 @@ public partial class LocalFileStorageService
     }
 
 
-    public IEnumerable<MessageFileModel> GetMessageFiles(string conversationId, IEnumerable<string> messageIds,
+    public IEnumerable<MessageFileModel> GetMessageFiles(string conversationId, IEnumerable<string> messageIds, MessageFileOptions? options = null)
-        string source, IEnumerable<string>? contentTypes = null)
     {
         var files = new List<MessageFileModel>();
         if (string.IsNullOrWhiteSpace(conversationId) || messageIds.IsNullOrEmpty())
@@ -67,39 +66,56 @@ public partial class LocalFileStorageService
                 continue;
             }
 
-            var dir = Path.Combine(_baseDir, CONVERSATION_FOLDER, conversationId, FILE_FOLDER, messageId, source);
+            var baseDir = Path.Combine(_baseDir, CONVERSATION_FOLDER, conversationId, FILE_FOLDER, messageId);
-            if (!ExistDirectory(dir))
+            if (!ExistDirectory(baseDir))
             {
                 continue;
             }
 
-            foreach (var subDir in Directory.GetDirectories(dir))
+            var sources = options?.Sources != null
+                            ? options.Sources
+                            : Directory.GetDirectories(baseDir).Select(x => x.Split(Path.DirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries).Last());
+            if (sources.IsNullOrEmpty())
             {
-                var index = subDir.Split(Path.DirectorySeparatorChar).Last();
+                continue;
+            }
 
-                foreach (var file in Directory.GetFiles(subDir))
+            foreach (var source in sources)
+            {
+                var dir = Path.Combine(baseDir, source);
+                if (!ExistDirectory(dir))
                 {
-                    var contentType = FileUtility.GetFileContentType(file);
+                    continue;
-                    if (!contentTypes.IsNullOrEmpty() && !contentTypes.Contains(contentType))
+                }
-                    {
-                        continue;
-                    }
 
-                    var fileName = Path.GetFileNameWithoutExtension(file);
+                foreach (var subDir in Directory.GetDirectories(dir))
-                    var fileExtension = Path.GetExtension(file).Substring(1);
+                {
-                    var model = new MessageFileModel()
+                    var fileIndex = subDir.Split(Path.DirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries).Last();
+
+                    foreach (var file in Directory.GetFiles(subDir))
                     {
-                        MessageId = messageId,
+                        var contentType = FileUtility.GetFileContentType(file);
-                        FileUrl = $"/conversation/{conversationId}/message/{messageId}/{source}/file/{index}/{fileName}",
+                        if (options?.ContentTypes != null && !options.ContentTypes.Contains(contentType))
-                        FileDownloadUrl = $"/conversation/{conversationId}/message/{messageId}/{source}/file/{index}/{fileName}/download",
+                        {
-                        FileStorageUrl = file,
+                            continue;
-                        FileName = fileName,
+                        }
-                        FileExtension = fileExtension,
+
-                        ContentType = contentType,
+                        var fileName = Path.GetFileNameWithoutExtension(file);
-                        FileSource = source,
+                        var fileExtension = Path.GetExtension(file).Substring(1);
-                        FileIndex = index
+                        var model = new MessageFileModel
-                    };
+                        {
-                    files.Add(model);
+                            MessageId = messageId,
+                            FileUrl = $"/conversation/{conversationId}/message/{messageId}/{source}/file/{fileIndex}/{fileName}",
+                            FileDownloadUrl = $"/conversation/{conversationId}/message/{messageId}/{source}/file/{fileIndex}/{fileName}/download",
+                            FileStorageUrl = file,
+                            FileName = fileName,
+                            FileExtension = fileExtension,
+                            ContentType = contentType,
+                            FileSource = source,
+                            FileIndex = fileIndex
+                        };
+                        files.Add(model);
+                    }
                 }
             }
         }
@@ -126,38 +142,6 @@ public partial class LocalFileStorageService
         return found;
     }
 
-    public IEnumerable<MessageFileModel> GetMessagesWithFile(string conversationId, IEnumerable<string> messageIds)
-    {
-        var foundMsgs = new List<MessageFileModel>();
-        if (string.IsNullOrWhiteSpace(conversationId) || messageIds.IsNullOrEmpty())
-        {
-            return foundMsgs;
-        }
-
-        foreach (var messageId in messageIds)
-        {
-            if (string.IsNullOrWhiteSpace(messageId))
-            {
-                continue;
-            }
-
-            var prefix = Path.Combine(_baseDir, CONVERSATION_FOLDER, conversationId, FILE_FOLDER, messageId);
-            var userDir = Path.Combine(prefix, FileSourceType.User);
-            if (ExistDirectory(userDir))
-            {
-                foundMsgs.Add(new MessageFileModel { MessageId = messageId, FileSource = FileSourceType.User });
-            }
-
-            var botDir = Path.Combine(prefix, FileSourceType.Bot);
-            if (ExistDirectory(botDir))
-            {
-                foundMsgs.Add(new MessageFileModel { MessageId = messageId, FileSource = FileSourceType.Bot });
-            }
-        }
-
-        return foundMsgs;
-    }
-
     public bool SaveMessageFiles(string conversationId, string messageId, string source, List<FileDataModel> files)
     {
         if (string.IsNullOrWhiteSpace(conversationId)

src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs

@@ -96,7 +96,7 @@ public class ConversationController : ControllerBase
         var fileStorage = _services.GetRequiredService<IFileStorageService>();
 
         var messageIds = history.Select(x => x.MessageId).Distinct().ToList();
-        var fileMessages = fileStorage.GetMessagesWithFile(conversationId, messageIds);
+        var files = fileStorage.GetMessageFiles(conversationId, messageIds, options: new() { Sources = [FileSource.User, FileSource.Bot] });
 
         var dialogs = new List<ChatResponseModel>();
         foreach (var message in history)
@@ -115,7 +115,7 @@ public class ConversationController : ControllerBase
                     Data = message.Data,
                     Sender = UserDto.FromUser(user),
                     Payload = message.Payload,
-                    HasMessageFiles = fileMessages.Any(x => x.MessageId.IsEqualTo(message.MessageId) && x.FileSource == FileSourceType.User)
+                    HasMessageFiles = files.Any(x => x.MessageId.IsEqualTo(message.MessageId) && x.FileSource == FileSource.User)
                 });
             }
             else if (message.Role == AgentRole.Assistant)
@@ -136,7 +136,7 @@ public class ConversationController : ControllerBase
                         Role = message.Role,
                     },
                     RichContent = message.SecondaryRichContent ?? message.RichContent,
-                    HasMessageFiles = fileMessages.Any(x => x.MessageId.IsEqualTo(message.MessageId) && x.FileSource == FileSourceType.Bot)
+                    HasMessageFiles = files.Any(x => x.MessageId.IsEqualTo(message.MessageId) && x.FileSource == FileSource.Bot)
                 });
             }
         }
@@ -490,7 +490,7 @@ public class ConversationController : ControllerBase
         var conv = await convService.GetConversationRecordOrCreateNew(agentId);
         var fileStorage = _services.GetRequiredService<IFileStorageService>();
         var messageId = Guid.NewGuid().ToString();
-        var isSaved = fileStorage.SaveMessageFiles(conv.Id, messageId, FileSourceType.User, input.Files);
+        var isSaved = fileStorage.SaveMessageFiles(conv.Id, messageId, FileSource.User, input.Files);
         return isSaved ? messageId : string.Empty;
     }
 
@@ -498,8 +498,8 @@ public class ConversationController : ControllerBase
     public IEnumerable<MessageFileViewModel> GetConversationMessageFiles([FromRoute] string conversationId, [FromRoute] string messageId, [FromRoute] string source)
     {
         var fileStorage = _services.GetRequiredService<IFileStorageService>();
-        var files = fileStorage.GetMessageFiles(conversationId, new List<string> { messageId }, source);
+        var files = fileStorage.GetMessageFiles(conversationId, [messageId], options: new() { Sources = [source] });
-        return files?.Select(x => MessageFileViewModel.Transform(x))?.ToList() ?? new List<MessageFileViewModel>();
+        return files?.Select(x => MessageFileViewModel.Transform(x))?.ToList() ?? [];
     }
 
     [HttpGet("/conversation/{conversationId}/message/{messageId}/{source}/file/{index}/{fileName}")]

src/Plugins/BotSharp.Plugin.AudioHandler/Functions/HandleAudioRequestFn.cs

@@ -13,7 +13,7 @@ public class HandleAudioRequestFn : IFunctionCallback
     private readonly ILogger<HandleAudioRequestFn> _logger;
     private readonly BotSharpOptions _options;
 
-    private readonly IEnumerable<string> _audioContentType = new List<string>
+    private readonly IEnumerable<string> _audioContentTypes = new List<string>
     {
         AudioType.mp3.ToFileType(),
         AudioType.wav.ToFileType(),
@@ -52,7 +52,11 @@ public class HandleAudioRequestFn : IFunctionCallback
         }
 
         var messageId = dialogs.Select(x => x.MessageId).Distinct().ToList();
-        var audioMessageFiles = _fileStorage.GetMessageFiles(convId, messageId, FileSourceType.User, _audioContentType);
+        var audioMessageFiles = _fileStorage.GetMessageFiles(convId, messageId, options: new()
+        {
+            Sources = [FileSource.User],
+            ContentTypes = _audioContentTypes
+        });
 
         audioMessageFiles = audioMessageFiles.Where(x => x.ContentType.Contains("audio")).ToList();
 

src/Plugins/BotSharp.Plugin.FileHandler/Functions/EditImageFn.cs

@@ -191,7 +191,7 @@ public class EditImageFn : IFunctionCallback
         };
 
         var fileStorage = _services.GetRequiredService<IFileStorageService>();
-        fileStorage.SaveMessageFiles(_conversationId, _messageId, FileSourceType.Bot, files);
+        fileStorage.SaveMessageFiles(_conversationId, _messageId, FileSource.Bot, files);
         return files.Select(x => x.FileName);
     }
 

src/Plugins/BotSharp.Plugin.FileHandler/Functions/GenerateImageFn.cs

@@ -151,7 +151,7 @@ public class GenerateImageFn : IFunctionCallback
         }).ToList();
 
         var fileStorage = _services.GetRequiredService<IFileStorageService>();
-        fileStorage.SaveMessageFiles(_conversationId, _messageId, FileSourceType.Bot, files);
+        fileStorage.SaveMessageFiles(_conversationId, _messageId, FileSource.Bot, files);
         return files.Select(x => x.FileName);
     }
 }

src/Plugins/BotSharp.Plugin.FileHandler/Functions/ReadImageFn.cs

@@ -10,6 +10,12 @@ public class ReadImageFn : IFunctionCallback
     private readonly IServiceProvider _services;
     private readonly ILogger<ReadImageFn> _logger;
 
+    private readonly IEnumerable<string> _imageContentTypes = new List<string>
+    {
+        MediaTypeNames.Image.Png,
+        MediaTypeNames.Image.Jpeg
+    };
+
     public ReadImageFn(
         IServiceProvider services,
         ILogger<ReadImageFn> logger)
@@ -58,17 +64,13 @@ public class ReadImageFn : IFunctionCallback
             return new List<RoleDialogModel>();
         }
 
-        var contentTypes = new List<string>
-        {
-            MediaTypeNames.Image.Png,
-            MediaTypeNames.Image.Jpeg
-        };
-
         var fileStorage = _services.GetRequiredService<IFileStorageService>();
         var messageIds = dialogs.Select(x => x.MessageId).Distinct().ToList();
-        var userImages = fileStorage.GetMessageFiles(conversationId, messageIds, FileSourceType.User, contentTypes);
+        var images = fileStorage.GetMessageFiles(conversationId, messageIds, options: new()
-        var botImages = fileStorage.GetMessageFiles(conversationId, messageIds, FileSourceType.Bot, contentTypes);
+        {
-        var images = userImages.Concat(botImages);
+            Sources = [FileSource.User, FileSource.Bot],
+            ContentTypes = _imageContentTypes
+        });
 
         foreach (var dialog in dialogs)
         {

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs

@@ -1,4 +1,5 @@
 #pragma warning disable OPENAI001
+using BotSharp.Abstraction.Hooks;
 using OpenAI.Images;
 
 namespace BotSharp.Plugin.OpenAI.Providers.Image;
@@ -7,10 +8,18 @@ public partial class ImageCompletionProvider
 {
     public async Task<RoleDialogModel> GetImageGeneration(Agent agent, RoleDialogModel message)
     {
+        var hooks = _services.GetHooks<IContentGeneratingHook>(agent.Id);
+
         var client = ProviderHelper.GetClient(Provider, _model, _services);
         var (prompt, imageCount, options) = PrepareGenerationOptions(message);
         var imageClient = client.GetImageClient(_model);
 
+        // Before generation
+        foreach (var hook in hooks)
+        {
+            await hook.BeforeGenerating(agent, [new RoleDialogModel(AgentRole.User, prompt)]);
+        }
+
         var response = imageClient.GenerateImages(prompt, imageCount, options);
         var images = response.Value;
 
@@ -23,6 +32,16 @@ public partial class ImageCompletionProvider
             GeneratedImages = generatedImages
         };
 
+        // After generation
+        var usage = response.Value.Usage;
+        foreach (var hook in hooks)
+        {
+            await hook.AfterGenerated(responseMessage, new TokenStatsModel
+            {
+
+            });
+        }
+
         return await Task.FromResult(responseMessage);
     }
 

src/Plugins/BotSharp.Plugin.TencentCos/Services/TencentCosService.Conversation.cs

@@ -16,7 +16,7 @@ public partial class TencentCosService
             return files;
         }
 
-        var source = FileSourceType.User;
+        var source = FileSource.User;
         var pathPrefix = $"{CONVERSATION_FOLDER}/{conversationId}/{FILE_FOLDER}";
         foreach (var messageId in messageIds)
         {
@@ -36,46 +36,66 @@ public partial class TencentCosService
         return files;
     }
 
-    public IEnumerable<MessageFileModel> GetMessageFiles(string conversationId, IEnumerable<string> messageIds,
+    public IEnumerable<MessageFileModel> GetMessageFiles(string conversationId, IEnumerable<string> messageIds, MessageFileOptions? options = null)
-        string source, IEnumerable<string>? contentTypes = null)
     {
         var files = new List<MessageFileModel>();
-        if (string.IsNullOrWhiteSpace(conversationId) || messageIds.IsNullOrEmpty()) return files;
+        if (string.IsNullOrWhiteSpace(conversationId) || messageIds.IsNullOrEmpty())
+        {
+            return files;
+        }
 
         foreach (var messageId in messageIds)
         {
-            var dir = $"{CONVERSATION_FOLDER}/{conversationId}/{FILE_FOLDER}/{messageId}/{source}";
+            var baseDir = $"{CONVERSATION_FOLDER}/{conversationId}/{FILE_FOLDER}/{messageId}";
-            if (!ExistDirectory(dir))
+            if (!ExistDirectory(baseDir))
             {
                 continue;
             }
 
-            foreach (var subDir in _cosClient.BucketClient.GetDirectories(dir))
+            var sources = options?.Sources != null
+                              ? options.Sources
+                              : _cosClient.BucketClient.GetDirectories(baseDir).Select(x => x.Split("/", StringSplitOptions.RemoveEmptyEntries).Last());
+            if (sources.IsNullOrEmpty())
             {
-                foreach (var file in _cosClient.BucketClient.GetDirFiles(subDir))
+                continue;
-                {
+            }
-                    var contentType = FileUtility.GetFileContentType(file);
-                    if (!contentTypes.IsNullOrEmpty() && !contentTypes.Contains(contentType))
-                    {
-                        continue;
-                    }
 
-                    var fileName = Path.GetFileNameWithoutExtension(file);
+            foreach (var source in sources)
-                    var fileExtension = Path.GetExtension(file).Substring(1);
+            {
+                var dir = Path.Combine(baseDir, source);
+                if (!ExistDirectory(dir))
+                {
+                    continue;
+                }
+
+                foreach (var subDir in _cosClient.BucketClient.GetDirectories(dir))
+                {
                     var fileIndex = subDir.Split("/", StringSplitOptions.RemoveEmptyEntries).LastOrDefault() ?? string.Empty;
-                    var model = new MessageFileModel()
+
+                    foreach (var file in _cosClient.BucketClient.GetDirFiles(subDir))
                     {
-                        MessageId = messageId,
+                        var contentType = FileUtility.GetFileContentType(file);
-                        FileUrl = BuilFileUrl(file),
+                        if (options?.ContentTypes != null && !options.ContentTypes.Contains(contentType))
-                        FileDownloadUrl = BuilFileUrl(file),
+                        {
-                        FileStorageUrl = file,
+                            continue;
-                        FileName = fileName,
+                        }
-                        FileExtension = fileExtension,
+
-                        ContentType = contentType,
+                        var fileName = Path.GetFileNameWithoutExtension(file);
-                        FileSource = source,
+                        var fileExtension = Path.GetExtension(file).Substring(1);
-                        FileIndex = fileIndex
+                        var model = new MessageFileModel()
-                    };
+                        {
-                    files.Add(model);
+                            MessageId = messageId,
+                            FileUrl = BuilFileUrl(file),
+                            FileDownloadUrl = BuilFileUrl(file),
+                            FileStorageUrl = file,
+                            FileName = fileName,
+                            FileExtension = fileExtension,
+                            ContentType = contentType,
+                            FileSource = source,
+                            FileIndex = fileIndex
+                        };
+                        files.Add(model);
+                    }
                 }
             }
         }
@@ -87,37 +107,13 @@ public partial class TencentCosService
 
     public string GetMessageFile(string conversationId, string messageId, string source, string index, string fileName)
     {
-        var dir = $"{CONVERSATION_FOLDER}/{conversationId}/{FILE_FOLDER}/{source}/{index}/";
+        var dir = $"{CONVERSATION_FOLDER}/{conversationId}/{FILE_FOLDER}/{source}/{index}";
 
         var fileList = _cosClient.BucketClient.GetDirFiles(dir);
         var found = fileList.FirstOrDefault(f => Path.GetFileNameWithoutExtension(f).IsEqualTo(fileName));
         return found;
     }
 
-    public IEnumerable<MessageFileModel> GetMessagesWithFile(string conversationId, IEnumerable<string> messageIds)
-    {
-        var foundMsgs = new List<MessageFileModel>();
-        if (string.IsNullOrWhiteSpace(conversationId) || messageIds.IsNullOrEmpty()) return foundMsgs;
-
-        foreach (var messageId in messageIds)
-        {
-            var prefix = $"{CONVERSATION_FOLDER}/{conversationId}/{FILE_FOLDER}/{messageId}";
-            var userDir = $"{prefix}/{FileSourceType.User}/";
-            if (ExistDirectory(userDir))
-            {
-                foundMsgs.Add(new MessageFileModel { MessageId = messageId, FileSource = FileSourceType.User });
-            }
-
-            var botDir = $"{prefix}/{FileSourceType.Bot}";
-            if (ExistDirectory(botDir))
-            {
-                foundMsgs.Add(new MessageFileModel { MessageId = messageId, FileSource = FileSourceType.Bot });
-            }
-        }
-
-        return foundMsgs;
-    }
-
     public bool SaveMessageFiles(string conversationId, string messageId, string source, List<FileDataModel> files)
     {
         if (files.IsNullOrEmpty()) return false;

tests/BotSharp.LLM.Tests/Core/NullFileStorageService.cs

@@ -63,8 +63,7 @@ namespace BotSharp.Plugin.Google.Core
             });
         }
 
-        public IEnumerable<MessageFileModel> GetMessageFiles(string conversationId, IEnumerable<string> messageIds, string source,
+        public IEnumerable<MessageFileModel> GetMessageFiles(string conversationId, IEnumerable<string> messageIds, MessageFileOptions? options = null)
-            IEnumerable<string>? contentTypes = null)
         {
             return new List<MessageFileModel>
             {
@@ -78,15 +77,6 @@ namespace BotSharp.Plugin.Google.Core
             return $"FakePath/{fileName}";
         }
 
-        public IEnumerable<MessageFileModel> GetMessagesWithFile(string conversationId, IEnumerable<string> messageIds)
-        {
-            return new List<MessageFileModel>
-            {
-                new MessageFileModel { FileName = "MessageFile1.jpg" },
-                new MessageFileModel { FileName = "MessageFile2.png" }
-            };
-        }
-
         public bool SaveMessageFiles(string conversationId, string messageId, string source, List<FileDataModel> files)
         {
             return true;