-
Notifications
You must be signed in to change notification settings - Fork 394
Use Qdrant.Client for QdrantMemory internals #1068
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
russcam
wants to merge
2
commits into
microsoft:main
Choose a base branch
from
russcam:qdrant-client
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
|
|
||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using Qdrant.Client.Grpc; | ||
|
|
||
| namespace Microsoft.KernelMemory.MemoryDb.Qdrant.Client; | ||
|
|
||
| internal static class QdrantFilter | ||
| { | ||
| public static Filter? BuildFilter(IEnumerable<IEnumerable<string>?>? tagGroups) | ||
| { | ||
| if (tagGroups == null) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| var list = tagGroups.ToList(); | ||
| var filter = new Filter(); | ||
|
|
||
| if (list.Count < 2) | ||
| { | ||
| var tags = list.FirstOrDefault(); | ||
| if (tags == null) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| filter.Must.AddRange(tags.Where(t => !string.IsNullOrEmpty(t)).Select(t => Conditions.MatchText("tags", t))); | ||
| return filter; | ||
| } | ||
|
|
||
| var orFilter = new Filter(); | ||
| foreach (var tags in list) | ||
| { | ||
| if (tags == null) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| var andFilter = new Filter(); | ||
| andFilter.Must.AddRange(tags.Where(t => !string.IsNullOrEmpty(t)).Select(t => Conditions.MatchText("tags", t))); | ||
| orFilter.Should.Add(Conditions.Filter(andFilter)); | ||
| } | ||
|
|
||
| filter.Must.Add(Conditions.Filter(orFilter)); | ||
| return filter; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
|
|
||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text.Json; | ||
| using Google.Protobuf; | ||
| using Microsoft.KernelMemory.MemoryStorage; | ||
| using Qdrant.Client.Grpc; | ||
|
|
||
| namespace Microsoft.KernelMemory.MemoryDb.Qdrant.Client; | ||
|
|
||
| internal static class QdrantPointStruct | ||
| { | ||
| private const string Id = "id"; | ||
| private const string Tags = "tags"; | ||
| private const string Payload = "payload"; | ||
|
|
||
| public static PointStruct FromMemoryRecord(MemoryRecord record) | ||
| { | ||
| return new PointStruct | ||
| { | ||
| Vectors = new Vectors { Vector = new Vector { Data = { record.Vector.Data.ToArray() } } }, | ||
| Payload = | ||
| { | ||
| [Id] = record.Id, | ||
| [Tags] = record.Tags.Pairs.Select(tag => $"{tag.Key}{Constants.ReservedEqualsChar}{tag.Value}").ToArray(), | ||
| [Payload] = Value.Parser.ParseJson(JsonSerializer.Serialize(record.Payload, QdrantConfig.JSONOptions)), | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| public static MemoryRecord ToMemoryRecord(ScoredPoint scoredPoint, bool withEmbedding = true) | ||
| { | ||
| MemoryRecord result = new() | ||
| { | ||
| Id = scoredPoint.Id.Uuid, | ||
| Payload = scoredPoint.Payload.TryGetValue(Payload, out var payload) | ||
| ? JsonSerializer.Deserialize<Dictionary<string, object>>(JsonFormatter.Default.Format(payload.StructValue), QdrantConfig.JSONOptions) ?? [] | ||
| : [] | ||
| }; | ||
|
|
||
| if (withEmbedding) | ||
| { | ||
| result.Vector = new Embedding(scoredPoint.Vectors.Vector.Data.ToArray()); | ||
| } | ||
|
|
||
| foreach (string[] keyValue in scoredPoint.Payload[Tags].ListValue.Values.Select(tag => tag.StringValue.Split(Constants.ReservedEqualsChar, 2))) | ||
| { | ||
| string key = keyValue[0]; | ||
| string? value = keyValue.Length == 1 ? null : keyValue[1]; | ||
| result.Tags.Add(key, value); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| public static MemoryRecord ToMemoryRecord(RetrievedPoint retrievedPoint, bool withEmbedding = true) | ||
| { | ||
| MemoryRecord result = new() | ||
| { | ||
| Id = retrievedPoint.Id.Uuid, | ||
| Payload = retrievedPoint.Payload.TryGetValue(Payload, out var payload) | ||
| ? JsonSerializer.Deserialize<Dictionary<string, object>>(JsonFormatter.Default.Format(payload.StructValue), QdrantConfig.JSONOptions) ?? [] | ||
| : [] | ||
| }; | ||
|
|
||
| if (withEmbedding) | ||
| { | ||
| result.Vector = new Embedding(retrievedPoint.Vectors.Vector.Data.ToArray()); | ||
| } | ||
|
|
||
| foreach (string[] keyValue in retrievedPoint.Payload[Tags].ListValue.Values.Select(tag => tag.StringValue.Split(Constants.ReservedEqualsChar, 2))) | ||
| { | ||
| string key = keyValue[0]; | ||
| string? value = keyValue.Length == 1 ? null : keyValue[1]; | ||
| result.Tags.Add(key, value); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can implement an
IDictionary<string, object>->Structmethod over this serialize/deserialize (to later serialize again) approach.