From aa324bc3bf7e9016ef29e8c5ffadb0713919944c Mon Sep 17 00:00:00 2001
From: Jicheng Lu <franklujc@gmail.com>
Date: Wed, 7 Aug 2024 22:00:18 -0500
Subject: [PATCH] fix setting

---
 .../BotSharp.Core/Files/FilePlugin.cs         |  3 ++-
 .../FileInstructService.SelectFile.cs         |  5 +++-
 .../Functions/HandleEmailReaderFn.cs          | 25 ++++++-------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/Infrastructure/BotSharp.Core/Files/FilePlugin.cs b/src/Infrastructure/BotSharp.Core/Files/FilePlugin.cs
index f02c9b41..46eded0f 100644
--- a/src/Infrastructure/BotSharp.Core/Files/FilePlugin.cs
+++ b/src/Infrastructure/BotSharp.Core/Files/FilePlugin.cs
@@ -10,13 +10,14 @@ public class FilePlugin : IBotSharpPlugin
 
     public string Name => "File";
 
-    public string Description => "Provides file analysis.";
+    public string Description => "Provides file storage and analysis.";
 
 
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
         var myFileStorageSettings = new FileStorageSettings();
         config.Bind("FileStorage", myFileStorageSettings);
+        services.AddSingleton(myFileStorageSettings);
 
         if (myFileStorageSettings.Default == FileStorageEnum.LocalFileStorage)
         {
diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs
index 70b3b80f..30031362 100644
--- a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs
+++ b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs
@@ -82,7 +82,10 @@ public partial class FileInstructService
 
             var response = await completion.GetChatCompletions(agent, new List<RoleDialogModel> { message });
             var content = response?.Content ?? string.Empty;
-            var selecteds = JsonSerializer.Deserialize<FileSelectContext>(content);
+            var selecteds = JsonSerializer.Deserialize<FileSelectContext>(content, new JsonSerializerOptions
+            {
+                AllowTrailingCommas = true
+            });
             var fids = selecteds?.Selecteds ?? new List<int>();
             return files.Where((x, idx) => fids.Contains(idx + 1)).ToList();
         }
diff --git a/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailReaderFn.cs b/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailReaderFn.cs
index 121638e7..d0f11466 100644
--- a/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailReaderFn.cs
+++ b/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailReaderFn.cs
@@ -1,17 +1,7 @@
-using BotSharp.Abstraction.Agents.Enums;
-using BotSharp.Abstraction.Files;
 using BotSharp.Abstraction.Messaging.Models.RichContent.Template;
-using BotSharp.Abstraction.MLTasks;
-using BotSharp.Core.Infrastructures;
 using BotSharp.Plugin.EmailHandler.Models;
 using BotSharp.Plugin.EmailHandler.Providers;
 using MailKit;
-using MailKit.Net.Imap;
-using MailKit.Search;
-using MailKit.Security;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using MimeKit;
 
 namespace BotSharp.Plugin.EmailReader.Functions;
 
@@ -31,13 +21,14 @@ public class HandleEmailReaderFn : IFunctionCallback
     private readonly IConversationStateService _state;
     private readonly IEmailReader _emailProvider;
 
-    public HandleEmailReaderFn(IServiceProvider services,
-                ILogger<HandleEmailReaderFn> logger,
-                IHttpContextAccessor context,
-                BotSharpOptions options,
-                EmailReaderSettings emailPluginSettings,
-                IConversationStateService state,
-                IEmailReader emailProvider)
+    public HandleEmailReaderFn(
+        IServiceProvider services,
+        ILogger<HandleEmailReaderFn> logger,
+        IHttpContextAccessor context,
+        BotSharpOptions options,
+        EmailReaderSettings emailPluginSettings,
+        IConversationStateService state,
+        IEmailReader emailProvider)
     {
         _services = services;
         _logger = logger;