From 6742147d6ada3af42ff73f03eb45fd2486cb64cc Mon Sep 17 00:00:00 2001
From: Max Hniebergall <137079448+maxhniebergall@users.noreply.github.com>
Date: Tue, 29 Oct 2024 08:59:19 -0400
Subject: [PATCH] [Inference API] Improve chunked results error message
 (#115807)

* Improve chunked results error message

* Update RestStatus to conflict

* precommit

* Update docs/changelog/115807.yaml
---
 docs/changelog/115807.yaml                                   | 5 +++++
 .../xpack/core/inference/results/ResultUtils.java            | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 docs/changelog/115807.yaml

diff --git a/docs/changelog/115807.yaml b/docs/changelog/115807.yaml
new file mode 100644
index 000000000000..d17cabca4bd0
--- /dev/null
+++ b/docs/changelog/115807.yaml
@@ -0,0 +1,5 @@
+pr: 115807
+summary: "[Inference API] Improve chunked results error message"
+area: Machine Learning
+type: enhancement
+issues: []
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/ResultUtils.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/ResultUtils.java
index 4fe2c9ae486f..eb68af758971 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/ResultUtils.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/ResultUtils.java
@@ -14,8 +14,9 @@ public class ResultUtils {
 
     public static ElasticsearchStatusException createInvalidChunkedResultException(String expectedResultName, String receivedResultName) {
         return new ElasticsearchStatusException(
-            "Expected a chunked inference [{}] received [{}]",
-            RestStatus.INTERNAL_SERVER_ERROR,
+            "Received incompatible results. Check that your model_id matches the task_type of this endpoint. "
+                + "Expected chunked output of type [{}] but received [{}].",
+            RestStatus.CONFLICT,
             expectedResultName,
             receivedResultName
         );