poc

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

Author: Xia

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

@@ -346,6 +346,7 @@ public <T> T createPayload(String action, Map<String, String> parameters) {
             String payload = connectorAction.get().getRequestBody();
             payload = fillNullParameters(parameters, payload);
             parseParameters(parameters);
+            payload = removeMissingParameterFields(payload, parameters);
             StringSubstitutor substitutor = new StringSubstitutor(parameters, "${parameters.", "}");
             payload = substitutor.replace(payload);
 
@@ -357,6 +358,27 @@ public <T> T createPayload(String action, Map<String, String> parameters) {
         return (T) parameters.get("http_body");
     }
 
+    private String removeMissingParameterFields(String payload, Map<String, String> params) {
+        // Match: "xxx": "${parameters.yyy}" or "xxx": {parameters.yyy}
+        Pattern pattern = Pattern.compile(
+                "\\s*\"[^\"]+\"\\s*:\\s*(\"?\\$?\\{parameters\\.([^}]+)\\}\"?)\\s*,?"
+        );
+        Matcher matcher = pattern.matcher(payload);
+        StringBuffer sb = new StringBuffer();
+
+        while (matcher.find()) {
+            String paramName = matcher.group(2); // yyy
+            if (!params.containsKey(paramName)) {
+                matcher.appendReplacement(sb, "");
+            } else {
+                matcher.appendReplacement(sb, Matcher.quoteReplacement(matcher.group(0)));
+            }
+        }
+        matcher.appendTail(sb);
+        return sb.toString().replaceAll(",\\s*}", "}").replaceAll(",\\s*]", "]");
+    }
+
+
     protected String fillNullParameters(Map<String, String> parameters, String payload) {
         List<String> bodyParams = findStringParametersWithNullDefaultValue(payload);
         String newPayload = payload;

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

@@ -9,6 +9,8 @@
 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.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -17,6 +19,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.logging.log4j.Logger;
 import org.opensearch.ExceptionsHelper;
@@ -28,11 +32,14 @@
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.TokenBucket;
+import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.commons.ConfigConstants;
 import org.opensearch.commons.authuser.User;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.ml.common.FunctionName;
 import org.opensearch.ml.common.connector.Connector;
 import org.opensearch.ml.common.connector.ConnectorAction;
@@ -42,6 +49,8 @@
 import org.opensearch.ml.common.dataset.TextDocsInputDataSet;
 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.AsymmetricTextEmbeddingParameters;
 import org.opensearch.ml.common.model.MLGuard;
 import org.opensearch.ml.common.output.model.ModelTensorOutput;
 import org.opensearch.ml.common.output.model.ModelTensors;
@@ -83,6 +92,7 @@ default void executeAction(String action, MLInput mlInput, ActionListener<MLTask
                         MLInput
                             .builder()
                             .algorithm(FunctionName.TEXT_EMBEDDING)
+                            .parameters(mlInput.getParameters())
                             .inputDataset(TextDocsInputDataSet.builder().docs(textDocs).build())
                             .build(),
                         new ExecutionContext(sequence++),
@@ -187,6 +197,26 @@ default void preparePayloadAndInvoke(
             inputParameters.putAll(((RemoteInferenceInputDataSet) inputDataset).getParameters());
         }
         parameters.putAll(inputParameters);
+
+        MLAlgoParams algoParams = mlInput.getParameters();
+        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) {
             parameters.putAll(inputData.getParameters());