Support more data type in Qdrant payload.

Oceania2018 · Oceania2018 · commit af484579f5b0 · 2024-09-28T20:00:35.000-05:00
diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/IVectorDb.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/IVectorDb.cs
@@ -12,7 +12,7 @@ public interface IVectorDb
     Task<IEnumerable<VectorCollectionData>> GetCollectionData(string collectionName, IEnumerable<Guid> ids, bool withPayload = false, bool withVector = false);
     Task<bool> CreateCollection(string collectionName, int dimension);
     Task<bool> DeleteCollection(string collectionName);
-    Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, string>? payload = null);
+    Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, object>? payload = null);
     Task<IEnumerable<VectorCollectionData>> Search(string collectionName, float[] vector, IEnumerable<string>? fields, int limit = 5, float confidence = 0.5f, bool withVector = false);
     Task<bool> DeleteCollectionData(string collectionName, List<Guid> ids);
     Task<bool> DeleteCollectionAllData(string collectionName);
diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionData.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionData.cs
@@ -3,7 +3,7 @@ namespace BotSharp.Abstraction.VectorStorage.Models;
 public class VectorCollectionData
 {
     public string Id { get; set; }
-    public Dictionary<string, string> Data { get; set; } = new();
+    public Dictionary<string, object> Data { get; set; } = new();
     public double? Score { get; set; }
 
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
diff --git a/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCreateModel.cs b/src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCreateModel.cs
@@ -6,5 +6,5 @@ public class VectorCreateModel
 {
     public string Text { get; set; }
     public string DataSource { get; set; } = VectorDataSource.Api;
-    public Dictionary<string, string>? Payload { get; set; }
+    public Dictionary<string, object>? Payload { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/VectorKnowledgeCreateRequest.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/VectorKnowledgeCreateRequest.cs
@@ -11,5 +11,5 @@ public class VectorKnowledgeCreateRequest
     public string DataSource { get; set; } = VectorDataSource.Api;
 
     [JsonPropertyName("payload")]
-    public Dictionary<string, string>? Payload { get; set; }
+    public Dictionary<string, object>? Payload { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/VectorKnowledgeViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/VectorKnowledgeViewModel.cs
@@ -9,7 +9,7 @@ public class VectorKnowledgeViewModel
     public string Id { get; set; }
 
     [JsonPropertyName("data")]
-    public IDictionary<string, string> Data { get; set; }
+    public IDictionary<string, object> Data { get; set; }
 
     [JsonPropertyName("score")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Functions/MemorizeKnowledgeFn.cs
@@ -24,7 +24,7 @@ public async Task<bool> Execute(RoleDialogModel message)
         var result = await knowledgeService.CreateVectorCollectionData(collectionName, new VectorCreateModel
         {
             Text = args.Question,
-            Payload = new Dictionary<string, string>
+            Payload = new Dictionary<string, object>
             {
                 { KnowledgePayloadName.Answer, args.Answer }
             }
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemoryVectorDb.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemoryVectorDb.cs
@@ -59,7 +59,7 @@ public async Task<IEnumerable<VectorCollectionData>> Search(string collectionNam
                         .Take(limit)
                         .Select(i => new VectorCollectionData
                         {
-                            Data = new Dictionary<string, string> { { "text", _vectors[collectionName][i].Text } },
+                            Data = new Dictionary<string, object> { { "text", _vectors[collectionName][i].Text } },
                             Score = similarities[i],
                             Vector = withVector ? _vectors[collectionName][i].Vector : null,
                         })
@@ -68,7 +68,7 @@ public async Task<IEnumerable<VectorCollectionData>> Search(string collectionNam
         return await Task.FromResult(results);
     }
 
-    public async Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, string>? payload = null)
+    public async Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, object>? payload = null)
     {
         _vectors[collectionName].Add(new VecRecord
         {
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Document.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Document.cs
@@ -398,7 +398,7 @@ private async Task<IEnumerable<string>> SaveToVectorDb(
         var vectorDb = GetVectorDb();
         var textEmbedding = GetTextEmbedding(collectionName);
 
-        var payload = new Dictionary<string, string>
+        var payload = new Dictionary<string, object>
         {
             { KnowledgePayloadName.DataSource, vectorDataSource },
             { KnowledgePayloadName.FileId, fileId.ToString() },
diff --git a/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Vector.cs b/src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Vector.cs
@@ -196,7 +196,7 @@ public async Task<bool> UpsertVectorCollectionData(string collectionName, Vector
                 withPayload: true);
             if (!found.IsNullOrEmpty())
             {
-                if (found.First().Data["text"] == update.Text)
+                if (found.First().Data["text"].ToString() == update.Text)
                 {
                     // Only update payload
                     return await db.Upsert(collectionName, guid, found.First().Vector, update.Text, update.Payload);
diff --git a/src/Plugins/BotSharp.Plugin.Planner/Functions/PrimaryStagePlanFn.cs b/src/Plugins/BotSharp.Plugin.Planner/Functions/PrimaryStagePlanFn.cs
@@ -19,30 +19,31 @@ public async Task<bool> Execute(RoleDialogModel message)
     {
         var agentService = _services.GetRequiredService<IAgentService>();
         var state = _services.GetRequiredService<IConversationStateService>();
-        var knowledgeService = _services.GetRequiredService<IKnowledgeService>();
-        var knowledgeSettings = _services.GetRequiredService<KnowledgeBaseSettings>();
+        // var knowledgeService = _services.GetRequiredService<IKnowledgeService>();
+        // var knowledgeSettings = _services.GetRequiredService<KnowledgeBaseSettings>();
 
         state.SetState("max_tokens", "4096");
         var task = JsonSerializer.Deserialize<PrimaryRequirementRequest>(message.FunctionArgs);
-        var collectionName = knowledgeSettings.Default.CollectionName ?? KnowledgeCollectionName.BotSharp;
+        // var collectionName = knowledgeSettings.Default.CollectionName ?? KnowledgeCollectionName.BotSharp;
 
         // Get knowledge from vectordb
         var hooks = _services.GetServices<IKnowledgeHook>();
         var knowledges = new List<string>();
         foreach (var question in task.Questions)
         {
-            var list = await knowledgeService.SearchVectorKnowledge(question, collectionName, new VectorSearchOptions
+            /*var list = await knowledgeService.SearchVectorKnowledge(question, collectionName, new VectorSearchOptions
             {
                 Confidence = 0.4f
             });
-            knowledges.Add(string.Join("\r\n\r\n=====\r\n", list.Select(x => x.ToQuestionAnswer())));
+            knowledges.Add(string.Join("\r\n\r\n=====\r\n", list.Select(x => x.ToQuestionAnswer())));*/
             
             foreach (var hook in hooks)
             {
                 var k = await hook.GetRelevantKnowledges(question);
                 knowledges.AddRange(k);
             }
         }
+        knowledges = knowledges.Distinct().ToList();
 
         // Get first stage planning prompt
         var currentAgent = await agentService.LoadAgent(message.CurrentAgentId);
diff --git a/src/Plugins/BotSharp.Plugin.Qdrant/BotSharp.Plugin.Qdrant.csproj b/src/Plugins/BotSharp.Plugin.Qdrant/BotSharp.Plugin.Qdrant.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Qdrant.Client" Version="1.10.0" />
+    <PackageReference Include="Qdrant.Client" Version="1.11.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Plugins/BotSharp.Plugin.Qdrant/QdrantDb.cs b/src/Plugins/BotSharp.Plugin.Qdrant/QdrantDb.cs
@@ -142,7 +142,13 @@ public async Task<StringIdPagedItems<VectorCollectionData>> GetPagedCollectionDa
         var points = response?.Result?.Select(x => new VectorCollectionData
         {
             Id = x.Id?.Uuid ?? string.Empty,
-            Data = x.Payload.ToDictionary(x => x.Key, x => x.Value.StringValue),
+            Data = x.Payload.ToDictionary(p => p.Key, p => p.Value.KindCase switch
+            {
+                Value.KindOneofCase.StringValue => p.Value.StringValue,
+                Value.KindOneofCase.BoolValue => p.Value.BoolValue,
+                Value.KindOneofCase.IntegerValue => p.Value.IntegerValue,
+                _ => new object()
+            }),
             Vector = filter.WithVector ? x.Vectors?.Vector?.Data?.ToArray() : null
         })?.ToList() ?? new List<VectorCollectionData>();
 
@@ -175,12 +181,18 @@ public async Task<IEnumerable<VectorCollectionData>> GetCollectionData(string co
         return points.Select(x => new VectorCollectionData
         {
             Id = x.Id?.Uuid ?? string.Empty,
-            Data = x.Payload?.ToDictionary(x => x.Key, x => x.Value.StringValue) ?? new(),
+            Data = x.Payload?.ToDictionary(p => p.Key, p => p.Value.KindCase switch 
+            { 
+                Value.KindOneofCase.StringValue => p.Value.StringValue,
+                Value.KindOneofCase.BoolValue => p.Value.BoolValue,
+                Value.KindOneofCase.IntegerValue => p.Value.IntegerValue,
+                _ => new object()
+            }) ?? new(),
             Vector = x.Vectors?.Vector?.Data?.ToArray()
         });
     }
 
-    public async Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, string>? payload = null)
+    public async Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, object>? payload = null)
     {
         // Insert vectors
         var point = new PointStruct()
@@ -200,7 +212,42 @@ public async Task<bool> Upsert(string collectionName, Guid id, float[] vector, s
         {
             foreach (var item in payload)
             {
-                point.Payload[item.Key] = item.Value;
+                if (item.Value is string str)
+                {
+                    point.Payload[item.Key] = str;
+                }
+                else if (item.Value is bool b)
+                {
+                    point.Payload[item.Key] = b;
+                }
+                else if (item.Value is byte int8)
+                {
+                    point.Payload[item.Key] = int8;
+                }
+                else if (item.Value is short int16)
+                {
+                    point.Payload[item.Key] = int16;
+                }
+                else if (item.Value is int int32)
+                {
+                    point.Payload[item.Key] = int32;
+                }
+                else if (item.Value is long int64)
+                {
+                    point.Payload[item.Key] = int64;
+                }
+                else if (item.Value is float f32)
+                {
+                    point.Payload[item.Key] = f32;
+                }
+                else if (item.Value is double f64)
+                {
+                    point.Payload[item.Key] = f64;
+                }
+                else if (item.Value is DateTime dt)
+                {
+                    point.Payload[item.Key] = dt.ToUniversalTime().ToString("o");
+                }
             }
         }
 
@@ -241,7 +288,13 @@ public async Task<IEnumerable<VectorCollectionData>> Search(string collectionNam
         results = points.Select(x => new VectorCollectionData
         {
             Id = x.Id.Uuid,
-            Data = x.Payload.ToDictionary(x => x.Key, x => x.Value.StringValue),
+            Data = x.Payload.ToDictionary(p => p.Key, p => p.Value.KindCase switch
+            {
+                Value.KindOneofCase.StringValue => p.Value.StringValue,
+                Value.KindOneofCase.BoolValue => p.Value.BoolValue,
+                Value.KindOneofCase.IntegerValue => p.Value.IntegerValue,
+                _ => new object()
+            }),
             Score = x.Score,
             Vector = x.Vectors?.Vector?.Data?.ToArray()
         }).ToList();
diff --git a/src/Plugins/BotSharp.Plugin.SqlDriver/Services/DbKnowledgeService.cs b/src/Plugins/BotSharp.Plugin.SqlDriver/Services/DbKnowledgeService.cs
@@ -69,7 +69,7 @@ public async Task<bool> Import(string provider, string model, string schema)
                     await knowledgeService.CreateVectorCollectionData(collectionName, new VectorCreateModel
                     {
                         Text = item.Question,
-                        Payload = new Dictionary<string, string>
+                        Payload = new Dictionary<string, object>
                         {
                             { KnowledgePayloadName.Answer, item.Answer }
                         }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace BotSharp.Abstraction.VectorStorage.Models;`
`3`	`3`	`public class VectorCollectionData`
`4`	`4`	`{`
`5`	`5`	`public string Id { get; set; }`
`6`		`- public Dictionary<string, string> Data { get; set; } = new();`
	`6`	`+ public Dictionary<string, object> Data { get; set; } = new();`
`7`	`7`	`public double? Score { get; set; }`
`8`	`8`
`9`	`9`	`[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ public class VectorCreateModel`
`6`	`6`	`{`
`7`	`7`	`public string Text { get; set; }`
`8`	`8`	`public string DataSource { get; set; } = VectorDataSource.Api;`
`9`		`- public Dictionary<string, string>? Payload { get; set; }`
	`9`	`+ public Dictionary<string, object>? Payload { get; set; }`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ public class VectorKnowledgeCreateRequest`
`11`	`11`	`public string DataSource { get; set; } = VectorDataSource.Api;`
`12`	`12`
`13`	`13`	`[JsonPropertyName("payload")]`
`14`		`- public Dictionary<string, string>? Payload { get; set; }`
	`14`	`+ public Dictionary<string, object>? Payload { get; set; }`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public async Task<bool> Execute(RoleDialogModel message)`
`24`	`24`	`var result = await knowledgeService.CreateVectorCollectionData(collectionName, new VectorCreateModel`
`25`	`25`	`{`
`26`	`26`	`Text = args.Question,`
`27`		`- Payload = new Dictionary<string, string>`
	`27`	`+ Payload = new Dictionary<string, object>`
`28`	`28`	`{`
`29`	`29`	`{ KnowledgePayloadName.Answer, args.Answer }`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public async Task<IEnumerable<VectorCollectionData>> Search(string collectionNam`
`59`	`59`	`.Take(limit)`
`60`	`60`	`.Select(i => new VectorCollectionData`
`61`	`61`	`{`
`62`		`- Data = new Dictionary<string, string> { { "text", _vectors[collectionName][i].Text } },`
	`62`	`+ Data = new Dictionary<string, object> { { "text", _vectors[collectionName][i].Text } },`
`63`	`63`	`Score = similarities[i],`
`64`	`64`	`Vector = withVector ? _vectors[collectionName][i].Vector : null,`
`65`	`65`	`})`
`@@ -68,7 +68,7 @@ public async Task<IEnumerable<VectorCollectionData>> Search(string collectionNam`
`68`	`68`	`return await Task.FromResult(results);`
`69`	`69`	`}`
`70`	`70`
`71`		`- public async Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, string>? payload = null)`
	`71`	`+ public async Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, object>? payload = null)`
`72`	`72`	`{`
`73`	`73`	`_vectors[collectionName].Add(new VecRecord`
`74`	`74`	`{`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ private async Task<IEnumerable<string>> SaveToVectorDb(`
`398`	`398`	`var vectorDb = GetVectorDb();`
`399`	`399`	`var textEmbedding = GetTextEmbedding(collectionName);`
`400`	`400`
`401`		`- var payload = new Dictionary<string, string>`
	`401`	`+ var payload = new Dictionary<string, object>`
`402`	`402`	`{`
`403`	`403`	`{ KnowledgePayloadName.DataSource, vectorDataSource },`
`404`	`404`	`{ KnowledgePayloadName.FileId, fileId.ToString() },`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public async Task<bool> UpsertVectorCollectionData(string collectionName, Vector`
`196`	`196`	`withPayload: true);`
`197`	`197`	`if (!found.IsNullOrEmpty())`
`198`	`198`	`{`
`199`		`- if (found.First().Data["text"] == update.Text)`
	`199`	`+ if (found.First().Data["text"].ToString() == update.Text)`
`200`	`200`	`{`
`201`	`201`	`// Only update payload`
`202`	`202`	`return await db.Upsert(collectionName, guid, found.First().Vector, update.Text, update.Payload);`
Original file line number	Diff line number	Diff line change
`@@ -19,30 +19,31 @@ public async Task<bool> Execute(RoleDialogModel message)`
`19`	`19`	`{`
`20`	`20`	`var agentService = _services.GetRequiredService<IAgentService>();`
`21`	`21`	`var state = _services.GetRequiredService<IConversationStateService>();`
`22`		`- var knowledgeService = _services.GetRequiredService<IKnowledgeService>();`
`23`		`- var knowledgeSettings = _services.GetRequiredService<KnowledgeBaseSettings>();`
	`22`	`+ // var knowledgeService = _services.GetRequiredService<IKnowledgeService>();`
	`23`	`+ // var knowledgeSettings = _services.GetRequiredService<KnowledgeBaseSettings>();`
`24`	`24`
`25`	`25`	`state.SetState("max_tokens", "4096");`
`26`	`26`	`var task = JsonSerializer.Deserialize<PrimaryRequirementRequest>(message.FunctionArgs);`
`27`		`- var collectionName = knowledgeSettings.Default.CollectionName ?? KnowledgeCollectionName.BotSharp;`
	`27`	`+ // var collectionName = knowledgeSettings.Default.CollectionName ?? KnowledgeCollectionName.BotSharp;`
`28`	`28`
`29`	`29`	`// Get knowledge from vectordb`
`30`	`30`	`var hooks = _services.GetServices<IKnowledgeHook>();`
`31`	`31`	`var knowledges = new List<string>();`
`32`	`32`	`foreach (var question in task.Questions)`
`33`	`33`	`{`
`34`		`- var list = await knowledgeService.SearchVectorKnowledge(question, collectionName, new VectorSearchOptions`
	`34`	`+ /*var list = await knowledgeService.SearchVectorKnowledge(question, collectionName, new VectorSearchOptions`
`35`	`35`	`{`
`36`	`36`	`Confidence = 0.4f`
`37`	`37`	`});`
`38`		`- knowledges.Add(string.Join("\r\n\r\n=====\r\n", list.Select(x => x.ToQuestionAnswer())));`
	`38`	`+ knowledges.Add(string.Join("\r\n\r\n=====\r\n", list.Select(x => x.ToQuestionAnswer())));*/`
`39`	`39`
`40`	`40`	`foreach (var hook in hooks)`
`41`	`41`	`{`
`42`	`42`	`var k = await hook.GetRelevantKnowledges(question);`
`43`	`43`	`knowledges.AddRange(k);`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+ knowledges = knowledges.Distinct().ToList();`
`46`	`47`
`47`	`48`	`// Get first stage planning prompt`
`48`	`49`	`var currentAgent = await agentService.LoadAgent(message.CurrentAgentId);`