Merge branch 'ml-inference-unified-api-elastic' of github.com:elastic/elasticsearch into ml-inference-unified-api-elastic

Author: Max Hniebergall

server/src/main/java/org/elasticsearch/inference/UnifiedCompletionRequest.java

@@ -140,7 +140,7 @@ private static Content parseContent(XContentParser parser) throws IOException {
                 return ContentString.of(parser);
             }
 
-            throw new XContentParseException("Unsupported token [" + token + "]");
+            throw new XContentParseException("Expected an array start token or a value string token but found token [" + token + "]");
         }
 
         public Message(StreamInput in) throws IOException {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/openai/OpenAiChatCompletionRequest.java

@@ -78,7 +78,7 @@ public void testCreateRequest_WithDefaultUrlAndWithoutUserOrganization() throws
         assertThat(httpRequest.httpRequestBase(), instanceOf(HttpPost.class));
         var httpPost = (HttpPost) httpRequest.httpRequestBase();
 
-        assertThat(httpPost.getURI().toString(), is(OpenAiChatCompletionRequest.buildDefaultUri().toString()));
+        assertThat(httpPost.getURI().toString(), is(OpenAiUnifiedChatCompletionRequest.buildDefaultUri().toString()));
         assertThat(httpPost.getLastHeader(HttpHeaders.CONTENT_TYPE).getValue(), is(XContentType.JSON.mediaType()));
         assertThat(httpPost.getLastHeader(HttpHeaders.AUTHORIZATION).getValue(), is("Bearer secret"));
         assertNull(httpPost.getLastHeader(ORGANIZATION_HEADER));
@@ -105,7 +105,7 @@ public void testCreateRequest_WithStreaming() throws URISyntaxException, IOExcep
     public void testTruncate_DoesNotReduceInputTextSize() throws URISyntaxException, IOException {
         var request = createRequest(null, null, "secret", "abcd", "model", null);
         var truncatedRequest = request.truncate();
-        assertThat(request.getURI().toString(), is(OpenAiChatCompletionRequest.buildDefaultUri().toString()));
+        assertThat(request.getURI().toString(), is(OpenAiUnifiedChatCompletionRequest.buildDefaultUri().toString()));
 
         var httpRequest = truncatedRequest.createHttpRequest();
         assertThat(httpRequest.httpRequestBase(), instanceOf(HttpPost.class));