From 2ea8ddfe194cf77fb27b0a5bbedfbfb4a334524a Mon Sep 17 00:00:00 2001 From: Jicheng Lu Date: Sun, 1 Sep 2024 00:15:13 -0500 Subject: [PATCH] relocate --- .../BotSharp.Core/BotSharp.Core.csproj | 2 +- .../Knowledges/KnowledgeCorePlugin.cs | 19 ------------------- .../PigPdf2TextConverter.cs | 2 +- .../Functions/KnowledgeRetrievalFn.cs | 2 -- .../Functions/MemorizeKnowledgeFn.cs | 2 -- .../Helpers/KnowledgeSettingHelper.cs | 5 +---- .../Helpers/TextChopper.cs} | 3 +-- .../KnowledgeBasePlugin.cs | 2 ++ .../Services/KnowledgeService.Create.cs | 6 +----- .../Services/KnowledgeService.Delete.cs | 2 +- .../Services/KnowledgeService.Get.cs | 4 +--- .../Services/KnowledgeService.Update.cs | 4 +--- .../Services/KnowledgeService.cs | 8 +------- 13 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 src/Infrastructure/BotSharp.Core/Knowledges/KnowledgeCorePlugin.cs rename src/Plugins/BotSharp.Plugin.KnowledgeBase/{Services => Converters}/PigPdf2TextConverter.cs (95%) rename src/{Infrastructure/BotSharp.Core/Knowledges => Plugins/BotSharp.Plugin.KnowledgeBase}/Helpers/KnowledgeSettingHelper.cs (89%) rename src/{Infrastructure/BotSharp.Core/Knowledges/Helpers/TextChopperService.cs => Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/TextChopper.cs} (94%) rename src/{Infrastructure/BotSharp.Core/Knowledges => Plugins/BotSharp.Plugin.KnowledgeBase}/Services/KnowledgeService.Create.cs (92%) rename src/{Infrastructure/BotSharp.Core/Knowledges => Plugins/BotSharp.Plugin.KnowledgeBase}/Services/KnowledgeService.Delete.cs (95%) rename src/{Infrastructure/BotSharp.Core/Knowledges => Plugins/BotSharp.Plugin.KnowledgeBase}/Services/KnowledgeService.Get.cs (96%) rename src/{Infrastructure/BotSharp.Core/Knowledges => Plugins/BotSharp.Plugin.KnowledgeBase}/Services/KnowledgeService.Update.cs (91%) rename src/{Infrastructure/BotSharp.Core/Knowledges => Plugins/BotSharp.Plugin.KnowledgeBase}/Services/KnowledgeService.cs (80%) diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj index ddd39d0c..ce4c82d2 100644 --- a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj +++ b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj @@ -1,4 +1,4 @@ - + $(TargetFramework) diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/KnowledgeCorePlugin.cs b/src/Infrastructure/BotSharp.Core/Knowledges/KnowledgeCorePlugin.cs deleted file mode 100644 index 6118647b..00000000 --- a/src/Infrastructure/BotSharp.Core/Knowledges/KnowledgeCorePlugin.cs +++ /dev/null @@ -1,19 +0,0 @@ -using BotSharp.Core.Knowledges.Services; -using Microsoft.Extensions.Configuration; - -namespace BotSharp.Core.Knowledges; - -public class KnowledgeCorePlugin : IBotSharpPlugin -{ - public string Id => "a5ebc8f9-d089-44d0-bf00-4eac97a050bc"; - - public string Name => "Knowledge Core"; - - public string Description => "Provides core knowledge services."; - - - public void RegisterDI(IServiceCollection services, IConfiguration config) - { - services.AddScoped(); - } -} \ No newline at end of file diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/PigPdf2TextConverter.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Converters/PigPdf2TextConverter.cs similarity index 95% rename from src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/PigPdf2TextConverter.cs rename to src/Plugins/BotSharp.Plugin.KnowledgeBase/Converters/PigPdf2TextConverter.cs index c334505e..0e39bef0 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/PigPdf2TextConverter.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Converters/PigPdf2TextConverter.cs @@ -1,7 +1,7 @@ using UglyToad.PdfPig; using UglyToad.PdfPig.Content; -namespace BotSharp.Plugin.KnowledgeBase.Services; +namespace BotSharp.Plugin.KnowledgeBase.Converters; public class PigPdf2TextConverter : IPdf2TextConverter { diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs index 400b1792..d6d719d7 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs @@ -1,5 +1,3 @@ -using BotSharp.Core.Knowledges.Helpers; - namespace BotSharp.Plugin.KnowledgeBase.Functions; public class KnowledgeRetrievalFn : IFunctionCallback diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs index 08b55d1c..ca545c65 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs @@ -1,5 +1,3 @@ -using BotSharp.Core.Knowledges.Helpers; - namespace BotSharp.Plugin.KnowledgeBase.Functions; public class MemorizeKnowledgeFn : IFunctionCallback diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/KnowledgeSettingHelper.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs similarity index 89% rename from src/Infrastructure/BotSharp.Core/Knowledges/Helpers/KnowledgeSettingHelper.cs rename to src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs index a278d7bf..48033c91 100644 --- a/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/KnowledgeSettingHelper.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/KnowledgeSettingHelper.cs @@ -1,7 +1,4 @@ -using BotSharp.Abstraction.Knowledges.Settings; -using BotSharp.Abstraction.MLTasks; - -namespace BotSharp.Core.Knowledges.Helpers; +namespace BotSharp.Plugin.KnowledgeBase.Helpers; public static class KnowledgeSettingHelper { diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/TextChopperService.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/TextChopper.cs similarity index 94% rename from src/Infrastructure/BotSharp.Core/Knowledges/Helpers/TextChopperService.cs rename to src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/TextChopper.cs index 68b58539..9e9b5f9d 100644 --- a/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/TextChopperService.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/TextChopper.cs @@ -1,7 +1,6 @@ -using BotSharp.Abstraction.Knowledges.Models; using System.Text.RegularExpressions; -namespace BotSharp.Core.Knowledges.Helpers; +namespace BotSharp.Plugin.KnowledgeBase.Helpers; public static class TextChopper { diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs index 9a955a5b..75d3284b 100644 --- a/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs @@ -1,5 +1,6 @@ using BotSharp.Abstraction.Plugins.Models; using BotSharp.Abstraction.Settings; +using BotSharp.Plugin.KnowledgeBase.Converters; using BotSharp.Plugin.KnowledgeBase.Hooks; using Microsoft.Extensions.Configuration; @@ -20,6 +21,7 @@ public class KnowledgeBasePlugin : IBotSharpPlugin return settingService.Bind("KnowledgeBase"); }); + services.AddScoped(); services.AddSingleton(); services.AddScoped(); services.AddScoped(); diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Create.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Create.cs similarity index 92% rename from src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Create.cs rename to src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Create.cs index d8b82fb5..2c4004fc 100644 --- a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Create.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Create.cs @@ -1,8 +1,4 @@ -using BotSharp.Abstraction.Knowledges.Models; -using BotSharp.Abstraction.VectorStorage.Models; -using BotSharp.Core.Knowledges.Helpers; - -namespace BotSharp.Core.Knowledges.Services; +namespace BotSharp.Plugin.KnowledgeBase.Services; public partial class KnowledgeService { diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Delete.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Delete.cs similarity index 95% rename from src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Delete.cs rename to src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Delete.cs index 404b4e2c..b0973a99 100644 --- a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Delete.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Delete.cs @@ -1,4 +1,4 @@ -namespace BotSharp.Core.Knowledges.Services; +namespace BotSharp.Plugin.KnowledgeBase.Services; public partial class KnowledgeService { diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Get.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Get.cs similarity index 96% rename from src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Get.cs rename to src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Get.cs index 69093659..ee36780e 100644 --- a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Get.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Get.cs @@ -1,8 +1,6 @@ using BotSharp.Abstraction.Graph.Models; -using BotSharp.Abstraction.Knowledges.Models; -using BotSharp.Abstraction.VectorStorage.Models; -namespace BotSharp.Core.Knowledges.Services; +namespace BotSharp.Plugin.KnowledgeBase.Services; public partial class KnowledgeService { diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Update.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Update.cs similarity index 91% rename from src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Update.cs rename to src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Update.cs index b9652f61..0fa1f5cd 100644 --- a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Update.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Update.cs @@ -1,6 +1,4 @@ -using BotSharp.Abstraction.VectorStorage.Models; - -namespace BotSharp.Core.Knowledges.Services; +namespace BotSharp.Plugin.KnowledgeBase.Services; public partial class KnowledgeService { diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs similarity index 80% rename from src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.cs rename to src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs index 2c0853d0..c668e07e 100644 --- a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.cs +++ b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs @@ -1,10 +1,4 @@ -using BotSharp.Abstraction.Graph; -using BotSharp.Abstraction.Knowledges.Settings; -using BotSharp.Abstraction.MLTasks; -using BotSharp.Abstraction.VectorStorage; -using BotSharp.Core.Knowledges.Helpers; - -namespace BotSharp.Core.Knowledges.Services; +namespace BotSharp.Plugin.KnowledgeBase.Services; public partial class KnowledgeService : IKnowledgeService {