Skip to content

Commit c1bfa55

Browse files
jdconradjdconrad
committed
more migrations
1 parent 6237548 commit c1bfa55

File tree

8 files changed

+31
-29
lines changed

8 files changed

+31
-29
lines changed

‎server/src/main/java/org/elasticsearch/TransportVersions.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ static TransportVersion def(int id) {
207207
public static final TransportVersion ML_INFERENCE_SAGEMAKER_ELASTIC_8_19 = def(8_841_0_57);
208208
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS_8_19 = def(8_841_0_58);
209209
public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19 = def(8_841_0_59);
210-
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION_8_19 = def(8_841_0_60);
211210
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
212211
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
213212
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
@@ -322,7 +321,6 @@ static TransportVersion def(int id) {
322321
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = def(9_107_0_00);
323322
public static final TransportVersion CLUSTER_STATE_PROJECTS_SETTINGS = def(9_108_0_00);
324323
public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED = def(9_109_00_0);
325-
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
326324

327325
/*
328326
* STOP! READ THIS FIRST! No, really,

‎server/src/main/resources/org/elasticsearch/transport/ml-inference-cohere-api-version.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "ml-inference-cohere-api-version",
3+
"ids": [
4+
9110000,
5+
8841060
6+
]
7+
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/CohereServiceSettings.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.apache.logging.log4j.LogManager;
1111
import org.apache.logging.log4j.Logger;
1212
import org.elasticsearch.TransportVersion;
13+
import org.elasticsearch.TransportVersionSet;
1314
import org.elasticsearch.TransportVersions;
1415
import org.elasticsearch.common.ValidationException;
1516
import org.elasticsearch.common.io.stream.StreamInput;
@@ -49,6 +50,8 @@ public class CohereServiceSettings extends FilteredXContentObject implements Ser
4950
public static final String API_VERSION = "api_version";
5051
public static final String MODEL_REQUIRED_FOR_V2_API = "The [service_settings.model_id] field is required for the Cohere V2 API.";
5152

53+
public static final TransportVersionSet ML_INFERENCE_COHERE_API_VERSION = TransportVersionSet.get("ml-inference-cohere-api-version");
54+
5255
public enum CohereApiVersion {
5356
V1,
5457
V2;
@@ -182,8 +185,7 @@ public CohereServiceSettings(StreamInput in) throws IOException {
182185
} else {
183186
rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS;
184187
}
185-
if (in.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
186-
|| in.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19)) {
188+
if (ML_INFERENCE_COHERE_API_VERSION.isCompatible(in.getTransportVersion())) {
187189
this.apiVersion = in.readEnum(CohereServiceSettings.CohereApiVersion.class);
188190
} else {
189191
this.apiVersion = CohereServiceSettings.CohereApiVersion.V1;
@@ -285,8 +287,7 @@ public void writeTo(StreamOutput out) throws IOException {
285287
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
286288
rateLimitSettings.writeTo(out);
287289
}
288-
if (out.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
289-
|| out.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19)) {
290+
if (ML_INFERENCE_COHERE_API_VERSION.isCompatible(out.getTransportVersion())) {
290291
out.writeEnum(apiVersion);
291292
}
292293
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/completion/CohereCompletionServiceSettings.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import static org.elasticsearch.xpack.inference.services.ServiceUtils.createOptionalUri;
3535
import static org.elasticsearch.xpack.inference.services.ServiceUtils.extractOptionalString;
3636
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.API_VERSION;
37+
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.ML_INFERENCE_COHERE_API_VERSION;
3738
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.MODEL_REQUIRED_FOR_V2_API;
3839
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.apiVersionFromMap;
3940

@@ -102,8 +103,7 @@ public CohereCompletionServiceSettings(StreamInput in) throws IOException {
102103
uri = createOptionalUri(in.readOptionalString());
103104
modelId = in.readOptionalString();
104105
rateLimitSettings = new RateLimitSettings(in);
105-
if (in.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
106-
|| in.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19)) {
106+
if (ML_INFERENCE_COHERE_API_VERSION.isCompatible(in.getTransportVersion())) {
107107
this.apiVersion = in.readEnum(CohereServiceSettings.CohereApiVersion.class);
108108
} else {
109109
this.apiVersion = CohereServiceSettings.CohereApiVersion.V1;
@@ -155,8 +155,7 @@ public void writeTo(StreamOutput out) throws IOException {
155155
out.writeOptionalString(uriToWrite);
156156
out.writeOptionalString(modelId);
157157
rateLimitSettings.writeTo(out);
158-
if (out.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
159-
|| out.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19)) {
158+
if (ML_INFERENCE_COHERE_API_VERSION.isCompatible(out.getTransportVersion())) {
160159
out.writeEnum(apiVersion);
161160
}
162161
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettings.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import static org.elasticsearch.xpack.inference.services.ServiceUtils.removeAsType;
4141
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.API_VERSION;
4242
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.DEFAULT_RATE_LIMIT_SETTINGS;
43+
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.ML_INFERENCE_COHERE_API_VERSION;
4344
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.MODEL_REQUIRED_FOR_V2_API;
4445
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.apiVersionFromMap;
4546

@@ -124,8 +125,7 @@ public CohereRerankServiceSettings(StreamInput in) throws IOException {
124125
this.rateLimitSettings = DEFAULT_RATE_LIMIT_SETTINGS;
125126
}
126127

127-
if (in.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
128-
|| in.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19)) {
128+
if (ML_INFERENCE_COHERE_API_VERSION.isCompatible(in.getTransportVersion())) {
129129
this.apiVersion = in.readEnum(CohereServiceSettings.CohereApiVersion.class);
130130
} else {
131131
this.apiVersion = CohereServiceSettings.CohereApiVersion.V1;
@@ -206,8 +206,7 @@ public void writeTo(StreamOutput out) throws IOException {
206206
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
207207
rateLimitSettings.writeTo(out);
208208
}
209-
if (out.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
210-
|| out.getTransportVersion().isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19)) {
209+
if (ML_INFERENCE_COHERE_API_VERSION.isCompatible(out.getTransportVersion())) {
211210
out.writeEnum(apiVersion);
212211
}
213212
}

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/CohereServiceSettingsTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.inference.services.cohere;
99

1010
import org.elasticsearch.TransportVersion;
11-
import org.elasticsearch.TransportVersions;
1211
import org.elasticsearch.common.Strings;
1312
import org.elasticsearch.common.ValidationException;
1413
import org.elasticsearch.common.io.stream.Writeable;
@@ -29,6 +28,7 @@
2928
import java.util.HashMap;
3029
import java.util.Map;
3130

31+
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.ML_INFERENCE_COHERE_API_VERSION;
3232
import static org.hamcrest.Matchers.containsString;
3333
import static org.hamcrest.Matchers.is;
3434

@@ -364,8 +364,7 @@ public static Map<String, Object> getServiceSettingsMap(@Nullable String url, @N
364364

365365
@Override
366366
protected CohereServiceSettings mutateInstanceForVersion(CohereServiceSettings instance, TransportVersion version) {
367-
if (version.before(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
368-
&& (version.isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19) == false)) {
367+
if (ML_INFERENCE_COHERE_API_VERSION.isNotCompatible(version)) {
369368
return new CohereServiceSettings(
370369
instance.uri(),
371370
instance.similarity(),

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/completion/CohereCompletionServiceSettingsTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.inference.services.cohere.completion;
99

1010
import org.elasticsearch.TransportVersion;
11-
import org.elasticsearch.TransportVersions;
1211
import org.elasticsearch.common.Strings;
1312
import org.elasticsearch.common.io.stream.Writeable;
1413
import org.elasticsearch.xcontent.XContentBuilder;
@@ -25,6 +24,7 @@
2524
import java.util.HashMap;
2625
import java.util.Map;
2726

27+
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.ML_INFERENCE_COHERE_API_VERSION;
2828
import static org.hamcrest.Matchers.is;
2929

3030
public class CohereCompletionServiceSettingsTests extends AbstractBWCWireSerializationTestCase<CohereCompletionServiceSettings> {
@@ -115,8 +115,7 @@ protected CohereCompletionServiceSettings mutateInstance(CohereCompletionService
115115

116116
@Override
117117
protected CohereCompletionServiceSettings mutateInstanceForVersion(CohereCompletionServiceSettings instance, TransportVersion version) {
118-
if (version.before(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
119-
&& (version.isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19) == false)) {
118+
if (ML_INFERENCE_COHERE_API_VERSION.isNotCompatible(version)) {
120119
return new CohereCompletionServiceSettings(
121120
instance.uri(),
122121
instance.modelId(),

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/rerank/CohereRerankServiceSettingsTests.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.Map;
2727

2828
import static org.elasticsearch.xpack.inference.MatchersUtils.equalToIgnoringWhitespaceInJsonString;
29+
import static org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings.ML_INFERENCE_COHERE_API_VERSION;
2930

3031
public class CohereRerankServiceSettingsTests extends AbstractBWCWireSerializationTestCase<CohereRerankServiceSettings> {
3132
public static CohereRerankServiceSettings createRandom() {
@@ -88,15 +89,14 @@ protected CohereRerankServiceSettings mutateInstanceForVersion(CohereRerankServi
8889
CohereServiceSettings.DEFAULT_RATE_LIMIT_SETTINGS,
8990
CohereServiceSettings.CohereApiVersion.V1
9091
);
91-
} else if (version.before(TransportVersions.ML_INFERENCE_COHERE_API_VERSION)
92-
&& version.isPatchFrom(TransportVersions.ML_INFERENCE_COHERE_API_VERSION_8_19) == false) {
93-
return new CohereRerankServiceSettings(
94-
instance.uri(),
95-
instance.modelId(),
96-
instance.rateLimitSettings(),
97-
CohereServiceSettings.CohereApiVersion.V1
98-
);
99-
}
92+
} else if (ML_INFERENCE_COHERE_API_VERSION.isNotCompatible(version)) {
93+
return new CohereRerankServiceSettings(
94+
instance.uri(),
95+
instance.modelId(),
96+
instance.rateLimitSettings(),
97+
CohereServiceSettings.CohereApiVersion.V1
98+
);
99+
}
100100
return instance;
101101
}
102102

0 commit comments

Comments
 (0)