diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Options/AgentCodeScriptUpdateOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Options/AgentCodeScriptUpdateOptions.cs index 4b5e9e95..476e42fc 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Agents/Options/AgentCodeScriptUpdateOptions.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Chart/IBotSharpChartService.cs b/src/Infrastructure/BotSharp.Abstraction/Chart/IBotSharpChartService.cs index 1a433e6f..0e1cab8c 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Chart/IBotSharpChartService.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Chart/Models/ChartCodeOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Chart/Options/ChartCodeOptions.cs similarity index 93% rename from src/Infrastructure/BotSharp.Abstraction/Chart/Models/ChartCodeOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Chart/Options/ChartCodeOptions.cs index beac046d..6827d180 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Chart/Models/ChartCodeOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Chart/Models/ChartDataOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Chart/Options/ChartDataOptions.cs similarity index 80% rename from src/Infrastructure/BotSharp.Abstraction/Chart/Models/ChartDataOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Chart/Options/ChartDataOptions.cs index 249ec080..f037c930 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Chart/Models/ChartDataOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/CodeInterpreter/Models/CodeInterpretResult.cs b/src/Infrastructure/BotSharp.Abstraction/CodeInterpreter/Models/CodeInterpretResult.cs index 30b44a97..2958cca8 100644 --- a/src/Infrastructure/BotSharp.Abstraction/CodeInterpreter/Models/CodeInterpretResult.cs +++ b/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; } } diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Models/FileSelectContext.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Contexts/FileSelectContext.cs similarity index 89% rename from src/Infrastructure/BotSharp.Abstraction/Files/Models/FileSelectContext.cs rename to src/Infrastructure/BotSharp.Abstraction/Files/Contexts/FileSelectContext.cs index 0a9f6f1d..0ec5cd71 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Files/Models/FileSelectContext.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Converters/IImageConverter.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Converters/IImageConverter.cs index 3fa856e4..e217cb52 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Files/Converters/IImageConverter.cs +++ b/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 diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/IFileInstructService.cs b/src/Infrastructure/BotSharp.Abstraction/Files/IFileInstructService.cs index f32ddaa7..bf72b86e 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Files/IFileInstructService.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/IFileStorageService.cs b/src/Infrastructure/BotSharp.Abstraction/Files/IFileStorageService.cs index 716b86e2..a7b6908f 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Files/IFileStorageService.cs +++ b/src/Infrastructure/BotSharp.Abstraction/Files/IFileStorageService.cs @@ -1,3 +1,4 @@ +using BotSharp.Abstraction.Files.Options; using System.IO; namespace BotSharp.Abstraction.Files; diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Models/FileLlmProcessOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Options/FileLlmProcessOptions.cs similarity index 74% rename from src/Infrastructure/BotSharp.Abstraction/Files/Models/FileLlmProcessOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Files/Options/FileLlmProcessOptions.cs index 16278d8a..eafae504 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Files/Models/FileLlmProcessOptions.cs +++ b/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 /// public string? Instruction { get; set; } + /// + /// Message from user + /// + public string? UserMessage { get; set; } + /// /// Template name in Agent /// public string? TemplateName { get; set; } + /// + /// The upstream where the file llm is invoked + /// + public string? InvokeFrom { get; set; } + /// /// Data that is used to render instruction /// diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Models/ImageConvertOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Options/ImageConvertOptions.cs similarity index 75% rename from src/Infrastructure/BotSharp.Abstraction/Files/Models/ImageConvertOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Files/Options/ImageConvertOptions.cs index 2147521a..f2b9dc2b 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Files/Models/ImageConvertOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Models/MessageFileOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Options/MessageFileOptions.cs similarity index 89% rename from src/Infrastructure/BotSharp.Abstraction/Files/Models/MessageFileOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Files/Options/MessageFileOptions.cs index a647ad61..a13e94fe 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Files/Models/MessageFileOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Models/SelectFileOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Options/SelectFileOptions.cs similarity index 96% rename from src/Infrastructure/BotSharp.Abstraction/Files/Models/SelectFileOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Files/Options/SelectFileOptions.cs index 4fa4946e..2f8d348e 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Files/Models/SelectFileOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Proccessors/IFileLlmProcessor.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Proccessors/IFileLlmProcessor.cs index f2102721..ebc05792 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Files/Proccessors/IFileLlmProcessor.cs +++ b/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 GetFileLlmInferenceAsync(Agent agent, string text, IEnumerable files, FileLlmProcessOptions? options = null) + Task GetFileLlmInferenceAsync(Agent agent, string text, IEnumerable files, FileLlmProcessOptions? options = null) => throw new NotImplementedException(); } diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Responses/FileLlmInferenceResponse.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Responses/FileLlmInferenceResponse.cs new file mode 100644 index 00000000..fa11b1f9 --- /dev/null +++ b/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; } +} diff --git a/src/Infrastructure/BotSharp.Abstraction/Graph/IGraphDb.cs b/src/Infrastructure/BotSharp.Abstraction/Graph/IGraphDb.cs index b15503e2..5f30d750 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Graph/IGraphDb.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Graph/Models/GraphSearchOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Graph/Options/GraphSearchOptions.cs similarity index 62% rename from src/Infrastructure/BotSharp.Abstraction/Graph/Models/GraphSearchOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Graph/Options/GraphSearchOptions.cs index 294aeea7..9b84a5e0 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Graph/Models/GraphSearchOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Instructs/Models/CodeInstructContext.cs b/src/Infrastructure/BotSharp.Abstraction/Instructs/Contexts/CodeInstructContext.cs similarity index 72% rename from src/Infrastructure/BotSharp.Abstraction/Instructs/Models/CodeInstructContext.cs rename to src/Infrastructure/BotSharp.Abstraction/Instructs/Contexts/CodeInstructContext.cs index 2be0368f..d6dae85f 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Instructs/Models/CodeInstructContext.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Instructs/IInstructHook.cs b/src/Infrastructure/BotSharp.Abstraction/Instructs/IInstructHook.cs index a7e3c1df..c275691b 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Instructs/IInstructHook.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Instructs/IInstructService.cs b/src/Infrastructure/BotSharp.Abstraction/Instructs/IInstructService.cs index 30fc88ad..ab457f13 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Instructs/IInstructService.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Instructs/Models/CodeInstructOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Instructs/Options/CodeInstructOptions.cs similarity index 79% rename from src/Infrastructure/BotSharp.Abstraction/Instructs/Models/CodeInstructOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Instructs/Options/CodeInstructOptions.cs index 72126653..e4081609 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Instructs/Models/CodeInstructOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Instructs/Models/FileInstructOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Instructs/Options/FileInstructOptions.cs similarity index 65% rename from src/Infrastructure/BotSharp.Abstraction/Instructs/Models/FileInstructOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Instructs/Options/FileInstructOptions.cs index a51db882..a4f3a858 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Instructs/Models/FileInstructOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Instructs/Models/InstructOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Instructs/Options/InstructOptions.cs similarity index 94% rename from src/Infrastructure/BotSharp.Abstraction/Instructs/Models/InstructOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Instructs/Options/InstructOptions.cs index 90f208bd..cc5a76cd 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Instructs/Models/InstructOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/KnowledgeFileFilter.cs b/src/Infrastructure/BotSharp.Abstraction/Knowledges/Filters/KnowledgeFileFilter.cs similarity index 86% rename from src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/KnowledgeFileFilter.cs rename to src/Infrastructure/BotSharp.Abstraction/Knowledges/Filters/KnowledgeFileFilter.cs index d275cf34..ec250418 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/KnowledgeFileFilter.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Knowledges/Helpers/TextChopper.cs b/src/Infrastructure/BotSharp.Abstraction/Knowledges/Helpers/TextChopper.cs index a3f88a56..a3bec7e3 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Knowledges/Helpers/TextChopper.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Knowledges/IKnowledgeService.cs b/src/Infrastructure/BotSharp.Abstraction/Knowledges/IKnowledgeService.cs index a0c84031..767615fe 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Knowledges/IKnowledgeService.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/ChunkOption.cs b/src/Infrastructure/BotSharp.Abstraction/Knowledges/Options/ChunkOption.cs similarity index 90% rename from src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/ChunkOption.cs rename to src/Infrastructure/BotSharp.Abstraction/Knowledges/Options/ChunkOption.cs index 72c474bf..8da1a83e 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/ChunkOption.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/UploadKnowledgeResponse.cs b/src/Infrastructure/BotSharp.Abstraction/Knowledges/Responses/UploadKnowledgeResponse.cs similarity index 89% rename from src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/UploadKnowledgeResponse.cs rename to src/Infrastructure/BotSharp.Abstraction/Knowledges/Responses/UploadKnowledgeResponse.cs index a1dad405..a173140e 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/UploadKnowledgeResponse.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/MLTasks/IRealTimeCompletion.cs b/src/Infrastructure/BotSharp.Abstraction/MLTasks/IRealTimeCompletion.cs index 65ae2dbc..29f46154 100644 --- a/src/Infrastructure/BotSharp.Abstraction/MLTasks/IRealTimeCompletion.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Realtime/IRealtimeHub.cs b/src/Infrastructure/BotSharp.Abstraction/Realtime/IRealtimeHub.cs index e75f4699..ed7db778 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Realtime/IRealtimeHub.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/Session/ChatSessionOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Realtime/Options/ChatSessionOptions.cs similarity index 83% rename from src/Infrastructure/BotSharp.Abstraction/Realtime/Models/Session/ChatSessionOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Realtime/Options/ChatSessionOptions.cs index f4318fbb..3235fce8 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/Session/ChatSessionOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Realtime/Options/RealtimeOptions.cs similarity index 87% rename from src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Realtime/Options/RealtimeOptions.cs index a720c88b..316c657d 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/Session/ChatSessionUpdate.cs b/src/Infrastructure/BotSharp.Abstraction/Realtime/Sessions/ChatSessionUpdate.cs similarity index 70% rename from src/Infrastructure/BotSharp.Abstraction/Realtime/Models/Session/ChatSessionUpdate.cs rename to src/Infrastructure/BotSharp.Abstraction/Realtime/Sessions/ChatSessionUpdate.cs index 7de2d0fd..e692aacf 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/Session/ChatSessionUpdate.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeSession.cs b/src/Infrastructure/BotSharp.Abstraction/Realtime/Sessions/RealtimeSession.cs similarity index 91% rename from src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeSession.cs rename to src/Infrastructure/BotSharp.Abstraction/Realtime/Sessions/RealtimeSession.cs index 59f191c9..256f4a23 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeSession.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeModelSettings.cs b/src/Infrastructure/BotSharp.Abstraction/Realtime/Settings/RealtimeModelSettings.cs similarity index 91% rename from src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeModelSettings.cs rename to src/Infrastructure/BotSharp.Abstraction/Realtime/Settings/RealtimeModelSettings.cs index 14f5923f..b66616fc 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/RealtimeModelSettings.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs index 63ca3da3..2b1f5922 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/Models/AgentCodeScriptDbUpdateOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/Options/AgentCodeScriptDbUpdateOptions.cs similarity index 62% rename from src/Infrastructure/BotSharp.Abstraction/Repositories/Models/AgentCodeScriptDbUpdateOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/Repositories/Options/AgentCodeScriptDbUpdateOptions.cs index 9217445b..5f604512 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Repositories/Models/AgentCodeScriptDbUpdateOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/SideCar/IConversationSideCar.cs b/src/Infrastructure/BotSharp.Abstraction/SideCar/IConversationSideCar.cs index 81b0cf9c..e561e6ae 100644 --- a/src/Infrastructure/BotSharp.Abstraction/SideCar/IConversationSideCar.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/SideCar/Models/SideCarOptions.cs b/src/Infrastructure/BotSharp.Abstraction/SideCar/Options/SideCarOptions.cs similarity index 92% rename from src/Infrastructure/BotSharp.Abstraction/SideCar/Models/SideCarOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/SideCar/Options/SideCarOptions.cs index bc6609c0..4686a4a1 100644 --- a/src/Infrastructure/BotSharp.Abstraction/SideCar/Models/SideCarOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionConfigFilter.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Filters/VectorCollectionConfigFilter.cs similarity index 86% rename from src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionConfigFilter.cs rename to src/Infrastructure/BotSharp.Abstraction/VectorStorage/Filters/VectorCollectionConfigFilter.cs index 8b612bba..14d5126d 100644 --- a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionConfigFilter.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/IVectorDb.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/IVectorDb.cs index 36e55c44..c862785a 100644 --- a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/IVectorDb.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionCreateOptions.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorCollectionCreateOptions.cs similarity index 77% rename from src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionCreateOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorCollectionCreateOptions.cs index 343bfb30..e66f0834 100644 --- a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionCreateOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionIndexOptions.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorCollectionIndexOptions.cs similarity index 88% rename from src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionIndexOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorCollectionIndexOptions.cs index 809bbf6b..1f49a0cf 100644 --- a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionIndexOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorQueryOptions.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorQueryOptions.cs similarity index 78% rename from src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorQueryOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorQueryOptions.cs index 37bad608..062c43cf 100644 --- a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorQueryOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorSearchOptions.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorSearchOptions.cs similarity index 87% rename from src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorSearchOptions.cs rename to src/Infrastructure/BotSharp.Abstraction/VectorStorage/Options/VectorSearchOptions.cs index ef888bb5..1e0141a8 100644 --- a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorSearchOptions.cs +++ b/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 { diff --git a/src/Infrastructure/BotSharp.Core.Realtime/RealtimePlugin.cs b/src/Infrastructure/BotSharp.Core.Realtime/RealtimePlugin.cs index 5e1f1478..ba30bf72 100644 --- a/src/Infrastructure/BotSharp.Core.Realtime/RealtimePlugin.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs b/src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs index b0a088cc..ab42a084 100644 --- a/src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs b/src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs index 4b636440..bb8bb538 100644 --- a/src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core.SideCar/Using.cs b/src/Infrastructure/BotSharp.Core.SideCar/Using.cs index e391d790..d48d41cc 100644 --- a/src/Infrastructure/BotSharp.Core.SideCar/Using.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Evaluations/Services/EvaluatingService.Evaluate.cs b/src/Infrastructure/BotSharp.Core/Evaluations/Services/EvaluatingService.Evaluate.cs index 8cdbc0da..16e25b86 100644 --- a/src/Infrastructure/BotSharp.Core/Evaluations/Services/EvaluatingService.Evaluate.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Audio.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Audio.cs index 339cb049..62a1356c 100644 --- a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Audio.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Image.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Image.cs index 7ee3bc7f..dbd9de90 100644 --- a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Image.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Pdf.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Pdf.cs index 723dd2ca..2e479222 100644 --- a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Pdf.cs +++ b/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; 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 581832d7..c20ea7f3 100644 --- a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Storage/LocalFileStorageService.Conversation.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Storage/LocalFileStorageService.Conversation.cs index 6050edcf..e4f5fc5c 100644 --- a/src/Infrastructure/BotSharp.Core/Files/Services/Storage/LocalFileStorageService.Conversation.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Infrastructures/Websocket/AsyncWebsocketDataResultEnumerator.cs b/src/Infrastructure/BotSharp.Core/Infrastructures/Websocket/AsyncWebsocketDataResultEnumerator.cs index 246bb55a..7c0bded4 100644 --- a/src/Infrastructure/BotSharp.Core/Infrastructures/Websocket/AsyncWebsocketDataResultEnumerator.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Execute.cs b/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Execute.cs index f869ce35..267f4633 100644 --- a/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Execute.cs +++ b/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) diff --git a/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Instruct.cs b/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Instruct.cs index d257b855..df1751cb 100644 --- a/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Instruct.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.AgentCodeScript.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.AgentCodeScript.cs index c332d147..b085ad34 100644 --- a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.AgentCodeScript.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.KnowledgeBase.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.KnowledgeBase.cs index ae9d0405..f245477f 100644 --- a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.KnowledgeBase.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.Core/Using.cs b/src/Infrastructure/BotSharp.Core/Using.cs index f67baef0..07b0f164 100644 --- a/src/Infrastructure/BotSharp.Core/Using.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ImageGenerationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ImageGenerationController.cs index f99ebc42..6dd03f64 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ImageGenerationController.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs index 4b656db7..cdb1dab4 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/KnowledgeBaseController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/KnowledgeBaseController.cs index 7ad48dc8..27588318 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/KnowledgeBaseController.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/Request/ConversationChartDataRequest.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/Request/ConversationChartDataRequest.cs index 19fcd14e..c887a16d 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Conversations/Request/ConversationChartDataRequest.cs +++ b/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 diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/Request/InstructMessageModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/Request/InstructMessageModel.cs index 0091f02a..4aa3c51f 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Instructs/Request/InstructMessageModel.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/GetKnowledgeDocsRequest.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/GetKnowledgeDocsRequest.cs index 40ffe3cb..52022b70 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/GetKnowledgeDocsRequest.cs +++ b/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 diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/VectorCollectionIndexRequest.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/VectorCollectionIndexRequest.cs index fada7032..94e66ff0 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/VectorCollectionIndexRequest.cs +++ b/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; diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/VectorKnowledgeUploadRequest.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/VectorKnowledgeUploadRequest.cs index 0934c508..76051966 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/Request/VectorKnowledgeUploadRequest.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs b/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs index a08fda08..8848a632 100644 --- a/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Models/Stream/ChatStreamRequest.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Models/Stream/ChatStreamRequest.cs index 13ef8f0e..36dcbc34 100644 --- a/src/Plugins/BotSharp.Plugin.ChatHub/Models/Stream/ChatStreamRequest.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailSenderFn.cs b/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailSenderFn.cs index e38233c3..f4be0628 100644 --- a/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailSenderFn.cs +++ b/src/Plugins/BotSharp.Plugin.EmailHandler/Functions/HandleEmailSenderFn.cs @@ -71,7 +71,7 @@ public class HandleEmailSenderFn : IFunctionCallback var fileInstruct = _services.GetRequiredService(); var convSettings = _services.GetRequiredService(); - var selecteds = await fileInstruct.SelectMessageFiles(convService.ConversationId, new SelectFileOptions + var selecteds = await fileInstruct.SelectMessageFiles(convService.ConversationId, options: new() { IsIncludeBotFiles = true, IsAttachFiles = true, diff --git a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs index 180d18c3..51d2232f 100644 --- a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.Graph/GraphDb.cs b/src/Plugins/BotSharp.Plugin.Graph/GraphDb.cs index ab6132dc..93ae8fbc 100644 --- a/src/Plugins/BotSharp.Plugin.Graph/GraphDb.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.ImageHandler/Converters/ImageHandlerImageConverter.cs b/src/Plugins/BotSharp.Plugin.ImageHandler/Converters/ImageHandlerImageConverter.cs index d058f335..1a0d9d4e 100644 --- a/src/Plugins/BotSharp.Plugin.ImageHandler/Converters/ImageHandlerImageConverter.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.ImageHandler/Functions/ComposeImageFn.cs b/src/Plugins/BotSharp.Plugin.ImageHandler/Functions/ComposeImageFn.cs index 39c772d5..4c1544e0 100644 --- a/src/Plugins/BotSharp.Plugin.ImageHandler/Functions/ComposeImageFn.cs +++ b/src/Plugins/BotSharp.Plugin.ImageHandler/Functions/ComposeImageFn.cs @@ -61,7 +61,7 @@ public class ComposeImageFn : IFunctionCallback var fileInstruct = _services.GetRequiredService(); var convSettings = _services.GetRequiredService(); - var selecteds = await fileInstruct.SelectMessageFiles(_conversationId, new SelectFileOptions + var selecteds = await fileInstruct.SelectMessageFiles(_conversationId, new() { Description = description, IsIncludeBotFiles = true, diff --git a/src/Plugins/BotSharp.Plugin.ImageHandler/Functions/EditImageFn.cs b/src/Plugins/BotSharp.Plugin.ImageHandler/Functions/EditImageFn.cs index d98f672e..8e73d639 100644 --- a/src/Plugins/BotSharp.Plugin.ImageHandler/Functions/EditImageFn.cs +++ b/src/Plugins/BotSharp.Plugin.ImageHandler/Functions/EditImageFn.cs @@ -62,7 +62,7 @@ public class EditImageFn : IFunctionCallback var fileInstruct = _services.GetRequiredService(); var convSettings = _services.GetRequiredService(); - var selecteds = await fileInstruct.SelectMessageFiles(_conversationId, new SelectFileOptions + var selecteds = await fileInstruct.SelectMessageFiles(_conversationId, options: new() { Description = description, IsIncludeBotFiles = true, diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs index 669f4ad1..e1bebc58 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs +++ b/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 diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Hooks/KnowledgeHook.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Hooks/KnowledgeHook.cs index 90aa0114..adb44139 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Hooks/KnowledgeHook.cs +++ b/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 diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemoryVectorDb.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemoryVectorDb.cs index 085653a2..c1641a26 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemoryVectorDb.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Document.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Document.cs index f81961db..20787931 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Document.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Graph.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Graph.cs index 7207bace..f6bcac18 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Graph.cs +++ b/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 diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Index.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Index.cs index 59ef1202..4ea03448 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Index.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Vector.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Vector.cs index 908fdc23..5d638f73 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Vector.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.AgentCodeScript.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.AgentCodeScript.cs index 8e8a8154..fa2830f2 100644 --- a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.AgentCodeScript.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.KnowledgeBase.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.KnowledgeBase.cs index f6bcba89..73496839 100644 --- a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.KnowledgeBase.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Models/Realtime/RealtimeSessionUpdate.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Models/Realtime/RealtimeSessionUpdate.cs index 395385d6..0dbf4fa5 100644 --- a/src/Plugins/BotSharp.Plugin.OpenAI/Models/Realtime/RealtimeSessionUpdate.cs +++ b/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 diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs index 379941b4..fe2e1bbb 100644 --- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Using.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Using.cs index b2bafc7b..a1f2392d 100644 --- a/src/Plugins/BotSharp.Plugin.OpenAI/Using.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.Qdrant/QdrantDb.cs b/src/Plugins/BotSharp.Plugin.Qdrant/QdrantDb.cs index 2ffbdb53..32543f83 100644 --- a/src/Plugins/BotSharp.Plugin.Qdrant/QdrantDb.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.SemanticKernel/SemanticKernelMemoryStoreProvider.cs b/src/Plugins/BotSharp.Plugin.SemanticKernel/SemanticKernelMemoryStoreProvider.cs index b8edde36..f0358b34 100644 --- a/src/Plugins/BotSharp.Plugin.SemanticKernel/SemanticKernelMemoryStoreProvider.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.SqlDriver/Functions/SqlValidateFn.cs b/src/Plugins/BotSharp.Plugin.SqlDriver/Functions/SqlValidateFn.cs index 1489c4a8..9cba8ecb 100644 --- a/src/Plugins/BotSharp.Plugin.SqlDriver/Functions/SqlValidateFn.cs +++ b/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 diff --git a/src/Plugins/BotSharp.Plugin.SqlDriver/Services/SqlChartService.cs b/src/Plugins/BotSharp.Plugin.SqlDriver/Services/SqlChartService.cs index 7e091bc3..5efef68f 100644 --- a/src/Plugins/BotSharp.Plugin.SqlDriver/Services/SqlChartService.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.TencentCos/Services/TencentCosService.Conversation.cs b/src/Plugins/BotSharp.Plugin.TencentCos/Services/TencentCosService.Conversation.cs index 0c774dd8..b72fc198 100644 --- a/src/Plugins/BotSharp.Plugin.TencentCos/Services/TencentCosService.Conversation.cs +++ b/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; diff --git a/src/Plugins/BotSharp.Plugin.Twilio/TwilioStreamMiddleware.cs b/src/Plugins/BotSharp.Plugin.Twilio/TwilioStreamMiddleware.cs index 95bf4475..78bcafed 100644 --- a/src/Plugins/BotSharp.Plugin.Twilio/TwilioStreamMiddleware.cs +++ b/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; diff --git a/tests/BotSharp.LLM.Tests/Core/NullFileStorageService.cs b/tests/BotSharp.LLM.Tests/Core/NullFileStorageService.cs index 0e1be86c..566d33e4 100644 --- a/tests/BotSharp.LLM.Tests/Core/NullFileStorageService.cs +++ b/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 {