Skip to content

Commit e86a863

Browse files
committed
fix spot less
Signed-off-by: xinyual <xinyual@amazon.com>
1 parent 70ad223 commit e86a863

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/agent/MLChatAgentRunner.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static org.opensearch.ml.common.conversation.ActionConstants.ADDITIONAL_INFO_FIELD;
99
import static org.opensearch.ml.common.conversation.ActionConstants.AI_RESPONSE_FIELD;
1010
import static org.opensearch.ml.common.utils.StringUtils.gson;
11-
import static org.opensearch.ml.common.utils.StringUtils.toUTF8;
1211
import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.extractModelResponseJson;
1312

1413
import java.security.AccessController;
@@ -546,7 +545,13 @@ private void runReAct(
546545
.singletonList(
547546
ModelTensor
548547
.builder()
549-
.dataAsMap(ImmutableMap.of("response", lastThought.get() + "\nObservation: " + outputToOutputString(output)))
548+
.dataAsMap(
549+
ImmutableMap
550+
.of(
551+
"response",
552+
lastThought.get() + "\nObservation: " + outputToOutputString(output)
553+
)
554+
)
550555
.build()
551556
)
552557
)
@@ -654,22 +659,17 @@ private void runReAct(
654659

655660
private String outputToOutputString(Object output) throws PrivilegedActionException {
656661
String outputString;
657-
if (output instanceof ModelTensorOutput)
658-
{
662+
if (output instanceof ModelTensorOutput) {
659663
ModelTensor outputModel = ((ModelTensorOutput) output).getMlModelOutputs().get(0).getMlModelTensors().get(0);
660-
if (outputModel.getDataAsMap() != null)
661-
{
662-
outputString = AccessController.doPrivileged((PrivilegedExceptionAction<String>) () -> gson.toJson(outputModel.getDataAsMap()));
663-
}
664-
else {
664+
if (outputModel.getDataAsMap() != null) {
665+
outputString = AccessController
666+
.doPrivileged((PrivilegedExceptionAction<String>) () -> gson.toJson(outputModel.getDataAsMap()));
667+
} else {
665668
outputString = outputModel.getResult();
666669
}
667-
}
668-
else if (output instanceof String)
669-
{
670+
} else if (output instanceof String) {
670671
outputString = (String) output;
671-
}
672-
else {
672+
} else {
673673
outputString = AccessController.doPrivileged((PrivilegedExceptionAction<String>) () -> gson.toJson(output));
674674
}
675675
return outputString;

ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/AgentTool.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package org.opensearch.ml.engine.tools;
77

8+
import static org.opensearch.ml.common.utils.StringUtils.gson;
9+
810
import java.util.Map;
911

1012
import org.opensearch.action.ActionRequest;
@@ -24,8 +26,6 @@
2426
import lombok.Setter;
2527
import lombok.extern.log4j.Log4j2;
2628

27-
import static org.opensearch.ml.common.utils.StringUtils.gson;
28-
2929
/**
3030
* This tool supports running any Agent.
3131
*/

0 commit comments

Comments
 (0)