Bump Azure.Search.Documents from 11.5.0-beta.5 to 11.5.0 (#165)

## Motivation and Context (Why the change? What's the scenario?) Update to the latest `Azure.Search.Documents` version. ## High level description (Approach, Design) Update package version and fix associated regressions (mostly naming).
microsoft · Nov 22, 2023 · 8ee959a · 8ee959a
1 parent ea0b94e
commit 8ee959a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageVersion Include="Azure.AI.FormRecognizer" Version="4.1.0"/>
-        <PackageVersion Include="Azure.Search.Documents" Version="11.5.0-beta.5"/>
+        <PackageVersion Include="Azure.Search.Documents" Version="11.5.0"/>
         <PackageVersion Include="Azure.Identity" Version="1.10.4"/>
         <PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1"/>
         <PackageVersion Include="Azure.Storage.Queues" Version="12.17.1"/>

diff --git a/service/Core/MemoryStorage/AzureCognitiveSearch/AzureCognitiveSearchMemory.cs b/service/Core/MemoryStorage/AzureCognitiveSearch/AzureCognitiveSearchMemory.cs
@@ -131,10 +131,9 @@ await client.IndexDocumentsAsync(
 
         var client = this.GetSearchClient(index);
 
-        RawVectorQuery vectorQuery = new()
+        VectorizedQuery vectorQuery = new(embedding.Data)
         {
             KNearestNeighborsCount = limit,
-            Vector = embedding.Data.ToArray(),
             Fields = { AzureCognitiveSearchMemoryRecord.VectorField },
             // Exhaustive search is a brute force comparison across all vectors,
             // ignoring the index, which can be much slower once the index contains a lot of data.
@@ -144,9 +143,12 @@ await client.IndexDocumentsAsync(
 
         SearchOptions options = new()
         {
-            VectorQueries = { vectorQuery },
-            // Default, applies the vector query AFTER the search filter
-            VectorFilterMode = VectorFilterMode.PreFilter
+            VectorSearch = new()
+            {
+                Queries = { vectorQuery },
+                // Default, applies the vector query AFTER the search filter
+                FilterMode = VectorFilterMode.PreFilter
+            }
         };
 
         // Remove empty filters
@@ -201,7 +203,7 @@ public async IAsyncEnumerable<MemoryRecord> GetListAsync(
         // Remove empty filters
         filters = filters?.Where(f => !f.IsEmpty()).ToList();
 
-        var options = new SearchOptions();
+        SearchOptions options = new();
         if (filters is { Count: > 0 })
         {
             options.Filter = BuildSearchFilter(filters);
@@ -452,7 +454,7 @@ private SearchIndex PrepareIndexSchema(string index, VectorDbSchema schema)
                 },
                 Algorithms =
                 {
-                    new HnswVectorSearchAlgorithmConfiguration(VectorSearchConfigName)
+                    new HnswAlgorithmConfiguration(VectorSearchConfigName)
                     {
                         Parameters = new HnswParameters
                         {
@@ -485,7 +487,7 @@ private SearchIndex PrepareIndexSchema(string index, VectorDbSchema schema)
                         IsFacetable = false,
                         IsSortable = false,
                         VectorSearchDimensions = field.VectorSize,
-                        VectorSearchProfile = VectorSearchProfileName,
+                        VectorSearchProfileName = VectorSearchProfileName,
                     };
 
                     break;

diff --git a/service/tests/azure-cognitive-search-tests/Program.cs b/service/tests/azure-cognitive-search-tests/Program.cs
@@ -140,7 +140,7 @@ private static async Task CreateIndexAsync(string name)
                 },
                 Algorithms =
                 {
-                    new HnswVectorSearchAlgorithmConfiguration(VectorSearchConfigName)
+                    new HnswAlgorithmConfiguration(VectorSearchConfigName)
                     {
                         Parameters = new HnswParameters
                         {
@@ -185,7 +185,7 @@ private static async Task CreateIndexAsync(string name)
             IsFacetable = false,
             IsSortable = false,
             VectorSearchDimensions = EmbeddingSize,
-            VectorSearchProfile = VectorSearchProfileName,
+            VectorSearchProfileName = VectorSearchProfileName,
         });
 
         try
@@ -253,7 +253,7 @@ private static async Task<IList<MemoryRecord>> SearchByFieldValueAsync(
 
         fieldValue1 = fieldValue1.Replace("'", "''", StringComparison.Ordinal);
         fieldValue2 = fieldValue2.Replace("'", "''", StringComparison.Ordinal);
-        var options = new SearchOptions
+        SearchOptions options = new()
         {
             Filter = fieldIsCollection
                 ? $"{fieldName}/any(s: s eq '{fieldValue1}') and {fieldName}/any(s: s eq '{fieldValue2}')"