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..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,9 +79,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS) + || version.isPatchFrom(TransportVersions.AMAZON_BEDROCK_TASK_SETTINGS_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalEnum(cohereTruncation()); 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..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,9 +90,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED) + || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeMap(secretParameters, StreamOutput::writeSecureString); 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..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,9 +394,16 @@ public ToXContentObject getFilteredXContentObject() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED) + || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { textEmbeddingSettings.writeTo(out); 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..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,9 +100,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED) + || version.isPatchFrom(TransportVersions.INFERENCE_CUSTOM_SERVICE_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(parameters); 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..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,9 +176,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_DEEPSEEK; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_DEEPSEEK) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_DEEPSEEK_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(modelId); 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..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,9 +205,16 @@ 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; } + @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); 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..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,9 +83,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_ELASTIC_RERANK; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_ELASTIC_RERANK) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19); + } + @Override protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder builder, Params params) throws IOException { builder.field(MODEL_ID, modelId); 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..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,9 +118,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(projectId); 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..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,9 +144,16 @@ 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; } + @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); 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..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,9 +115,16 @@ 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; } + @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()); 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..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,9 +118,16 @@ 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; } + @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); 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..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,9 +78,16 @@ 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; } + @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; 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..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,9 +111,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(endpointName()); 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..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,9 +101,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(customAttributes); 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..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,9 +29,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) { 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..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,9 +39,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) {} 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..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,9 +250,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalVInt(dimensions); 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..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,9 +50,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_ELASTIC_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(passthroughSettings); 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..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,9 +138,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalInt(dimensions); 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..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,9 +37,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION) + || version.isPatchFrom(TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION_8_19); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(user); 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..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,9 +108,16 @@ 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; } + @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); 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..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,9 +226,16 @@ 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; } + @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); 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..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,9 +162,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED) + || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalEnum(inputType); 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..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,9 +90,16 @@ 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; } + @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); 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..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,9 +135,16 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { + assert false : "should never be called when supportsVersion is used"; return TransportVersions.VOYAGE_AI_INTEGRATION_ADDED; } + @Override + public boolean supportsVersion(TransportVersion version) { + return version.onOrAfter(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED) + || version.isPatchFrom(TransportVersions.VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X); + } + @Override public void writeTo(StreamOutput out) throws IOException { out.writeOptionalInt(topKDocumentsOnly);