relocate

iceljc · iceljc · commit 32c99dee5f62 · 2024-09-03T22:13:25.000-05:00
diff --git a/src/Infrastructure/BotSharp.Abstraction/BotSharp.Abstraction.csproj b/src/Infrastructure/BotSharp.Abstraction/BotSharp.Abstraction.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(TargetFramework)</TargetFramework>
diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Extensions/VectorStorageExtension.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Extensions/VectorStorageExtension.cs
@@ -1,9 +1,9 @@
 using BotSharp.Abstraction.Knowledges.Enums;
 using BotSharp.Abstraction.VectorStorage.Models;
 
-namespace BotSharp.Abstraction.VectorStorage.Helpers;
+namespace BotSharp.Abstraction.VectorStorage.Extensions;
 
-public static class VectorStorageHelper
+public static class VectorStorageExtension
 {
     public static string ToQuestionAnswer(this VectorSearchResult data)
     {
diff --git a/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj b/src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(TargetFramework)</TargetFramework>
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ConversationPlugin.cs b/src/Infrastructure/BotSharp.Core/Conversations/ConversationPlugin.cs
@@ -6,6 +6,7 @@
 using BotSharp.Abstraction.Settings;
 using BotSharp.Abstraction.Templating;
 using BotSharp.Core.Instructs;
+using BotSharp.Core.Knowledges.Services;
 using BotSharp.Core.Messaging;
 using BotSharp.Core.Routing.Planning;
 using BotSharp.Core.Templating;
@@ -54,6 +55,8 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
         services.AddScoped<IExecutor, InstructExecutor>();
         services.AddScoped<IInstructService, InstructService>();
         services.AddScoped<ITokenStatistics, TokenStatistics>();
+
+        services.AddScoped<IKnowledgeService, KnowledgeService>();
     }
 
     public bool AttachMenu(List<PluginMenuDef> menu)
diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/KnowledgeSettingHelper.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/KnowledgeSettingHelper.cs
@@ -1,4 +1,7 @@
-namespace BotSharp.Plugin.KnowledgeBase.Helpers;
+using BotSharp.Abstraction.Knowledges.Settings;
+using BotSharp.Abstraction.MLTasks;
+
+namespace BotSharp.Core.Knowledges.Helpers;
 
 public static class KnowledgeSettingHelper
 {
diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/TextChopper.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Helpers/TextChopper.cs
@@ -1,6 +1,7 @@
+using BotSharp.Abstraction.Knowledges.Models;
 using System.Text.RegularExpressions;
 
-namespace BotSharp.Plugin.KnowledgeBase.Helpers;
+namespace BotSharp.Core.Knowledges.Helpers;
 
 public static class TextChopper
 {
diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Create.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Create.cs
@@ -1,4 +1,8 @@
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+using BotSharp.Abstraction.Knowledges.Models;
+using BotSharp.Abstraction.VectorStorage.Models;
+using BotSharp.Core.Knowledges.Helpers;
+
+namespace BotSharp.Core.Knowledges.Services;
 
 public partial class KnowledgeService
 {
diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Delete.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Delete.cs
@@ -1,4 +1,4 @@
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+namespace BotSharp.Core.Knowledges.Services;
 
 public partial class KnowledgeService
 {
diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Get.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Get.cs
@@ -1,6 +1,8 @@
 using BotSharp.Abstraction.Graph.Models;
+using BotSharp.Abstraction.Knowledges.Models;
+using BotSharp.Abstraction.VectorStorage.Models;
 
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+namespace BotSharp.Core.Knowledges.Services;
 
 public partial class KnowledgeService
 {
diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Update.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.Update.cs
@@ -1,4 +1,6 @@
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+using BotSharp.Abstraction.VectorStorage.Models;
+
+namespace BotSharp.Core.Knowledges.Services;
 
 public partial class KnowledgeService
 {
diff --git a/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.cs b/src/Infrastructure/BotSharp.Core/Knowledges/Services/KnowledgeService.cs
@@ -1,4 +1,10 @@
-namespace BotSharp.Plugin.KnowledgeBase.Services;
+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;
 
 public partial class KnowledgeService : IKnowledgeService
 {
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/KnowledgeRetrievalFn.cs
@@ -1,4 +1,4 @@
-using BotSharp.Abstraction.VectorStorage.Helpers;
+using BotSharp.Abstraction.VectorStorage.Extensions;
 
 namespace BotSharp.Plugin.KnowledgeBase.Functions;
 
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/KnowledgeBasePlugin.cs
@@ -21,7 +21,6 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
             return settingService.Bind<KnowledgeBaseSettings>("KnowledgeBase");
         });
 
-        services.AddScoped<IKnowledgeService, KnowledgeService>();
         services.AddSingleton<IPdf2TextConverter, PigPdf2TextConverter>();
         services.AddScoped<IAgentUtilityHook, KnowledgeBaseUtilityHook>();
         services.AddScoped<IAgentHook, KnowledgeBaseAgentHook>();
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Using.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Using.cs
@@ -31,6 +31,5 @@
 global using BotSharp.Abstraction.Agents.Models;
 global using BotSharp.Abstraction.Functions.Models;
 global using BotSharp.Abstraction.Repositories;
-global using BotSharp.Plugin.KnowledgeBase.Services;
 global using BotSharp.Plugin.KnowledgeBase.Enum;
 global using BotSharp.Plugin.KnowledgeBase.Helpers;
diff --git a/src/Plugins/BotSharp.Plugin.Planner/Using.cs b/src/Plugins/BotSharp.Plugin.Planner/Using.cs
@@ -28,7 +28,7 @@
 global using BotSharp.Abstraction.Knowledges.Settings;
 global using BotSharp.Abstraction.Knowledges.Enums;
 global using BotSharp.Abstraction.VectorStorage.Models;
-global using BotSharp.Abstraction.VectorStorage.Helpers;
+global using BotSharp.Abstraction.VectorStorage.Extensions;
 
 global using BotSharp.Plugin.Planner.Hooks;
 global using BotSharp.Plugin.Planner.Enums;
diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs b/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs
@@ -82,8 +82,7 @@ public async Task<TwiMLResult> ReceiveCallerMessage([FromRoute] string conversat
                 }
             }
 
-            response = new VoiceResponse()
-                .Redirect(new Uri($"{_settings.CallbackHost}/twilio/voice/{conversationId}/reply/{seqNum}?states={states}"), HttpMethod.Post);
+            response = new VoiceResponse().Redirect(new Uri($"{_settings.CallbackHost}/twilio/voice/{conversationId}/reply/{seqNum}?states={states}"), HttpMethod.Post);
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`	`4`	`<TargetFramework>$(TargetFramework)</TargetFramework>`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`using BotSharp.Abstraction.Knowledges.Enums;`
`2`	`2`	`using BotSharp.Abstraction.VectorStorage.Models;`
`3`	`3`
`4`		`-namespace BotSharp.Abstraction.VectorStorage.Helpers;`
	`4`	`+namespace BotSharp.Abstraction.VectorStorage.Extensions;`
`5`	`5`
`6`		`-public static class VectorStorageHelper`
	`6`	`+public static class VectorStorageExtension`
`7`	`7`	`{`
`8`	`8`	`public static string ToQuestionAnswer(this VectorSearchResult data)`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`		`-namespace BotSharp.Plugin.KnowledgeBase.Helpers;`
	`1`	`+using BotSharp.Abstraction.Knowledges.Settings;`
	`2`	`+using BotSharp.Abstraction.MLTasks;`
	`3`	`+`
	`4`	`+namespace BotSharp.Core.Knowledges.Helpers;`
`2`	`5`
`3`	`6`	`public static class KnowledgeSettingHelper`
`4`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
	`1`	`+using BotSharp.Abstraction.Knowledges.Models;`
`1`	`2`	`using System.Text.RegularExpressions;`
`2`	`3`
`3`		`-namespace BotSharp.Plugin.KnowledgeBase.Helpers;`
	`4`	`+namespace BotSharp.Core.Knowledges.Helpers;`
`4`	`5`
`5`	`6`	`public static class TextChopper`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`		`-namespace BotSharp.Plugin.KnowledgeBase.Services;`
	`1`	`+using BotSharp.Abstraction.Knowledges.Models;`
	`2`	`+using BotSharp.Abstraction.VectorStorage.Models;`
	`3`	`+using BotSharp.Core.Knowledges.Helpers;`
	`4`	`+`
	`5`	`+namespace BotSharp.Core.Knowledges.Services;`
`2`	`6`
`3`	`7`	`public partial class KnowledgeService`
`4`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`using BotSharp.Abstraction.Graph.Models;`
	`2`	`+using BotSharp.Abstraction.Knowledges.Models;`
	`3`	`+using BotSharp.Abstraction.VectorStorage.Models;`
`2`	`4`
`3`		`-namespace BotSharp.Plugin.KnowledgeBase.Services;`
	`5`	`+namespace BotSharp.Core.Knowledges.Services;`
`4`	`6`
`5`	`7`	`public partial class KnowledgeService`
`6`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace BotSharp.Plugin.KnowledgeBase.Services;`
	`1`	`+using BotSharp.Abstraction.VectorStorage.Models;`
	`2`	`+`
	`3`	`+namespace BotSharp.Core.Knowledges.Services;`
`2`	`4`
`3`	`5`	`public partial class KnowledgeService`
`4`	`6`	`{`