Skip to content

Fix embeddings not being returned in Azure AI Search memory #867

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Fix embeddings not being returned in Azure AI Search memory #867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e4987f
Fix embeddings not being returned in Azure AI Search memory
alexmg Oct 30, 2024
2b08e9c
Merge branch 'main' into AISearchWithEmbeddings
dluc Oct 30, 2024
ed4b1b8
Rename function
dluc Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions extensions/AzureAISearch/AzureAISearch/AzureAISearchMemory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ await client.IndexDocumentsAsync(
FilterMode = VectorFilterMode.PreFilter
}
};
DefineFieldsToSelect(options, withEmbeddings);

if (limit > 0)
{
Expand Down Expand Up @@ -253,6 +254,7 @@ public async IAsyncEnumerable<MemoryRecord> GetListAsync(
var client = this.GetSearchClient(index);

SearchOptions options = new();
DefineFieldsToSelect(options, withEmbeddings);

if (limit > 0)
{
Expand Down Expand Up @@ -515,7 +517,7 @@ private SearchIndex PrepareIndexSchema(string index, MemoryDbSchema schema)
* - searchable: Full-text searchable, subject to lexical analysis such as word-breaking during indexing.
* - filterable: Filterable fields of type Edm.String or Collection(Edm.String) don't undergo word-breaking.
* - facetable: Used for counting. Fields of type Edm.String that are filterable, "sortable", or "facetable" can be at most 32kb. */
SearchField? vectorField = null;
VectorSearchField? vectorField = null;
foreach (var field in schema.Fields)
{
switch (field.Type)
Expand All @@ -525,15 +527,10 @@ private SearchIndex PrepareIndexSchema(string index, MemoryDbSchema schema)
throw new AzureAISearchMemoryException($"Unsupported field type {field.Type:G}");

case MemoryDbField.FieldType.Vector:
vectorField = new SearchField(field.Name, SearchFieldDataType.Collection(SearchFieldDataType.Single))
vectorField = new VectorSearchField(field.Name, field.VectorSize, VectorSearchProfileName)
{
IsKey = false,
IsFilterable = false,
IsSearchable = true,
IsFacetable = false,
IsSortable = false,
VectorSearchDimensions = field.VectorSize,
VectorSearchProfileName = VectorSearchProfileName,
IsHidden = false,
IsStored = true
};

break;
Expand Down Expand Up @@ -630,6 +627,17 @@ at Azure.Search.Documents.SearchClient.SearchInternal[T](SearchOptions options,
return indexSchema;
}

private static void DefineFieldsToSelect(SearchOptions options, bool withEmbeddings)
{
options.Select.Add(AzureAISearchMemoryRecord.IdField);
options.Select.Add(AzureAISearchMemoryRecord.TagsField);
options.Select.Add(AzureAISearchMemoryRecord.PayloadField);
if (withEmbeddings)
{
options.Select.Add(AzureAISearchMemoryRecord.VectorField);
}
}

private static double ScoreToCosineSimilarity(double score)
{
return 2 - (1 / score);
Expand Down
4 changes: 2 additions & 2 deletions extensions/AzureAISearch/AzureAISearch/Internals/AzureAISearchMemoryRecord.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ internal sealed class AzureAISearchMemoryRecord
{
internal const string IdField = "id";
internal const string VectorField = "embedding";
private const string TagsField = "tags";
private const string PayloadField = "payload";
internal const string TagsField = "tags";
internal const string PayloadField = "payload";

private static readonly JsonSerializerOptions s_jsonOptions = new()
{
Expand Down
Loading