Change to action and tests

Author: Max Hniebergall

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java

@@ -59,13 +59,15 @@ public static class Request extends ActionRequest {
         public static final TimeValue DEFAULT_TIMEOUT = TimeValue.timeValueSeconds(30);
         public static final ParseField INPUT = new ParseField("input");
         public static final ParseField TASK_SETTINGS = new ParseField("task_settings");
+        public static final ParseField PARAMETERS = new ParseField("parameters");
         public static final ParseField QUERY = new ParseField("query");
         public static final ParseField TIMEOUT = new ParseField("timeout");
 
         static final ObjectParser<Request.Builder, Void> PARSER = new ObjectParser<>(NAME, Request.Builder::new);
         static {
             PARSER.declareStringArray(Request.Builder::setInput, INPUT);
             PARSER.declareObject(Request.Builder::setTaskSettings, (p, c) -> p.mapOrdered(), TASK_SETTINGS);
+            PARSER.declareObject(Request.Builder::setTaskSettings, (p, c) -> p.mapOrdered(), PARAMETERS);
             PARSER.declareString(Request.Builder::setQuery, QUERY);
             PARSER.declareString(Builder::setInferenceTimeout, TIMEOUT);
         }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/InferenceActionRequestTests.java

@@ -73,6 +73,77 @@ public void testParsing() throws IOException {
         }
     }
 
+    public void testParsingWithTaskSettings() throws IOException {
+        String requestText = """
+            {
+              "input": "single text input",
+                "task_settings": {
+                    "foo": "bar"
+                }
+            }
+            """;
+        try (var parser = createParser(JsonXContent.jsonXContent, requestText)) {
+            var request = InferenceAction.Request.parseRequest("model_id", TaskType.SPARSE_EMBEDDING, parser).build();
+            assertThat(request.getInput(), contains("single text input"));
+            assertThat(request.getTaskSettings(), is(Map.of("foo", "bar")));
+        }
+    }
+
+    public void testParsingWithParameters() throws IOException {
+        String requestText = """
+            {
+              "input": "single text input",
+                "parameters": {
+                    "foo": "bar"
+                }
+            }
+            """;
+        try (var parser = createParser(JsonXContent.jsonXContent, requestText)) {
+            var request = InferenceAction.Request.parseRequest("model_id", TaskType.SPARSE_EMBEDDING, parser).build();
+            assertThat(request.getInput(), contains("single text input"));
+            assertThat(request.getTaskSettings(), is(Map.of("foo", "bar")));
+        }
+    }
+
+    public void testParsingWithTaskSettingsAndParameters() throws IOException {
+        {
+            String singleInputRequest = """
+                {
+                  "input": "single text input",
+                  "parameters": {
+                        "foo": "bar"
+                    },
+                  "task_settings": {
+                        "food": "bard"
+                  }
+                }
+                """;
+            try (var parser = createParser(JsonXContent.jsonXContent, singleInputRequest)) {
+                var request = InferenceAction.Request.parseRequest("model_id", TaskType.SPARSE_EMBEDDING, parser).build();
+                assertThat(request.getInput(), contains("single text input"));
+                assertThat(request.getTaskSettings(), is(Map.of("food", "bard")));
+            }
+        }
+        {
+            String singleInputRequest = """
+                {
+                  "input": "single text input",
+                  "task_settings": {
+                        "food": "bard"
+                  },
+                  "parameters": {
+                        "foo": "bar"
+                  }
+                }
+                """;
+            try (var parser = createParser(JsonXContent.jsonXContent, singleInputRequest)) {
+                var request = InferenceAction.Request.parseRequest("model_id", TaskType.SPARSE_EMBEDDING, parser).build();
+                assertThat(request.getInput(), contains("single text input"));
+                assertThat(request.getTaskSettings(), is(Map.of("foo", "bar")));
+            }
+        }
+    }
+
     public void testValidation_TextEmbedding() {
         InferenceAction.Request request = new InferenceAction.Request(
             TaskType.TEXT_EMBEDDING,