Skip to content

Commit 37ee750

Browse files
floberndflobernd
committed
Simplify inference requests
1 parent 7e163f4 commit 37ee750

18 files changed

+68
-1207
lines changed

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutAlibabacloudRequest.g.cs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAlibabacloudRequest R
3838
{
3939
reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
4040
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.InferenceChunkingSettings?> propChunkingSettings = default;
41-
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AlibabaCloudServiceType> propService = default;
4241
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AlibabaCloudServiceSettings> propServiceSettings = default;
4342
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AlibabaCloudTaskSettings?> propTaskSettings = default;
4443
while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
@@ -48,8 +47,9 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAlibabacloudRequest R
4847
continue;
4948
}
5049

51-
if (propService.TryReadProperty(ref reader, options, PropService, null))
50+
if (reader.ValueTextEquals(PropService))
5251
{
52+
reader.Skip();
5353
continue;
5454
}
5555

@@ -76,7 +76,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAlibabacloudRequest R
7676
return new Elastic.Clients.Elasticsearch.Inference.PutAlibabacloudRequest(Elastic.Clients.Elasticsearch.Serialization.JsonConstructorSentinel.Instance)
7777
{
7878
ChunkingSettings = propChunkingSettings.Value,
79-
Service = propService.Value,
8079
ServiceSettings = propServiceSettings.Value,
8180
TaskSettings = propTaskSettings.Value
8281
};
@@ -118,9 +117,8 @@ public PutAlibabacloudRequest(Elastic.Clients.Elasticsearch.Inference.AlibabaClo
118117
}
119118

120119
[System.Diagnostics.CodeAnalysis.SetsRequiredMembers]
121-
public PutAlibabacloudRequest(Elastic.Clients.Elasticsearch.Inference.AlibabaCloudTaskType taskType, Elastic.Clients.Elasticsearch.Id alibabacloudInferenceId, Elastic.Clients.Elasticsearch.Inference.AlibabaCloudServiceType service, Elastic.Clients.Elasticsearch.Inference.AlibabaCloudServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("alibabacloud_inference_id", alibabacloudInferenceId))
120+
public PutAlibabacloudRequest(Elastic.Clients.Elasticsearch.Inference.AlibabaCloudTaskType taskType, Elastic.Clients.Elasticsearch.Id alibabacloudInferenceId, Elastic.Clients.Elasticsearch.Inference.AlibabaCloudServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("alibabacloud_inference_id", alibabacloudInferenceId))
122121
{
123-
Service = service;
124122
ServiceSettings = serviceSettings;
125123
}
126124
#if NET7_0_OR_GREATER
@@ -176,11 +174,7 @@ internal PutAlibabacloudRequest(Elastic.Clients.Elasticsearch.Serialization.Json
176174
/// The type of service supported for the specified task type. In this case, <c>alibabacloud-ai-search</c>.
177175
/// </para>
178176
/// </summary>
179-
public
180-
#if NET7_0_OR_GREATER
181-
required
182-
#endif
183-
Elastic.Clients.Elasticsearch.Inference.AlibabaCloudServiceType Service { get; set; }
177+
public string Service => "alibabacloud-ai-search";
184178

185179
/// <summary>
186180
/// <para>
@@ -298,17 +292,6 @@ public Elastic.Clients.Elasticsearch.Inference.PutAlibabacloudRequestDescriptor
298292
return this;
299293
}
300294

301-
/// <summary>
302-
/// <para>
303-
/// The type of service supported for the specified task type. In this case, <c>alibabacloud-ai-search</c>.
304-
/// </para>
305-
/// </summary>
306-
public Elastic.Clients.Elasticsearch.Inference.PutAlibabacloudRequestDescriptor Service(Elastic.Clients.Elasticsearch.Inference.AlibabaCloudServiceType value)
307-
{
308-
Instance.Service = value;
309-
return this;
310-
}
311-
312295
/// <summary>
313296
/// <para>
314297
/// Settings used to install the inference model. These settings are specific to the <c>alibabacloud-ai-search</c> service.

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutAmazonbedrockRequest.g.cs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAmazonbedrockRequest
3838
{
3939
reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
4040
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.InferenceChunkingSettings?> propChunkingSettings = default;
41-
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AmazonBedrockServiceType> propService = default;
4241
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AmazonBedrockServiceSettings> propServiceSettings = default;
4342
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AmazonBedrockTaskSettings?> propTaskSettings = default;
4443
while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
@@ -48,8 +47,9 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAmazonbedrockRequest
4847
continue;
4948
}
5049

51-
if (propService.TryReadProperty(ref reader, options, PropService, null))
50+
if (reader.ValueTextEquals(PropService))
5251
{
52+
reader.Skip();
5353
continue;
5454
}
5555

@@ -76,7 +76,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAmazonbedrockRequest
7676
return new Elastic.Clients.Elasticsearch.Inference.PutAmazonbedrockRequest(Elastic.Clients.Elasticsearch.Serialization.JsonConstructorSentinel.Instance)
7777
{
7878
ChunkingSettings = propChunkingSettings.Value,
79-
Service = propService.Value,
8079
ServiceSettings = propServiceSettings.Value,
8180
TaskSettings = propTaskSettings.Value
8281
};
@@ -122,9 +121,8 @@ public PutAmazonbedrockRequest(Elastic.Clients.Elasticsearch.Inference.AmazonBed
122121
}
123122

124123
[System.Diagnostics.CodeAnalysis.SetsRequiredMembers]
125-
public PutAmazonbedrockRequest(Elastic.Clients.Elasticsearch.Inference.AmazonBedrockTaskType taskType, Elastic.Clients.Elasticsearch.Id amazonbedrockInferenceId, Elastic.Clients.Elasticsearch.Inference.AmazonBedrockServiceType service, Elastic.Clients.Elasticsearch.Inference.AmazonBedrockServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("amazonbedrock_inference_id", amazonbedrockInferenceId))
124+
public PutAmazonbedrockRequest(Elastic.Clients.Elasticsearch.Inference.AmazonBedrockTaskType taskType, Elastic.Clients.Elasticsearch.Id amazonbedrockInferenceId, Elastic.Clients.Elasticsearch.Inference.AmazonBedrockServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("amazonbedrock_inference_id", amazonbedrockInferenceId))
126125
{
127-
Service = service;
128126
ServiceSettings = serviceSettings;
129127
}
130128
#if NET7_0_OR_GREATER
@@ -180,11 +178,7 @@ internal PutAmazonbedrockRequest(Elastic.Clients.Elasticsearch.Serialization.Jso
180178
/// The type of service supported for the specified task type. In this case, <c>amazonbedrock</c>.
181179
/// </para>
182180
/// </summary>
183-
public
184-
#if NET7_0_OR_GREATER
185-
required
186-
#endif
187-
Elastic.Clients.Elasticsearch.Inference.AmazonBedrockServiceType Service { get; set; }
181+
public string Service => "amazonbedrock";
188182

189183
/// <summary>
190184
/// <para>
@@ -306,17 +300,6 @@ public Elastic.Clients.Elasticsearch.Inference.PutAmazonbedrockRequestDescriptor
306300
return this;
307301
}
308302

309-
/// <summary>
310-
/// <para>
311-
/// The type of service supported for the specified task type. In this case, <c>amazonbedrock</c>.
312-
/// </para>
313-
/// </summary>
314-
public Elastic.Clients.Elasticsearch.Inference.PutAmazonbedrockRequestDescriptor Service(Elastic.Clients.Elasticsearch.Inference.AmazonBedrockServiceType value)
315-
{
316-
Instance.Service = value;
317-
return this;
318-
}
319-
320303
/// <summary>
321304
/// <para>
322305
/// Settings used to install the inference model. These settings are specific to the <c>amazonbedrock</c> service.

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutAnthropicRequest.g.cs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAnthropicRequest Read
3838
{
3939
reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
4040
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.InferenceChunkingSettings?> propChunkingSettings = default;
41-
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AnthropicServiceType> propService = default;
4241
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AnthropicServiceSettings> propServiceSettings = default;
4342
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AnthropicTaskSettings?> propTaskSettings = default;
4443
while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
@@ -48,8 +47,9 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAnthropicRequest Read
4847
continue;
4948
}
5049

51-
if (propService.TryReadProperty(ref reader, options, PropService, null))
50+
if (reader.ValueTextEquals(PropService))
5251
{
52+
reader.Skip();
5353
continue;
5454
}
5555

@@ -76,7 +76,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAnthropicRequest Read
7676
return new Elastic.Clients.Elasticsearch.Inference.PutAnthropicRequest(Elastic.Clients.Elasticsearch.Serialization.JsonConstructorSentinel.Instance)
7777
{
7878
ChunkingSettings = propChunkingSettings.Value,
79-
Service = propService.Value,
8079
ServiceSettings = propServiceSettings.Value,
8180
TaskSettings = propTaskSettings.Value
8281
};
@@ -118,9 +117,8 @@ public PutAnthropicRequest(Elastic.Clients.Elasticsearch.Inference.AnthropicTask
118117
}
119118

120119
[System.Diagnostics.CodeAnalysis.SetsRequiredMembers]
121-
public PutAnthropicRequest(Elastic.Clients.Elasticsearch.Inference.AnthropicTaskType taskType, Elastic.Clients.Elasticsearch.Id anthropicInferenceId, Elastic.Clients.Elasticsearch.Inference.AnthropicServiceType service, Elastic.Clients.Elasticsearch.Inference.AnthropicServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("anthropic_inference_id", anthropicInferenceId))
120+
public PutAnthropicRequest(Elastic.Clients.Elasticsearch.Inference.AnthropicTaskType taskType, Elastic.Clients.Elasticsearch.Id anthropicInferenceId, Elastic.Clients.Elasticsearch.Inference.AnthropicServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("anthropic_inference_id", anthropicInferenceId))
122121
{
123-
Service = service;
124122
ServiceSettings = serviceSettings;
125123
}
126124
#if NET7_0_OR_GREATER
@@ -177,11 +175,7 @@ internal PutAnthropicRequest(Elastic.Clients.Elasticsearch.Serialization.JsonCon
177175
/// The type of service supported for the specified task type. In this case, <c>anthropic</c>.
178176
/// </para>
179177
/// </summary>
180-
public
181-
#if NET7_0_OR_GREATER
182-
required
183-
#endif
184-
Elastic.Clients.Elasticsearch.Inference.AnthropicServiceType Service { get; set; }
178+
public string Service => "anthropic";
185179

186180
/// <summary>
187181
/// <para>
@@ -300,17 +294,6 @@ public Elastic.Clients.Elasticsearch.Inference.PutAnthropicRequestDescriptor Chu
300294
return this;
301295
}
302296

303-
/// <summary>
304-
/// <para>
305-
/// The type of service supported for the specified task type. In this case, <c>anthropic</c>.
306-
/// </para>
307-
/// </summary>
308-
public Elastic.Clients.Elasticsearch.Inference.PutAnthropicRequestDescriptor Service(Elastic.Clients.Elasticsearch.Inference.AnthropicServiceType value)
309-
{
310-
Instance.Service = value;
311-
return this;
312-
}
313-
314297
/// <summary>
315298
/// <para>
316299
/// Settings used to install the inference model. These settings are specific to the <c>watsonxai</c> service.

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutAzureaistudioRequest.g.cs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAzureaistudioRequest
3838
{
3939
reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
4040
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.InferenceChunkingSettings?> propChunkingSettings = default;
41-
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AzureAiStudioServiceType> propService = default;
4241
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AzureAiStudioServiceSettings> propServiceSettings = default;
4342
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AzureAiStudioTaskSettings?> propTaskSettings = default;
4443
while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
@@ -48,8 +47,9 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAzureaistudioRequest
4847
continue;
4948
}
5049

51-
if (propService.TryReadProperty(ref reader, options, PropService, null))
50+
if (reader.ValueTextEquals(PropService))
5251
{
52+
reader.Skip();
5353
continue;
5454
}
5555

@@ -76,7 +76,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAzureaistudioRequest
7676
return new Elastic.Clients.Elasticsearch.Inference.PutAzureaistudioRequest(Elastic.Clients.Elasticsearch.Serialization.JsonConstructorSentinel.Instance)
7777
{
7878
ChunkingSettings = propChunkingSettings.Value,
79-
Service = propService.Value,
8079
ServiceSettings = propServiceSettings.Value,
8180
TaskSettings = propTaskSettings.Value
8281
};
@@ -118,9 +117,8 @@ public PutAzureaistudioRequest(Elastic.Clients.Elasticsearch.Inference.AzureAiSt
118117
}
119118

120119
[System.Diagnostics.CodeAnalysis.SetsRequiredMembers]
121-
public PutAzureaistudioRequest(Elastic.Clients.Elasticsearch.Inference.AzureAiStudioTaskType taskType, Elastic.Clients.Elasticsearch.Id azureaistudioInferenceId, Elastic.Clients.Elasticsearch.Inference.AzureAiStudioServiceType service, Elastic.Clients.Elasticsearch.Inference.AzureAiStudioServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("azureaistudio_inference_id", azureaistudioInferenceId))
120+
public PutAzureaistudioRequest(Elastic.Clients.Elasticsearch.Inference.AzureAiStudioTaskType taskType, Elastic.Clients.Elasticsearch.Id azureaistudioInferenceId, Elastic.Clients.Elasticsearch.Inference.AzureAiStudioServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("azureaistudio_inference_id", azureaistudioInferenceId))
122121
{
123-
Service = service;
124122
ServiceSettings = serviceSettings;
125123
}
126124
#if NET7_0_OR_GREATER
@@ -176,11 +174,7 @@ internal PutAzureaistudioRequest(Elastic.Clients.Elasticsearch.Serialization.Jso
176174
/// The type of service supported for the specified task type. In this case, <c>azureaistudio</c>.
177175
/// </para>
178176
/// </summary>
179-
public
180-
#if NET7_0_OR_GREATER
181-
required
182-
#endif
183-
Elastic.Clients.Elasticsearch.Inference.AzureAiStudioServiceType Service { get; set; }
177+
public string Service => "azureaistudio";
184178

185179
/// <summary>
186180
/// <para>
@@ -298,17 +292,6 @@ public Elastic.Clients.Elasticsearch.Inference.PutAzureaistudioRequestDescriptor
298292
return this;
299293
}
300294

301-
/// <summary>
302-
/// <para>
303-
/// The type of service supported for the specified task type. In this case, <c>azureaistudio</c>.
304-
/// </para>
305-
/// </summary>
306-
public Elastic.Clients.Elasticsearch.Inference.PutAzureaistudioRequestDescriptor Service(Elastic.Clients.Elasticsearch.Inference.AzureAiStudioServiceType value)
307-
{
308-
Instance.Service = value;
309-
return this;
310-
}
311-
312295
/// <summary>
313296
/// <para>
314297
/// Settings used to install the inference model. These settings are specific to the <c>openai</c> service.

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/Inference/PutAzureopenaiRequest.g.cs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAzureopenaiRequest Re
3838
{
3939
reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
4040
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.InferenceChunkingSettings?> propChunkingSettings = default;
41-
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AzureOpenAIServiceType> propService = default;
4241
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AzureOpenAIServiceSettings> propServiceSettings = default;
4342
LocalJsonValue<Elastic.Clients.Elasticsearch.Inference.AzureOpenAITaskSettings?> propTaskSettings = default;
4443
while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
@@ -48,8 +47,9 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAzureopenaiRequest Re
4847
continue;
4948
}
5049

51-
if (propService.TryReadProperty(ref reader, options, PropService, null))
50+
if (reader.ValueTextEquals(PropService))
5251
{
52+
reader.Skip();
5353
continue;
5454
}
5555

@@ -76,7 +76,6 @@ public override Elastic.Clients.Elasticsearch.Inference.PutAzureopenaiRequest Re
7676
return new Elastic.Clients.Elasticsearch.Inference.PutAzureopenaiRequest(Elastic.Clients.Elasticsearch.Serialization.JsonConstructorSentinel.Instance)
7777
{
7878
ChunkingSettings = propChunkingSettings.Value,
79-
Service = propService.Value,
8079
ServiceSettings = propServiceSettings.Value,
8180
TaskSettings = propTaskSettings.Value
8281
};
@@ -136,9 +135,8 @@ public PutAzureopenaiRequest(Elastic.Clients.Elasticsearch.Inference.AzureOpenAI
136135
}
137136

138137
[System.Diagnostics.CodeAnalysis.SetsRequiredMembers]
139-
public PutAzureopenaiRequest(Elastic.Clients.Elasticsearch.Inference.AzureOpenAITaskType taskType, Elastic.Clients.Elasticsearch.Id azureopenaiInferenceId, Elastic.Clients.Elasticsearch.Inference.AzureOpenAIServiceType service, Elastic.Clients.Elasticsearch.Inference.AzureOpenAIServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("azureopenai_inference_id", azureopenaiInferenceId))
138+
public PutAzureopenaiRequest(Elastic.Clients.Elasticsearch.Inference.AzureOpenAITaskType taskType, Elastic.Clients.Elasticsearch.Id azureopenaiInferenceId, Elastic.Clients.Elasticsearch.Inference.AzureOpenAIServiceSettings serviceSettings) : base(r => r.Required("task_type", taskType).Required("azureopenai_inference_id", azureopenaiInferenceId))
140139
{
141-
Service = service;
142140
ServiceSettings = serviceSettings;
143141
}
144142
#if NET7_0_OR_GREATER
@@ -195,11 +193,7 @@ internal PutAzureopenaiRequest(Elastic.Clients.Elasticsearch.Serialization.JsonC
195193
/// The type of service supported for the specified task type. In this case, <c>azureopenai</c>.
196194
/// </para>
197195
/// </summary>
198-
public
199-
#if NET7_0_OR_GREATER
200-
required
201-
#endif
202-
Elastic.Clients.Elasticsearch.Inference.AzureOpenAIServiceType Service { get; set; }
196+
public string Service => "azureopenai";
203197

204198
/// <summary>
205199
/// <para>
@@ -336,17 +330,6 @@ public Elastic.Clients.Elasticsearch.Inference.PutAzureopenaiRequestDescriptor C
336330
return this;
337331
}
338332

339-
/// <summary>
340-
/// <para>
341-
/// The type of service supported for the specified task type. In this case, <c>azureopenai</c>.
342-
/// </para>
343-
/// </summary>
344-
public Elastic.Clients.Elasticsearch.Inference.PutAzureopenaiRequestDescriptor Service(Elastic.Clients.Elasticsearch.Inference.AzureOpenAIServiceType value)
345-
{
346-
Instance.Service = value;
347-
return this;
348-
}
349-
350333
/// <summary>
351334
/// <para>
352335
/// Settings used to install the inference model. These settings are specific to the <c>azureopenai</c> service.

0 commit comments

Comments
 (0)