From 15f2be45b339e2bafdae9ef91ca3fca787dc58d3 Mon Sep 17 00:00:00 2001 From: Pat Whelan Date: Wed, 25 Jun 2025 14:04:17 -0400 Subject: [PATCH 1/4] [ML] SageMaker supports 8.19 + 9.1 clusters Overriding version support to include the 8.19 patch version. --- .../services/sagemaker/model/SageMakerServiceSettings.java | 5 +++++ .../services/sagemaker/model/SageMakerTaskSettings.java | 5 +++++ .../sagemaker/schema/SageMakerStoredServiceSchema.java | 6 ++++++ .../sagemaker/schema/SageMakerStoredTaskSchema.java | 6 ++++++ .../schema/elastic/ElasticTextEmbeddingPayload.java | 6 ++++++ .../schema/elastic/SageMakerElasticTaskSettings.java | 6 ++++++ .../sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java | 6 ++++++ .../schema/openai/SageMakerOpenAiTaskSettings.java | 6 ++++++ 8 files changed, 46 insertions(+) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java index 2caf97bdd05b7..c2b6e842d7b4a 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java @@ -114,6 +114,11 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(endpointName()); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java index c1c244cc37051..6d62151b8dcc9 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java @@ -104,6 +104,11 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(customAttributes); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java index 9fb320a2d364a..09b896dafc2c4 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java @@ -32,6 +32,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return SageMakerStoredServiceSchema.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) { diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java index 2aa2f9556d415..f605c040b42ae 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java @@ -42,6 +42,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return SageMakerStoredTaskSchema.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) {} diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java index cf9d24a86dcc3..bcf716bd341bb 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java @@ -253,6 +253,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC; } + @Override + public boolean supportsVersion(TransportVersion version) { + return SageMakerStoredServiceSchema.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalVInt(dimensions); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java index 3cdcbb35ffdc9..4fa2c76651fe7 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java @@ -53,6 +53,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC; } + @Override + public boolean supportsVersion(TransportVersion version) { + return SageMakerStoredTaskSchema.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(passthroughSettings); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java index 276c407d694d6..5f7d4c7047ea4 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java @@ -141,6 +141,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return SageMakerStoredServiceSchema.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalInt(dimensions); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java index 4eeba9f69022d..debb851e3fde8 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java @@ -40,6 +40,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION; } + @Override + public boolean supportsVersion(TransportVersion version) { + return SageMakerStoredTaskSchema.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(user); From f359acf0b123fb009d77d94f57aa6028273adc21 Mon Sep 17 00:00:00 2001 From: Pat Whelan Date: Wed, 25 Jun 2025 14:32:29 -0400 Subject: [PATCH 2/4] Add all other ML and inference backports --- .../embeddings/AmazonBedrockEmbeddingsTaskSettings.java | 5 +++++ .../inference/services/custom/CustomSecretSettings.java | 5 +++++ .../inference/services/custom/CustomServiceSettings.java | 5 +++++ .../xpack/inference/services/custom/CustomTaskSettings.java | 5 +++++ .../services/deepseek/DeepSeekChatCompletionModel.java | 5 +++++ ...cInferenceServiceDenseTextEmbeddingsServiceSettings.java | 6 ++++++ .../ElasticInferenceServiceRerankServiceSettings.java | 6 ++++++ .../GoogleVertexAiChatCompletionServiceSettings.java | 6 ++++++ .../HuggingFaceChatCompletionServiceSettings.java | 6 ++++++ .../rerank/HuggingFaceRerankServiceSettings.java | 6 ++++++ .../huggingface/rerank/HuggingFaceRerankTaskSettings.java | 6 ++++++ .../completion/MistralChatCompletionServiceSettings.java | 6 ++++++ .../services/voyageai/VoyageAIServiceSettings.java | 6 ++++++ .../embeddings/VoyageAIEmbeddingsServiceSettings.java | 6 ++++++ .../voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java | 6 ++++++ .../voyageai/rerank/VoyageAIRerankServiceSettings.java | 6 ++++++ .../voyageai/rerank/VoyageAIRerankTaskSettings.java | 6 ++++++ 17 files changed, 97 insertions(+) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java index bb0a8a3348ada..1550da56ed698 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java @@ -82,6 +82,11 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS; } + @Override + public boolean supportsVersion(TransportVersion version) { + return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalEnum(cohereTruncation()); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java index ac6b7ab10c8b3..0b5294e5d9424 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java @@ -93,6 +93,11 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return SecretSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeMap(secretParameters, StreamOutput::writeSecureString); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java index 83048120bc545..c1be4787797c2 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java @@ -397,6 +397,11 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { textEmbeddingSettings.writeTo(out); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java index bb665cc196bdf..546e48ec1b093 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java @@ -103,6 +103,11 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(parameters); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java index 5e9a7e5f93a0b..5cad9a1286bb9 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java @@ -179,6 +179,11 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_DEEPSEEK; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.ML_INFERENCE_DEEPSEEK_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(modelId); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java index 5047f34a1b2e3..820fcaaea3ad6 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java @@ -208,6 +208,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(modelId); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java index c20846c7fdfc2..a1a90569d0a70 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java @@ -86,6 +86,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_ELASTIC_RERANK; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) + || 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); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java index 105d76a9f8ccb..86aeeea1e66ce 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java @@ -121,6 +121,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(projectId); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java index af88316ef5161..dab7c03c2da2d 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java @@ -147,6 +147,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(modelId); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java index 3d4c6aef71e96..fa0766626d0a7 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java @@ -118,6 +118,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(uri.toString()); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java index 9f90386edff90..f787f19c8ae5e 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java @@ -121,6 +121,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return TaskSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalVInt(topNDocumentsOnly); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java index 676653d54a560..76baa67a00148 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java @@ -81,6 +81,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED_8_19); + } + @Override public String modelId() { return this.modelId; diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java index 75497d1a4b4f0..b6d991d5a1590 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java @@ -111,6 +111,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(modelId); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java index cc4db278d0e2b..9f8cebda8ecd0 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java @@ -229,6 +229,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); + } + @Override public void writeTo(StreamOutput out) throws IOException { commonSettings.writeTo(out); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java index 2c6bf3a59c617..8f26a486338ef 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java @@ -165,6 +165,12 @@ public TransportVersion getMinimalSupportedVersion() { return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return TaskSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalEnum(inputType); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java index 1d3607922c5c2..dfa47529fc447 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java @@ -88,6 +88,12 @@ protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder buil return builder; } + @Override + public boolean supportsVersion(TransportVersion version) { + return ServiceSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); + } + @Override public TransportVersion getMinimalSupportedVersion() { return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java index a5004fde1e17e..77ac24e628ba6 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java @@ -133,6 +133,12 @@ public String getWriteableName() { return NAME; } + @Override + public boolean supportsVersion(TransportVersion version) { + return TaskSettings.super.supportsVersion(version) + || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); + } + @Override public TransportVersion getMinimalSupportedVersion() { return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; From fdb2c1dc78a2de6b75bf61941be4634fd5a24699 Mon Sep 17 00:00:00 2001 From: Pat Whelan Date: Wed, 25 Jun 2025 18:09:52 -0400 Subject: [PATCH 3/4] don't call super --- .../AmazonBedrockEmbeddingsTaskSettings.java | 3 ++- .../services/custom/CustomSecretSettings.java | 3 ++- .../services/custom/CustomServiceSettings.java | 3 ++- .../inference/services/custom/CustomTaskSettings.java | 3 ++- .../services/deepseek/DeepSeekChatCompletionModel.java | 3 ++- ...renceServiceDenseTextEmbeddingsServiceSettings.java | 2 +- .../ElasticInferenceServiceRerankServiceSettings.java | 2 +- .../GoogleVertexAiChatCompletionServiceSettings.java | 2 +- .../HuggingFaceChatCompletionServiceSettings.java | 2 +- .../rerank/HuggingFaceRerankServiceSettings.java | 2 +- .../rerank/HuggingFaceRerankTaskSettings.java | 2 +- .../MistralChatCompletionServiceSettings.java | 2 +- .../sagemaker/model/SageMakerServiceSettings.java | 3 ++- .../sagemaker/model/SageMakerTaskSettings.java | 3 ++- .../sagemaker/schema/SageMakerStoredServiceSchema.java | 2 +- .../sagemaker/schema/SageMakerStoredTaskSchema.java | 2 +- .../schema/elastic/ElasticTextEmbeddingPayload.java | 2 +- .../schema/elastic/SageMakerElasticTaskSettings.java | 2 +- .../schema/openai/OpenAiTextEmbeddingPayload.java | 2 +- .../schema/openai/SageMakerOpenAiTaskSettings.java | 2 +- .../services/voyageai/VoyageAIServiceSettings.java | 2 +- .../embeddings/VoyageAIEmbeddingsServiceSettings.java | 2 +- .../embeddings/VoyageAIEmbeddingsTaskSettings.java | 2 +- .../voyageai/rerank/VoyageAIRerankServiceSettings.java | 10 +++++----- .../voyageai/rerank/VoyageAIRerankTaskSettings.java | 10 +++++----- 25 files changed, 40 insertions(+), 33 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java index 1550da56ed698..648ba5426934a 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java @@ -84,7 +84,8 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS_8_19); + return version.onOrAfter(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS) + || version.isPatchFrom(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS_8_19); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java index 0b5294e5d9424..417536926e324 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java @@ -95,7 +95,8 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return SecretSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); + return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED) + || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java index c1be4787797c2..cd3dd9d5061cd 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java @@ -399,7 +399,8 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); + return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED) + || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java index 546e48ec1b093..cac2becad6660 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java @@ -105,7 +105,8 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); + return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED) + || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java index 5cad9a1286bb9..39e766215305c 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java @@ -181,7 +181,8 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.ML_INFERENCE_DEEPSEEK_8_19); + return version.onOrAfter(TransportVersions.ML_INFERENCE_DEEPSEEK) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_DEEPSEEK_8_19); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java index 820fcaaea3ad6..88653452b049f 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java @@ -210,7 +210,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED) || version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java index a1a90569d0a70..b79e261b9f12b 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java @@ -88,7 +88,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_RERANK) || version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java index 86aeeea1e66ce..6df2b3a829d34 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java @@ -123,7 +123,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED) || version.isPatchFrom(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java index dab7c03c2da2d..17336de35c656 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java @@ -149,7 +149,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED) || version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java index fa0766626d0a7..3a5ccebb293c6 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java @@ -120,7 +120,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED) || version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java index f787f19c8ae5e..49e0c8a4551c4 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java @@ -123,7 +123,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return TaskSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED) || version.isPatchFrom(TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java index 76baa67a00148..3122bf3d7e4ff 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java @@ -83,7 +83,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED) || version.isPatchFrom(TransportVersions.ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java index c2b6e842d7b4a..0599b4d31b888 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java @@ -116,7 +116,8 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java index 6d62151b8dcc9..58841f09b3d3f 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java @@ -106,7 +106,8 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return TaskSettings.super.supportsVersion(version) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java index 09b896dafc2c4..a989adaface38 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java @@ -34,7 +34,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return SageMakerStoredServiceSchema.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java index f605c040b42ae..8532e0db49841 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java @@ -44,7 +44,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return SageMakerStoredTaskSchema.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java index bcf716bd341bb..1a2ea77c94ae3 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java @@ -255,7 +255,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return SageMakerStoredServiceSchema.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java index 4fa2c76651fe7..24265545144ac 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java @@ -55,7 +55,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return SageMakerStoredTaskSchema.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java index 5f7d4c7047ea4..d5bfbed1a5b14 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java @@ -143,7 +143,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return SageMakerStoredServiceSchema.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java index debb851e3fde8..0b0ba76aee979 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java @@ -42,7 +42,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return SageMakerStoredTaskSchema.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION) || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION_8_19); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java index b6d991d5a1590..7a9d1bf3121c9 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java @@ -113,7 +113,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED) || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java index 9f8cebda8ecd0..e89ce6169ffd5 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java @@ -231,7 +231,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED) || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java index 8f26a486338ef..04bcd5a7d72ff 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java @@ -167,7 +167,7 @@ public TransportVersion getMinimalSupportedVersion() { @Override public boolean supportsVersion(TransportVersion version) { - return TaskSettings.super.supportsVersion(version) + return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED) || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java index dfa47529fc447..2e7ad0f57728a 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java @@ -89,14 +89,14 @@ protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder buil } @Override - public boolean supportsVersion(TransportVersion version) { - return ServiceSettings.super.supportsVersion(version) - || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); + public TransportVersion getMinimalSupportedVersion() { + return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } @Override - public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED) + || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java index 77ac24e628ba6..0671e51ef203c 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java @@ -134,14 +134,14 @@ public String getWriteableName() { } @Override - public boolean supportsVersion(TransportVersion version) { - return TaskSettings.super.supportsVersion(version) - || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); + public TransportVersion getMinimalSupportedVersion() { + return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } @Override - public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED) + || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); } @Override From 2caf69a0813a2df7c355665f09f4d364db2cbd54 Mon Sep 17 00:00:00 2001 From: Pat Whelan Date: Thu, 26 Jun 2025 09:52:23 -0400 Subject: [PATCH 4/4] add invariant to getMinimalSupportedVersion --- .../embeddings/AmazonBedrockEmbeddingsTaskSettings.java | 1 + .../xpack/inference/services/custom/CustomSecretSettings.java | 1 + .../xpack/inference/services/custom/CustomServiceSettings.java | 1 + .../xpack/inference/services/custom/CustomTaskSettings.java | 1 + .../inference/services/deepseek/DeepSeekChatCompletionModel.java | 1 + ...lasticInferenceServiceDenseTextEmbeddingsServiceSettings.java | 1 + .../rerank/ElasticInferenceServiceRerankServiceSettings.java | 1 + .../completion/GoogleVertexAiChatCompletionServiceSettings.java | 1 + .../completion/HuggingFaceChatCompletionServiceSettings.java | 1 + .../huggingface/rerank/HuggingFaceRerankServiceSettings.java | 1 + .../huggingface/rerank/HuggingFaceRerankTaskSettings.java | 1 + .../mistral/completion/MistralChatCompletionServiceSettings.java | 1 + .../services/sagemaker/model/SageMakerServiceSettings.java | 1 + .../services/sagemaker/model/SageMakerTaskSettings.java | 1 + .../services/sagemaker/schema/SageMakerStoredServiceSchema.java | 1 + .../services/sagemaker/schema/SageMakerStoredTaskSchema.java | 1 + .../sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java | 1 + .../sagemaker/schema/elastic/SageMakerElasticTaskSettings.java | 1 + .../sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java | 1 + .../sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java | 1 + .../inference/services/voyageai/VoyageAIServiceSettings.java | 1 + .../voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java | 1 + .../voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java | 1 + .../services/voyageai/rerank/VoyageAIRerankServiceSettings.java | 1 + .../services/voyageai/rerank/VoyageAIRerankTaskSettings.java | 1 + 25 files changed, 25 insertions(+) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java index 648ba5426934a..ad06e669ff567 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/embeddings/AmazonBedrockEmbeddingsTaskSettings.java @@ -79,6 +79,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java index 417536926e324..4c2ff22a5829a 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java @@ -90,6 +90,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java index cd3dd9d5061cd..931eb3b798553 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java @@ -394,6 +394,7 @@ public ToXContentObject getFilteredXContentObject() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java index cac2becad6660..2d43e42781009 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomTaskSettings.java @@ -100,6 +100,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java index 39e766215305c..06f21e19a6408 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekChatCompletionModel.java @@ -176,6 +176,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_DEEPSEEK; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java index 88653452b049f..e8eeee5a34dd4 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java @@ -205,6 +205,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java index b79e261b9f12b..eff22c2771930 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java @@ -83,6 +83,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_ELASTIC_RERANK; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java index 6df2b3a829d34..a753fc5dc66f2 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java @@ -118,6 +118,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java index 17336de35c656..cdc2529428bed 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/completion/HuggingFaceChatCompletionServiceSettings.java @@ -144,6 +144,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java index 3a5ccebb293c6..b0b21b26395af 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java @@ -115,6 +115,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java index 49e0c8a4551c4..8b9e9113bce12 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankTaskSettings.java @@ -118,6 +118,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_HUGGING_FACE_RERANK_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java index 3122bf3d7e4ff..89b9475ad65d8 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java @@ -78,6 +78,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_MISTRAL_CHAT_COMPLETION_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java index 0599b4d31b888..b7a554d387c84 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerServiceSettings.java @@ -111,6 +111,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java index 58841f09b3d3f..fd9eb2d20c5d3 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerTaskSettings.java @@ -101,6 +101,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java index a989adaface38..b3d948a85de97 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredServiceSchema.java @@ -29,6 +29,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java index 8532e0db49841..09a73f0f42ea4 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/SageMakerStoredTaskSchema.java @@ -39,6 +39,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java index 1a2ea77c94ae3..6e1407beab1d8 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/ElasticTextEmbeddingPayload.java @@ -250,6 +250,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java index 24265545144ac..088de2068741c 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/elastic/SageMakerElasticTaskSettings.java @@ -50,6 +50,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java index d5bfbed1a5b14..6fcbd309551e3 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiTextEmbeddingPayload.java @@ -138,6 +138,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java index 0b0ba76aee979..b8ce19ba712bf 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java @@ -37,6 +37,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java index 7a9d1bf3121c9..ba7db5bc16f47 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/VoyageAIServiceSettings.java @@ -108,6 +108,7 @@ public XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder builder @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java index e89ce6169ffd5..a0960fb6f74aa 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsServiceSettings.java @@ -226,6 +226,7 @@ protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder buil @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java index 04bcd5a7d72ff..11728075fe2b8 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/embeddings/VoyageAIEmbeddingsTaskSettings.java @@ -162,6 +162,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java index 2e7ad0f57728a..4e23efac2701c 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankServiceSettings.java @@ -90,6 +90,7 @@ protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder buil @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java index 0671e51ef203c..9e57b58487674 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/voyageai/rerank/VoyageAIRerankTaskSettings.java @@ -135,6 +135,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; }