passed all UT

Signed-off-by: Shiqi Xia <[email protected]>

Author: Xia

common/src/main/java/org/opensearch/ml/common/connector/HttpConnector.java

@@ -359,7 +359,9 @@ public <T> T createPayload(String action, Map<String, String> parameters) {
     }
 
     public String removeMissingParameterFields(String payload, Map<String, String> params) {
-        // Match: "xxx": "${parameters.yyy}" or "xxx": {parameters.yyy}
+        if (params == null) {
+            return payload;
+        }
         Pattern pattern = Pattern.compile(
                 "\\s*\"[^\"]+\"\\s*:\\s*(\"?\\$?\\{parameters\\.([^}]+)\\}\"?)\\s*,?"
         );
@@ -368,7 +370,7 @@ public String removeMissingParameterFields(String payload, Map<String, String> p
 
         while (matcher.find()) {
             String paramName = matcher.group(2); // yyy
-            if (!params.containsKey(paramName)) {
+            if (!params.containsKey(paramName) && !"input".equals(paramName)) {
                 matcher.appendReplacement(sb, "");
             } else {
                 matcher.appendReplacement(sb, Matcher.quoteReplacement(matcher.group(0)));

common/src/test/java/org/opensearch/ml/common/connector/HttpConnectorTest.java

@@ -193,6 +193,22 @@ public void createPayload() {
         Assert.assertEquals("{\"input\": \"test input value\"}", predictPayload);
     }
 
+    @Test
+    public void createPayload_ExtraParams() {
+
+        String requestBody = "{\"input\": \"${parameters.input}\", \"parameters\": {\"sparseEmbeddingFormat\": \"${parameters.sparseEmbeddingFormat}\", \"content_type\": \"${parameters.content_type}\" }}";
+        String expected = "{\"input\": \"test value\", \"parameters\": {\"sparseEmbeddingFormat\": \"WORD\", \"content_type\": \"query\" }}";
+
+        HttpConnector connector = createHttpConnectorWithRequestBody(requestBody);
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("input", "test value");
+        parameters.put("sparseEmbeddingFormat", "WORD");
+        parameters.put("content_type", "query");
+        String predictPayload = connector.createPayload(PREDICT.name(), parameters);
+        connector.validatePayload(predictPayload);
+        Assert.assertEquals(expected, predictPayload);
+    }
+
     @Test
     public void parseResponse_modelTensorJson() throws IOException {
         HttpConnector connector = createHttpConnector();
@@ -439,7 +455,7 @@ public void removeMissingParameterFields_MissingAll() {
         Map<String, String> params = new HashMap<>();
 
         String payload = "{\"input\": ${parameters.input}, \"parameters\": {\"sparseEmbeddingFormat\": \"${parameters.sparseEmbeddingFormat}\", \"content_type\": \"${parameters.content_type}\"}}";
-        String expected = "{ \"parameters\": {}}";
+        String expected = "{\"input\": ${parameters.input}, \"parameters\": {}}";
         String result = connector.removeMissingParameterFields(payload, params);
         Assert.assertEquals(expected, result);
     }
@@ -450,7 +466,6 @@ public void removeMissingParameterFields_Nest() {
         Map<String, String> params = new HashMap<>();
         params.put("input", "test value");
 
-        // Case 1: Payload with valid parameter placeholders
         String payload = "{\"input\": \"${parameters.input}\", \"parameters\": {\"nested\": {\"sparseEmbeddingFormat\": \"${parameters.sparseEmbeddingFormat}\"}}}";
         String expected = "{\"input\": \"${parameters.input}\", \"parameters\": {\"nested\": {}}}";
         String result = connector.removeMissingParameterFields(payload, params);

ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/remote/RemoteConnectorExecutor.java

@@ -5,18 +5,13 @@
 
 package org.opensearch.ml.engine.algorithms.remote;
 
-import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
-//import static org.opensearch.ml.common.dataset.SearchQueryInputDataset.xContentRegistry;
 import static org.opensearch.ml.engine.algorithms.remote.ConnectorUtils.SKIP_VALIDATE_MISSING_PARAMETERS;
 import static org.opensearch.ml.engine.algorithms.remote.ConnectorUtils.escapeRemoteInferenceInputData;
 import static org.opensearch.ml.engine.algorithms.remote.ConnectorUtils.processInput;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.logging.log4j.Logger;
@@ -30,7 +25,6 @@
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.TokenBucket;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.commons.ConfigConstants;
 import org.opensearch.commons.authuser.User;
 import org.opensearch.core.action.ActionListener;
@@ -46,7 +40,6 @@
 import org.opensearch.ml.common.dataset.remote.RemoteInferenceInputDataSet;
 import org.opensearch.ml.common.input.MLInput;
 import org.opensearch.ml.common.input.parameter.MLAlgoParams;
-//import org.opensearch.ml.common.input.parameter.textembedding.SparseEmbeddingFormat;
 import org.opensearch.ml.common.model.MLGuard;
 import org.opensearch.ml.common.output.model.ModelTensorOutput;
 import org.opensearch.ml.common.output.model.ModelTensors;
@@ -88,7 +81,7 @@ default void executeAction(String action, MLInput mlInput, ActionListener<MLTask
                         MLInput
                             .builder()
                             .algorithm(FunctionName.TEXT_EMBEDDING)
-                            .parameters(mlInput.getParameters())
+//                            .parameters(mlInput.getParameters())
                             .inputDataset(TextDocsInputDataSet.builder().docs(textDocs).build())
                             .build(),
                         new ExecutionContext(sequence++),
@@ -203,23 +196,6 @@ default void preparePayloadAndInvoke(
                 actionListener.onFailure(e);
             }
         }
-//        if (algoParams != null) {
-//            Map<String, String> parametersMap = new HashMap<>();
-//            String algoParamsStr = algoParams.toString();
-//            Pattern pattern = Pattern.compile("\\(([^)]+)\\)");
-//            Matcher matcher = pattern.matcher(algoParamsStr);
-//            if (matcher.find()) {
-//                String bracketContent = matcher.group(1);
-//                pattern = Pattern.compile("(\\w+)=([^,\\s]+)");
-//                matcher = pattern.matcher(bracketContent);
-//                while (matcher.find()) {
-//                    String fieldName = matcher.group(1);
-//                    String fieldValue = matcher.group(2);
-//                    parametersMap.put(fieldName, fieldValue);
-//                }
-//            }
-//            parameters.putAll(parametersMap);
-//        }
 
         RemoteInferenceInputDataSet inputData = processInput(action, mlInput, connector, parameters, getScriptService());
         if (inputData.getParameters() != null) {