remove useless code

Signed-off-by: xinyual <xinyual@amazon.com>

Author: xinyual

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

@@ -289,6 +289,8 @@ public  <T> T createPredictPayload(Map<String, String> parameters) {
             payload = fillNullParameters(parameters, payload);
             StringSubstitutor substitutor = new StringSubstitutor(parameters, "${parameters.", "}");
             payload = substitutor.replace(payload);
+            log.info("to llm");
+            log.info(payload);
             if (!isJson(payload)) {
                 throw new IllegalArgumentException("Invalid payload: " + payload);
             }

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

@@ -10,17 +10,7 @@
 import static org.opensearch.ml.common.utils.StringUtils.isJson;
 import static org.opensearch.ml.common.utils.StringUtils.toJson;
 import static org.opensearch.ml.engine.algorithms.agent.MLAgentExecutor.MESSAGE_HISTORY_LIMIT;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.ACTION;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.ACTION_INPUT;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.CHAT_HISTORY;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.CONTEXT;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.EXAMPLES;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.FINAL_ANSWER;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.OS_INDICES;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.THOUGHT;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.THOUGHT_RESPONSE;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.TOOL_DESCRIPTIONS;
-import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.TOOL_NAMES;
+import static org.opensearch.ml.engine.algorithms.agent.MLChatAgentRunner.*;
 import static org.opensearch.ml.engine.memory.ConversationIndexMemory.LAST_N_INTERACTIONS;
 
 import java.security.AccessController;
@@ -223,7 +213,7 @@ public static Map<String, String> parseLLMOutput(
                 modelOutput.remove(ACTION);
             }
         }
-        if (!modelOutput.containsKey(ACTION) && !modelOutput.containsKey(FINAL_ANSWER)) {
+        if (!modelOutput.containsKey(ACTION) && !modelOutput.containsKey(FINAL_ANSWER) && !modelOutput.containsKey(EMPTY_LABEL)) {
             modelOutput.put(FINAL_ANSWER, modelOutput.get(THOUGHT_RESPONSE));
         }
         return modelOutput;

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

@@ -83,6 +83,7 @@ public class MLChatAgentRunner implements MLAgentRunner {
     public static final String ACTION_INPUT = "action_input";
     public static final String FINAL_ANSWER = "final_answer";
     public static final String THOUGHT_RESPONSE = "thought_response";
+    public static final String EMPTY_LABEL = "empty";
 
     private Client client;
     private Settings settings;
@@ -419,6 +420,7 @@ private void getNextStep(
         } else {
             tmpParameters.put("prompt.format_instruction", PROMPT_FORMAT_INSTRUCTION_FOR_THOUGHT_EXTRACT);
             tmpParameters.put("prompt.suffix", PROMPT_TEMPLATE_SUFFIX_FOR_THOUGHT_EXTRACT);
+            tmpParameters.remove(PROMPT);
             String thuoghtPrompt = constructLLMPrompt(tools, tmpParameters);
             StringSubstitutor tmpSubstitutor = new StringSubstitutor(
                 Map.of(SCRATCHPAD, scratchpadBuilder.toString()),
@@ -485,7 +487,7 @@ private void getNextStep(
                         tmpParameters.put("prompt.format_instruction", PROMPT_FORMAT_INSTRUCTION_FOR_ACTION_INPUT);
                         tmpParameters.put("prompt.suffix", PROMPT_TEMPLATE_SUFFIX_FOR_ACTION_INPUT);
                         tmpParameters.put("current_thought", thought);
-
+                        tmpParameters.remove(PROMPT);
                         String actionPrompt = constructLLMPrompt(ImmutableMap.of(action, tools.get(action)), tmpParameters);
                         tmpParameters.put("prompt", tmpSubstitutor.replace(actionPrompt));
                         ActionRequest getActionInputRequest = new MLPredictionTaskRequest(

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

@@ -117,6 +117,8 @@ public void invokeRemoteModel(MLInput mlInput, Map<String, String> parameters, S
                 throw new OpenSearchStatusException("No response from model", RestStatus.BAD_REQUEST);
             }
             String modelResponse = responseBuilder.toString();
+            log.info("from LLM");
+            log.info(modelResponse);
             if (statusCode < 200 || statusCode >= 300) {
                 throw new OpenSearchStatusException(REMOTE_SERVICE_ERROR + modelResponse, RestStatus.fromCode(statusCode));
             }