diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs index f635a8a9de..41141acf27 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs @@ -74,6 +74,7 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien /// /// /// Delete a legacy index template. +/// IMPORTANT: This documentation is about legacy index templates, which are deprecated and will be replaced by the composable templates introduced in Elasticsearch 7.8. /// /// [System.Text.Json.Serialization.JsonConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateRequestConverter))] @@ -134,6 +135,7 @@ internal DeleteTemplateRequest(Elastic.Clients.Elasticsearch.Serialization.JsonC /// /// /// Delete a legacy index template. +/// IMPORTANT: This documentation is about legacy index templates, which are deprecated and will be replaced by the composable templates introduced in Elasticsearch 7.8. /// /// public readonly partial struct DeleteTemplateRequestDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs index 747d6dc5dc..30f1cfc5a7 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs @@ -79,7 +79,7 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien /// /// -/// Get index templates. +/// Get legacy index templates. /// Get information about one or more index templates. /// /// @@ -150,7 +150,7 @@ internal GetTemplateRequest(Elastic.Clients.Elasticsearch.Serialization.JsonCons /// /// -/// Get index templates. +/// Get legacy index templates. /// Get information about one or more index templates. /// /// diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs index 13b4e0abdb..be23a48f4d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs @@ -134,7 +134,7 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien /// /// -/// Create or update an index template. +/// Create or update a legacy index template. /// Index templates define settings, mappings, and aliases that can be applied automatically to new indices. /// Elasticsearch applies templates to new indices based on an index pattern that matches the index name. /// @@ -275,7 +275,7 @@ internal PutTemplateRequest(Elastic.Clients.Elasticsearch.Serialization.JsonCons /// /// -/// Create or update an index template. +/// Create or update a legacy index template. /// Index templates define settings, mappings, and aliases that can be applied automatically to new indices. /// Elasticsearch applies templates to new indices based on an index pattern that matches the index name. /// @@ -667,7 +667,7 @@ public Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateRequestDescripto /// /// -/// Create or update an index template. +/// Create or update a legacy index template. /// Index templates define settings, mappings, and aliases that can be applied automatically to new indices. /// Elasticsearch applies templates to new indices based on an index pattern that matches the index name. /// diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutJinaaiResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutJinaaiResponse.g.cs index 7b312e81b9..e5176fdbd5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutJinaaiResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutJinaaiResponse.g.cs @@ -40,7 +40,7 @@ public override Elastic.Clients.Elasticsearch.Inference.PutJinaaiResponse Read(r LocalJsonValue propService = default; LocalJsonValue propServiceSettings = default; LocalJsonValue propTaskSettings = default; - LocalJsonValue propTaskType = default; + LocalJsonValue propTaskType = default; while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName) { if (propChunkingSettings.TryReadProperty(ref reader, options, PropChunkingSettings, null)) @@ -177,5 +177,5 @@ internal PutJinaaiResponse(Elastic.Clients.Elasticsearch.Serialization.JsonConst #if NET7_0_OR_GREATER required #endif - Elastic.Clients.Elasticsearch.Inference.TaskType TaskType { get; set; } + Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi TaskType { get; set; } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs index 66d539377c..f5284ca166 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs @@ -1208,6 +1208,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateRespo return DoRequest(request); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateResponse DeleteTemplate(Elastic.Clients.Elasticsearch.Name name) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateRequestDescriptor(name); @@ -1216,6 +1217,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateRespo return DoRequest(request); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateResponse DeleteTemplate(Elastic.Clients.Elasticsearch.Name name, System.Action action) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateRequestDescriptor(name); @@ -1231,6 +1233,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateRespo return DoRequestAsync(request, cancellationToken); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual System.Threading.Tasks.Task DeleteTemplateAsync(Elastic.Clients.Elasticsearch.Name name, System.Threading.CancellationToken cancellationToken = default) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateRequestDescriptor(name); @@ -1239,6 +1242,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateRespo return DoRequestAsync(request, cancellationToken); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual System.Threading.Tasks.Task DeleteTemplateAsync(Elastic.Clients.Elasticsearch.Name name, System.Action action, System.Threading.CancellationToken cancellationToken = default) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.DeleteTemplateRequestDescriptor(name); @@ -3350,6 +3354,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse return DoRequest(request); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse GetTemplate() { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateRequestDescriptor(); @@ -3358,6 +3363,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse return DoRequest(request); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse GetTemplate(System.Action action) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateRequestDescriptor(); @@ -3367,6 +3373,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse return DoRequest(request); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse GetTemplate(Elastic.Clients.Elasticsearch.Names? name) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateRequestDescriptor(name); @@ -3375,6 +3382,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse return DoRequest(request); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse GetTemplate(Elastic.Clients.Elasticsearch.Names? name, System.Action action) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateRequestDescriptor(name); @@ -3390,6 +3398,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse return DoRequestAsync(request, cancellationToken); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual System.Threading.Tasks.Task GetTemplateAsync(System.Threading.CancellationToken cancellationToken = default) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateRequestDescriptor(); @@ -3398,6 +3407,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse return DoRequestAsync(request, cancellationToken); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual System.Threading.Tasks.Task GetTemplateAsync(System.Action action, System.Threading.CancellationToken cancellationToken = default) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateRequestDescriptor(); @@ -3407,6 +3417,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse return DoRequestAsync(request, cancellationToken); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual System.Threading.Tasks.Task GetTemplateAsync(Elastic.Clients.Elasticsearch.Names? name, System.Threading.CancellationToken cancellationToken = default) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateRequestDescriptor(name); @@ -3415,6 +3426,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateResponse return DoRequestAsync(request, cancellationToken); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual System.Threading.Tasks.Task GetTemplateAsync(Elastic.Clients.Elasticsearch.Names? name, System.Action action, System.Threading.CancellationToken cancellationToken = default) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.GetTemplateRequestDescriptor(name); @@ -4156,6 +4168,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateResponse return DoRequest(request); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateResponse PutTemplate(Elastic.Clients.Elasticsearch.Name name) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateRequestDescriptor(name); @@ -4164,6 +4177,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateResponse return DoRequest(request); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateResponse PutTemplate(Elastic.Clients.Elasticsearch.Name name, System.Action action) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateRequestDescriptor(name); @@ -4173,6 +4187,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateResponse return DoRequest(request); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateResponse PutTemplate(Elastic.Clients.Elasticsearch.Name name, System.Action> action) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateRequestDescriptor(name); @@ -4188,6 +4203,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateResponse return DoRequestAsync(request, cancellationToken); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual System.Threading.Tasks.Task PutTemplateAsync(Elastic.Clients.Elasticsearch.Name name, System.Threading.CancellationToken cancellationToken = default) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateRequestDescriptor(name); @@ -4196,6 +4212,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateResponse return DoRequestAsync(request, cancellationToken); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual System.Threading.Tasks.Task PutTemplateAsync(Elastic.Clients.Elasticsearch.Name name, System.Action action, System.Threading.CancellationToken cancellationToken = default) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateRequestDescriptor(name); @@ -4205,6 +4222,7 @@ public virtual Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateResponse return DoRequestAsync(request, cancellationToken); } + [System.Obsolete("Deprecated in '7.8.0'.")] public virtual System.Threading.Tasks.Task PutTemplateAsync(Elastic.Clients.Elasticsearch.Name name, System.Action> action, System.Threading.CancellationToken cancellationToken = default) { var builder = new Elastic.Clients.Elasticsearch.IndexManagement.PutTemplateRequestDescriptor(name); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/ShardProfile.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/ShardProfile.g.cs index 53a0507771..1d6a34f2ad 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/ShardProfile.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/ShardProfile.g.cs @@ -46,7 +46,7 @@ public override Elastic.Clients.Elasticsearch.Core.Search.ShardProfile Read(ref LocalJsonValue propIndex = default; LocalJsonValue propNodeId = default; LocalJsonValue> propSearches = default; - LocalJsonValue propShardId = default; + LocalJsonValue propShardId = default; while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName) { if (propAggregations.TryReadProperty(ref reader, options, PropAggregations, static System.Collections.Generic.IReadOnlyCollection (ref System.Text.Json.Utf8JsonReader r, System.Text.Json.JsonSerializerOptions o) => r.ReadCollectionValue(o, null)!)) @@ -138,7 +138,7 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien public sealed partial class ShardProfile { [System.Diagnostics.CodeAnalysis.SetsRequiredMembers] - public ShardProfile(System.Collections.Generic.IReadOnlyCollection aggregations, string cluster, string id, string index, string nodeId, System.Collections.Generic.IReadOnlyCollection searches, long shardId) + public ShardProfile(System.Collections.Generic.IReadOnlyCollection aggregations, string cluster, string id, string index, string nodeId, System.Collections.Generic.IReadOnlyCollection searches, int shardId) { Aggregations = aggregations; Cluster = cluster; @@ -201,5 +201,5 @@ internal ShardProfile(Elastic.Clients.Elasticsearch.Serialization.JsonConstructo #if NET7_0_OR_GREATER required #endif - long ShardId { get; set; } + int ShardId { get; set; } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Inference.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Inference.g.cs index 4c02a43e4a..9962b1d218 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Inference.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Inference.g.cs @@ -1034,6 +1034,63 @@ public override void WriteAsPropertyName(System.Text.Json.Utf8JsonWriter writer, } } +internal sealed partial class TaskTypeJinaAiConverter : System.Text.Json.Serialization.JsonConverter +{ + private static readonly System.Text.Json.JsonEncodedText MemberRerank = System.Text.Json.JsonEncodedText.Encode("rerank"); + private static readonly System.Text.Json.JsonEncodedText MemberTextEmbedding = System.Text.Json.JsonEncodedText.Encode("text_embedding"); + + public override Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options) + { + if (reader.ValueTextEquals(MemberRerank)) + { + return Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi.Rerank; + } + + if (reader.ValueTextEquals(MemberTextEmbedding)) + { + return Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi.TextEmbedding; + } + + var value = reader.GetString()!; + if (string.Equals(value, MemberRerank.Value, System.StringComparison.OrdinalIgnoreCase)) + { + return Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi.Rerank; + } + + if (string.Equals(value, MemberTextEmbedding.Value, System.StringComparison.OrdinalIgnoreCase)) + { + return Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi.TextEmbedding; + } + + throw new System.Text.Json.JsonException($"Unknown member '{value}' for enum '{nameof(Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi)}'."); + } + + public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi value, System.Text.Json.JsonSerializerOptions options) + { + switch (value) + { + case Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi.Rerank: + writer.WriteStringValue(MemberRerank); + break; + case Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi.TextEmbedding: + writer.WriteStringValue(MemberTextEmbedding); + break; + default: + throw new System.Text.Json.JsonException($"Invalid value '{value}' for enum '{nameof(Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi)}'."); + } + } + + public override Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi ReadAsPropertyName(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options) + { + return Read(ref reader, typeToConvert, options); + } + + public override void WriteAsPropertyName(System.Text.Json.Utf8JsonWriter writer, Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAi value, System.Text.Json.JsonSerializerOptions options) + { + Write(writer, value, options); + } +} + internal sealed partial class CohereEmbeddingTypeConverter : System.Text.Json.Serialization.JsonConverter { private static readonly System.Text.Json.JsonEncodedText MemberByte = System.Text.Json.JsonEncodedText.Encode("byte"); @@ -1647,6 +1704,15 @@ public enum WatsonxTaskType TextEmbedding } +[System.Text.Json.Serialization.JsonConverter(typeof(Elastic.Clients.Elasticsearch.Inference.TaskTypeJinaAiConverter))] +public enum TaskTypeJinaAi +{ + [System.Runtime.Serialization.EnumMember(Value = "rerank")] + Rerank, + [System.Runtime.Serialization.EnumMember(Value = "text_embedding")] + TextEmbedding +} + [System.Text.Json.Serialization.JsonConverter(typeof(Elastic.Clients.Elasticsearch.Inference.CohereEmbeddingTypeConverter))] public enum CohereEmbeddingType { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotShardFailure.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotShardFailure.g.cs index 5fb771dfb0..e228dfc5b6 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotShardFailure.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotShardFailure.g.cs @@ -39,7 +39,7 @@ public override Elastic.Clients.Elasticsearch.Snapshot.SnapshotShardFailure Read LocalJsonValue propIndexUuid = default; LocalJsonValue propNodeId = default; LocalJsonValue propReason = default; - LocalJsonValue propShardId = default; + LocalJsonValue propShardId = default; LocalJsonValue propStatus = default; while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName) { @@ -111,7 +111,7 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien public sealed partial class SnapshotShardFailure { [System.Diagnostics.CodeAnalysis.SetsRequiredMembers] - public SnapshotShardFailure(string index, string indexUuid, string reason, string shardId, string status) + public SnapshotShardFailure(string index, string indexUuid, string reason, int shardId, string status) { Index = index; IndexUuid = indexUuid; @@ -156,7 +156,7 @@ internal SnapshotShardFailure(Elastic.Clients.Elasticsearch.Serialization.JsonCo #if NET7_0_OR_GREATER required #endif - string ShardId { get; set; } + int ShardId { get; set; } public #if NET7_0_OR_GREATER required