Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 26, 2025
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15f2be4
[ML] SageMaker supports 8.19 + 9.1 clusters
prwhelan Jun 25, 2025
f359acf
Add all other ML and inference backports
prwhelan Jun 25, 2025
fdb2c1d
don't call super
prwhelan Jun 25, 2025
b666b49
Merge branch 'main' into sagemaker-8-19
prwhelan Jun 26, 2025
24206e2
Merge branch 'main' into sagemaker-8-19
prwhelan Jun 26, 2025
2caf69a
add invariant to getMinimalSupportedVersion
prwhelan Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...pack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS;
Copy link
Contributor

@jan-elastic jan-elastic Jun 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional/nitpick: I would change this to

throw Exception("should never be called when supportsVersion is used")

or so (see other classes).

Copy link
Member Author

@prwhelan prwhelan Jun 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spoke offline - i agree with this but i'm scared to change to exceptions in case there is something in prod using this, so to keep 9.1+ clusters alive and fail in non-prod, we added assertions

}

@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());
Expand Down
6 changes: 6 additions & 0 deletions ...src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...rc/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...e/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...lastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...rence/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...k/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...csearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ public TransportVersion getMinimalSupportedVersion() {
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());
Expand Down
6 changes: 6 additions & 0 deletions ...sticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...rch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ public TransportVersion getMinimalSupportedVersion() {
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;
Expand Down
6 changes: 6 additions & 0 deletions .../org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@ public TransportVersion getMinimalSupportedVersion() {
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());
Expand Down
6 changes: 6 additions & 0 deletions ...ava/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ public TransportVersion getMinimalSupportedVersion() {
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) {

Expand Down
6 changes: 6 additions & 0 deletions ...rg/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ public TransportVersion getMinimalSupportedVersion() {
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) {}

Expand Down
6 changes: 6 additions & 0 deletions ...search/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...earch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...icsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...csearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...ain/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...earch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...icsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down
6 changes: 6 additions & 0 deletions ...rg/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ public TransportVersion getMinimalSupportedVersion() {
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);
Expand Down