github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-27 17:10:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Support 8.19 + 9.1 clusters for all new inference providers (#130033)

Browse source 
Overriding version support to include the 8.19 patch version.
This commit is contained in:
Pat Whelan 2025-06-26 11:38:38 -04:00 • committed by GitHub
parent f70ff89456
commit 9cb30cc892
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 175 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,9 +79,16 @@ public record AmazonBedrockEmbeddingsTaskSettings(@Nullable CohereTruncation coh
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS)
|| version.isPatchFrom(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalEnum(cohereTruncation());

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

@ -90,9 +90,16 @@ public class CustomSecretSettings implements SecretSettings {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED)
|| version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeMap(secretParameters, StreamOutput::writeSecureString);

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

@ -394,9 +394,16 @@ public class CustomServiceSettings extends FilteredXContentObject implements Ser
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED)
|| version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
textEmbeddingSettings.writeTo(out);

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

@ -100,9 +100,16 @@ public class CustomTaskSettings implements TaskSettings {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED)
|| version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeGenericMap(parameters);

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

@ -176,9 +176,16 @@ public class DeepSeekChatCompletionModel extends Model {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_DEEPSEEK;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_DEEPSEEK)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_DEEPSEEK_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(modelId);

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

@ -205,9 +205,16 @@ public class ElasticInferenceServiceDenseTextEmbeddingsServiceSettings extends F
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(modelId);

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

@ -83,9 +83,16 @@ public class ElasticInferenceServiceRerankServiceSettings extends FilteredXConte
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_ELASTIC_RERANK;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_RERANK)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19);
}
@Override
protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder builder, Params params) throws IOException {
builder.field(MODEL_ID, modelId);

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

@ -118,9 +118,16 @@ public class GoogleVertexAiChatCompletionServiceSettings extends FilteredXConten
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(projectId);

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

@ -144,9 +144,16 @@ public class HuggingFaceChatCompletionServiceSettings extends FilteredXContentOb
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalString(modelId);

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

@ -115,9 +115,16 @@ public class HuggingFaceRerankServiceSettings extends FilteredXContentObject
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(uri.toString());

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java
View file

@ -118,9 +118,16 @@ public class HuggingFaceRerankTaskSettings implements TaskSettings {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalVInt(topNDocumentsOnly);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java
View file

@ -78,9 +78,16 @@ public class MistralChatCompletionServiceSettings extends FilteredXContentObject
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED_8_19);
}
@Override
public String modelId() {
return this.modelId;

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java
View file

@ -111,9 +111,16 @@ record SageMakerServiceSettings(
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_SAGEMAKER;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(endpointName());

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java
View file

@ -101,9 +101,16 @@ record SageMakerTaskSettings(
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_SAGEMAKER;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalString(customAttributes);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java
View file

@ -29,9 +29,16 @@ public interface SageMakerStoredServiceSchema extends ServiceSettings {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_SAGEMAKER;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19);
}
@Override
public void writeTo(StreamOutput out) {

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java
View file

@ -39,9 +39,16 @@ public interface SageMakerStoredTaskSchema extends TaskSettings {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_SAGEMAKER;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19);
}
@Override
public void writeTo(StreamOutput out) {}

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java
View file

@ -250,9 +250,16 @@ public class ElasticTextEmbeddingPayload implements ElasticPayload {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalVInt(dimensions);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java
View file

@ -50,9 +50,16 @@ record SageMakerElasticTaskSettings(@Nullable Map<String, Object> passthroughSet
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeGenericMap(passthroughSettings);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java
View file

@ -138,9 +138,16 @@ public class OpenAiTextEmbeddingPayload implements SageMakerSchemaPayload {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_SAGEMAKER;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalInt(dimensions);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java
View file

@ -37,9 +37,16 @@ record SageMakerOpenAiTaskSettings(@Nullable String user) implements SageMakerSt
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION)
|| version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION_8_19);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalString(user);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java
View file

@ -108,9 +108,16 @@ public class VoyageAIServiceSettings extends FilteredXContentObject implements S
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED)
|| version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(modelId);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java
View file

@ -226,9 +226,16 @@ public class VoyageAIEmbeddingsServiceSettings extends FilteredXContentObject im
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED)
|| version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
commonSettings.writeTo(out);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java
View file

@ -162,9 +162,16 @@ public class VoyageAIEmbeddingsTaskSettings implements TaskSettings {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED)
|| version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalEnum(inputType);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java
View file

@ -90,9 +90,16 @@ public class VoyageAIRerankServiceSettings extends FilteredXContentObject implem
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED)
|| version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
commonSettings.writeTo(out);

7
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java
View file

@ -135,9 +135,16 @@ public class VoyageAIRerankTaskSettings implements TaskSettings {
@Override
public TransportVersion getMinimalSupportedVersion() {
assert false : "should never be called when supportsVersion is used";
return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED;
}
@Override
public boolean supportsVersion(TransportVersion version) {
return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED)
|| version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalInt(topKDocumentsOnly);