Skip to content

Commit b1287e6

Browse files
l-trottal-trotta
committed
regen
1 parent 11ae0f5 commit b1287e6

24 files changed

+0
-1701
lines changed

‎java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,7 @@
2626
'_global.create.Request': '_global/create/CreateRequest.ts#L35-L221',
2727
'_global.create.Response': '_global/create/CreateResponse.ts#L22-L25',
2828
'_global.delete.Request': '_global/delete/DeleteRequest.ts#L34-L146',
29-
<<<<<<< HEAD
30-
<<<<<<< HEAD
3129
'_global.delete.Response': '_global/delete/DeleteResponse.ts#L22-L35',
32-
=======
33-
'_global.delete.Response': '_global/delete/DeleteResponse.ts#L22-L34',
34-
>>>>>>> 03828daff (regen from latest spec)
35-
=======
36-
'_global.delete.Response': '_global/delete/DeleteResponse.ts#L22-L35',
37-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
3830
'_global.delete_by_query.Request': '_global/delete_by_query/DeleteByQueryRequest.ts#L36-L314',
3931
'_global.delete_by_query.Response': '_global/delete_by_query/DeleteByQueryResponse.ts#L26-L88',
4032
'_global.delete_by_query_rethrottle.Request': '_global/delete_by_query_rethrottle/DeleteByQueryRethrottleRequest.ts#L24-L55',
@@ -1816,10 +1808,6 @@
18161808
'inference._types.TextEmbeddingByteResult': 'inference/_types/Results.ts#L53-L58',
18171809
'inference._types.TextEmbeddingInferenceResult': 'inference/_types/Results.ts#L67-L75',
18181810
'inference._types.TextEmbeddingResult': 'inference/_types/Results.ts#L60-L65',
1819-
<<<<<<< HEAD
1820-
<<<<<<< HEAD
1821-
=======
1822-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
18231811
'inference._types.ToolCall': 'inference/_types/CommonTypes.ts#L112-L128',
18241812
'inference._types.ToolCallFunction': 'inference/_types/CommonTypes.ts#L98-L110',
18251813
'inference._types.VoyageAIServiceSettings': 'inference/_types/CommonTypes.ts#L1075-L1106',
@@ -1831,41 +1819,14 @@
18311819
'inference._types.WatsonxTaskType': 'inference/_types/CommonTypes.ts#L1182-L1184',
18321820
'inference.chat_completion_unified.Request': 'inference/chat_completion_unified/UnifiedRequest.ts#L24-L53',
18331821
'inference.chat_completion_unified.Response': 'inference/chat_completion_unified/UnifiedResponse.ts#L22-L25',
1834-
<<<<<<< HEAD
1835-
=======
1836-
'inference.chat_completion_unified.CompletionTool': 'inference/chat_completion_unified/UnifiedRequest.ts#L180-L192',
1837-
'inference.chat_completion_unified.CompletionToolChoice': 'inference/chat_completion_unified/UnifiedRequest.ts#L143-L155',
1838-
'inference.chat_completion_unified.CompletionToolChoiceFunction': 'inference/chat_completion_unified/UnifiedRequest.ts#L132-L141',
1839-
'inference.chat_completion_unified.CompletionToolFunction': 'inference/chat_completion_unified/UnifiedRequest.ts#L157-L178',
1840-
'inference.chat_completion_unified.CompletionToolType': 'inference/chat_completion_unified/UnifiedRequest.ts#L54-L57',
1841-
'inference.chat_completion_unified.ContentObject': 'inference/chat_completion_unified/UnifiedRequest.ts#L59-L71',
1842-
'inference.chat_completion_unified.Message': 'inference/chat_completion_unified/UnifiedRequest.ts#L110-L130',
1843-
'inference.chat_completion_unified.MessageContent': 'inference/chat_completion_unified/UnifiedRequest.ts#L105-L108',
1844-
'inference.chat_completion_unified.Request': 'inference/chat_completion_unified/UnifiedRequest.ts#L25-L52',
1845-
'inference.chat_completion_unified.Response': 'inference/chat_completion_unified/UnifiedResponse.ts#L22-L24',
1846-
'inference.chat_completion_unified.ToolCall': 'inference/chat_completion_unified/UnifiedRequest.ts#L87-L103',
1847-
'inference.chat_completion_unified.ToolCallFunction': 'inference/chat_completion_unified/UnifiedRequest.ts#L73-L85',
1848-
>>>>>>> 03828daff (regen from latest spec)
1849-
=======
1850-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
18511822
'inference.completion.Request': 'inference/completion/CompletionRequest.ts#L25-L63',
18521823
'inference.completion.Response': 'inference/completion/CompletionResponse.ts#L22-L25',
18531824
'inference.delete.Request': 'inference/delete/DeleteRequest.ts#L24-L66',
18541825
'inference.delete.Response': 'inference/delete/DeleteResponse.ts#L22-L25',
18551826
'inference.get.Request': 'inference/get/GetRequest.ts#L24-L56',
18561827
'inference.get.Response': 'inference/get/GetResponse.ts#L22-L26',
1857-
<<<<<<< HEAD
1858-
<<<<<<< HEAD
1859-
'inference.post_eis_chat_completion.Request': 'inference/post_eis_chat_completion/PostEisChatCompletionRequest.ts#L23-L48',
1860-
'inference.post_eis_chat_completion.Response': 'inference/post_eis_chat_completion/PostEisChatCompletionResponse.ts#L22-L25',
1861-
=======
1862-
'inference.post_eis_chat_completion.Request': 'inference/post_eis_chat_completion/PostEisChatCompletionRequest.ts#L23-L46',
1863-
'inference.post_eis_chat_completion.Response': 'inference/post_eis_chat_completion/PostEisChatCompletionResponse.ts#L22-L24',
1864-
>>>>>>> 03828daff (regen from latest spec)
1865-
=======
18661828
'inference.post_eis_chat_completion.Request': 'inference/post_eis_chat_completion/PostEisChatCompletionRequest.ts#L23-L48',
18671829
'inference.post_eis_chat_completion.Response': 'inference/post_eis_chat_completion/PostEisChatCompletionResponse.ts#L22-L25',
1868-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
18691830
'inference.put.Request': 'inference/put/PutRequest.ts#L25-L65',
18701831
'inference.put.Response': 'inference/put/PutResponse.ts#L22-L25',
18711832
'inference.put_alibabacloud.Request': 'inference/put_alibabacloud/PutAlibabaCloudRequest.ts#L30-L83',

‎java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ChatCompletionUnifiedRequest.java‎

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,7 @@
3535
import co.elastic.clients.util.ApiTypeHelper;
3636
import co.elastic.clients.util.ObjectBuilder;
3737
import jakarta.json.stream.JsonGenerator;
38-
<<<<<<< HEAD
39-
<<<<<<< HEAD
40-
<<<<<<< HEAD
4138
import jakarta.json.stream.JsonParser;
42-
=======
43-
>>>>>>> 03828daff (regen from latest spec)
44-
=======
45-
>>>>>>> c49af58dc (Revert "temp rebase fix")
46-
=======
47-
import jakarta.json.stream.JsonParser;
48-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
4939
import java.lang.String;
5040
import java.util.HashMap;
5141
import java.util.Map;
@@ -84,38 +74,16 @@ public class ChatCompletionUnifiedRequest extends RequestBase implements JsonpSe
8474
@Nullable
8575
private final Time timeout;
8676

87-
<<<<<<< HEAD
88-
<<<<<<< HEAD
89-
<<<<<<< HEAD
90-
private final RequestChatCompletion chatCompletionRequest;
91-
92-
=======
93-
>>>>>>> 03828daff (regen from latest spec)
94-
=======
95-
>>>>>>> c49af58dc (Revert "temp rebase fix")
96-
=======
9777
private final RequestChatCompletion chatCompletionRequest;
9878

99-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
10079
// ---------------------------------------------------------------------------------------------
10180

10281
private ChatCompletionUnifiedRequest(Builder builder) {
10382

10483
this.inferenceId = ApiTypeHelper.requireNonNull(builder.inferenceId, this, "inferenceId");
10584
this.timeout = builder.timeout;
106-
<<<<<<< HEAD
107-
<<<<<<< HEAD
108-
<<<<<<< HEAD
109-
this.chatCompletionRequest = ApiTypeHelper.requireNonNull(builder.chatCompletionRequest, this,
110-
"chatCompletionRequest");
111-
=======
112-
>>>>>>> 03828daff (regen from latest spec)
113-
=======
114-
>>>>>>> c49af58dc (Revert "temp rebase fix")
115-
=======
11685
this.chatCompletionRequest = ApiTypeHelper.requireNonNull(builder.chatCompletionRequest, this,
11786
"chatCompletionRequest");
118-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
11987

12088
}
12189

@@ -142,11 +110,6 @@ public final Time timeout() {
142110
return this.timeout;
143111
}
144112

145-
<<<<<<< HEAD
146-
<<<<<<< HEAD
147-
<<<<<<< HEAD
148-
=======
149-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
150113
/**
151114
* Required - Request body.
152115
*/
@@ -162,13 +125,6 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
162125

163126
}
164127

165-
<<<<<<< HEAD
166-
=======
167-
>>>>>>> 03828daff (regen from latest spec)
168-
=======
169-
>>>>>>> c49af58dc (Revert "temp rebase fix")
170-
=======
171-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
172128
// ---------------------------------------------------------------------------------------------
173129

174130
/**
@@ -183,19 +139,8 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
183139
@Nullable
184140
private Time timeout;
185141

186-
<<<<<<< HEAD
187-
<<<<<<< HEAD
188-
<<<<<<< HEAD
189142
private RequestChatCompletion chatCompletionRequest;
190143

191-
=======
192-
>>>>>>> 03828daff (regen from latest spec)
193-
=======
194-
>>>>>>> c49af58dc (Revert "temp rebase fix")
195-
=======
196-
private RequestChatCompletion chatCompletionRequest;
197-
198-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
199144
/**
200145
* Required - The inference Id
201146
* <p>
@@ -225,11 +170,6 @@ public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
225170
return this.timeout(fn.apply(new Time.Builder()).build());
226171
}
227172

228-
<<<<<<< HEAD
229-
<<<<<<< HEAD
230-
<<<<<<< HEAD
231-
=======
232-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
233173
/**
234174
* Required - Request body.
235175
*/
@@ -255,13 +195,6 @@ public Builder withJson(JsonParser parser, JsonpMapper mapper) {
255195
return this.chatCompletionRequest(value);
256196
}
257197

258-
<<<<<<< HEAD
259-
=======
260-
>>>>>>> 03828daff (regen from latest spec)
261-
=======
262-
>>>>>>> c49af58dc (Revert "temp rebase fix")
263-
=======
264-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
265198
@Override
266199
protected Builder self() {
267200
return this;
@@ -280,44 +213,13 @@ public ChatCompletionUnifiedRequest build() {
280213
}
281214
}
282215

283-
<<<<<<< HEAD
284-
<<<<<<< HEAD
285-
public static final JsonpDeserializer<ChatCompletionUnifiedRequest> _DESERIALIZER = createChatCompletionUnifiedRequestDeserializer();
286-
protected static JsonpDeserializer<ChatCompletionUnifiedRequest> createChatCompletionUnifiedRequestDeserializer() {
287-
288-
<<<<<<< HEAD
289-
JsonpDeserializer<RequestChatCompletion> valueDeserializer = RequestChatCompletion._DESERIALIZER;
290-
=======
291-
=======
292-
// ---------------------------------------------------------------------------------------------
293-
294-
>>>>>>> c49af58dc (Revert "temp rebase fix")
295-
/**
296-
* Json deserializer for {@link ChatCompletionUnifiedRequest}
297-
*/
298-
public static final JsonpDeserializer<ChatCompletionUnifiedRequest> _DESERIALIZER = ObjectBuilderDeserializer
299-
.lazy(Builder::new, ChatCompletionUnifiedRequest::setupChatCompletionUnifiedRequestDeserializer);
300-
301-
protected static void setupChatCompletionUnifiedRequestDeserializer(
302-
ObjectDeserializer<ChatCompletionUnifiedRequest.Builder> op) {
303-
RequestChatCompletionBase.setupRequestChatCompletionBaseDeserializer(op);
304-
<<<<<<< HEAD
305-
>>>>>>> 03828daff (regen from latest spec)
306-
307-
return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper, event) -> new Builder()
308-
.chatCompletionRequest(valueDeserializer.deserialize(parser, mapper, event)).build());
309-
=======
310-
311-
>>>>>>> c49af58dc (Revert "temp rebase fix")
312-
=======
313216
public static final JsonpDeserializer<ChatCompletionUnifiedRequest> _DESERIALIZER = createChatCompletionUnifiedRequestDeserializer();
314217
protected static JsonpDeserializer<ChatCompletionUnifiedRequest> createChatCompletionUnifiedRequestDeserializer() {
315218

316219
JsonpDeserializer<RequestChatCompletion> valueDeserializer = RequestChatCompletion._DESERIALIZER;
317220

318221
return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper, event) -> new Builder()
319222
.chatCompletionRequest(valueDeserializer.deserialize(parser, mapper, event)).build());
320-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
321223
}
322224

323225
// ---------------------------------------------------------------------------------------------

‎java-client/src/main/java/co/elastic/clients/elasticsearch/inference/EisTaskType.java‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
<<<<<<< HEAD
21-
<<<<<<< HEAD:java-client/src/main/java/co/elastic/clients/elasticsearch/inference/EisTaskType.java
2220
package co.elastic.clients.elasticsearch.inference;
23-
=======
24-
<<<<<<<< HEAD:java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_voyageai/ServiceType.java
25-
package co.elastic.clients.elasticsearch.inference.put_voyageai;
26-
========
27-
package co.elastic.clients.elasticsearch.inference.put_openai;
28-
>>>>>>>> c86960dc6 (regen from latest spec):java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_openai/ServiceType.java
29-
>>>>>>> 03828daff (regen from latest spec):java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_openai/ServiceType.java
30-
=======
31-
package co.elastic.clients.elasticsearch.inference;
32-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
3321

3422
import co.elastic.clients.json.JsonEnum;
3523
import co.elastic.clients.json.JsonpDeserializable;
@@ -52,36 +40,12 @@ >>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
5240

5341
/**
5442
*
55-
<<<<<<< HEAD
56-
<<<<<<< HEAD:java-client/src/main/java/co/elastic/clients/elasticsearch/inference/EisTaskType.java
57-
=======
58-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
5943
* @see <a href="../doc-files/api-spec.html#inference._types.EisTaskType">API
6044
* specification</a>
6145
*/
6246
@JsonpDeserializable
6347
public enum EisTaskType implements JsonEnum {
6448
ChatCompletion("chat_completion"),
65-
<<<<<<< HEAD
66-
=======
67-
* @see <a href=
68-
<<<<<<<< HEAD:java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_voyageai/ServiceType.java
69-
* "../../doc-files/api-spec.html#inference.put_voyageai.ServiceType">API
70-
========
71-
* "../../doc-files/api-spec.html#inference.put_openai.ServiceType">API
72-
>>>>>>>> c86960dc6 (regen from latest spec):java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_openai/ServiceType.java
73-
* specification</a>
74-
*/
75-
@JsonpDeserializable
76-
public enum ServiceType implements JsonEnum {
77-
<<<<<<<< HEAD:java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_voyageai/ServiceType.java
78-
Voyageai("voyageai"),
79-
========
80-
Openai("openai"),
81-
>>>>>>>> c86960dc6 (regen from latest spec):java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_openai/ServiceType.java
82-
>>>>>>> 03828daff (regen from latest spec):java-client/src/main/java/co/elastic/clients/elasticsearch/inference/put_openai/ServiceType.java
83-
=======
84-
>>>>>>> b5f478d93 ([codegen] update to latest spec and generator)
8549

8650
;
8751

0 commit comments

Comments
 (0)