Azure AI Search 2024-07-01 GA preparation (#40924)

Azure AI Search 2024-07-01 GA preparation

Author: alzimmermsft

sdk/search/azure-search-documents/README.md

@@ -75,7 +75,7 @@ add the direct dependency to your project as follows.
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-search-documents</artifactId>
-    <version>11.7.0-beta.3</version>
+    <version>11.7.0-beta.4</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

sdk/search/azure-search-documents/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/search/azure-search-documents",
-  "Tag": "java/search/azure-search-documents_68da41c6ed"
+  "Tag": "java/search/azure-search-documents_773510d633"
 }

sdk/search/azure-search-documents/pom.xml

@@ -107,6 +107,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-ai-openai</artifactId>
       <version>1.0.0-beta.9</version> <!-- {x-version-update;com.azure:azure-ai-openai;dependency} -->
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

sdk/search/azure-search-documents/spotbugs-exclude.xml

@@ -80,7 +80,7 @@
       <Class name="com.azure.search.documents.indexes.models.SearchIndex" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexer" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexerIndexProjectionSelector" />
-      <Class name="com.azure.search.documents.indexes.models.SearchIndexerIndexProjections" />
+      <Class name="com.azure.search.documents.indexes.models.SearchIndexerIndexProjection" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexerIndexProjectionsParameters" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexerKnowledgeStore" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexerKnowledgeStoreParameters" />
@@ -99,6 +99,7 @@
       <Class name="com.azure.search.documents.indexes.models.TextWeights" />
       <Class name="com.azure.search.documents.indexes.models.VectorSearch" />
       <Class name="com.azure.search.documents.indexes.models.WebApiSkill" />
+      <Class name="com.azure.search.documents.indexes.models.WebApiVectorizerParameters"/>
       <Class name="com.azure.search.documents.indexes.models.WordDelimiterTokenFilter" />
       <Class name="com.azure.search.documents.models.AutocompleteOptions" />
       <Class name="com.azure.search.documents.models.AutocompleteResult" />
@@ -188,7 +189,7 @@
       <Class name="com.azure.search.documents.indexes.models.SearchIndex" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexer" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexerIndexProjectionSelector" />
-      <Class name="com.azure.search.documents.indexes.models.SearchIndexerIndexProjections" />
+      <Class name="com.azure.search.documents.indexes.models.SearchIndexerIndexProjection" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexerIndexProjectionsParameters" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexerKnowledgeStore" />
       <Class name="com.azure.search.documents.indexes.models.SearchIndexerKnowledgeStoreParameters" />
@@ -207,6 +208,7 @@
       <Class name="com.azure.search.documents.indexes.models.TextWeights" />
       <Class name="com.azure.search.documents.indexes.models.VectorSearch" />
       <Class name="com.azure.search.documents.indexes.models.WebApiSkill" />
+      <Class name="com.azure.search.documents.indexes.models.WebApiVectorizerParameters"/>
       <Class name="com.azure.search.documents.indexes.models.WordDelimiterTokenFilter" />
       <Class name="com.azure.search.documents.models.AutocompleteOptions" />
       <Class name="com.azure.search.documents.models.AutocompleteResult" />

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchAsyncClient.java

@@ -343,7 +343,7 @@ public String getIndexName() {
      *
      * @return the pipeline.
      */
-    public HttpPipeline getHttpPipeline() {
+    HttpPipeline getHttpPipeline() {
         return this.httpPipeline;
     }
 
@@ -1315,9 +1315,7 @@ static SearchRequest createSearchRequest(String searchText, SearchOptions option
             .setSessionId(options.getSessionId())
             .setSelect(nullSafeStringJoin(options.getSelect()))
             .setSkip(options.getSkip())
-            .setTop(options.getTop())
-            .setQueryLanguage(options.getQueryLanguage())
-            .setSpeller(options.getSpeller());
+            .setTop(options.getTop());
 
         SemanticSearchOptions semanticSearchOptions = options.getSemanticSearchOptions();
         if (semanticSearchOptions != null) {
@@ -1328,9 +1326,7 @@ static SearchRequest createSearchRequest(String searchText, SearchOptions option
                 .setSemanticMaxWaitInMilliseconds(waitInMillis)
                 .setAnswers(createSearchRequestAnswers(semanticSearchOptions.getQueryAnswer()))
                 .setCaptions(createSearchRequestCaptions(semanticSearchOptions.getQueryCaption()))
-                .setSemanticQuery(semanticSearchOptions.getSemanticQuery())
-                .setSemanticFields(nullSafeStringJoin(semanticSearchOptions.getSemanticFields()))
-                .setDebug(semanticSearchOptions.getDebug());
+                .setSemanticQuery(semanticSearchOptions.getSemanticQuery());
         }
 
         VectorSearchOptions vectorSearchOptions = options.getVectorSearchOptions();
@@ -1339,7 +1335,6 @@ static SearchRequest createSearchRequest(String searchText, SearchOptions option
                 .setVectorQueries(vectorSearchOptions.getQueries());
         }
 
-        request.setHybridSearch(options.getHybridSearch());
 
         return request;
     }

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchClient.java

@@ -15,9 +15,9 @@
 import com.azure.search.documents.implementation.SearchIndexClientImpl;
 import com.azure.search.documents.implementation.converters.IndexActionConverter;
 import com.azure.search.documents.implementation.models.AutocompleteRequest;
+import com.azure.search.documents.implementation.models.ErrorResponseException;
 import com.azure.search.documents.implementation.models.SearchContinuationToken;
 import com.azure.search.documents.implementation.models.SearchDocumentsResult;
-import com.azure.search.documents.implementation.models.SearchErrorException;
 import com.azure.search.documents.implementation.models.SearchFirstPageResponseWrapper;
 import com.azure.search.documents.implementation.models.SearchRequest;
 import com.azure.search.documents.implementation.models.SuggestDocumentsResult;
@@ -334,7 +334,7 @@ public String getIndexName() {
      *
      * @return the pipeline.
      */
-    public HttpPipeline getHttpPipeline() {
+    HttpPipeline getHttpPipeline() {
         return this.httpPipeline;
     }
 
@@ -839,8 +839,8 @@ public <T> Response<T> getDocumentWithResponse(String key, Class<T> modelClass,
 
             return new SimpleResponse<>(response, serializer.deserializeFromBytes(
                 serializer.serializeToBytes(response.getValue()), createInstance(modelClass)));
-        } catch (SearchErrorException ex) {
-            throw LOGGER.logExceptionAsError(Utility.mapSearchErrorException(ex));
+        } catch (ErrorResponseException ex) {
+            throw LOGGER.logExceptionAsError(Utility.mapErrorResponseException(ex));
         } catch (RuntimeException ex) {
             throw LOGGER.logExceptionAsError(ex);
         }

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchServiceVersion.java

@@ -20,9 +20,9 @@ public enum SearchServiceVersion implements ServiceVersion {
     V2023_11_01("2023-11-01"),
 
     /**
-     * {@code 2024-03-01-preview} service version.
+     * {@code 2024-07-01} service version.
      */
-    V2024_03_01_PREVIEW("2024-03-01-preview");
+    V2024_07_01("2024-07-01");
 
     private final String version;
 
@@ -44,6 +44,6 @@ public String getVersion() {
      * @return The latest version supported by this client library.
      */
     public static SearchServiceVersion getLatest() {
-        return V2024_03_01_PREVIEW;
+        return V2024_07_01;
     }
 }

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/DocumentsImpl.java

@@ -66,8 +66,8 @@ public final class DocumentsImpl {
     }
 
     /**
-     * The interface defining all the services for SearchIndexClientDocuments to be used by the proxy service to
-     * perform REST calls.
+     * The interface defining all the services for SearchIndexClientDocuments to be used by the proxy service to perform
+     * REST calls.
      */
     @Host("{endpoint}/indexes('{indexName}')")
     @ServiceInterface(name = "SearchIndexClientDoc")
@@ -422,8 +422,11 @@ public Mono<Response<Map<String, Object>>> getWithResponseAsync(String key, List
             xMsClientRequestIdInternal = requestOptions.getXMsClientRequestId();
         }
         UUID xMsClientRequestId = xMsClientRequestIdInternal;
-        String selectedFieldsConverted = (selectedFields == null) ? null : selectedFields.stream()
-            .map(paramItemValue -> Objects.toString(paramItemValue, "")).collect(Collectors.joining(","));
+        String selectedFieldsConverted = (selectedFields == null)
+            ? null
+            : selectedFields.stream()
+                .map(paramItemValue -> Objects.toString(paramItemValue, ""))
+                .collect(Collectors.joining(","));
         return FluxUtil.withContext(context -> service.get(this.client.getEndpoint(), this.client.getIndexName(), key,
             selectedFieldsConverted, this.client.getApiVersion(), xMsClientRequestId, accept, context));
     }
@@ -451,8 +454,11 @@ public Mono<Response<Map<String, Object>>> getWithResponseAsync(String key, List
             xMsClientRequestIdInternal = requestOptions.getXMsClientRequestId();
         }
         UUID xMsClientRequestId = xMsClientRequestIdInternal;
-        String selectedFieldsConverted = (selectedFields == null) ? null : selectedFields.stream()
-            .map(paramItemValue -> Objects.toString(paramItemValue, "")).collect(Collectors.joining(","));
+        String selectedFieldsConverted = (selectedFields == null)
+            ? null
+            : selectedFields.stream()
+                .map(paramItemValue -> Objects.toString(paramItemValue, ""))
+                .collect(Collectors.joining(","));
         return service.get(this.client.getEndpoint(), this.client.getIndexName(), key, selectedFieldsConverted,
             this.client.getApiVersion(), xMsClientRequestId, accept, context);
     }
@@ -517,8 +523,11 @@ public Response<Map<String, Object>> getWithResponse(String key, List<String> se
             xMsClientRequestIdInternal = requestOptions.getXMsClientRequestId();
         }
         UUID xMsClientRequestId = xMsClientRequestIdInternal;
-        String selectedFieldsConverted = (selectedFields == null) ? null : selectedFields.stream()
-            .map(paramItemValue -> Objects.toString(paramItemValue, "")).collect(Collectors.joining(","));
+        String selectedFieldsConverted = (selectedFields == null)
+            ? null
+            : selectedFields.stream()
+                .map(paramItemValue -> Objects.toString(paramItemValue, ""))
+                .collect(Collectors.joining(","));
         return service.getSync(this.client.getEndpoint(), this.client.getIndexName(), key, selectedFieldsConverted,
             this.client.getApiVersion(), xMsClientRequestId, accept, context);
     }

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/SearchIndexClientImpl.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-//
+// 
 // Code generated by Microsoft (R) AutoRest Code Generator.
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/SearchResultConverter.java

@@ -24,8 +24,7 @@ public static SearchResult map(com.azure.search.documents.implementation.models.
         SearchResult searchResult = new SearchResult(obj.getScore());
 
         SearchResultHelper.setHighlights(searchResult, obj.getHighlights());
-        SearchResultHelper.setSemanticSearchResults(searchResult, obj.getRerankerScore(), obj.getCaptions(),
-            obj.getDocumentDebugInfo());
+        SearchResultHelper.setSemanticSearchResults(searchResult, obj.getRerankerScore(), obj.getCaptions());
         SearchResultHelper.setAdditionalProperties(searchResult, new SearchDocument(obj.getAdditionalProperties()));
         SearchResultHelper.setJsonSerializer(searchResult, (JsonSerializer) serializer);
         return searchResult;