diff --git a/sdk/search/Azure.Search.Documents/src/Generated/AliasesRestClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/AliasesRestClient.cs index e6da67e60f81..811c8bd46402 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/AliasesRestClient.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/AliasesRestClient.cs @@ -32,7 +32,7 @@ internal partial class AliasesRestClient /// The tracking ID sent with the request to help with debugging. /// Api Version. /// , , or is null. - public AliasesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2025-03-01-preview") + public AliasesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2024-11-01-preview") { ClientDiagnostics = clientDiagnostics ?? throw new ArgumentNullException(nameof(clientDiagnostics)); _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/DataSourcesRestClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/DataSourcesRestClient.cs index 8e2fe902a54b..b962d396a758 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/DataSourcesRestClient.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/DataSourcesRestClient.cs @@ -32,7 +32,7 @@ internal partial class DataSourcesRestClient /// The tracking ID sent with the request to help with debugging. /// Api Version. /// , , or is null. - public DataSourcesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2025-03-01-preview") + public DataSourcesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2024-11-01-preview") { ClientDiagnostics = clientDiagnostics ?? throw new ArgumentNullException(nameof(clientDiagnostics)); _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/DocumentsRestClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/DocumentsRestClient.cs index d7c476be46ac..557cfebeee78 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/DocumentsRestClient.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/DocumentsRestClient.cs @@ -36,7 +36,7 @@ internal partial class DocumentsRestClient /// Api Version. /// , , , or is null. /// is an empty string, and was expected to be non-empty. - public DocumentsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, string indexName, Guid? xMsClientRequestId = null, string apiVersion = "2025-03-01-preview") + public DocumentsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, string indexName, Guid? xMsClientRequestId = null, string apiVersion = "2024-11-01-preview") { ClientDiagnostics = clientDiagnostics ?? throw new ArgumentNullException(nameof(clientDiagnostics)); _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/IndexersRestClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/IndexersRestClient.cs index d021cb826a9a..3460520aaf1f 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/IndexersRestClient.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/IndexersRestClient.cs @@ -33,7 +33,7 @@ internal partial class IndexersRestClient /// The tracking ID sent with the request to help with debugging. /// Api Version. /// , , or is null. - public IndexersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2025-03-01-preview") + public IndexersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2024-11-01-preview") { ClientDiagnostics = clientDiagnostics ?? throw new ArgumentNullException(nameof(clientDiagnostics)); _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/IndexesRestClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/IndexesRestClient.cs index edf5d4c0b39f..0f0bbd40640f 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/IndexesRestClient.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/IndexesRestClient.cs @@ -32,7 +32,7 @@ internal partial class IndexesRestClient /// The tracking ID sent with the request to help with debugging. /// Api Version. /// , , or is null. - public IndexesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2025-03-01-preview") + public IndexesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2024-11-01-preview") { ClientDiagnostics = clientDiagnostics ?? throw new ArgumentNullException(nameof(clientDiagnostics)); _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/AIFoundryModelCatalogName.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/AIFoundryModelCatalogName.cs index d65745f5b56d..cf28f2bcf9e9 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/AIFoundryModelCatalogName.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/AIFoundryModelCatalogName.cs @@ -10,7 +10,7 @@ namespace Azure.Search.Documents.Indexes.Models { - /// The name of the embedding model from the Azure AI Studio Catalog that will be called. + /// The name of the embedding model from the Azure AI Foundry Catalog that will be called. public readonly partial struct AIFoundryModelCatalogName : IEquatable { private readonly string _value; diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/AIServicesAccountIdentity.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/AIServicesAccountIdentity.Serialization.cs index e312411cef5b..37599a33fe0e 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/AIServicesAccountIdentity.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/AIServicesAccountIdentity.Serialization.cs @@ -15,17 +15,14 @@ public partial class AIServicesAccountIdentity : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(Identity)) + if (Identity != null) { - if (Identity != null) - { - writer.WritePropertyName("identity"u8); - writer.WriteObjectValue(Identity); - } - else - { - writer.WriteNull("identity"); - } + writer.WritePropertyName("identity"u8); + writer.WriteObjectValue(Identity); + } + else + { + writer.WriteNull("identity"); } writer.WritePropertyName("subdomainUrl"u8); writer.WriteStringValue(SubdomainUrl); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/AIServicesAccountIdentity.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/AIServicesAccountIdentity.cs index 29f8a0bf25e0..21d3f2861259 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/AIServicesAccountIdentity.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/AIServicesAccountIdentity.cs @@ -13,12 +13,18 @@ namespace Azure.Search.Documents.Indexes.Models public partial class AIServicesAccountIdentity : CognitiveServicesAccount { /// Initializes a new instance of . + /// + /// The user-assigned managed identity used for connections to AI Service. If not specified, the system-assigned managed identity is used. On updates to the skillset, if the identity is unspecified, the value remains unchanged. If set to "none", the value of this property is cleared. + /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. + /// The available derived classes include and . + /// /// The subdomain url for the corresponding AI Service. /// is null. - public AIServicesAccountIdentity(string subdomainUrl) + public AIServicesAccountIdentity(SearchIndexerDataIdentity identity, string subdomainUrl) { Argument.AssertNotNull(subdomainUrl, nameof(subdomainUrl)); + Identity = identity; SubdomainUrl = subdomainUrl; ODataType = "#Microsoft.Azure.Search.AIServicesByIdentity"; } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/AzureMachineLearningParameters.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/AzureMachineLearningParameters.cs index 933ce5586932..899f99a9246b 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/AzureMachineLearningParameters.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/AzureMachineLearningParameters.cs @@ -25,7 +25,7 @@ public AzureMachineLearningParameters(Uri scoringUri) /// (Required for token authentication). The Azure Resource Manager resource ID of the AML service. It should be in the format subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.MachineLearningServices/workspaces/{workspace-name}/services/{service_name}. /// (Optional) When specified, indicates the timeout for the http client making the API call. /// (Optional for token authentication). The region the AML service is deployed in. - /// The name of the embedding model from the Azure AI Studio Catalog that is deployed at the provided endpoint. + /// The name of the embedding model from the Azure AI Foundry Catalog that is deployed at the provided endpoint. internal AzureMachineLearningParameters(Uri scoringUri, string authenticationKey, string resourceId, TimeSpan? timeout, string region, AIFoundryModelCatalogName? modelName) { ScoringUri = scoringUri; @@ -46,7 +46,7 @@ internal AzureMachineLearningParameters(Uri scoringUri, string authenticationKey public TimeSpan? Timeout { get; set; } /// (Optional for token authentication). The region the AML service is deployed in. public string Region { get; set; } - /// The name of the embedding model from the Azure AI Studio Catalog that is deployed at the provided endpoint. + /// The name of the embedding model from the Azure AI Foundry Catalog that is deployed at the provided endpoint. public AIFoundryModelCatalogName? ModelName { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/AzureMachineLearningVectorizer.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/AzureMachineLearningVectorizer.cs index 7aef8e982c11..a459785ad47d 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/AzureMachineLearningVectorizer.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/AzureMachineLearningVectorizer.cs @@ -9,7 +9,7 @@ namespace Azure.Search.Documents.Indexes.Models { - /// Specifies an Azure Machine Learning endpoint deployed via the Azure AI Studio Model Catalog for generating the vector embedding of a query string. + /// Specifies an Azure Machine Learning endpoint deployed via the Azure AI Foundry Model Catalog for generating the vector embedding of a query string. public partial class AzureMachineLearningVectorizer : VectorSearchVectorizer { /// Initializes a new instance of . diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/BinaryQuantizationCompression.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/BinaryQuantizationCompression.Serialization.cs index 6f3e9bfd4a8a..5913c87f85d7 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/BinaryQuantizationCompression.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/BinaryQuantizationCompression.Serialization.cs @@ -21,15 +21,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(RerankWithOriginalVectors)) { - if (RerankWithOriginalVectors != null) - { - writer.WritePropertyName("rerankWithOriginalVectors"u8); - writer.WriteBooleanValue(RerankWithOriginalVectors.Value); - } - else - { - writer.WriteNull("rerankWithOriginalVectors"); - } + writer.WritePropertyName("rerankWithOriginalVectors"u8); + writer.WriteBooleanValue(RerankWithOriginalVectors.Value); } if (Optional.IsDefined(DefaultOversampling)) { @@ -98,7 +91,6 @@ internal static BinaryQuantizationCompression DeserializeBinaryQuantizationCompr { if (property.Value.ValueKind == JsonValueKind.Null) { - rerankWithOriginalVectors = null; continue; } rerankWithOriginalVectors = property.Value.GetBoolean(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/FacetResult.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/FacetResult.Serialization.cs index 8cb54a984259..857b91bbd87d 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/FacetResult.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/FacetResult.Serialization.cs @@ -19,7 +19,6 @@ internal static FacetResult DeserializeFacetResult(JsonElement element) return null; } long? count = default; - double? sum = default; IReadOnlyDictionary> searchFacets = default; IReadOnlyDictionary additionalProperties = default; Dictionary additionalPropertiesDictionary = new Dictionary(); @@ -34,15 +33,6 @@ internal static FacetResult DeserializeFacetResult(JsonElement element) count = property.Value.GetInt64(); continue; } - if (property.NameEquals("sum"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - sum = property.Value.GetDouble(); - continue; - } if (property.NameEquals("@search.facets"u8)) { if (property.Value.ValueKind == JsonValueKind.Null) @@ -72,7 +62,7 @@ internal static FacetResult DeserializeFacetResult(JsonElement element) additionalPropertiesDictionary.Add(property.Name, property.Value.GetObject()); } additionalProperties = additionalPropertiesDictionary; - return new FacetResult(count, sum, searchFacets ?? new ChangeTrackingDictionary>(), additionalProperties); + return new FacetResult(count, searchFacets ?? new ChangeTrackingDictionary>(), additionalProperties); } /// Deserializes the model from a raw response. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/FacetResult.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/FacetResult.cs index 7370e6daf1c2..fa48a3d346a9 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/FacetResult.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/FacetResult.cs @@ -21,21 +21,17 @@ internal FacetResult() /// Initializes a new instance of . /// The approximate count of documents falling within the bucket described by this facet. - /// The resulting total sum for the facet when a sum metric is requested. /// The nested facet query results for the search operation, organized as a collection of buckets for each faceted field; null if the query did not contain any nested facets. /// Additional Properties. - internal FacetResult(long? count, double? sum, IReadOnlyDictionary> facets, IReadOnlyDictionary additionalProperties) + internal FacetResult(long? count, IReadOnlyDictionary> facets, IReadOnlyDictionary additionalProperties) { Count = count; - Sum = sum; Facets = facets; AdditionalProperties = additionalProperties; } /// The approximate count of documents falling within the bucket described by this facet. public long? Count { get; } - /// The resulting total sum for the facet when a sum metric is requested. - public double? Sum { get; } /// The nested facet query results for the search operation, organized as a collection of buckets for each faceted field; null if the query did not contain any nested facets. public IReadOnlyDictionary> Facets { get; } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexStatisticsSummary.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexStatisticsSummary.Serialization.cs deleted file mode 100644 index 8c7fb7c0c87a..000000000000 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexStatisticsSummary.Serialization.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Text.Json; - -namespace Azure.Search.Documents.Indexes.Models -{ - public partial class IndexStatisticsSummary - { - internal static IndexStatisticsSummary DeserializeIndexStatisticsSummary(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string name = default; - long documentCount = default; - long storageSize = default; - long vectorIndexSize = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("name"u8)) - { - name = property.Value.GetString(); - continue; - } - if (property.NameEquals("documentCount"u8)) - { - documentCount = property.Value.GetInt64(); - continue; - } - if (property.NameEquals("storageSize"u8)) - { - storageSize = property.Value.GetInt64(); - continue; - } - if (property.NameEquals("vectorIndexSize"u8)) - { - vectorIndexSize = property.Value.GetInt64(); - continue; - } - } - return new IndexStatisticsSummary(name, documentCount, storageSize, vectorIndexSize); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static IndexStatisticsSummary FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeIndexStatisticsSummary(document.RootElement); - } - } -} diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexStatisticsSummary.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexStatisticsSummary.cs deleted file mode 100644 index 4f178cffee0d..000000000000 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexStatisticsSummary.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; - -namespace Azure.Search.Documents.Indexes.Models -{ - /// Statistics for a given index. Statistics are collected periodically and are not guaranteed to always be up-to-date. - public partial class IndexStatisticsSummary - { - /// Initializes a new instance of . - /// The name of the index. - /// The number of documents in the index. - /// The amount of storage in bytes consumed by the index. - /// The amount of memory in bytes consumed by vectors in the index. - /// is null. - internal IndexStatisticsSummary(string name, long documentCount, long storageSize, long vectorIndexSize) - { - Argument.AssertNotNull(name, nameof(name)); - - Name = name; - DocumentCount = documentCount; - StorageSize = storageSize; - VectorIndexSize = vectorIndexSize; - } - - /// The name of the index. - public string Name { get; } - /// The number of documents in the index. - public long DocumentCount { get; } - /// The amount of storage in bytes consumed by the index. - public long StorageSize { get; } - /// The amount of memory in bytes consumed by vectors in the index. - public long VectorIndexSize { get; } - } -} diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ListIndexStatsSummary.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ListIndexStatsSummary.Serialization.cs deleted file mode 100644 index 057ab563766c..000000000000 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ListIndexStatsSummary.Serialization.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; - -namespace Azure.Search.Documents.Indexes.Models -{ - public partial class ListIndexStatsSummary - { - internal static ListIndexStatsSummary DeserializeListIndexStatsSummary(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IReadOnlyList value = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("value"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(IndexStatisticsSummary.DeserializeIndexStatisticsSummary(item)); - } - value = array; - continue; - } - } - return new ListIndexStatsSummary(value); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static ListIndexStatsSummary FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeListIndexStatsSummary(document.RootElement); - } - } -} diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ListIndexStatsSummary.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ListIndexStatsSummary.cs deleted file mode 100644 index 3cd8803f85bc..000000000000 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ListIndexStatsSummary.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Linq; - -namespace Azure.Search.Documents.Indexes.Models -{ - /// Response from a request to retrieve stats summary of all indexes. If successful, it includes the stats of each index in the service. - public partial class ListIndexStatsSummary - { - /// Initializes a new instance of . - /// The Statistics summary of all indexes in the Search service. - internal ListIndexStatsSummary(IEnumerable indexesStatistics) - { - IndexesStatistics = indexesStatistics.ToList(); - } - - /// Initializes a new instance of . - /// The Statistics summary of all indexes in the Search service. - internal ListIndexStatsSummary(IReadOnlyList indexesStatistics) - { - IndexesStatistics = indexesStatistics; - } - - /// The Statistics summary of all indexes in the Search service. - public IReadOnlyList IndexesStatistics { get; } - } -} diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ScalarQuantizationCompression.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ScalarQuantizationCompression.Serialization.cs index 0b68cdef505e..cdb6dd2ee977 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ScalarQuantizationCompression.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/ScalarQuantizationCompression.Serialization.cs @@ -26,15 +26,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(RerankWithOriginalVectors)) { - if (RerankWithOriginalVectors != null) - { - writer.WritePropertyName("rerankWithOriginalVectors"u8); - writer.WriteBooleanValue(RerankWithOriginalVectors.Value); - } - else - { - writer.WriteNull("rerankWithOriginalVectors"); - } + writer.WritePropertyName("rerankWithOriginalVectors"u8); + writer.WriteBooleanValue(RerankWithOriginalVectors.Value); } if (Optional.IsDefined(DefaultOversampling)) { @@ -113,7 +106,6 @@ internal static ScalarQuantizationCompression DeserializeScalarQuantizationCompr { if (property.Value.ValueKind == JsonValueKind.Null) { - rerankWithOriginalVectors = null; continue; } rerankWithOriginalVectors = property.Value.GetBoolean(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchDocumentsResult.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchDocumentsResult.cs index 1e3b5acb2fff..afba0fd4e874 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchDocumentsResult.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchDocumentsResult.cs @@ -27,20 +27,20 @@ internal SearchDocumentsResult(IEnumerable results) /// A value indicating the percentage of the index that was included in the query, or null if minimumCoverage was not specified in the request. /// The facet query results for the search operation, organized as a collection of buckets for each faceted field; null if the query did not include any facet expressions. /// The answers query results for the search operation; null if the answers query parameter was not specified or set to 'none'. - /// Debug information that applies to the search results as a whole. + /// Debug information that applies to the search results as a whole. /// Continuation JSON payload returned when the query can't return all the requested results in a single response. You can use this JSON along with @odata.nextLink to formulate another POST Search request to get the next part of the search response. /// The sequence of results returned by the query. /// Continuation URL returned when the query can't return all the requested results in a single response. You can use this URL to formulate another GET or POST Search request to get the next part of the search response. Make sure to use the same verb (GET or POST) as the request that produced this response. /// Reason that a partial response was returned for a semantic ranking request. /// Type of partial response that was returned for a semantic ranking request. /// Type of query rewrite that was used to retrieve documents. - internal SearchDocumentsResult(long? count, double? coverage, IReadOnlyDictionary> facets, IReadOnlyList answers, DebugInfo debugInfo, SearchOptions nextPageParameters, IReadOnlyList results, string nextLink, SemanticErrorReason? semanticPartialResponseReason, SemanticSearchResultsType? semanticPartialResponseType, SemanticQueryRewritesResultType? semanticQueryRewritesResultType) + internal SearchDocumentsResult(long? count, double? coverage, IReadOnlyDictionary> facets, IReadOnlyList answers, DebugInfo debug, SearchOptions nextPageParameters, IReadOnlyList results, string nextLink, SemanticErrorReason? semanticPartialResponseReason, SemanticSearchResultsType? semanticPartialResponseType, SemanticQueryRewritesResultType? semanticQueryRewritesResultType) { Count = count; Coverage = coverage; Facets = facets; Answers = answers; - DebugInfo = debugInfo; + Debug = debug; NextPageParameters = nextPageParameters; Results = results; NextLink = nextLink; @@ -58,7 +58,7 @@ internal SearchDocumentsResult(long? count, double? coverage, IReadOnlyDictionar /// The answers query results for the search operation; null if the answers query parameter was not specified or set to 'none'. public IReadOnlyList Answers { get; } /// Debug information that applies to the search results as a whole. - public DebugInfo DebugInfo { get; } + public DebugInfo Debug { get; } /// Continuation JSON payload returned when the query can't return all the requested results in a single response. You can use this JSON along with @odata.nextLink to formulate another POST Search request to get the next part of the search response. public SearchOptions NextPageParameters { get; } /// The sequence of results returned by the query. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerCache.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerCache.Serialization.cs index 1b2596884feb..d08e1ac14ee6 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerCache.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerCache.Serialization.cs @@ -15,11 +15,6 @@ public partial class SearchIndexerCache : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(Id)) - { - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - } if (Optional.IsDefined(StorageConnectionString)) { writer.WritePropertyName("storageConnectionString"u8); @@ -58,17 +53,11 @@ internal static SearchIndexerCache DeserializeSearchIndexerCache(JsonElement ele { return null; } - string id = default; string storageConnectionString = default; bool? enableReprocessing = default; SearchIndexerDataIdentity identity = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } if (property.NameEquals("storageConnectionString"u8)) { storageConnectionString = property.Value.GetString(); @@ -95,7 +84,7 @@ internal static SearchIndexerCache DeserializeSearchIndexerCache(JsonElement ele continue; } } - return new SearchIndexerCache(id, storageConnectionString, enableReprocessing, identity); + return new SearchIndexerCache(storageConnectionString, enableReprocessing, identity); } /// Deserializes the model from a raw response. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerCache.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerCache.cs index 2a7e3b785262..bddd36fa0a5a 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerCache.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerCache.cs @@ -16,7 +16,6 @@ public SearchIndexerCache() } /// Initializes a new instance of . - /// A guid for the SearchIndexerCache. /// The connection string to the storage account where the cache data will be persisted. /// Specifies whether incremental reprocessing is enabled. /// @@ -24,16 +23,12 @@ public SearchIndexerCache() /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include and . /// - internal SearchIndexerCache(string id, string storageConnectionString, bool? enableReprocessing, SearchIndexerDataIdentity identity) + internal SearchIndexerCache(string storageConnectionString, bool? enableReprocessing, SearchIndexerDataIdentity identity) { - Id = id; StorageConnectionString = storageConnectionString; EnableReprocessing = enableReprocessing; Identity = identity; } - - /// A guid for the SearchIndexerCache. - public string Id { get; set; } /// Specifies whether incremental reprocessing is enabled. public bool? EnableReprocessing { get; set; } /// diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchResourceEncryptionKey.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchResourceEncryptionKey.Serialization.cs index da4aa4996060..97ca75c316f9 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchResourceEncryptionKey.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchResourceEncryptionKey.Serialization.cs @@ -17,11 +17,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteStartObject(); writer.WritePropertyName("keyVaultKeyName"u8); writer.WriteStringValue(KeyName); - if (Optional.IsDefined(KeyVersion)) - { - writer.WritePropertyName("keyVaultKeyVersion"u8); - writer.WriteStringValue(KeyVersion); - } + writer.WritePropertyName("keyVaultKeyVersion"u8); + writer.WriteStringValue(KeyVersion); writer.WritePropertyName("keyVaultUri"u8); writer.WriteStringValue(_vaultUri); if (Optional.IsDefined(AccessCredentialsInternal)) diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchResourceEncryptionKey.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchResourceEncryptionKey.cs index bbb9e6c17fa1..cfa721e80570 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchResourceEncryptionKey.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchResourceEncryptionKey.cs @@ -12,6 +12,22 @@ namespace Azure.Search.Documents.Indexes.Models /// A customer-managed encryption key in Azure Key Vault. Keys that you create and manage can be used to encrypt or decrypt data-at-rest, such as indexes and synonym maps. public partial class SearchResourceEncryptionKey { + /// Initializes a new instance of . + /// The name of your Azure Key Vault key to be used to encrypt your data at rest. + /// The version of your Azure Key Vault key to be used to encrypt your data at rest. + /// The URI of your Azure Key Vault, also referred to as DNS name, that contains the key to be used to encrypt your data at rest. An example URI might be `https://my-keyvault-name.vault.azure.net`. + /// , or is null. + public SearchResourceEncryptionKey(string keyName, string keyVersion, string vaultUri) + { + Argument.AssertNotNull(keyName, nameof(keyName)); + Argument.AssertNotNull(keyVersion, nameof(keyVersion)); + Argument.AssertNotNull(vaultUri, nameof(vaultUri)); + + KeyName = keyName; + KeyVersion = keyVersion; + _vaultUri = vaultUri; + } + /// Initializes a new instance of . /// The name of your Azure Key Vault key to be used to encrypt your data at rest. /// The version of your Azure Key Vault key to be used to encrypt your data at rest. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SemanticConfiguration.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SemanticConfiguration.Serialization.cs index c6cbc8142492..d45f9b7d5886 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SemanticConfiguration.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SemanticConfiguration.Serialization.cs @@ -19,11 +19,6 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteStringValue(Name); writer.WritePropertyName("prioritizedFields"u8); writer.WriteObjectValue(PrioritizedFields); - if (Optional.IsDefined(FlightingOptIn)) - { - writer.WritePropertyName("flightingOptIn"u8); - writer.WriteBooleanValue(FlightingOptIn.Value); - } writer.WriteEndObject(); } @@ -35,7 +30,6 @@ internal static SemanticConfiguration DeserializeSemanticConfiguration(JsonEleme } string name = default; SemanticPrioritizedFields prioritizedFields = default; - bool? flightingOptIn = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("name"u8)) @@ -48,17 +42,8 @@ internal static SemanticConfiguration DeserializeSemanticConfiguration(JsonEleme prioritizedFields = SemanticPrioritizedFields.DeserializeSemanticPrioritizedFields(property.Value); continue; } - if (property.NameEquals("flightingOptIn"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - flightingOptIn = property.Value.GetBoolean(); - continue; - } } - return new SemanticConfiguration(name, prioritizedFields, flightingOptIn); + return new SemanticConfiguration(name, prioritizedFields); } /// Deserializes the model from a raw response. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SemanticConfiguration.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SemanticConfiguration.cs index cc03bf762248..6d38d73c985a 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SemanticConfiguration.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SemanticConfiguration.cs @@ -25,22 +25,9 @@ public SemanticConfiguration(string name, SemanticPrioritizedFields prioritizedF PrioritizedFields = prioritizedFields; } - /// Initializes a new instance of . - /// The name of the semantic configuration. - /// Describes the title, content, and keyword fields to be used for semantic ranking, captions, highlights, and answers. At least one of the three sub properties (titleField, prioritizedKeywordsFields and prioritizedContentFields) need to be set. - /// Determines how which semantic or query rewrite models to use during model flighting/upgrades. - internal SemanticConfiguration(string name, SemanticPrioritizedFields prioritizedFields, bool? flightingOptIn) - { - Name = name; - PrioritizedFields = prioritizedFields; - FlightingOptIn = flightingOptIn; - } - /// The name of the semantic configuration. public string Name { get; set; } /// Describes the title, content, and keyword fields to be used for semantic ranking, captions, highlights, and answers. At least one of the three sub properties (titleField, prioritizedKeywordsFields and prioritizedContentFields) need to be set. public SemanticPrioritizedFields PrioritizedFields { get; set; } - /// Determines how which semantic or query rewrite models to use during model flighting/upgrades. - public bool? FlightingOptIn { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/TokenFilterName.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/TokenFilterName.cs index 4a73a4c73841..218e1c1685af 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/TokenFilterName.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/TokenFilterName.cs @@ -65,7 +65,7 @@ public TokenFilterName(string value) public static TokenFilterName AsciiFolding { get; } = new TokenFilterName(AsciiFoldingValue); /// Forms bigrams of CJK terms that are generated from the standard tokenizer. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/cjk/CJKBigramFilter.html. public static TokenFilterName CjkBigram { get; } = new TokenFilterName(CjkBigramValue); - /// Normalizes CJK width differences. Folds fullwidth ASCII variants into the equivalent basic Latin, and half-width Katakana variants into the equivalent Kana. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/cjk/CJKWidthFilter.html. + /// Normalizes CJK width differences. Folds full-width ASCII variants into the equivalent basic Latin, and half-width Katakana variants into the equivalent Kana. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/cjk/CJKWidthFilter.html. public static TokenFilterName CjkWidth { get; } = new TokenFilterName(CjkWidthValue); /// Removes English possessives, and dots from acronyms. See http://lucene.apache.org/core/4_10_3/analyzers-common/org/apache/lucene/analysis/standard/ClassicFilter.html. public static TokenFilterName Classic { get; } = new TokenFilterName(ClassicValue); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/UnknownVectorSearchCompression.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/UnknownVectorSearchCompression.Serialization.cs index 393d0ed3a494..8b2b81021366 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/UnknownVectorSearchCompression.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/UnknownVectorSearchCompression.Serialization.cs @@ -22,15 +22,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(RerankWithOriginalVectors)) { - if (RerankWithOriginalVectors != null) - { - writer.WritePropertyName("rerankWithOriginalVectors"u8); - writer.WriteBooleanValue(RerankWithOriginalVectors.Value); - } - else - { - writer.WriteNull("rerankWithOriginalVectors"); - } + writer.WritePropertyName("rerankWithOriginalVectors"u8); + writer.WriteBooleanValue(RerankWithOriginalVectors.Value); } if (Optional.IsDefined(DefaultOversampling)) { @@ -99,7 +92,6 @@ internal static UnknownVectorSearchCompression DeserializeUnknownVectorSearchCom { if (property.Value.ValueKind == JsonValueKind.Null) { - rerankWithOriginalVectors = null; continue; } rerankWithOriginalVectors = property.Value.GetBoolean(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/VectorSearchCompression.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/VectorSearchCompression.Serialization.cs index 71de5c7b0d7d..303a8552a462 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/VectorSearchCompression.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/VectorSearchCompression.Serialization.cs @@ -22,15 +22,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(RerankWithOriginalVectors)) { - if (RerankWithOriginalVectors != null) - { - writer.WritePropertyName("rerankWithOriginalVectors"u8); - writer.WriteBooleanValue(RerankWithOriginalVectors.Value); - } - else - { - writer.WriteNull("rerankWithOriginalVectors"); - } + writer.WritePropertyName("rerankWithOriginalVectors"u8); + writer.WriteBooleanValue(RerankWithOriginalVectors.Value); } if (Optional.IsDefined(DefaultOversampling)) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/VectorSearchVectorizerKind.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/VectorSearchVectorizerKind.cs index bef6730ac985..7443589ba5fc 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/VectorSearchVectorizerKind.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/VectorSearchVectorizerKind.cs @@ -33,7 +33,7 @@ public VectorSearchVectorizerKind(string value) public static VectorSearchVectorizerKind CustomWebApi { get; } = new VectorSearchVectorizerKind(CustomWebApiValue); /// Generate embeddings for an image or text input at query time using the Azure AI Services Vision Vectorize API. public static VectorSearchVectorizerKind AIServicesVision { get; } = new VectorSearchVectorizerKind(AIServicesVisionValue); - /// Generate embeddings using an Azure Machine Learning endpoint deployed via the Azure AI Studio Model Catalog at query time. + /// Generate embeddings using an Azure Machine Learning endpoint deployed via the Azure AI Foundry Model Catalog at query time. public static VectorSearchVectorizerKind AML { get; } = new VectorSearchVectorizerKind(AMLValue); /// Determines if two values are the same. public static bool operator ==(VectorSearchVectorizerKind left, VectorSearchVectorizerKind right) => left.Equals(right); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/SearchModelFactory.cs b/sdk/search/Azure.Search.Documents/src/Generated/SearchModelFactory.cs index 35935eb9ddb3..15d3056d77f1 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/SearchModelFactory.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/SearchModelFactory.cs @@ -15,18 +15,149 @@ namespace Azure.Search.Documents.Models /// Model factory for models. public static partial class SearchModelFactory { + /// Initializes a new instance of . + /// Overall indexer status. + /// The result of the most recent or an in-progress indexer execution. + /// History of the recent indexer executions, sorted in reverse chronological order. + /// The execution limits for the indexer. + /// A new instance for mocking. + public static SearchIndexerStatus SearchIndexerStatus(IndexerStatus status = default, IndexerExecutionResult lastResult = null, IEnumerable executionHistory = null, SearchIndexerLimits limits = null) + { + executionHistory ??= new List(); + + return new SearchIndexerStatus(status, lastResult, executionHistory?.ToList(), limits); + } + + /// Initializes a new instance of . + /// The outcome of this indexer execution. + /// The outcome of this indexer execution. + /// All of the state that defines and dictates the indexer's current execution. + /// The error message indicating the top-level error, if any. + /// The start time of this indexer execution. + /// The end time of this indexer execution, if the execution has already completed. + /// The item-level indexing errors. + /// The item-level indexing warnings. + /// The number of items that were processed during this indexer execution. This includes both successfully processed items and items where indexing was attempted but failed. + /// The number of items that failed to be indexed during this indexer execution. + /// Change tracking state with which an indexer execution started. + /// Change tracking state with which an indexer execution finished. + /// A new instance for mocking. + public static IndexerExecutionResult IndexerExecutionResult(IndexerExecutionStatus status = default, IndexerExecutionStatusDetail? statusDetail = null, IndexerState currentState = null, string errorMessage = null, DateTimeOffset? startTime = null, DateTimeOffset? endTime = null, IEnumerable errors = null, IEnumerable warnings = null, int itemCount = default, int failedItemCount = default, string initialTrackingState = null, string finalTrackingState = null) + { + errors ??= new List(); + warnings ??= new List(); + + return new IndexerExecutionResult( + status, + statusDetail, + currentState, + errorMessage, + startTime, + endTime, + errors?.ToList(), + warnings?.ToList(), + itemCount, + failedItemCount, + initialTrackingState, + finalTrackingState); + } + + /// Initializes a new instance of . + /// The number of documents in the index. + /// The amount of storage in bytes consumed by the index. + /// The amount of memory in bytes consumed by vectors in the index. + /// A new instance for mocking. + public static SearchIndexStatistics SearchIndexStatistics(long documentCount = default, long storageSize = default, long vectorIndexSize = default) + { + return new SearchIndexStatistics(documentCount, storageSize, vectorIndexSize); + } + + /// Initializes a new instance of . + /// Total number of aliases. + /// Total number of documents across all indexes in the service. + /// Total number of indexes. + /// Total number of indexers. + /// Total number of data sources. + /// Total size of used storage in bytes. + /// Total number of synonym maps. + /// Total number of skillsets. + /// Total memory consumption of all vector indexes within the service, in bytes. + /// , , , , , , , or is null. + /// A new instance for mocking. + public static SearchServiceCounters SearchServiceCounters(SearchResourceCounter aliasCounter = null, SearchResourceCounter documentCounter = null, SearchResourceCounter indexCounter = null, SearchResourceCounter indexerCounter = null, SearchResourceCounter dataSourceCounter = null, SearchResourceCounter storageSizeCounter = null, SearchResourceCounter synonymMapCounter = null, SearchResourceCounter skillsetCounter = null, SearchResourceCounter vectorIndexSizeCounter = null) + { + if (aliasCounter == null) + { + throw new ArgumentNullException(nameof(aliasCounter)); + } + if (documentCounter == null) + { + throw new ArgumentNullException(nameof(documentCounter)); + } + if (indexCounter == null) + { + throw new ArgumentNullException(nameof(indexCounter)); + } + if (indexerCounter == null) + { + throw new ArgumentNullException(nameof(indexerCounter)); + } + if (dataSourceCounter == null) + { + throw new ArgumentNullException(nameof(dataSourceCounter)); + } + if (storageSizeCounter == null) + { + throw new ArgumentNullException(nameof(storageSizeCounter)); + } + if (synonymMapCounter == null) + { + throw new ArgumentNullException(nameof(synonymMapCounter)); + } + if (skillsetCounter == null) + { + throw new ArgumentNullException(nameof(skillsetCounter)); + } + if (vectorIndexSizeCounter == null) + { + throw new ArgumentNullException(nameof(vectorIndexSizeCounter)); + } + + return new SearchServiceCounters( + aliasCounter, + documentCounter, + indexCounter, + indexerCounter, + dataSourceCounter, + storageSizeCounter, + synonymMapCounter, + skillsetCounter, + vectorIndexSizeCounter); + } + + /// Initializes a new instance of . + /// The maximum allowed fields per index. + /// The maximum depth which you can nest sub-fields in an index, including the top-level complex field. For example, a/b/c has a nesting depth of 3. + /// The maximum number of fields of type Collection(Edm.ComplexType) allowed in an index. + /// The maximum number of objects in complex collections allowed per document. + /// The maximum amount of storage in bytes allowed per index. + /// A new instance for mocking. + public static SearchServiceLimits SearchServiceLimits(int? maxFieldsPerIndex = null, int? maxFieldNestingDepthPerIndex = null, int? maxComplexCollectionFieldsPerIndex = null, int? maxComplexObjectsInCollectionsPerDocument = null, long? maxStoragePerIndexInBytes = null) + { + return new SearchServiceLimits(maxFieldsPerIndex, maxFieldNestingDepthPerIndex, maxComplexCollectionFieldsPerIndex, maxComplexObjectsInCollectionsPerDocument, maxStoragePerIndexInBytes); + } + /// Initializes a new instance of . /// The approximate count of documents falling within the bucket described by this facet. - /// The resulting total sum for the facet when a sum metric is requested. /// The nested facet query results for the search operation, organized as a collection of buckets for each faceted field; null if the query did not contain any nested facets. /// Additional Properties. /// A new instance for mocking. - public static FacetResult FacetResult(long? count = null, double? sum = null, IReadOnlyDictionary> facets = null, IReadOnlyDictionary additionalProperties = null) + public static FacetResult FacetResult(long? count = null, IReadOnlyDictionary> facets = null, IReadOnlyDictionary additionalProperties = null) { facets ??= new Dictionary>(); additionalProperties ??= new Dictionary(); - return new FacetResult(count, sum, facets, additionalProperties); + return new FacetResult(count, facets, additionalProperties); } /// Initializes a new instance of . @@ -174,164 +305,5 @@ public static AutocompleteResults AutocompleteResults(double? coverage = null, I return new AutocompleteResults(coverage, results?.ToList()); } - - /// Initializes a new instance of . - /// Overall indexer status. - /// The result of the most recent or an in-progress indexer execution. - /// History of the recent indexer executions, sorted in reverse chronological order. - /// The execution limits for the indexer. - /// A new instance for mocking. - public static SearchIndexerStatus SearchIndexerStatus(IndexerStatus status = default, IndexerExecutionResult lastResult = null, IEnumerable executionHistory = null, SearchIndexerLimits limits = null) - { - executionHistory ??= new List(); - - return new SearchIndexerStatus(status, lastResult, executionHistory?.ToList(), limits); - } - - /// Initializes a new instance of . - /// The outcome of this indexer execution. - /// The outcome of this indexer execution. - /// All of the state that defines and dictates the indexer's current execution. - /// The error message indicating the top-level error, if any. - /// The start time of this indexer execution. - /// The end time of this indexer execution, if the execution has already completed. - /// The item-level indexing errors. - /// The item-level indexing warnings. - /// The number of items that were processed during this indexer execution. This includes both successfully processed items and items where indexing was attempted but failed. - /// The number of items that failed to be indexed during this indexer execution. - /// Change tracking state with which an indexer execution started. - /// Change tracking state with which an indexer execution finished. - /// A new instance for mocking. - public static IndexerExecutionResult IndexerExecutionResult(IndexerExecutionStatus status = default, IndexerExecutionStatusDetail? statusDetail = null, IndexerState currentState = null, string errorMessage = null, DateTimeOffset? startTime = null, DateTimeOffset? endTime = null, IEnumerable errors = null, IEnumerable warnings = null, int itemCount = default, int failedItemCount = default, string initialTrackingState = null, string finalTrackingState = null) - { - errors ??= new List(); - warnings ??= new List(); - - return new IndexerExecutionResult( - status, - statusDetail, - currentState, - errorMessage, - startTime, - endTime, - errors?.ToList(), - warnings?.ToList(), - itemCount, - failedItemCount, - initialTrackingState, - finalTrackingState); - } - - /// Initializes a new instance of . - /// The number of documents in the index. - /// The amount of storage in bytes consumed by the index. - /// The amount of memory in bytes consumed by vectors in the index. - /// A new instance for mocking. - public static SearchIndexStatistics SearchIndexStatistics(long documentCount = default, long storageSize = default, long vectorIndexSize = default) - { - return new SearchIndexStatistics(documentCount, storageSize, vectorIndexSize); - } - - /// Initializes a new instance of . - /// Total number of aliases. - /// Total number of documents across all indexes in the service. - /// Total number of indexes. - /// Total number of indexers. - /// Total number of data sources. - /// Total size of used storage in bytes. - /// Total number of synonym maps. - /// Total number of skillsets. - /// Total memory consumption of all vector indexes within the service, in bytes. - /// , , , , , , , or is null. - /// A new instance for mocking. - public static SearchServiceCounters SearchServiceCounters(SearchResourceCounter aliasCounter = null, SearchResourceCounter documentCounter = null, SearchResourceCounter indexCounter = null, SearchResourceCounter indexerCounter = null, SearchResourceCounter dataSourceCounter = null, SearchResourceCounter storageSizeCounter = null, SearchResourceCounter synonymMapCounter = null, SearchResourceCounter skillsetCounter = null, SearchResourceCounter vectorIndexSizeCounter = null) - { - if (aliasCounter == null) - { - throw new ArgumentNullException(nameof(aliasCounter)); - } - if (documentCounter == null) - { - throw new ArgumentNullException(nameof(documentCounter)); - } - if (indexCounter == null) - { - throw new ArgumentNullException(nameof(indexCounter)); - } - if (indexerCounter == null) - { - throw new ArgumentNullException(nameof(indexerCounter)); - } - if (dataSourceCounter == null) - { - throw new ArgumentNullException(nameof(dataSourceCounter)); - } - if (storageSizeCounter == null) - { - throw new ArgumentNullException(nameof(storageSizeCounter)); - } - if (synonymMapCounter == null) - { - throw new ArgumentNullException(nameof(synonymMapCounter)); - } - if (skillsetCounter == null) - { - throw new ArgumentNullException(nameof(skillsetCounter)); - } - if (vectorIndexSizeCounter == null) - { - throw new ArgumentNullException(nameof(vectorIndexSizeCounter)); - } - - return new SearchServiceCounters( - aliasCounter, - documentCounter, - indexCounter, - indexerCounter, - dataSourceCounter, - storageSizeCounter, - synonymMapCounter, - skillsetCounter, - vectorIndexSizeCounter); - } - - /// Initializes a new instance of . - /// The maximum allowed fields per index. - /// The maximum depth which you can nest sub-fields in an index, including the top-level complex field. For example, a/b/c has a nesting depth of 3. - /// The maximum number of fields of type Collection(Edm.ComplexType) allowed in an index. - /// The maximum number of objects in complex collections allowed per document. - /// The maximum amount of storage in bytes allowed per index. - /// A new instance for mocking. - public static SearchServiceLimits SearchServiceLimits(int? maxFieldsPerIndex = null, int? maxFieldNestingDepthPerIndex = null, int? maxComplexCollectionFieldsPerIndex = null, int? maxComplexObjectsInCollectionsPerDocument = null, long? maxStoragePerIndexInBytes = null) - { - return new SearchServiceLimits(maxFieldsPerIndex, maxFieldNestingDepthPerIndex, maxComplexCollectionFieldsPerIndex, maxComplexObjectsInCollectionsPerDocument, maxStoragePerIndexInBytes); - } - - /// Initializes a new instance of . - /// The Statistics summary of all indexes in the Search service. - /// A new instance for mocking. - public static ListIndexStatsSummary ListIndexStatsSummary(IEnumerable indexesStatistics = null) - { - indexesStatistics ??= new List(); - - return new ListIndexStatsSummary(indexesStatistics?.ToList()); - } - - /// Initializes a new instance of . - /// The name of the index. - /// The number of documents in the index. - /// The amount of storage in bytes consumed by the index. - /// The amount of memory in bytes consumed by vectors in the index. - /// is null. - /// A new instance for mocking. - public static IndexStatisticsSummary IndexStatisticsSummary(string name = null, long documentCount = default, long storageSize = default, long vectorIndexSize = default) - { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - return new IndexStatisticsSummary(name, documentCount, storageSize, vectorIndexSize); - } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/SearchServiceRestClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/SearchServiceRestClient.cs index 29fc4d3efd08..455680d4c694 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/SearchServiceRestClient.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/SearchServiceRestClient.cs @@ -32,7 +32,7 @@ internal partial class SearchServiceRestClient /// The tracking ID sent with the request to help with debugging. /// Api Version. /// , , or is null. - public SearchServiceRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2025-03-01-preview") + public SearchServiceRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2024-11-01-preview") { ClientDiagnostics = clientDiagnostics ?? throw new ArgumentNullException(nameof(clientDiagnostics)); _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); @@ -94,59 +94,5 @@ public Response GetServiceStatistics(CancellationToken throw new RequestFailedException(message.Response); } } - - internal HttpMessage CreateGetIndexStatsSummaryRequest() - { - var message = _pipeline.CreateMessage(); - var request = message.Request; - request.Method = RequestMethod.Get; - var uri = new RawRequestUriBuilder(); - uri.AppendRaw(_endpoint, false); - uri.AppendPath("/indexstats", false); - uri.AppendQuery("api-version", _apiVersion, true); - request.Uri = uri; - request.Headers.Add("Accept", "application/json; odata.metadata=minimal"); - return message; - } - - /// Retrieves a summary of statistics for all indexes in the search service. - /// The cancellation token to use. - public async Task> GetIndexStatsSummaryAsync(CancellationToken cancellationToken = default) - { - using var message = CreateGetIndexStatsSummaryRequest(); - await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); - switch (message.Response.Status) - { - case 200: - { - ListIndexStatsSummary value = default; - using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false); - value = ListIndexStatsSummary.DeserializeListIndexStatsSummary(document.RootElement); - return Response.FromValue(value, message.Response); - } - default: - throw new RequestFailedException(message.Response); - } - } - - /// Retrieves a summary of statistics for all indexes in the search service. - /// The cancellation token to use. - public Response GetIndexStatsSummary(CancellationToken cancellationToken = default) - { - using var message = CreateGetIndexStatsSummaryRequest(); - _pipeline.Send(message, cancellationToken); - switch (message.Response.Status) - { - case 200: - { - ListIndexStatsSummary value = default; - using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions); - value = ListIndexStatsSummary.DeserializeListIndexStatsSummary(document.RootElement); - return Response.FromValue(value, message.Response); - } - default: - throw new RequestFailedException(message.Response); - } - } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/SkillsetsRestClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/SkillsetsRestClient.cs index f9c5d975e2ce..29ff7500fa13 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/SkillsetsRestClient.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/SkillsetsRestClient.cs @@ -33,7 +33,7 @@ internal partial class SkillsetsRestClient /// The tracking ID sent with the request to help with debugging. /// Api Version. /// , , or is null. - public SkillsetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2025-03-01-preview") + public SkillsetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2024-11-01-preview") { ClientDiagnostics = clientDiagnostics ?? throw new ArgumentNullException(nameof(clientDiagnostics)); _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/SynonymMapsRestClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/SynonymMapsRestClient.cs index 27411a284510..8f59b4b04278 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/SynonymMapsRestClient.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/SynonymMapsRestClient.cs @@ -32,7 +32,7 @@ internal partial class SynonymMapsRestClient /// The tracking ID sent with the request to help with debugging. /// Api Version. /// , , or is null. - public SynonymMapsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2025-03-01-preview") + public SynonymMapsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, Guid? xMsClientRequestId = null, string apiVersion = "2024-11-01-preview") { ClientDiagnostics = clientDiagnostics ?? throw new ArgumentNullException(nameof(clientDiagnostics)); _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); diff --git a/sdk/search/Azure.Search.Documents/src/autorest.md b/sdk/search/Azure.Search.Documents/src/autorest.md index 689c9034ba14..a0bf7129471d 100644 --- a/sdk/search/Azure.Search.Documents/src/autorest.md +++ b/sdk/search/Azure.Search.Documents/src/autorest.md @@ -10,9 +10,8 @@ See the [Contributing guidelines](https://github.com/Azure/azure-sdk-for-net/blo ## Swagger Source(s) ```yaml title: SearchServiceClient -input-file: - - https://github.com/Azure/azure-rest-api-specs/blob/8c53aa7023e66a9ec24ede6a9fad0ed730d62515/specification/search/data-plane/Azure.Search/preview/2025-03-01-preview/searchindex.json - - https://github.com/Azure/azure-rest-api-specs/blob/8c53aa7023e66a9ec24ede6a9fad0ed730d62515/specification/search/data-plane/Azure.Search/preview/2025-03-01-preview/searchservice.json +require: +- /mnt/vss/_work/1/s/azure-rest-api-specs/specification/search/data-plane/Azure.Search/readme.md generation1-convenience-client: true deserialize-null-collection-as-null-value: true ``` @@ -549,3 +548,4 @@ directive: "modelAsString": false } ``` +