remove chat connector and do not include payload in the exception mes…

…sage Signed-off-by: Xun Zhang <[email protected]>
opensearch-project · Jun 29, 2023 · 6a43a0a · 6a43a0a
1 parent 56bc7a8
commit 6a43a0a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 544 deletions.
diff --git a/common/src/main/java/org/opensearch/ml/common/CommonValue.java b/common/src/main/java/org/opensearch/ml/common/CommonValue.java
@@ -7,10 +7,6 @@
 
 import org.opensearch.ml.common.connector.template.DetachedConnector;
 
-import static org.opensearch.ml.common.connector.template.APISchema.HEADERS_FIELD;
-import static org.opensearch.ml.common.connector.template.APISchema.METHOD_FIELD;
-import static org.opensearch.ml.common.connector.template.APISchema.REQUEST_BODY_FIELD;
-import static org.opensearch.ml.common.connector.template.APISchema.URL_FIELD;
 import static org.opensearch.ml.common.model.MLModelConfig.ALL_CONFIG_FIELD;
 import static org.opensearch.ml.common.model.MLModelConfig.MODEL_TYPE_FIELD;
 import static org.opensearch.ml.common.model.TextEmbeddingModelConfig.EMBEDDING_DIMENSION_FIELD;

diff --git a/common/src/main/java/org/opensearch/ml/common/connector/ChatConnector.java b/common/src/main/java/org/opensearch/ml/common/connector/ChatConnector.java
diff --git a/common/src/main/java/org/opensearch/ml/common/connector/ConnectorNames.java b/common/src/main/java/org/opensearch/ml/common/connector/ConnectorNames.java
@@ -9,5 +9,4 @@ public class ConnectorNames {
 
     public static final String HTTP_V1 = "http/v1";
     public static final String AWS_V1 = "aws/v1";
-    public static final String CHAT_V1 = "chat/v1";
 }
diff --git a/common/src/main/java/org/opensearch/ml/common/connector/HttpConnector.java b/common/src/main/java/org/opensearch/ml/common/connector/HttpConnector.java
@@ -172,7 +172,7 @@ public  <T> T createPredictPayload(Map<String, String> parameters) {
             payload = substitutor.replace(payload);
 
             if (!isJson(payload)) {
-                throw new IllegalArgumentException("Invalid JSON: " + payload);
+                throw new IllegalArgumentException("Invalid JSON in payload");
             }
             return (T) payload;
         }

diff --git a/common/src/main/java/org/opensearch/ml/common/connector/template/DetachedConnector.java b/common/src/main/java/org/opensearch/ml/common/connector/template/DetachedConnector.java
@@ -382,7 +382,7 @@ public <T> T createPredictPayload(Map<String, String> parameters) {
             payload = substitutor.replace(payload);
 
             if (!isJson(payload)) {
-                throw new IllegalArgumentException("Invalid JSON: " + payload);
+                throw new IllegalArgumentException("Invalid JSON in payload!");
             }
             return (T) payload;
         }

diff --git a/...rithms/src/main/java/org/opensearch/ml/engine/algorithms/remote/AwsConnectorExecutor.java b/...rithms/src/main/java/org/opensearch/ml/engine/algorithms/remote/AwsConnectorExecutor.java
@@ -120,9 +120,12 @@ public ModelTensorOutput executePredict(MLInput mlInput) {
             ModelTensors tensors = processOutput(modelResponse, connector, scriptService, parameters, modelTensors);
             tensorOutputs.add(tensors);
             return new ModelTensorOutput(tensorOutputs);
+        } catch (IllegalArgumentException exception) {
+            log.error("Failed to execute predict in aws connector: " + exception.getMessage(), exception);
+            throw new MLException("Fail to execute predict in aws connector", exception);
         } catch (Throwable e) {
-            log.error("Failed to execute aws connector", e);
-            throw new MLException("Fail to execute aws connector", e);
+            log.error("Failed to execute predict in aws connector", e);
+            throw new MLException("Fail to execute predict in aws connector", e);
         }
     }