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

Author: jonathan-buttner

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceNamedWriteablesProvider.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.inference.SecretSettings;
 import org.elasticsearch.inference.ServiceSettings;
 import org.elasticsearch.inference.TaskSettings;
+import org.elasticsearch.inference.UnifiedCompletionRequest;
 import org.elasticsearch.xpack.core.inference.results.ChatCompletionResults;
 import org.elasticsearch.xpack.core.inference.results.ErrorChunkedInferenceResults;
 import org.elasticsearch.xpack.core.inference.results.InferenceChunkedSparseEmbeddingResults;
@@ -137,11 +138,18 @@ public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
         addEisNamedWriteables(namedWriteables);
         addAlibabaCloudSearchNamedWriteables(namedWriteables);
 
+        addUnifiedNamedWriteables(namedWriteables);
+
         namedWriteables.addAll(StreamingTaskManager.namedWriteables());
 
         return namedWriteables;
     }
 
+    private static void addUnifiedNamedWriteables(List<NamedWriteableRegistry.Entry> namedWriteables) {
+        var writeables = UnifiedCompletionRequest.getNamedWriteables();
+        namedWriteables.addAll(writeables);
+    }
+
     private static void addAmazonBedrockNamedWriteables(List<NamedWriteableRegistry.Entry> namedWriteables) {
         namedWriteables.add(
             new NamedWriteableRegistry.Entry(

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

@@ -69,12 +69,14 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                     switch (message.content()) {
                         case UnifiedCompletionRequest.ContentString contentString -> builder.field(CONTENT_FIELD, contentString.content());
                         case UnifiedCompletionRequest.ContentObjects contentObjects -> {
+                            builder.startArray(CONTENT_FIELD);
                             for (UnifiedCompletionRequest.ContentObject contentObject : contentObjects.contentObjects()) {
-                                builder.startObject(CONTENT_FIELD);
+                                builder.startObject();
                                 builder.field(TEXT_FIELD, contentObject.text());
                                 builder.field(TYPE_FIELD, contentObject.type());
                                 builder.endObject();
                             }
+                            builder.endArray();
                         }
                     }
 
@@ -116,7 +118,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
         builder.field(NUMBER_OF_RETURNED_CHOICES_FIELD, 1);
 
-        if (unifiedRequest.stop() != null) {
+        if (unifiedRequest.stop() != null && unifiedRequest.stop().isEmpty() == false) {
             builder.field(STOP_FIELD, unifiedRequest.stop());
         }
         if (unifiedRequest.temperature() != null) {
@@ -141,7 +143,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                 builder.endObject();
             }
         }
-        if (unifiedRequest.tools() != null) {
+        if (unifiedRequest.tools() != null && unifiedRequest.tools().isEmpty() == false) {
             builder.startArray(TOOL_FIELD);
             for (UnifiedCompletionRequest.Tool t : unifiedRequest.tools()) {
                 builder.startObject();