Skip to content

Commit b0d9273

Browse files
prwhelanprwhelan
authored
[ML] Support 8.19 + 9.1 clusters for all new inference providers (elastic#130033) (elastic#130124)
Overriding version support to include the 8.19 patch version.
1 parent 10e2001 commit b0d9273

25 files changed

+175
-0
lines changed

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,16 @@ public String getWriteableName() {
7979

8080
@Override
8181
public TransportVersion getMinimalSupportedVersion() {
82+
assert false : "should never be called when supportsVersion is used";
8283
return TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS;
8384
}
8485

86+
@Override
87+
public boolean supportsVersion(TransportVersion version) {
88+
return version.onOrAfter(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS)
89+
|| version.isPatchFrom(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS_8_19);
90+
}
91+
8592
@Override
8693
public void writeTo(StreamOutput out) throws IOException {
8794
out.writeOptionalEnum(cohereTruncation());

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,16 @@ public String getWriteableName() {
9090

9191
@Override
9292
public TransportVersion getMinimalSupportedVersion() {
93+
assert false : "should never be called when supportsVersion is used";
9394
return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED;
9495
}
9596

97+
@Override
98+
public boolean supportsVersion(TransportVersion version) {
99+
return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED)
100+
|| version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
101+
}
102+
96103
@Override
97104
public void writeTo(StreamOutput out) throws IOException {
98105
out.writeMap(secretParameters, StreamOutput::writeSecureString);

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,9 +394,16 @@ public ToXContentObject getFilteredXContentObject() {
394394

395395
@Override
396396
public TransportVersion getMinimalSupportedVersion() {
397+
assert false : "should never be called when supportsVersion is used";
397398
return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED;
398399
}
399400

401+
@Override
402+
public boolean supportsVersion(TransportVersion version) {
403+
return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED)
404+
|| version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
405+
}
406+
400407
@Override
401408
public void writeTo(StreamOutput out) throws IOException {
402409
textEmbeddingSettings.writeTo(out);

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,16 @@ public String getWriteableName() {
100100

101101
@Override
102102
public TransportVersion getMinimalSupportedVersion() {
103+
assert false : "should never be called when supportsVersion is used";
103104
return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED;
104105
}
105106

107+
@Override
108+
public boolean supportsVersion(TransportVersion version) {
109+
return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED)
110+
|| version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
111+
}
112+
106113
@Override
107114
public void writeTo(StreamOutput out) throws IOException {
108115
out.writeGenericMap(parameters);

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,16 @@ public String getWriteableName() {
176176

177177
@Override
178178
public TransportVersion getMinimalSupportedVersion() {
179+
assert false : "should never be called when supportsVersion is used";
179180
return TransportVersions.ML_INFERENCE_DEEPSEEK;
180181
}
181182

183+
@Override
184+
public boolean supportsVersion(TransportVersion version) {
185+
return version.onOrAfter(TransportVersions.ML_INFERENCE_DEEPSEEK)
186+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_DEEPSEEK_8_19);
187+
}
188+
182189
@Override
183190
public void writeTo(StreamOutput out) throws IOException {
184191
out.writeString(modelId);

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,16 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
205205

206206
@Override
207207
public TransportVersion getMinimalSupportedVersion() {
208+
assert false : "should never be called when supportsVersion is used";
208209
return TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED;
209210
}
210211

212+
@Override
213+
public boolean supportsVersion(TransportVersion version) {
214+
return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED)
215+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19);
216+
}
217+
211218
@Override
212219
public void writeTo(StreamOutput out) throws IOException {
213220
out.writeString(modelId);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,16 @@ public String getWriteableName() {
8383

8484
@Override
8585
public TransportVersion getMinimalSupportedVersion() {
86+
assert false : "should never be called when supportsVersion is used";
8687
return TransportVersions.ML_INFERENCE_ELASTIC_RERANK;
8788
}
8889

90+
@Override
91+
public boolean supportsVersion(TransportVersion version) {
92+
return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_RERANK)
93+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19);
94+
}
95+
8996
@Override
9097
protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder builder, Params params) throws IOException {
9198
builder.field(MODEL_ID, modelId);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,16 @@ public String getWriteableName() {
118118

119119
@Override
120120
public TransportVersion getMinimalSupportedVersion() {
121+
assert false : "should never be called when supportsVersion is used";
121122
return TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED;
122123
}
123124

125+
@Override
126+
public boolean supportsVersion(TransportVersion version) {
127+
return version.onOrAfter(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED)
128+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED_8_19);
129+
}
130+
124131
@Override
125132
public void writeTo(StreamOutput out) throws IOException {
126133
out.writeString(projectId);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,16 @@ public String getWriteableName() {
144144

145145
@Override
146146
public TransportVersion getMinimalSupportedVersion() {
147+
assert false : "should never be called when supportsVersion is used";
147148
return TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED;
148149
}
149150

151+
@Override
152+
public boolean supportsVersion(TransportVersion version) {
153+
return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED)
154+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19);
155+
}
156+
150157
@Override
151158
public void writeTo(StreamOutput out) throws IOException {
152159
out.writeOptionalString(modelId);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,16 @@ public String getWriteableName() {
115115

116116
@Override
117117
public TransportVersion getMinimalSupportedVersion() {
118+
assert false : "should never be called when supportsVersion is used";
118119
return TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED;
119120
}
120121

122+
@Override
123+
public boolean supportsVersion(TransportVersion version) {
124+
return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED)
125+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED_8_19);
126+
}
127+
121128
@Override
122129
public void writeTo(StreamOutput out) throws IOException {
123130
out.writeString(uri.toString());

0 commit comments

Comments
 (0)