Merge pull request #625 from iceljc/master

iceljc · web-flow · commit a5ba69c05c8b · 2024-09-05T10:42:09.000-05:00
relocate
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ConversationPlugin.cs b/src/Infrastructure/BotSharp.Core/Conversations/ConversationPlugin.cs
@@ -6,7 +6,6 @@
 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;
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/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/Plugins/BotSharp.Plugin.KnowledgeBase/Helpers/TextChopper.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
@@ -1,8 +1,8 @@
 using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Settings;
-using BotSharp.Core.Knowledges.Services;
 using BotSharp.Plugin.KnowledgeBase.Converters;
 using BotSharp.Plugin.KnowledgeBase.Hooks;
+using BotSharp.Plugin.KnowledgeBase.Services;
 using Microsoft.Extensions.Configuration;
 
 namespace BotSharp.Plugin.KnowledgeBase;
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/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/Plugins/BotSharp.Plugin.KnowledgeBase/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/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Get.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Get.cs
@@ -1,8 +1,4 @@
-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/Plugins/BotSharp.Plugin.KnowledgeBase/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/Plugins/BotSharp.Plugin.KnowledgeBase/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
 {
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Using.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Using.cs
@@ -20,6 +20,7 @@
 global using BotSharp.Abstraction.Knowledges.Enums;
 global using BotSharp.Abstraction.VectorStorage;
 global using BotSharp.Abstraction.VectorStorage.Models;
+global using BotSharp.Abstraction.Graph.Models;
 global using BotSharp.Abstraction.Knowledges.Models;
 global using BotSharp.Abstraction.MLTasks;
 global using BotSharp.Abstraction.Functions;
diff --git a/src/Plugins/BotSharp.Plugin.SqlDriver/Functions/GetTableDefinitionFn.cs b/src/Plugins/BotSharp.Plugin.SqlDriver/Functions/GetTableDefinitionFn.cs
@@ -36,22 +36,14 @@ public async Task<bool> Execute(RoleDialogModel message)
         {
             try
             {
-                var sql = $"select * from information_schema.tables where table_name = @tableName";
                 var escapedTableName = MySqlHelper.EscapeString(table);
+                var sql = $"SHOW CREATE TABLE `{escapedTableName}`";
 
-                var result = connection.QueryFirstOrDefault(sql, new
-                {
-                    tableName = escapedTableName
-                });
-
-                if (result == null) continue;
-
-                sql = $"SHOW CREATE TABLE `{escapedTableName}`";
                 using var command = new MySqlCommand(sql, connection);
                 using var reader = command.ExecuteReader();
                 if (reader.Read())
                 {
-                    result = reader.GetString(1);
+                    var result = reader.GetString(1);
                     tableDdls.Add(result);
                 }
 
diff --git a/src/Plugins/BotSharp.Plugin.SqlDriver/Services/DbKnowledgeService.cs b/src/Plugins/BotSharp.Plugin.SqlDriver/Services/DbKnowledgeService.cs
@@ -91,13 +91,13 @@ public async Task<bool> Import(string provider, string model, string schema)
     private string GetTableStructure(string table)
     {
         var settings = _services.GetRequiredService<SqlDriverSetting>();
-        using var connection = new MySqlConnection(settings.MySqlConnectionString);
-        connection.Open();
-
+        
         var ddl = string.Empty;
         var escapedTableName = MySqlHelper.EscapeString(table);
         var sql = $"SHOW CREATE TABLE `{escapedTableName}`";
 
+        using var connection = new MySqlConnection(settings.MySqlConnectionString);
+        connection.Open();
         using var command = new MySqlCommand(sql, connection);
         using var reader = command.ExecuteReader();
         if (reader.Read())

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using BotSharp.Abstraction.Knowledges.Settings;`
`2`		`-using BotSharp.Abstraction.MLTasks;`
`3`		`-`
`4`		`-namespace BotSharp.Core.Knowledges.Helpers;`
	`1`	`+namespace BotSharp.Plugin.KnowledgeBase.Helpers;`
`5`	`2`
`6`	`3`	`public static class KnowledgeSettingHelper`
`7`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-using BotSharp.Abstraction.Knowledges.Models;`
`2`	`1`	`using System.Text.RegularExpressions;`
`3`	`2`
`4`		`-namespace BotSharp.Core.Knowledges.Helpers;`
	`3`	`+namespace BotSharp.Plugin.KnowledgeBase.Helpers;`
`5`	`4`
`6`	`5`	`public static class TextChopper`
`7`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`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;`
	`1`	`+namespace BotSharp.Plugin.KnowledgeBase.Services;`
`6`	`2`
`7`	`3`	`public partial class KnowledgeService`
`8`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace BotSharp.Core.Knowledges.Services;`
	`1`	`+namespace BotSharp.Plugin.KnowledgeBase.Services;`
`2`	`2`
`3`	`3`	`public partial class KnowledgeService`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-using BotSharp.Abstraction.Graph.Models;`
`2`		`-using BotSharp.Abstraction.Knowledges.Models;`
`3`		`-using BotSharp.Abstraction.VectorStorage.Models;`
`4`		`-`
`5`		`-namespace BotSharp.Core.Knowledges.Services;`
	`1`	`+namespace BotSharp.Plugin.KnowledgeBase.Services;`
`6`	`2`
`7`	`3`	`public partial class KnowledgeService`
`8`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using BotSharp.Abstraction.VectorStorage.Models;`
`2`		`-`
`3`		`-namespace BotSharp.Core.Knowledges.Services;`
	`1`	`+namespace BotSharp.Plugin.KnowledgeBase.Services;`
`4`	`2`
`5`	`3`	`public partial class KnowledgeService`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,22 +36,14 @@ public async Task<bool> Execute(RoleDialogModel message)`
`36`	`36`	`{`
`37`	`37`	`try`
`38`	`38`	`{`
`39`		`- var sql = $"select * from information_schema.tables where table_name = @tableName";`
`40`	`39`	`var escapedTableName = MySqlHelper.EscapeString(table);`
	`40`	+ var sql = $"SHOW CREATE TABLE `{escapedTableName}`";
`41`	`41`
`42`		`- var result = connection.QueryFirstOrDefault(sql, new`
`43`		`- {`
`44`		`- tableName = escapedTableName`
`45`		`- });`
`46`		`-`
`47`		`- if (result == null) continue;`
`48`		`-`
`49`		- sql = $"SHOW CREATE TABLE `{escapedTableName}`";
`50`	`42`	`using var command = new MySqlCommand(sql, connection);`
`51`	`43`	`using var reader = command.ExecuteReader();`
`52`	`44`	`if (reader.Read())`
`53`	`45`	`{`
`54`		`- result = reader.GetString(1);`
	`46`	`+ var result = reader.GetString(1);`
`55`	`47`	`tableDdls.Add(result);`
`56`	`48`	`}`
`57`	`49`