Fixing issues

Author: jonathan-buttner

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

@@ -40,7 +40,7 @@ public class OpenAiUnifiedChatCompletionRequestEntity implements ToXContentObjec
     private static final String STOP_FIELD = "stop";
     private static final String TEMPERATURE_FIELD = "temperature";
     private static final String TOOL_CHOICE_FIELD = "tool_choice";
-    private static final String TOOL_FIELD = "tool";
+    private static final String TOOL_FIELD = "tools";
     private static final String TEXT_FIELD = "text";
     private static final String TYPE_FIELD = "type";
 
@@ -107,9 +107,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
         builder.endArray();
 
-        if (unifiedRequest.model() != null) {
-            builder.field(MODEL_FIELD, model.getServiceSettings().modelId());
-        }
+        builder.field(MODEL_FIELD, model.getServiceSettings().modelId());
         if (unifiedRequest.maxCompletionTokens() != null) {
             builder.field(MAX_COMPLETION_TOKENS_FIELD, unifiedRequest.maxCompletionTokens());
         }
@@ -144,9 +142,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                 builder.endObject();
             }
         }
-        if (unifiedRequest.tool() != null) {
+        if (unifiedRequest.tools() != null) {
             builder.startArray(TOOL_FIELD);
-            for (UnifiedCompletionRequest.Tool t : unifiedRequest.tool()) {
+            for (UnifiedCompletionRequest.Tool t : unifiedRequest.tools()) {
                 builder.startObject();
                 {
                     builder.field(TYPE_FIELD, t.type());
@@ -155,7 +153,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                         builder.field(DESCRIPTION_FIELD, t.function().description());
                         builder.field(NAME_FIELD, t.function().name());
                         builder.field(PARAMETERS_FIELD, t.function().parameters());
-                        builder.field(STRICT_FIELD, t.function().strict());
+                        if (t.function().strict() != null) {
+                            builder.field(STRICT_FIELD, t.function().strict());
+                        }
                     }
                     builder.endObject();
                 }
@@ -167,12 +167,15 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.field(TOP_P_FIELD, unifiedRequest.topP());
         }
 
-        if (Strings.isNullOrEmpty(model.getTaskSettings().user())) {
+        if (Strings.isNullOrEmpty(model.getTaskSettings().user()) == false) {
             builder.field(USER_FIELD, model.getTaskSettings().user());
         }
 
         builder.field(STREAM_FIELD, stream);
         builder.endObject();
+
+        System.out.println(Strings.toString(builder));
+
         return builder;
     }
 }

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

@@ -12,7 +12,6 @@
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.Scope;
 import org.elasticsearch.rest.ServerlessScope;
-import org.elasticsearch.xpack.core.inference.action.InferenceAction;
 import org.elasticsearch.xpack.core.inference.action.UnifiedCompletionAction;
 
 import java.io.IOException;
@@ -45,6 +44,6 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient
             request = UnifiedCompletionAction.Request.parseRequest(params.inferenceEntityId(), params.taskType(), inferTimeout, parser);
         }
 
-        return channel -> client.execute(InferenceAction.INSTANCE, request, new ServerSentEventsRestActionListener(channel));
+        return channel -> client.execute(UnifiedCompletionAction.INSTANCE, request, new ServerSentEventsRestActionListener(channel));
     }
 }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/completion/OpenAiChatCompletionModel.java

@@ -53,7 +53,7 @@ public static OpenAiChatCompletionModel of(OpenAiChatCompletionModel model, Unif
 
         var overriddenTaskSettings = OpenAiChatCompletionTaskSettings.of(model.getTaskSettings(), requestTaskSettings);
         return new OpenAiChatCompletionModel(
-            overriddenServiceSettings.modelId(),
+            model.getInferenceEntityId(),
             model.getTaskType(),
             model.getConfigurations().getService(),
             overriddenServiceSettings,