Merge pull request #535 from Qtoss-AI/master

Oceania2018 · web-flow · commit 0420d7febaf4 · 2024-07-10T11:10:46.000-05:00
EnumHelper.cs
diff --git a/src/Infrastructure/BotSharp.Abstraction/Plugins/IBotSharpPlugin.cs b/src/Infrastructure/BotSharp.Abstraction/Plugins/IBotSharpPlugin.cs
@@ -21,7 +21,7 @@ public interface IBotSharpPlugin
     /// <summary>
     /// Has build-in agent profile with this plugin
     /// </summary>
-    string[] AgentIds => new string[0];
+    string[] AgentIds => [];
 
     void RegisterDI(IServiceCollection services, IConfiguration config);
 
diff --git a/src/Infrastructure/BotSharp.Abstraction/Utilities/EnumHelper.cs b/src/Infrastructure/BotSharp.Abstraction/Utilities/EnumHelper.cs
@@ -0,0 +1,18 @@
+using System.ComponentModel;
+using System.Reflection;
+
+namespace BotSharp.Abstraction.Utilities;
+
+public static class EnumHelper
+{
+    public static string GetDescription(Enum value)
+    {
+        FieldInfo fi = value.GetType().GetField(value.ToString());
+        DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false);
+
+        if (attributes != null && attributes.Length > 0)
+            return attributes[0].Description;
+        else
+            return value.ToString();
+    }
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/IVectorDb.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/IVectorDb.cs
@@ -4,6 +4,6 @@ public interface IVectorDb
 {
     Task<List<string>> GetCollections();
     Task CreateCollection(string collectionName, int dim);
-    Task Upsert(string collectionName, int id, float[] vector, string text);
+    Task Upsert(string collectionName, string id, float[] vector, string text, Dictionary<string, string>? payload = null);
     Task<List<string>> Search(string collectionName, float[] vector, int limit = 5);
 }
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Handlers/RouteToAgentRoutingHandler.cs b/src/Infrastructure/BotSharp.Core/Routing/Handlers/RouteToAgentRoutingHandler.cs
@@ -57,7 +57,10 @@ await hook.OnNewTaskDetected(message, inst.NextActionReason)
         }
 
         message.FunctionArgs = JsonSerializer.Serialize(inst);
-        var ret = await routing.InvokeFunction(message.FunctionName, message);
+        if (message.FunctionName != null)
+        {
+            var ret = await routing.InvokeFunction(message.FunctionName, message);
+        }
 
         var agentId = routing.Context.GetCurrentAgentId();
 
@@ -82,7 +85,7 @@ await hook.OnNewTaskDetected(message, inst.NextActionReason)
         }
         else
         {
-            ret = await routing.InvokeAgent(agentId, _dialogs, onFunctionExecuting);
+            var ret = await routing.InvokeAgent(agentId, _dialogs, onFunctionExecuting);
         }
 
         var response = _dialogs.Last();
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemVectorDatabase.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemVectorDatabase.cs
@@ -37,7 +37,7 @@ public async Task<List<string>> Search(string collectionName, float[] vector, in
         return texts;
     }
 
-    public async Task Upsert(string collectionName, int id, float[] vector, string text)
+    public async Task Upsert(string collectionName, string id, float[] vector, string text, Dictionary<string, string>? payload = null)
     {
         _vectors[collectionName].Add(new VecRecord
         {
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/VecRecord.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/VecRecord.cs
@@ -2,7 +2,7 @@ namespace BotSharp.Plugin.KnowledgeBase.MemVecDb;
 
 public class VecRecord
 {
-    public int Id { get; set; }
+    public string Id { get; set; }
     public float[] Vector { get; set; }
     public string Text { get; set; }
 
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.cs
@@ -32,7 +32,7 @@ public async Task EmbedKnowledge(KnowledgeCreationModel knowledge)
         foreach (var line in lines)
         {
             var vec = await textEmbedding.GetVectorAsync(line);
-            await db.Upsert("shared", idStart, vec, line);
+            await db.Upsert("shared", idStart.ToString(), vec, line);
             idStart++;
             Console.WriteLine($"Saved vector {idStart}/{lines.Count}: {line}\n");
         }
@@ -55,7 +55,7 @@ public async Task Feed(KnowledgeFeedModel knowledge)
         foreach (var line in lines)
         {
             var vec = await textEmbedding.GetVectorAsync(line);
-            await db.Upsert(knowledge.AgentId, idStart, vec, line);
+            await db.Upsert(knowledge.AgentId, idStart.ToString(), vec, line);
             idStart++;
             Console.WriteLine($"Saved vector {idStart}/{lines.Count}: {line}\n");
         }
diff --git a/src/Plugins/BotSharp.Plugin.Qdrant/BotSharp.Plugin.Qdrant.csproj b/src/Plugins/BotSharp.Plugin.Qdrant/BotSharp.Plugin.Qdrant.csproj
@@ -11,8 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Qdrant.Client" Version="8.0.1" />
-    <PackageReference Include="Qdrant.Client" Version="1.9.0" />
+    <PackageReference Include="Qdrant.Client" Version="1.10.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Plugins/BotSharp.Plugin.Qdrant/QdrantDb.cs b/src/Plugins/BotSharp.Plugin.Qdrant/QdrantDb.cs
@@ -32,6 +32,7 @@ private QdrantClient GetClient()
             _client = new QdrantClient
             (
                 host: _setting.Url,
+                https: true,
                 apiKey: _setting.ApiKey
             );
         }
@@ -41,7 +42,7 @@ private QdrantClient GetClient()
     public async Task<List<string>> GetCollections()
     {
         // List all the collections
-        var collections = await _client.ListCollectionsAsync();
+        var collections = await GetClient().ListCollectionsAsync();
         return collections.ToList();
     }
 
@@ -56,11 +57,6 @@ public async Task CreateCollection(string collectionName, int dim)
                 Size = (ulong)dim,
                 Distance = Distance.Cosine
             });
-
-            var agentService = _services.GetRequiredService<IAgentService>();
-            var agentDataDir = agentService.GetAgentDataDir(collectionName);
-            var knowledgePath = Path.Combine(agentDataDir, "knowledge.txt");
-            File.WriteAllLines(knowledgePath, new string[0]);
         }
 
         // Get collection info
@@ -71,26 +67,29 @@ public async Task CreateCollection(string collectionName, int dim)
         }
     }
 
-    public async Task Upsert(string collectionName, int id, float[] vector, string text)
+    public async Task Upsert(string collectionName, string id, float[] vector, string text, Dictionary<string, string>? payload = null)
     {
         // Insert vectors
-        await GetClient().UpsertAsync(collectionName, points: new List<PointStruct>
+        var point = new PointStruct()
         {
-            new PointStruct() 
+            Id = new PointId()
             {
-                Id = new PointId()
-                {
-                    Num = (ulong)id,
-                },
-                Vectors = vector
-            }
-        });
+                Uuid = id
+            },
+            Vectors = vector,
 
-        // Store chunks in local file system
-        var agentService = _services.GetRequiredService<IAgentService>();
-        var agentDataDir = agentService.GetAgentDataDir(collectionName);
-        var knowledgePath = Path.Combine(agentDataDir, "knowledge.txt");
-        File.AppendAllLines(knowledgePath, new[] { text });
+            Payload = { }
+        };
+
+        foreach (var item in payload)
+        {
+            point.Payload.Add(item.Key, item.Value);
+        }
+
+        var result = await GetClient().UpsertAsync(collectionName, points: new List<PointStruct>
+        {
+            point
+        });
     }
 
     public async Task<List<string>> Search(string collectionName, float[] vector, int limit = 5)
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/BotSharp.Plugin.WebDriver.csproj b/src/Plugins/BotSharp.Plugin.WebDriver/BotSharp.Plugin.WebDriver.csproj
@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Playwright" Version="1.44.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.21.0" />
+    <PackageReference Include="Microsoft.Playwright" Version="1.45.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.22.0" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
   </ItemGroup>
 
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightInstance.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightInstance.cs
@@ -111,9 +111,20 @@ public async Task<IPage> NewPage(string ctxId, DataFetched? fetched)
                     e.Headers["content-type"].Contains("application/json") &&
                     e.Request.ResourceType == "fetch")
                 {
-                    Serilog.Log.Information($"Response: {e.Url}");
-                    var json = await e.JsonAsync();
-                    fetched(e.Url.ToLower(), JsonSerializer.Serialize(json));
+                    Serilog.Log.Information($"fetched: {e.Url}");
+                    JsonElement? json = null;
+                    try
+                    {
+                        json = await e.JsonAsync();
+                    }
+                    catch(Exception ex)
+                    {
+                        Serilog.Log.Error(ex.ToString());
+                    }
+                    finally
+                    {
+                        fetched(e.Url.ToLower(), JsonSerializer.Serialize(json ?? new JsonElement()));
+                    }
                 }
             };
         }
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.DoAction.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.DoAction.cs
@@ -5,7 +5,19 @@ public partial class PlaywrightWebDriver
     public async Task DoAction(MessageInfo message, ElementActionArgs action, BrowserActionResult result)
     {
         var page = _instance.GetPage(message.ContextId);
+        if (string.IsNullOrEmpty(result.Selector))
+        {
+            Serilog.Log.Error($"Selector is not set.");
+            return;
+        }
+
         ILocator locator = page.Locator(result.Selector);
+        var count = await locator.CountAsync();
+        if (count == 0)
+        {
+            Serilog.Log.Error($"Element not found: {result.Selector}");
+            return;
+        }
 
         if (action.Action == BroswerActionEnum.Click)
         {
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.GoToPage.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.GoToPage.cs
@@ -29,6 +29,7 @@ public async Task<BrowserActionResult> GoToPage(MessageInfo message, PageActionA
             var page = args.OpenNewTab ? await _instance.NewPage(message.ContextId, fetched: args.OnDataFetched) : 
                 _instance.GetPage(message.ContextId);
 
+            Serilog.Log.Information($"goto page: {args.Url}");
             var response = await page.GotoAsync(args.Url, new PageGotoOptions
             {
                 Timeout = args.Timeout

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ public interface IVectorDb`
`4`	`4`	`{`
`5`	`5`	`Task<List<string>> GetCollections();`
`6`	`6`	`Task CreateCollection(string collectionName, int dim);`
`7`		`- Task Upsert(string collectionName, int id, float[] vector, string text);`
	`7`	`+ Task Upsert(string collectionName, string id, float[] vector, string text, Dictionary<string, string>? payload = null);`
`8`	`8`	`Task<List<string>> Search(string collectionName, float[] vector, int limit = 5);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,10 @@ await hook.OnNewTaskDetected(message, inst.NextActionReason)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`message.FunctionArgs = JsonSerializer.Serialize(inst);`
`60`		`- var ret = await routing.InvokeFunction(message.FunctionName, message);`
	`60`	`+ if (message.FunctionName != null)`
	`61`	`+ {`
	`62`	`+ var ret = await routing.InvokeFunction(message.FunctionName, message);`
	`63`	`+ }`
`61`	`64`
`62`	`65`	`var agentId = routing.Context.GetCurrentAgentId();`
`63`	`66`
`@@ -82,7 +85,7 @@ await hook.OnNewTaskDetected(message, inst.NextActionReason)`
`82`	`85`	`}`
`83`	`86`	`else`
`84`	`87`	`{`
`85`		`- ret = await routing.InvokeAgent(agentId, _dialogs, onFunctionExecuting);`
	`88`	`+ var ret = await routing.InvokeAgent(agentId, _dialogs, onFunctionExecuting);`
`86`	`89`	`}`
`87`	`90`
`88`	`91`	`var response = _dialogs.Last();`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public async Task<List<string>> Search(string collectionName, float[] vector, in`
`37`	`37`	`return texts;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public async Task Upsert(string collectionName, int id, float[] vector, string text)`
	`40`	`+ public async Task Upsert(string collectionName, string id, float[] vector, string text, Dictionary<string, string>? payload = null)`
`41`	`41`	`{`
`42`	`42`	`_vectors[collectionName].Add(new VecRecord`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ namespace BotSharp.Plugin.KnowledgeBase.MemVecDb;`
`2`	`2`
`3`	`3`	`public class VecRecord`
`4`	`4`	`{`
`5`		`- public int Id { get; set; }`
	`5`	`+ public string Id { get; set; }`
`6`	`6`	`public float[] Vector { get; set; }`
`7`	`7`	`public string Text { get; set; }`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public async Task EmbedKnowledge(KnowledgeCreationModel knowledge)`
`32`	`32`	`foreach (var line in lines)`
`33`	`33`	`{`
`34`	`34`	`var vec = await textEmbedding.GetVectorAsync(line);`
`35`		`- await db.Upsert("shared", idStart, vec, line);`
	`35`	`+ await db.Upsert("shared", idStart.ToString(), vec, line);`
`36`	`36`	`idStart++;`
`37`	`37`	`Console.WriteLine($"Saved vector {idStart}/{lines.Count}: {line}\n");`
`38`	`38`	`}`
`@@ -55,7 +55,7 @@ public async Task Feed(KnowledgeFeedModel knowledge)`
`55`	`55`	`foreach (var line in lines)`
`56`	`56`	`{`
`57`	`57`	`var vec = await textEmbedding.GetVectorAsync(line);`
`58`		`- await db.Upsert(knowledge.AgentId, idStart, vec, line);`
	`58`	`+ await db.Upsert(knowledge.AgentId, idStart.ToString(), vec, line);`
`59`	`59`	`idStart++;`
`60`	`60`	`Console.WriteLine($"Saved vector {idStart}/{lines.Count}: {line}\n");`
`61`	`61`	`}`