Added ability for people to add names and desriptions to their MCP agents in the secret they provide. Also, working to successfully merge develop template.yaml into mine without conflicts

Author: kaleko

docs/custom-MCP-agent.md

@@ -159,7 +159,9 @@ In the AWS account where the IDP solution is deployed, create a secret with your
        "cognito_user_pool_id": "us-east-1_XXXXXXXXX",
        "cognito_client_id": "xxxxxxxxxxxxxxxxxxxxxxxxxx",
        "cognito_username": "mcp-service-user-1", 
-       "cognito_password": "SecurePassword123!"
+       "cognito_password": "SecurePassword123!",
+       "agent_name": "My Custom Calculator Agent",
+       "agent_description": "Provides advanced mathematical calculations for document analysis"
      },
      {
        "mcp_url": "https://your-second-mcp-server.example.com/mcp",
@@ -177,6 +179,8 @@ In the AWS account where the IDP solution is deployed, create a secret with your
 - `cognito_client_id`: The App Client ID from Step 2  
 - `cognito_username`: The username created in Step 2
 - `cognito_password`: The permanent password set in Step 2
+- `agent_name` (optional): Custom name for the agent (defaults to "External MCP Agent {N}")
+- `agent_description` (optional): Custom description for the agent (tool information is automatically appended)
 
 ### Step 5: Verify Integration
 

lib/idp_common_pkg/idp_common/agents/README.md

@@ -154,7 +154,9 @@ The agent requires credentials stored in AWS Secrets Manager at `{StackName}/ext
     "cognito_user_pool_id": "us-east-1_XXXXXXXXX",
     "cognito_client_id": "xxxxxxxxxxxxxxxxxxxxxxxxxx", 
     "cognito_username": "<your first user here>",
-    "cognito_password": "<your first password here>"
+    "cognito_password": "<your first password here>",
+    "agent_name": "My Custom Calculator Agent",
+    "agent_description": "Provides advanced mathematical calculations"
   },
   {
     "mcp_url": "https://your-second-mcp-server.com/mcp",
@@ -166,6 +168,10 @@ The agent requires credentials stored in AWS Secrets Manager at `{StackName}/ext
 ]
 ```
 
+**Optional Fields:**
+- `agent_name`: Custom name for the agent (defaults to "External MCP Agent {N}")
+- `agent_description`: Custom description (tool information is automatically appended)
+
 **Usage:**
 ```python
 from idp_common.agents.factory import agent_factory

lib/idp_common_pkg/idp_common/agents/factory/registry.py

@@ -18,6 +18,7 @@
 """
 
 import logging
+import uuid
 
 from ..analytics.agent import create_analytics_agent
 
@@ -128,15 +129,15 @@ def wrapper(config=None, session=None, model_id=None, **kwargs):
             test_strands_agent, test_mcp_client = test_result
 
             # Extract available tools for dynamic description
-            dynamic_description = f"Agent {i} which connects to external MCP servers to provide additional tools and capabilities"
+            tools_description = ""
             if (
                 hasattr(test_strands_agent, "tool_names")
                 and test_strands_agent.tool_names
             ):
                 tool_names = list(test_strands_agent.tool_names)
                 if tool_names:
                     tools_list = ", ".join(tool_names)
-                    dynamic_description = f"Agent {i} with access to external MCP tools: {tools_list}. Use this agent to access external capabilities and services."
+                    tools_description = f" The tools available are: {tools_list}."
 
             # Clean up the test MCP client
             if test_mcp_client:
@@ -148,21 +149,39 @@ def wrapper(config=None, session=None, model_id=None, **kwargs):
 
         except Exception as e:
             logger.warning(f"Could not discover MCP tools for agent {i}: {e}")
-            dynamic_description = f"Agent {i} which connects to external MCP servers to provide additional tools and capabilities"
+            tools_description = ""
+
+        # Determine agent name and ID
+        if "agent_name" in mcp_config and mcp_config["agent_name"]:
+            agent_name = mcp_config["agent_name"]
+            # Create ID from name with UUID for uniqueness
+            name_no_spaces = agent_name.replace(" ", "_").lower()
+            agent_id = f"{name_no_spaces}_{str(uuid.uuid4())[:8]}"
+        else:
+            agent_name = f"External MCP Agent {i}"
+            agent_id = f"external-mcp-agent-{i}"
+
+        # Determine agent description
+        if "agent_description" in mcp_config and mcp_config["agent_description"]:
+            agent_description = mcp_config["agent_description"] + tools_description
+        else:
+            agent_description = f"Agent which connects to external MCP servers to provide additional tools and capabilities.{tools_description}"
 
         # Register the agent
         agent_factory.register_agent(
-            agent_id=f"external-mcp-agent-{i}",
-            agent_name=f"External MCP Agent {i}",
-            agent_description=dynamic_description,
+            agent_id=agent_id,
+            agent_name=agent_name,
+            agent_description=agent_description,
             creator_func=create_mcp_agent_wrapper(),
             sample_queries=[
                 "What tools are available from the external MCP server?",
                 "Help me use the external tools to solve my problem",
                 "Show me what capabilities the MCP server provides",
             ],
         )
-        logger.info(f"External MCP Agent {i} registered successfully")
+        logger.info(
+            f"External MCP Agent '{agent_name}' registered successfully with ID '{agent_id}'"
+        )
 
 except Exception as e:
     logger.warning(