Fix parser poc

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>

Author: b4sjoo

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

@@ -8,8 +8,7 @@
 import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
 import static org.opensearch.ml.common.connector.ConnectorProtocols.HTTP;
 import static org.opensearch.ml.common.connector.ConnectorProtocols.validateProtocol;
-import static org.opensearch.ml.common.utils.StringUtils.getParameterMap;
-import static org.opensearch.ml.common.utils.StringUtils.isJson;
+import static org.opensearch.ml.common.utils.StringUtils.*;
 
 import java.io.IOException;
 import java.time.Instant;
@@ -129,7 +128,7 @@ public HttpConnector(String protocol, XContentParser parser) throws IOException
                     connectorClientConfig = ConnectorClientConfig.parse(parser);
                     break;
                 case MODEL_INTERFACE_FIELD:
-                    modelInterface =  getParameterMap(parser.map());
+                    modelInterface =  getInterfaceMap(parser.map());
                     break;
                 default:
                     parser.skipChildren();

common/src/main/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorInput.java

@@ -27,7 +27,7 @@
 import java.util.Map;
 
 import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
-import static org.opensearch.ml.common.utils.StringUtils.getParameterMap;
+import static org.opensearch.ml.common.utils.StringUtils.*;
 
 @Data
 public class MLCreateConnectorInput implements ToXContentObject, Writeable {
@@ -182,7 +182,7 @@ public static MLCreateConnectorInput parse(XContentParser parser, boolean update
                     connectorClientConfig = ConnectorClientConfig.parse(parser);
                     break;
                 case AbstractConnector.MODEL_INTERFACE_FIELD:
-                    modelInterface = getParameterMap(parser.map());
+                    modelInterface = getInterfaceMap(parser.map());
                     break;
                 default:
                     parser.skipChildren();

common/src/main/java/org/opensearch/ml/common/utils/StringUtils.java

@@ -19,10 +19,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -94,6 +91,28 @@ public static Map<String, Object> fromJson(String jsonStr, String defaultKey) {
         return result;
     }
 
+    public static Map<String, String> getInterfaceMap(Map<String, ?> interfaceObjs) {
+        Map<String, String> parameters = new HashMap<>();
+        for (String key : interfaceObjs.keySet()) {
+            if (Objects.equals(key, "input") || Objects.equals(key, "output")) {
+                Object value = interfaceObjs.get(key);
+                try {
+                    AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
+                        if (value instanceof String) {
+                            parameters.put(key, (String)value);
+                        } else {
+                            parameters.put(key, gson.toJson(value));
+                        }
+                        return null;
+                    });
+                } catch (PrivilegedActionException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        return parameters;
+    }
+
     @SuppressWarnings("removal")
     public static Map<String, String> getParameterMap(Map<String, ?> parameterObjs) {
         Map<String, String> parameters = new HashMap<>();

common/src/test/java/org/opensearch/ml/common/utils/StringUtilsTest.java

@@ -115,6 +115,23 @@ public void getParameterMap() {
         Assert.assertEquals("[1.01,\"abc\"]", parameterMap.get("key5"));
     }
 
+    @Test
+    public void getInterfaceMap() {
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("input", "value1");
+        parameters.put("output", 2);
+        parameters.put("key3", 2.1);
+        parameters.put("key4", new int[]{10, 20});
+        parameters.put("key5", new Object[]{1.01, "abc"});
+        Map<String, String> interfaceMap = StringUtils.getInterfaceMap(parameters);
+        Assert.assertEquals(2, interfaceMap.size());
+        Assert.assertEquals("value1", interfaceMap.get("input"));
+        Assert.assertEquals("2", interfaceMap.get("output"));
+        Assert.assertNull(interfaceMap.get("key3"));
+        Assert.assertNull(interfaceMap.get("key4"));
+        Assert.assertNull(interfaceMap.get("key5"));
+    }
+
     @Test
     public void processTextDocs() {
         List<String> processedDocs = StringUtils.processTextDocs(Arrays.asList("abc \n\n123\"4", null, "[1.01,\"abc\"]"));