Merge pull request #1188 from iceljc/master

Refine file llm processor

src/Infrastructure/BotSharp.Abstraction/Agents/Options/AgentCodeScriptUpdateOptions.cs

@@ -1,4 +1,4 @@
-using BotSharp.Abstraction.Repositories.Models;
+using BotSharp.Abstraction.Repositories.Options;
 
 namespace BotSharp.Abstraction.Agents.Options;
 

src/Infrastructure/BotSharp.Abstraction/Chart/IBotSharpChartService.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Chart.Models;
+using BotSharp.Abstraction.Chart.Options;
 
 namespace BotSharp.Abstraction.Chart;
 

src/Infrastructure/BotSharp.Abstraction/Chart/Options/ChartCodeOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Chart.Models;
+namespace BotSharp.Abstraction.Chart.Options;
 
 public class ChartCodeOptions
 {

src/Infrastructure/BotSharp.Abstraction/Chart/Options/ChartDataOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Chart.Models;
+namespace BotSharp.Abstraction.Chart.Options;
 
 public class ChartDataOptions
 {

src/Infrastructure/BotSharp.Abstraction/CodeInterpreter/Models/CodeInterpretResult.cs

@@ -2,7 +2,7 @@ namespace BotSharp.Abstraction.CodeInterpreter.Models;
 
 public class CodeInterpretResult
 {
-    public object Result { get; set; }
+    public string Result { get; set; } = string.Empty;
     public bool Success { get; set; }
     public string? ErrorMsg { get; set; }
 }

src/Infrastructure/BotSharp.Abstraction/Files/Contexts/FileSelectContext.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Files.Models;
+namespace BotSharp.Abstraction.Files.Contexts;
 
 public class FileSelectContext
 {

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

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Files.Options;
+
 namespace BotSharp.Abstraction.Files.Converters;
 
 public interface IImageConverter

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

@@ -1,4 +1,5 @@
-using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Files.Options;
+using BotSharp.Abstraction.Instructs.Options;
 
 namespace BotSharp.Abstraction.Files;
 

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

@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Files.Options;
 using System.IO;
 
 namespace BotSharp.Abstraction.Files;

src/Infrastructure/BotSharp.Abstraction/Files/Options/FileLlmProcessOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Files.Models;
+namespace BotSharp.Abstraction.Files.Options;
 
 public class FileLlmProcessOptions
 {
@@ -27,11 +27,21 @@ public class FileLlmProcessOptions
     /// </summary>
     public string? Instruction { get; set; }
 
+    /// <summary>
+    /// Message from user
+    /// </summary>
+    public string? UserMessage { get; set; }
+
     /// <summary>
     /// Template name in Agent
     /// </summary>
     public string? TemplateName { get; set; }
 
+    /// <summary>
+    /// The upstream where the file llm is invoked
+    /// </summary>
+    public string? InvokeFrom { get; set; }
+
     /// <summary>
     /// Data that is used to render instruction
     /// </summary>

src/Infrastructure/BotSharp.Abstraction/Files/Options/ImageConvertOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Files.Models;
+namespace BotSharp.Abstraction.Files.Options;
 
 public class ImageConvertOptions
 {

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

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Files.Models;
+namespace BotSharp.Abstraction.Files.Options;
 
 public class MessageFileOptions
 {

src/Infrastructure/BotSharp.Abstraction/Files/Options/SelectFileOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Files.Models;
+namespace BotSharp.Abstraction.Files.Options;
 
 public class SelectFileOptions : LlmConfigBase
 {

src/Infrastructure/BotSharp.Abstraction/Files/Proccessors/IFileLlmProcessor.cs

@@ -1,9 +1,12 @@
+using BotSharp.Abstraction.Files.Options;
+using BotSharp.Abstraction.Files.Responses;
+
 namespace BotSharp.Abstraction.Files.Proccessors;
 
 public interface IFileLlmProcessor
 {
     public string Provider { get; }
 
-    Task<RoleDialogModel> GetFileLlmInferenceAsync(Agent agent, string text, IEnumerable<InstructFileModel> files, FileLlmProcessOptions? options = null)
+    Task<FileLlmInferenceResponse> GetFileLlmInferenceAsync(Agent agent, string text, IEnumerable<InstructFileModel> files, FileLlmProcessOptions? options = null)
         => throw new NotImplementedException();
 }

src/Infrastructure/BotSharp.Abstraction/Files/Responses/FileLlmInferenceResponse.cs

@@ -0,0 +1,8 @@
+namespace BotSharp.Abstraction.Files.Responses;
+
+public class FileLlmInferenceResponse
+{
+    public string Result { get; set; } = string.Empty;
+    public bool Success { get; set; }
+    public string? ErrorMsg { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Graph/IGraphDb.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Graph.Models;
+using BotSharp.Abstraction.Graph.Options;
 
 namespace BotSharp.Abstraction.Graph;
 

src/Infrastructure/BotSharp.Abstraction/Graph/Options/GraphSearchOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Graph.Models;
+namespace BotSharp.Abstraction.Graph.Options;
 
 public class GraphSearchOptions
 {

src/Infrastructure/BotSharp.Abstraction/Instructs/Contexts/CodeInstructContext.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Instructs.Models;
+namespace BotSharp.Abstraction.Instructs.Contexts;
 
 public class CodeInstructContext
 {

src/Infrastructure/BotSharp.Abstraction/Instructs/IInstructHook.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Hooks;
+using BotSharp.Abstraction.Instructs.Contexts;
 using BotSharp.Abstraction.Instructs.Models;
 
 namespace BotSharp.Abstraction.Instructs;

src/Infrastructure/BotSharp.Abstraction/Instructs/IInstructService.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Instructs.Options;
 
 namespace BotSharp.Abstraction.Instructs;
 

src/Infrastructure/BotSharp.Abstraction/Instructs/Options/CodeInstructOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Instructs.Models;
+namespace BotSharp.Abstraction.Instructs.Options;
 
 public class CodeInstructOptions
 {

src/Infrastructure/BotSharp.Abstraction/Instructs/Options/FileInstructOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Instructs.Models;
+namespace BotSharp.Abstraction.Instructs.Options;
 
 public class FileInstructOptions
 {

src/Infrastructure/BotSharp.Abstraction/Instructs/Options/InstructOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Instructs.Models;
+namespace BotSharp.Abstraction.Instructs.Options;
 
 public class InstructOptions
 {

src/Infrastructure/BotSharp.Abstraction/Knowledges/Filters/KnowledgeFileFilter.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Knowledges.Models;
+namespace BotSharp.Abstraction.Knowledges.Filters;
 
 public class KnowledgeFileFilter : Pagination
 {

src/Infrastructure/BotSharp.Abstraction/Knowledges/Helpers/TextChopper.cs

@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Knowledges.Options;
 using System.Text.RegularExpressions;
 
 namespace BotSharp.Abstraction.Knowledges.Helpers;

src/Infrastructure/BotSharp.Abstraction/Knowledges/IKnowledgeService.cs

@@ -1,5 +1,10 @@
 using BotSharp.Abstraction.Graph.Models;
+using BotSharp.Abstraction.Graph.Options;
+using BotSharp.Abstraction.Knowledges.Filters;
+using BotSharp.Abstraction.Knowledges.Options;
+using BotSharp.Abstraction.Knowledges.Responses;
 using BotSharp.Abstraction.VectorStorage.Models;
+using BotSharp.Abstraction.VectorStorage.Options;
 
 namespace BotSharp.Abstraction.Knowledges;
 

src/Infrastructure/BotSharp.Abstraction/Knowledges/Options/ChunkOption.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Knowledges.Models;
+namespace BotSharp.Abstraction.Knowledges.Options;
 
 public class ChunkOption
 {

src/Infrastructure/BotSharp.Abstraction/Knowledges/Responses/UploadKnowledgeResponse.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Knowledges.Models;
+namespace BotSharp.Abstraction.Knowledges.Responses;
 
 public class UploadKnowledgeResponse
 {

src/Infrastructure/BotSharp.Abstraction/MLTasks/IRealTimeCompletion.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Realtime.Models;
+using BotSharp.Abstraction.Realtime.Options;
 
 namespace BotSharp.Abstraction.MLTasks;
 

src/Infrastructure/BotSharp.Abstraction/Realtime/IRealtimeHub.cs

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.MLTasks;
 using BotSharp.Abstraction.Realtime.Models;
+using BotSharp.Abstraction.Realtime.Options;
 
 namespace BotSharp.Abstraction.Realtime;
 

src/Infrastructure/BotSharp.Abstraction/Realtime/Options/ChatSessionOptions.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
 
-namespace BotSharp.Abstraction.Realtime.Models.Session;
+namespace BotSharp.Abstraction.Realtime.Options;
 
 public class ChatSessionOptions
 {

src/Infrastructure/BotSharp.Abstraction/Realtime/Options/RealtimeOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Realtime.Models;
+namespace BotSharp.Abstraction.Realtime.Options;
 
 public class RealtimeOptions
 {

src/Infrastructure/BotSharp.Abstraction/Realtime/Sessions/ChatSessionUpdate.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Realtime.Models.Session;
+namespace BotSharp.Abstraction.Realtime.Sessions;
 
 public class ChatSessionUpdate
 {

src/Infrastructure/BotSharp.Abstraction/Realtime/Sessions/RealtimeSession.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Realtime.Models;
+namespace BotSharp.Abstraction.Realtime.Sessions;
 
 public class RealtimeSession
 {

src/Infrastructure/BotSharp.Abstraction/Realtime/Settings/RealtimeModelSettings.cs

@@ -1,4 +1,6 @@
-namespace BotSharp.Abstraction.Realtime.Models;
+using BotSharp.Abstraction.Realtime.Models;
+
+namespace BotSharp.Abstraction.Realtime.Settings;
 
 public class RealtimeModelSettings
 {

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -1,7 +1,8 @@
+using BotSharp.Abstraction.Knowledges.Filters;
 using BotSharp.Abstraction.Loggers.Models;
 using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Repositories.Filters;
-using BotSharp.Abstraction.Repositories.Models;
+using BotSharp.Abstraction.Repositories.Options;
 using BotSharp.Abstraction.Roles.Models;
 using BotSharp.Abstraction.Shared;
 using BotSharp.Abstraction.Statistics.Enums;
@@ -10,6 +11,7 @@ using BotSharp.Abstraction.Tasks.Models;
 using BotSharp.Abstraction.Translation.Models;
 using BotSharp.Abstraction.Users.Enums;
 using BotSharp.Abstraction.Users.Models;
+using BotSharp.Abstraction.VectorStorage.Filters;
 using BotSharp.Abstraction.VectorStorage.Models;
 
 namespace BotSharp.Abstraction.Repositories;

src/Infrastructure/BotSharp.Abstraction/Repositories/Options/AgentCodeScriptDbUpdateOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Repositories.Models;
+namespace BotSharp.Abstraction.Repositories.Options;
 
 public class AgentCodeScriptDbUpdateOptions
 {

src/Infrastructure/BotSharp.Abstraction/SideCar/IConversationSideCar.cs

@@ -1,4 +1,4 @@
-using BotSharp.Abstraction.SideCar.Models;
+using BotSharp.Abstraction.SideCar.Options;
 
 namespace BotSharp.Abstraction.SideCar;
 

src/Infrastructure/BotSharp.Abstraction/SideCar/Options/SideCarOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.SideCar.Models;
+namespace BotSharp.Abstraction.SideCar.Options;
 
 public class SideCarOptions
 {

src/Infrastructure/BotSharp.Abstraction/VectorStorage/Filters/VectorCollectionConfigFilter.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.VectorStorage.Models;
+namespace BotSharp.Abstraction.VectorStorage.Filters;
 
 public class VectorCollectionConfigFilter
 {

src/Infrastructure/BotSharp.Abstraction/VectorStorage/IVectorDb.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.VectorStorage.Models;
+using BotSharp.Abstraction.VectorStorage.Options;
 
 namespace BotSharp.Abstraction.VectorStorage;
 

src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorCollectionCreateOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.VectorStorage.Models;
+namespace BotSharp.Abstraction.VectorStorage.Options;
 
 public class VectorCollectionCreateOptions
 {

src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorCollectionIndexOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.VectorStorage.Models;
+namespace BotSharp.Abstraction.VectorStorage.Options;
 
 public class VectorCollectionIndexOptions
 {

src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorQueryOptions.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.VectorStorage.Models;
+namespace BotSharp.Abstraction.VectorStorage.Options;
 
 public class VectorQueryOptions
 {

src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorSearchOptions.cs

@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Knowledges.Enums;
+using BotSharp.Abstraction.VectorStorage.Models;
 
-namespace BotSharp.Abstraction.VectorStorage.Models;
+namespace BotSharp.Abstraction.VectorStorage.Options;
 
 public class VectorSearchOptions
 {

src/Infrastructure/BotSharp.Core.Realtime/RealtimePlugin.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Plugins;
+using BotSharp.Abstraction.Realtime.Settings;
 using BotSharp.Abstraction.Settings;
 using BotSharp.Core.Realtime.Hooks;
 using BotSharp.Core.Realtime.Services;

src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs

@@ -3,6 +3,8 @@ using BotSharp.Abstraction.Functions.Models;
 using BotSharp.Abstraction.Hooks;
 using BotSharp.Abstraction.Models;
 using BotSharp.Abstraction.Options;
+using BotSharp.Abstraction.Realtime.Options;
+using BotSharp.Abstraction.Realtime.Settings;
 using BotSharp.Abstraction.Routing.Enums;
 using BotSharp.Core.Infrastructures;
 

src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs

@@ -14,6 +14,7 @@
   limitations under the License.
 ******************************************************************************/
 
+using BotSharp.Abstraction.SideCar.Options;
 using BotSharp.Core.Infrastructures;
 
 namespace BotSharp.Core.SideCar.Services;

src/Infrastructure/BotSharp.Core.SideCar/Using.cs

@@ -16,6 +16,6 @@ global using BotSharp.Abstraction.Conversations.Models;
 global using BotSharp.Abstraction.Models;
 global using BotSharp.Abstraction.Routing;
 global using BotSharp.Abstraction.SideCar;
-global using BotSharp.Abstraction.SideCar.Models;
+global using BotSharp.Abstraction.SideCar.Options;
 global using BotSharp.Abstraction.Utilities;
 global using BotSharp.Core.SideCar.Settings;

src/Infrastructure/BotSharp.Core/Evaluations/Services/EvaluatingService.Evaluate.cs

@@ -1,6 +1,6 @@
 using BotSharp.Abstraction.Evaluations.Models;
 using BotSharp.Abstraction.Instructs;
-using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Instructs.Options;
 using BotSharp.Abstraction.Models;
 
 namespace BotSharp.Core.Evaluations.Services;

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

@@ -1,4 +1,4 @@
-using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Instructs.Options;
 
 namespace BotSharp.Core.Files.Services;
 

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

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Instructs;
 using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Instructs.Options;
 using System.IO;
 
 namespace BotSharp.Core.Files.Services;

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

@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Instructs.Models;
 using BotSharp.Abstraction.Instructs;
 using BotSharp.Abstraction.Files.Converters;
+using BotSharp.Abstraction.Instructs.Options;
 
 namespace BotSharp.Core.Files.Services;
 

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

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Files.Contexts;
+using BotSharp.Abstraction.Files.Options;
 using BotSharp.Abstraction.MLTasks;
 using BotSharp.Abstraction.Models;
 using BotSharp.Abstraction.Templating;

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

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Files.Converters;
+using BotSharp.Abstraction.Files.Options;
 using Microsoft.EntityFrameworkCore;
 using System.IO;
 

src/Infrastructure/BotSharp.Core/Infrastructures/Websocket/AsyncWebsocketDataResultEnumerator.cs

@@ -1,4 +1,3 @@
-using Microsoft.AspNetCore.Builder;
 using System.Buffers;
 using System.ClientModel;
 using System.Net.WebSockets;

src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Execute.cs

@@ -1,7 +1,10 @@
 using BotSharp.Abstraction.CodeInterpreter;
+using BotSharp.Abstraction.Files.Options;
 using BotSharp.Abstraction.Files.Proccessors;
 using BotSharp.Abstraction.Instructs;
+using BotSharp.Abstraction.Instructs.Contexts;
 using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Instructs.Options;
 using BotSharp.Abstraction.MLTasks;
 using BotSharp.Abstraction.Models;
 
@@ -116,10 +119,12 @@ public partial class InstructService
                     Provider = provider,
                     Model = model,
                     Instruction = instruction,
+                    UserMessage = message.Content,
                     TemplateName = templateName,
+                    InvokeFrom = $"{nameof(InstructService)}.{nameof(Execute)}",
                     Data = state.GetStates().ToDictionary(x => x.Key, x => (object)x.Value)
                 });
-                result = inference?.Content ?? string.Empty;
+                result = inference.Result.IfNullOrEmptyAs(string.Empty);
             }
             else
             {
@@ -253,7 +258,7 @@ public partial class InstructService
         {
             MessageId = message.MessageId,
             Template = scriptName,
-            Text = result?.Result?.ToString()
+            Text = result?.Result ?? result?.ErrorMsg
         };
 
         if (context?.Arguments != null)

src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Instruct.cs

@@ -1,4 +1,4 @@
-using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Instructs.Options;
 using BotSharp.Abstraction.Options;
 using BotSharp.Abstraction.Templating;
 using System.Collections;

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.AgentCodeScript.cs

@@ -1,4 +1,3 @@
-using BotSharp.Abstraction.Repositories.Models;
 using System.IO;
 
 namespace BotSharp.Core.Repository;

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.KnowledgeBase.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Knowledges.Filters;
+using BotSharp.Abstraction.VectorStorage.Filters;
 using BotSharp.Abstraction.VectorStorage.Models;
 using System.IO;
 

src/Infrastructure/BotSharp.Core/Using.cs

@@ -35,10 +35,13 @@ global using BotSharp.Abstraction.Utilities;
 global using BotSharp.Abstraction.Loggers.Services;
 global using BotSharp.Abstraction.Infrastructures.Events;
 global using BotSharp.Abstraction.Templating.Constants;
-global using BotSharp.Abstraction.Realtime.Models.Session;
 global using BotSharp.Abstraction.Conversations.Enums;
 global using BotSharp.Abstraction.Hooks;
 global using BotSharp.Abstraction.MessageHub.Models;
+global using BotSharp.Abstraction.Repositories.Models;
+global using BotSharp.Abstraction.Repositories.Options;
+global using BotSharp.Abstraction.Realtime.Options;
+global using BotSharp.Abstraction.Realtime.Sessions;
 global using BotSharp.Core.Agents.Services;
 global using BotSharp.Core.Conversations.Services;
 global using BotSharp.Core.Infrastructures;

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

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Instructs.Options;
 using BotSharp.OpenAPI.ViewModels.Instructs;
 
 namespace BotSharp.OpenAPI.Controllers;

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

@@ -2,6 +2,7 @@ using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Files.Utilities;
 using BotSharp.Abstraction.Instructs;
 using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Instructs.Options;
 using BotSharp.Core.Infrastructures;
 using BotSharp.OpenAPI.ViewModels.Instructs;
 

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

@@ -1,6 +1,9 @@
 using BotSharp.Abstraction.Files.Utilities;
-using BotSharp.Abstraction.Graph.Models;
+using BotSharp.Abstraction.Graph.Options;
+using BotSharp.Abstraction.Knowledges.Options;
+using BotSharp.Abstraction.Knowledges.Responses;
 using BotSharp.Abstraction.VectorStorage.Models;
+using BotSharp.Abstraction.VectorStorage.Options;
 using BotSharp.OpenAPI.ViewModels.Knowledges;
 using BotSharp.OpenAPI.ViewModels.Knowledges.Request;
 

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/Request/ConversationChartDataRequest.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Chart.Options;
+
 namespace BotSharp.OpenAPI.ViewModels.Conversations;
 
 public class ConversationChartDataRequest : ChartDataOptions

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/Request/InstructMessageModel.cs

@@ -1,4 +1,4 @@
-using BotSharp.Abstraction.Instructs.Models;
+using BotSharp.Abstraction.Instructs.Options;
 
 namespace BotSharp.OpenAPI.ViewModels.Instructs;
 

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/GetKnowledgeDocsRequest.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Knowledges.Filters;
+
 namespace BotSharp.OpenAPI.ViewModels.Knowledges;
 
 public class GetKnowledgeDocsRequest : KnowledgeFileFilter

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/VectorCollectionIndexRequest.cs

@@ -1,4 +1,4 @@
-using BotSharp.Abstraction.VectorStorage.Models;
+using BotSharp.Abstraction.VectorStorage.Options;
 
 namespace BotSharp.OpenAPI.ViewModels.Knowledges.Request;
 

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/VectorKnowledgeUploadRequest.cs

@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Knowledges.Options;
 using System.Text.Json.Serialization;
 
 namespace BotSharp.OpenAPI.ViewModels.Knowledges;

src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs

@@ -1,4 +1,5 @@
-using BotSharp.Abstraction.Realtime.Models.Session;
+using BotSharp.Abstraction.Realtime.Options;
+using BotSharp.Abstraction.Realtime.Sessions;
 using BotSharp.Core.Session;
 using Microsoft.AspNetCore.Http;
 using System.Net.WebSockets;

src/Plugins/BotSharp.Plugin.ChatHub/Models/Stream/ChatStreamRequest.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Models;
+using BotSharp.Abstraction.Realtime.Options;
 using System.Text.Json.Serialization;
 
 namespace BotSharp.Plugin.ChatHub.Models.Stream;

src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailSenderFn.cs

@@ -71,7 +71,7 @@ public class HandleEmailSenderFn : IFunctionCallback
         var fileInstruct = _services.GetRequiredService<IFileInstructService>();
         var convSettings = _services.GetRequiredService<ConversationSetting>();
 
-        var selecteds = await fileInstruct.SelectMessageFiles(convService.ConversationId, new SelectFileOptions
+        var selecteds = await fileInstruct.SelectMessageFiles(convService.ConversationId, options: new()
         {
             IsIncludeBotFiles = true,
             IsAttachFiles = true,

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs

@@ -1,5 +1,7 @@
 using BotSharp.Abstraction.Hooks;
-using BotSharp.Abstraction.Realtime.Models.Session;
+using BotSharp.Abstraction.Realtime.Options;
+using BotSharp.Abstraction.Realtime.Sessions;
+using BotSharp.Abstraction.Realtime.Settings;
 using BotSharp.Core.Infrastructures.Streams;
 using BotSharp.Core.Session;
 using BotSharp.Plugin.GoogleAI.Models.Realtime;

src/Plugins/BotSharp.Plugin.Graph/GraphDb.cs

@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Graph.Options;
 using BotSharp.Plugin.Graph.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;

src/Plugins/BotSharp.Plugin.ImageHandler/Converters/ImageHandlerImageConverter.cs

@@ -2,6 +2,7 @@ using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Formats.Png;
 using System.IO;
+using BotSharp.Abstraction.Files.Options;
 
 namespace BotSharp.Plugin.ImageHandler.Converters;
 

src/Plugins/BotSharp.Plugin.ImageHandler/Functions/ComposeImageFn.cs

@@ -61,7 +61,7 @@ public class ComposeImageFn : IFunctionCallback
         var fileInstruct = _services.GetRequiredService<IFileInstructService>();
         var convSettings = _services.GetRequiredService<ConversationSetting>();
 
-        var selecteds = await fileInstruct.SelectMessageFiles(_conversationId, new SelectFileOptions
+        var selecteds = await fileInstruct.SelectMessageFiles(_conversationId, new()
         {
             Description = description,
             IsIncludeBotFiles = true,

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

@@ -62,7 +62,7 @@ public class EditImageFn : IFunctionCallback
         var fileInstruct = _services.GetRequiredService<IFileInstructService>();
         var convSettings = _services.GetRequiredService<ConversationSetting>();
 
-        var selecteds = await fileInstruct.SelectMessageFiles(_conversationId, new SelectFileOptions
+        var selecteds = await fileInstruct.SelectMessageFiles(_conversationId, options: new()
         {
             Description = description,
             IsIncludeBotFiles = true,

src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.VectorStorage.Filters;
+
 namespace BotSharp.Plugin.KnowledgeBase.Helpers;
 
 public static class KnowledgeSettingHelper

src/Plugins/BotSharp.Plugin.KnowledgeBase/Hooks/KnowledgeHook.cs

@@ -1,3 +1,6 @@
+using BotSharp.Abstraction.Graph.Options;
+using BotSharp.Abstraction.VectorStorage.Options;
+
 namespace BotSharp.Plugin.KnowledgeBase.Hooks;
 
 public class KnowledgeHook : IKnowledgeHook

src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemoryVectorDb.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.VectorStorage.Enums;
+using BotSharp.Abstraction.VectorStorage.Options;
 using System.Linq;
 using Tensorflow.NumPy;
 

src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Document.cs

@@ -1,7 +1,10 @@
 using BotSharp.Abstraction.Files;
 using BotSharp.Abstraction.Files.Models;
 using BotSharp.Abstraction.Files.Utilities;
+using BotSharp.Abstraction.Knowledges.Filters;
 using BotSharp.Abstraction.Knowledges.Helpers;
+using BotSharp.Abstraction.Knowledges.Options;
+using BotSharp.Abstraction.Knowledges.Responses;
 using BotSharp.Abstraction.VectorStorage.Enums;
 using System.Net.Http;
 using System.Net.Mime;

src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Graph.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Graph.Options;
+
 namespace BotSharp.Plugin.KnowledgeBase.Services;
 
 public partial class KnowledgeService

src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Index.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Models;
+using BotSharp.Abstraction.VectorStorage.Options;
 
 namespace BotSharp.Plugin.KnowledgeBase.Services;
 

src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Vector.cs

@@ -1,5 +1,7 @@
 using BotSharp.Abstraction.Files;
 using BotSharp.Abstraction.VectorStorage.Enums;
+using BotSharp.Abstraction.VectorStorage.Filters;
+using BotSharp.Abstraction.VectorStorage.Options;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace BotSharp.Plugin.KnowledgeBase.Services;

src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.AgentCodeScript.cs

@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Repositories.Filters;
 using BotSharp.Abstraction.Repositories.Models;
+using BotSharp.Abstraction.Repositories.Options;
 
 namespace BotSharp.Plugin.MongoStorage.Repository;
 

src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.KnowledgeBase.cs

@@ -1,4 +1,6 @@
+using BotSharp.Abstraction.Knowledges.Filters;
 using BotSharp.Abstraction.Knowledges.Models;
+using BotSharp.Abstraction.VectorStorage.Filters;
 using BotSharp.Abstraction.VectorStorage.Models;
 
 namespace BotSharp.Plugin.MongoStorage.Repository;

src/Plugins/BotSharp.Plugin.OpenAI/Models/Realtime/RealtimeSessionUpdate.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Realtime.Sessions;
+
 namespace BotSharp.Plugin.OpenAI.Models.Realtime;
 
 public class RealtimeSessionUpdate

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs

@@ -1,4 +1,7 @@
 using BotSharp.Abstraction.Hooks;
+using BotSharp.Abstraction.Realtime.Options;
+using BotSharp.Abstraction.Realtime.Sessions;
+using BotSharp.Abstraction.Realtime.Settings;
 using BotSharp.Plugin.OpenAI.Models.Realtime;
 using OpenAI.Chat;
 

src/Plugins/BotSharp.Plugin.OpenAI/Using.cs

@@ -30,7 +30,7 @@ global using BotSharp.Abstraction.MLTasks.Utilities;
 global using BotSharp.Abstraction.Options;
 global using BotSharp.Abstraction.Realtime;
 global using BotSharp.Abstraction.Realtime.Models;
-global using BotSharp.Abstraction.Realtime.Models.Session;
+global using BotSharp.Abstraction.Realtime.Sessions;
 global using BotSharp.Core.Infrastructures;
 global using BotSharp.Core.Session;
 global using BotSharp.Plugin.OpenAI.Models;

src/Plugins/BotSharp.Plugin.Qdrant/QdrantDb.cs

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Options;
 using BotSharp.Abstraction.Utilities;
+using BotSharp.Abstraction.VectorStorage.Options;
 using BotSharp.Plugin.Qdrant.Models;
 using Google.Protobuf.Collections;
 using Microsoft.Extensions.DependencyInjection;

src/Plugins/BotSharp.Plugin.SemanticKernel/SemanticKernelMemoryStoreProvider.cs

@@ -2,6 +2,7 @@ using BotSharp.Abstraction.Utilities;
 using BotSharp.Abstraction.VectorStorage;
 using BotSharp.Abstraction.VectorStorage.Enums;
 using BotSharp.Abstraction.VectorStorage.Models;
+using BotSharp.Abstraction.VectorStorage.Options;
 using Microsoft.SemanticKernel.Memory;
 using System;
 using System.Collections.Generic;

src/Plugins/BotSharp.Plugin.SqlDriver/Functions/SqlValidateFn.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Instructs.Options;
+
 namespace BotSharp.Plugin.SqlDriver.Functions;
 
 public class SqlValidateFn : IFunctionCallback

src/Plugins/BotSharp.Plugin.SqlDriver/Services/SqlChartService.cs

@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Chart.Options;
 using BotSharp.Abstraction.Options;
 using BotSharp.Abstraction.Repositories;
 using BotSharp.Core.Infrastructures;

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

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Files.Converters;
+using BotSharp.Abstraction.Files.Options;
 using BotSharp.Abstraction.Files.Utilities;
 using System.Net.Mime;
 

src/Plugins/BotSharp.Plugin.Twilio/TwilioStreamMiddleware.cs

@@ -3,7 +3,8 @@ using BotSharp.Abstraction.MLTasks;
 using BotSharp.Abstraction.Options;
 using BotSharp.Abstraction.Realtime;
 using BotSharp.Abstraction.Realtime.Models;
-using BotSharp.Abstraction.Realtime.Models.Session;
+using BotSharp.Abstraction.Realtime.Options;
+using BotSharp.Abstraction.Realtime.Sessions;
 using BotSharp.Abstraction.Routing;
 using BotSharp.Abstraction.Utilities;
 using BotSharp.Core.Session;

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

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Files;
 using BotSharp.Abstraction.Files.Models;
+using BotSharp.Abstraction.Files.Options;
 
 namespace BotSharp.Plugin.Google.Core
 {