From 6915d5b6c3661a4cf8240a1b101c0dea0d8100ca Mon Sep 17 00:00:00 2001 From: Max Hniebergall Date: Fri, 3 Jan 2025 15:15:56 -0500 Subject: [PATCH 1/3] fix unique ID message for inference ID matches trained model ID --- .../org/elasticsearch/xpack/core/ml/job/messages/Messages.java | 2 ++ .../inference/action/TransportPutInferenceModelAction.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/messages/Messages.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/messages/Messages.java index 9f9def6a0678d..f01ac08f922c4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/messages/Messages.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/messages/Messages.java @@ -281,6 +281,8 @@ public final class Messages { public static final String FIELD_CANNOT_BE_NULL = "Field [{0}] cannot be null"; public static final String MODEL_ID_MATCHES_EXISTING_MODEL_IDS_BUT_MUST_NOT = "Model IDs must be unique. Requested model ID [{}] matches existing model IDs but must not."; + public static final String INFERENCE_ID_MATCHES_EXISTING_MODEL_IDS_BUT_MUST_NOT = + "Inference endpoint IDs must be unique. Requested inference endpoint ID [{}] matches existing trained model ID(s) but must not."; public static final String MODEL_ID_DOES_NOT_MATCH_EXISTING_MODEL_IDS_BUT_MUST_FOR_IN_CLUSTER_SERVICE = "Requested model ID [{}] does not have a matching trained model and thus cannot be updated."; public static final String INFERENCE_ENTITY_NON_EXISTANT_NO_UPDATE = "The inference endpoint [{}] does not exist and cannot be updated"; diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java index 2baee7f8afd66..7c2a139672e8f 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java @@ -153,7 +153,7 @@ protected void masterOperation( if ((assignments == null || assignments.isEmpty()) == false) { listener.onFailure( ExceptionsHelper.badRequestException( - Messages.MODEL_ID_MATCHES_EXISTING_MODEL_IDS_BUT_MUST_NOT, + Messages.INFERENCE_ID_MATCHES_EXISTING_MODEL_IDS_BUT_MUST_NOT, request.getInferenceEntityId() ) ); From bc16ff4a1c7fee18d1e2f7a9b6206f04dd1cbe5b Mon Sep 17 00:00:00 2001 From: Max Hniebergall <137079448+maxhniebergall@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:17:10 -0500 Subject: [PATCH 2/3] Update docs/changelog/119543.yaml --- docs/changelog/119543.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docs/changelog/119543.yaml diff --git a/docs/changelog/119543.yaml b/docs/changelog/119543.yaml new file mode 100644 index 0000000000000..7027ea2a49672 --- /dev/null +++ b/docs/changelog/119543.yaml @@ -0,0 +1,7 @@ +pr: 119543 +summary: "[Inference API] Fix unique ID message for inference ID matches trained model\ + \ ID" +area: Machine Learning +type: bug +issues: + - 111312 From f14c0f667426757d4f066fcf4b62322b4335c05e Mon Sep 17 00:00:00 2001 From: Max Hniebergall Date: Fri, 3 Jan 2025 16:19:09 -0500 Subject: [PATCH 3/3] update test to match fix --- .../xpack/ml/integration/ModelIdUniquenessIT.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/ml/qa/ml-inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ModelIdUniquenessIT.java b/x-pack/plugin/ml/qa/ml-inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ModelIdUniquenessIT.java index 9904cfb752de5..f6f5a1299c105 100644 --- a/x-pack/plugin/ml/qa/ml-inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ModelIdUniquenessIT.java +++ b/x-pack/plugin/ml/qa/ml-inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ModelIdUniquenessIT.java @@ -29,9 +29,10 @@ public void testPutInferenceModelFailsWhenTrainedModelWithIdAlreadyExists() thro assertThat( e.getMessage(), Matchers.containsString( - "Model IDs must be unique. Requested model ID [" + modelId + "] matches existing model IDs but must not." + "Inference endpoint IDs must be unique. Requested inference endpoint ID [" + + modelId + + "] matches existing trained model ID(s) but must not." ) - ); }