01-Tutorial fixes: E2E Workshop

01-tutorials/07-AgentCore-E2E/Optional-lab-agentcore-observability.ipynb

@@ -250,7 +250,7 @@
     "import argparse\n",
     "from boto3.session import Session\n",
     "from opentelemetry import baggage, context\n",
-    "from scripts.utils import get_ssm_parameter\n",
+    "from lab_helpers.utils import get_ssm_parameter\n",
     "\n",
     "from strands import Agent\n",
     "from strands.models import BedrockModel\n",

01-tutorials/07-AgentCore-E2E/Optional-lab-identity.ipynb

@@ -680,7 +680,7 @@
     "try:\n",
     "    print(\"📥 Fetching Cognito configuration from SSM...\")\n",
     "    \n",
-    "    client_id = get_ssm_parameter(\"/app/customersupport/agentcore/machine_client_id\")\n",
+    "    client_id = get_ssm_parameter(\"/app/customersupport/agentcore/client_id\")\n",
     "    print(f\"✅ Retrieved client ID: {client_id}\")\n",
     "\n",
     "    client_secret = get_ssm_parameter(\"/app/customersupport/agentcore/cognito_secret\")\n",

01-tutorials/07-AgentCore-E2E/lab-03-agentcore-gateway.ipynb

@@ -108,18 +108,17 @@
    "outputs": [],
    "source": [
     "# Import libraries\n",
-    "from strands import Agent\n",
-    "from strands.models import BedrockModel\n",
-    "from strands.tools.mcp import MCPClient\n",
     "import os\n",
     "import sys\n",
     "import boto3\n",
     "import json\n",
-    "from bedrock_agentcore.identity.auth import requires_access_token\n",
+    "\n",
+    "from strands import Agent\n",
+    "from strands.models import BedrockModel\n",
+    "from strands.tools.mcp import MCPClient\n",
     "from mcp.client.streamable_http import streamablehttp_client\n",
-    "import requests\n",
+    "from lab_helpers.utils import get_or_create_cognito_pool, put_ssm_parameter, get_ssm_parameter, load_api_spec\n",
     "\n",
-    "from scripts.utils import get_ssm_parameter, put_ssm_parameter, load_api_spec, get_cognito_client_secret\n",
     "\n",
     "sts_client = boto3.client('sts')\n",
     "\n",
@@ -286,12 +285,11 @@
    "source": [
     "gateway_name = \"customersupport-gw\"\n",
     "\n",
+    "cognito_config = get_or_create_cognito_pool(refresh_token=True)\n",
     "auth_config = {\n",
     "    \"customJWTAuthorizer\": {\n",
-    "        \"allowedClients\": [\n",
-    "            get_ssm_parameter(\"/app/customersupport/agentcore/machine_client_id\")\n",
-    "        ],\n",
-    "        \"discoveryUrl\": get_ssm_parameter(\"/app/customersupport/agentcore/cognito_discovery_url\")\n",
+    "        \"allowedClients\": [cognito_config[\"client_id\"]],\n",
+    "        \"discoveryUrl\": cognito_config[\"discovery_url\"]\n",
     "    }\n",
     "}\n",
     "\n",
@@ -317,7 +315,13 @@
     "        \"gateway_arn\": create_response[\"gatewayArn\"],\n",
     "    }\n",
     "    put_ssm_parameter(\"/app/customersupport/agentcore/gateway_id\", gateway_id)\n",
-    "\n",
+    "    put_ssm_parameter(\"/app/customersupport/agentcore/gateway_name\", gateway_name)\n",
+    "    put_ssm_parameter(\n",
+    "            \"/app/customersupport/agentcore/gateway_arn\", create_response[\"gatewayArn\"]\n",
+    "        )\n",
+    "    put_ssm_parameter(\n",
+    "            \"/app/customersupport/agentcore/gateway_url\", create_response[\"gatewayUrl\"]\n",
+    "        )\n",
     "    print(f\"✅ Gateway created successfully with ID: {gateway_id}\")\n",
     "\n",
     "except Exception as e:\n",
@@ -354,14 +358,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def load_api_spec(file_path: str) -> list:\n",
-    "    with open(file_path, \"r\") as f:\n",
-    "        data = json.load(f)\n",
-    "        \n",
-    "    if not isinstance(data, list):\n",
-    "        raise ValueError(\"Expected a list in the JSON file\")\n",
-    "    return data\n",
-    "\n",
     "try:\n",
     "    api_spec_file = \"./prerequisite/lambda/api_spec.json\"\n",
     "\n",
@@ -406,40 +402,8 @@
    "metadata": {},
    "source": [
     "## Step 7: Add our new MCP-based tools to our support agent\n",
-    "Here we integrate our authentication token from Cognito into an MCPClient from Strands SDK to create an MCP Server object to integrate with our Strands Agent"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6fec14df-e398-4321-9903-21a5f5f76c3a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def get_token(client_id: str, client_secret: str, scope_string: str, url: str) -> dict:\n",
-    "    try:\n",
-    "        headers = {\"Content-Type\": \"application/x-www-form-urlencoded\"}\n",
-    "        data = {\n",
-    "            \"grant_type\": \"client_credentials\",\n",
-    "            \"client_id\": client_id,\n",
-    "            \"client_secret\": client_secret,\n",
-    "            \"scope\": scope_string,\n",
-    "\n",
-    "        }\n",
-    "        response = requests.post(url, headers=headers, data=data)\n",
-    "        response.raise_for_status()\n",
-    "        return response.json()\n",
-    "\n",
-    "    except requests.exceptions.RequestException as err:\n",
-    "        return {\"error\": str(err)}"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "bff0a6b8-fdd3-4536-8012-6d0ab34f568f",
-   "metadata": {},
-   "source": [
-    "## Step 7.1. Set up a secure MCP client object"
+    "Here we integrate our authentication token from Cognito into an MCPClient from Strands SDK to create an MCP Server object to integrate with our Strands Agent\n",
+    "### Step 7.1. Set up a secure MCP client object"
    ]
   },
   {
@@ -449,19 +413,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "gateway_access_token = get_token(\n",
-    "    get_ssm_parameter(\"/app/customersupport/agentcore/machine_client_id\"),\n",
-    "    get_cognito_client_secret(),\n",
-    "    get_ssm_parameter(\"/app/customersupport/agentcore/cognito_auth_scope\"),\n",
-    "    get_ssm_parameter(\"/app/customersupport/agentcore/cognito_token_url\"))\n",
-    "\n",
     "print(f\"Gateway Endpoint - MCP URL: {gateway['gateway_url']}\")\n",
-    "\n",
     "# Set up MCP client\n",
     "mcp_client = MCPClient(\n",
     "    lambda: streamablehttp_client(\n",
     "        gateway['gateway_url'],\n",
-    "        headers={\"Authorization\": f\"Bearer {gateway_access_token['access_token']}\"},\n",
+    "        headers={\"Authorization\": f\"Bearer {cognito_config['bearer_token']}\"},\n",
     "    )\n",
     ")"
    ]
@@ -501,28 +458,29 @@
     "    temperature=0.3,  # Balanced between creativity and consistency\n",
     "    region_name=REGION\n",
     ")\n",
-    "\n",
-    "try:\n",
-    "    mcp_client.start()\n",
-    "except Exception as e:\n",
-    "    print(f\"Error initializing agent: {str(e)}\")\n",
-    "\n",
-    "tools = (\n",
-    "            [\n",
-    "                get_product_info,\n",
-    "                get_return_policy,\n",
-    "                get_technical_support\n",
-    "            ]\n",
-    "            + mcp_client.list_tools_sync()\n",
-    "        )\n",
-    "\n",
-    "# Create the customer support agent\n",
-    "agent = Agent(\n",
-    "    model=model,\n",
-    "    tools=tools,\n",
-    "    hooks=[memory_hooks],\n",
-    "    system_prompt=SYSTEM_PROMPT\n",
-    ")\n",
+    "def create_agent(prompt):\n",
+    "    try:\n",
+    "        with mcp_client:\n",
+    "            tools = (\n",
+    "                [\n",
+    "                    get_product_info,\n",
+    "                    get_return_policy,\n",
+    "                    get_technical_support\n",
+    "                ]\n",
+    "                + mcp_client.list_tools_sync()\n",
+    "            )\n",
+    "            \n",
+    "            # Create the customer support agent\n",
+    "            agent = Agent(\n",
+    "                model=model,\n",
+    "                tools=tools,\n",
+    "                hooks=[memory_hooks],\n",
+    "                system_prompt=SYSTEM_PROMPT\n",
+    "            )\n",
+    "            response = agent(prompt)\n",
+    "            return response\n",
+    "    except Exception as e:\n",
+    "        raise e\n",
     "\n",
     "print(\"✅ Customer support agent created successfully!\")"
    ]
@@ -557,18 +515,18 @@
     "]\n",
     "\n",
     "# Function to test the agent\n",
-    "def test_agent_responses(agent, prompts):\n",
+    "def test_agent_responses(prompts):\n",
     "    for i, prompt in enumerate(prompts, 1):\n",
     "        print(f\"\\nTest Case {i}: {prompt}\")\n",
     "        print(\"-\" * 50)\n",
     "        try:\n",
-    "            response = agent(prompt)\n",
+    "            response = create_agent(prompt)\n",
     "        except Exception as e:\n",
     "            print(f\"Error: {str(e)}\")\n",
     "        print(\"-\" * 50)\n",
     "\n",
     "# Run the tests\n",
-    "test_agent_responses(agent, test_prompts)\n",
+    "test_agent_responses(test_prompts)\n",
     "\n",
     "print(\"\\\\n✅ Basic testing completed!\")\n"
    ]