support mcp connector in agent update api (opensearch-project#4352)

Signed-off-by: Jiaping Zeng <jpz@amazon.com>

Author: jiapingzeng

common/src/main/java/org/opensearch/ml/common/transport/agent/MLAgentUpdateInput.java

@@ -8,6 +8,7 @@
 import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
 import static org.opensearch.ml.common.CommonValue.TENANT_ID_FIELD;
 import static org.opensearch.ml.common.CommonValue.VERSION_2_19_0;
+import static org.opensearch.ml.common.utils.StringUtils.getParameterMap;
 
 import java.io.IOException;
 import java.time.Instant;
@@ -256,7 +257,7 @@ public static MLAgentUpdateInput parse(XContentParser parser) throws IOException
                                 llmModelId = parser.text();
                                 break;
                             case LLM_PARAMETERS_FIELD:
-                                llmParameters = parser.mapStrings();
+                                llmParameters = getParameterMap(parser.map());
                                 break;
                             default:
                                 parser.skipChildren();
@@ -272,7 +273,7 @@ public static MLAgentUpdateInput parse(XContentParser parser) throws IOException
                     }
                     break;
                 case PARAMETERS_FIELD:
-                    parameters = parser.mapStrings();
+                    parameters = getParameterMap(parser.map());
                     break;
                 case MEMORY_FIELD:
                     ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser);

common/src/test/java/org/opensearch/ml/common/transport/agent/MLAgentUpdateInputTest.java

@@ -995,4 +995,54 @@ public void testStreamInputOutputWithVersion() throws IOException {
         assertEquals(input.getLastUpdateTime(), parsedInput.getLastUpdateTime());
         assertEquals(input.getTenantId(), parsedInput.getTenantId());
     }
+
+    @Test
+    public void testParseWithMcpConnectors() throws Exception {
+        String inputStr = """
+            {
+              "agent_id": "test-agent-id",
+              "name": "test-agent",
+              "parameters": {
+                "_llm_interface": "openai/v1/chat/completions",
+                "mcp_connectors": [
+                  {
+                    "mcp_connector_id": "test-connector-id",
+                    "tool_filters": ["^get_alerts$", "^list_.*$"]
+                  }
+                ]
+              }
+            }
+            """;
+        testParseFromJsonString(inputStr, parsedInput -> {
+            assertEquals("test-agent", parsedInput.getName());
+            assertNotNull(parsedInput.getParameters());
+            assertEquals("openai/v1/chat/completions", parsedInput.getParameters().get("_llm_interface"));
+            assertTrue(parsedInput.getParameters().containsKey("mcp_connectors"));
+            String mcpConnectorsJson = parsedInput.getParameters().get("mcp_connectors");
+            assertTrue(mcpConnectorsJson.contains("test-connector-id"));
+            assertTrue(mcpConnectorsJson.contains("tool_filters"));
+        });
+    }
+
+    @Test
+    public void testParseWithMcpConnectorsMinimal() throws Exception {
+        String inputStr = """
+            {
+              "agent_id": "test-agent-id",
+              "parameters": {
+                "mcp_connectors": [
+                  {
+                    "mcp_connector_id": "connector-123"
+                  }
+                ]
+              }
+            }
+            """;
+        testParseFromJsonString(inputStr, parsedInput -> {
+            assertNotNull(parsedInput.getParameters());
+            assertTrue(parsedInput.getParameters().containsKey("mcp_connectors"));
+            String mcpConnectorsJson = parsedInput.getParameters().get("mcp_connectors");
+            assertTrue(mcpConnectorsJson.contains("connector-123"));
+        });
+    }
 }