Skip to content

Commit f359acf

Browse files
committed
Add all other ML and inference backports
1 parent 15f2be4 commit f359acf

17 files changed

+97
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ public TransportVersion getMinimalSupportedVersion() {
8282
return TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS;
8383
}
8484

85+
@Override
86+
public boolean supportsVersion(TransportVersion version) {
87+
return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS_8_19);
88+
}
89+
8590
@Override
8691
public void writeTo(StreamOutput out) throws IOException {
8792
out.writeOptionalEnum(cohereTruncation());

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ public TransportVersion getMinimalSupportedVersion() {
9393
return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED;
9494
}
9595

96+
@Override
97+
public boolean supportsVersion(TransportVersion version) {
98+
return SecretSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
99+
}
100+
96101
@Override
97102
public void writeTo(StreamOutput out) throws IOException {
98103
out.writeMap(secretParameters, StreamOutput::writeSecureString);

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,11 @@ public TransportVersion getMinimalSupportedVersion() {
397397
return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED;
398398
}
399399

400+
@Override
401+
public boolean supportsVersion(TransportVersion version) {
402+
return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
403+
}
404+
400405
@Override
401406
public void writeTo(StreamOutput out) throws IOException {
402407
textEmbeddingSettings.writeTo(out);

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ public TransportVersion getMinimalSupportedVersion() {
103103
return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED;
104104
}
105105

106+
@Override
107+
public boolean supportsVersion(TransportVersion version) {
108+
return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
109+
}
110+
106111
@Override
107112
public void writeTo(StreamOutput out) throws IOException {
108113
out.writeGenericMap(parameters);

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@ public TransportVersion getMinimalSupportedVersion() {
179179
return TransportVersions.ML_INFERENCE_DEEPSEEK;
180180
}
181181

182+
@Override
183+
public boolean supportsVersion(TransportVersion version) {
184+
return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.ML_INFERENCE_DEEPSEEK_8_19);
185+
}
186+
182187
@Override
183188
public void writeTo(StreamOutput out) throws IOException {
184189
out.writeString(modelId);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,12 @@ public TransportVersion getMinimalSupportedVersion() {
208208
return TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED;
209209
}
210210

211+
@Override
212+
public boolean supportsVersion(TransportVersion version) {
213+
return ServiceSettings.super.supportsVersion(version)
214+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19);
215+
}
216+
211217
@Override
212218
public void writeTo(StreamOutput out) throws IOException {
213219
out.writeString(modelId);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ public TransportVersion getMinimalSupportedVersion() {
8686
return TransportVersions.ML_INFERENCE_ELASTIC_RERANK;
8787
}
8888

89+
@Override
90+
public boolean supportsVersion(TransportVersion version) {
91+
return ServiceSettings.super.supportsVersion(version)
92+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19);
93+
}
94+
8995
@Override
9096
protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder builder, Params params) throws IOException {
9197
builder.field(MODEL_ID, modelId);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ public TransportVersion getMinimalSupportedVersion() {
121121
return TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED;
122122
}
123123

124+
@Override
125+
public boolean supportsVersion(TransportVersion version) {
126+
return ServiceSettings.super.supportsVersion(version)
127+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED_8_19);
128+
}
129+
124130
@Override
125131
public void writeTo(StreamOutput out) throws IOException {
126132
out.writeString(projectId);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ public TransportVersion getMinimalSupportedVersion() {
147147
return TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED;
148148
}
149149

150+
@Override
151+
public boolean supportsVersion(TransportVersion version) {
152+
return ServiceSettings.super.supportsVersion(version)
153+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19);
154+
}
155+
150156
@Override
151157
public void writeTo(StreamOutput out) throws IOException {
152158
out.writeOptionalString(modelId);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@ public TransportVersion getMinimalSupportedVersion() {
118118
return TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED;
119119
}
120120

121+
@Override
122+
public boolean supportsVersion(TransportVersion version) {
123+
return ServiceSettings.super.supportsVersion(version)
124+
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED_8_19);
125+
}
126+
121127
@Override
122128
public void writeTo(StreamOutput out) throws IOException {
123129
out.writeString(uri.toString());

0 commit comments

Comments
 (0)