Skip to content

Commit b0857a0

Browse files
add prefix to show the error is from remote service (#1499) (#1515)
Signed-off-by: Yaliang Wu <[email protected]> (cherry picked from commit 3897ad1) Co-authored-by: Yaliang Wu <[email protected]>
1 parent 0177e21 commit b0857a0

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

common/src/main/java/org/opensearch/ml/common/CommonValue.java

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
public class CommonValue {
1919

2020
public static Integer NO_SCHEMA_VERSION = 0;
21+
public static final String REMOTE_SERVICE_ERROR = "Error from remote service: ";
2122
public static final String USER = "user";
2223
public static final String META = "_meta";
2324
public static final String SCHEMA_VERSION_FIELD = "schema_version";

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.List;
3535
import java.util.Map;
3636

37+
import static org.opensearch.ml.common.CommonValue.REMOTE_SERVICE_ERROR;
3738
import static org.opensearch.ml.common.connector.ConnectorProtocols.AWS_SIGV4;
3839
import static org.opensearch.ml.engine.algorithms.remote.ConnectorUtils.processOutput;
3940
import static software.amazon.awssdk.http.SdkHttpMethod.POST;
@@ -102,7 +103,7 @@ public void invokeRemoteModel(MLInput mlInput, Map<String, String> parameters, S
102103
}
103104
String modelResponse = responseBuilder.toString();
104105
if (statusCode < 200 || statusCode >= 300) {
105-
throw new OpenSearchStatusException(modelResponse, RestStatus.fromCode(statusCode));
106+
throw new OpenSearchStatusException(REMOTE_SERVICE_ERROR + modelResponse, RestStatus.fromCode(statusCode));
106107
}
107108

108109
ModelTensors tensors = processOutput(modelResponse, connector, scriptService, parameters);

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.Map;
3535
import java.util.concurrent.atomic.AtomicReference;
3636

37+
import static org.opensearch.ml.common.CommonValue.REMOTE_SERVICE_ERROR;
3738
import static org.opensearch.ml.common.connector.ConnectorProtocols.HTTP;
3839
import static org.opensearch.ml.engine.algorithms.remote.ConnectorUtils.processOutput;
3940

@@ -107,7 +108,7 @@ public void invokeRemoteModel(MLInput mlInput, Map<String, String> parameters, S
107108
String modelResponse = responseRef.get();
108109
Integer statusCode = statusCodeRef.get();
109110
if (statusCode < 200 || statusCode >= 300) {
110-
throw new OpenSearchStatusException(modelResponse, RestStatus.fromCode(statusCode));
111+
throw new OpenSearchStatusException(REMOTE_SERVICE_ERROR + modelResponse, RestStatus.fromCode(statusCode));
111112
}
112113

113114
ModelTensors tensors = processOutput(modelResponse, connector, scriptService, parameters);

0 commit comments

Comments
 (0)