fix: update main.py files with gateway conditional imports

All 5 framework main.py files now use Handlebars conditionals to
import the correct MCP client function based on hasGateway flag.
Fix snakeCase helper to handle all special characters.

Author: aidandaly24

src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap

@@ -918,7 +918,11 @@ from autogen_agentchat.agents import AssistantAgent
 from autogen_core.tools import FunctionTool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_tools
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_tools
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
@@ -943,7 +947,11 @@ async def invoke(payload, context):
     log.info("Invoking Agent.....")
 
     # Get MCP Tools
+    {{#if hasGateway}}
+    mcp_tools = await get_all_gateway_mcp_tools()
+    {{else}}
     mcp_tools = await get_streamable_http_mcp_tools()
+    {{/if}}
     if mcp_tools is None:
         mcp_tools = []
 
@@ -1617,7 +1625,11 @@ from google.adk.sessions import InMemorySessionService
 from google.genai import types
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_toolsets
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
@@ -1635,8 +1647,12 @@ def add_numbers(a: int, b: int) -> int:
 
 
 # Get MCP Toolset
+{{#if hasGateway}}
+mcp_toolset = get_all_gateway_mcp_toolsets()
+{{else}}
 mcp_client = get_streamable_http_mcp_client()
 mcp_toolset = [mcp_client] if mcp_client else []
+{{/if}}
 
 _credentials_loaded = False
 
@@ -1914,7 +1930,11 @@ from langgraph.prebuilt import create_react_agent
 from langchain.tools import tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_client
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
@@ -1944,7 +1964,11 @@ async def invoke(payload, context):
     log.info("Invoking Agent.....")
 
     # Get MCP Client
+    {{#if hasGateway}}
+    mcp_client = get_all_gateway_mcp_client()
+    {{else}}
     mcp_client = get_streamable_http_mcp_client()
+    {{/if}}
 
     # Load MCP Tools
     mcp_tools = []
@@ -2315,13 +2339,22 @@ exports[`Assets Directory Snapshots > Python framework assets > python/python/op
 from agents import Agent, Runner, function_tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_servers
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
 
 # Get MCP Server
+{{#if hasGateway}}
+mcp_servers = get_all_gateway_mcp_servers()
+{{else}}
 mcp_server = get_streamable_http_mcp_client()
+mcp_servers = [mcp_server] if mcp_server else []
+{{/if}}
 
 _credentials_loaded = False
 
@@ -2343,8 +2376,28 @@ def add_numbers(a: int, b: int) -> int:
 async def main(query):
     ensure_credentials_loaded()
     try:
-        if mcp_server:
-            async with mcp_server as server:
+        {{#if hasGateway}}
+        if mcp_servers:
+            agent = Agent(
+                name="{{ name }}",
+                model="gpt-4.1",
+                mcp_servers=mcp_servers,
+                tools=[add_numbers]
+            )
+            result = await Runner.run(agent, query)
+            return result
+        else:
+            agent = Agent(
+                name="{{ name }}",
+                model="gpt-4.1",
+                mcp_servers=[],
+                tools=[add_numbers]
+            )
+            result = await Runner.run(agent, query)
+            return result
+        {{else}}
+        if mcp_servers:
+            async with mcp_servers[0] as server:
                 active_servers = [server]
                 agent = Agent(
                     name="{{ name }}",
@@ -2363,6 +2416,7 @@ async def main(query):
             )
             result = await Runner.run(agent, query)
             return result
+        {{/if}}
     except Exception as e:
         log.error(f"Error during agent execution: {e}", exc_info=True)
         raise e
@@ -2621,7 +2675,11 @@ exports[`Assets Directory Snapshots > Python framework assets > python/python/st
 "from strands import Agent, tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_clients
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 {{#if hasMemory}}
 from memory.session import get_memory_session_manager
 {{/if}}
@@ -2630,7 +2688,11 @@ app = BedrockAgentCoreApp()
 log = app.logger
 
 # Define a Streamable HTTP MCP Client
-mcp_client = get_streamable_http_mcp_client()
+{{#if hasGateway}}
+mcp_clients = get_all_gateway_mcp_clients()
+{{else}}
+mcp_clients = [get_streamable_http_mcp_client()]
+{{/if}}
 
 # Define a collection of tools used by the model
 tools = []
@@ -2643,8 +2705,9 @@ def add_numbers(a: int, b: int) -> int:
 tools.append(add_numbers)
 
 # Add MCP client to tools if available
-if mcp_client:
-    tools.append(mcp_client)
+for mcp_client in mcp_clients:
+    if mcp_client:
+        tools.append(mcp_client)
 
 
 {{#if hasMemory}}

src/assets/python/autogen/base/main.py

@@ -3,7 +3,11 @@
 from autogen_core.tools import FunctionTool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_tools
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_tools
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
@@ -28,7 +32,11 @@ async def invoke(payload, context):
     log.info("Invoking Agent.....")
 
     # Get MCP Tools
+    {{#if hasGateway}}
+    mcp_tools = await get_all_gateway_mcp_tools()
+    {{else}}
     mcp_tools = await get_streamable_http_mcp_tools()
+    {{/if}}
     if mcp_tools is None:
         mcp_tools = []
 

src/assets/python/googleadk/base/main.py

@@ -5,7 +5,11 @@
 from google.genai import types
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_toolsets
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
@@ -23,8 +27,12 @@ def add_numbers(a: int, b: int) -> int:
 
 
 # Get MCP Toolset
+{{#if hasGateway}}
+mcp_toolset = get_all_gateway_mcp_toolsets()
+{{else}}
 mcp_client = get_streamable_http_mcp_client()
 mcp_toolset = [mcp_client] if mcp_client else []
+{{/if}}
 
 _credentials_loaded = False
 

src/assets/python/langchain_langgraph/base/main.py

@@ -4,7 +4,11 @@
 from langchain.tools import tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_client
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
@@ -34,7 +38,11 @@ async def invoke(payload, context):
     log.info("Invoking Agent.....")
 
     # Get MCP Client
+    {{#if hasGateway}}
+    mcp_client = get_all_gateway_mcp_client()
+    {{else}}
     mcp_client = get_streamable_http_mcp_client()
+    {{/if}}
 
     # Load MCP Tools
     mcp_tools = []

src/assets/python/openaiagents/base/main.py

@@ -2,13 +2,22 @@
 from agents import Agent, Runner, function_tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_servers
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 
 app = BedrockAgentCoreApp()
 log = app.logger
 
 # Get MCP Server
+{{#if hasGateway}}
+mcp_servers = get_all_gateway_mcp_servers()
+{{else}}
 mcp_server = get_streamable_http_mcp_client()
+mcp_servers = [mcp_server] if mcp_server else []
+{{/if}}
 
 _credentials_loaded = False
 
@@ -30,8 +39,28 @@ def add_numbers(a: int, b: int) -> int:
 async def main(query):
     ensure_credentials_loaded()
     try:
-        if mcp_server:
-            async with mcp_server as server:
+        {{#if hasGateway}}
+        if mcp_servers:
+            agent = Agent(
+                name="{{ name }}",
+                model="gpt-4.1",
+                mcp_servers=mcp_servers,
+                tools=[add_numbers]
+            )
+            result = await Runner.run(agent, query)
+            return result
+        else:
+            agent = Agent(
+                name="{{ name }}",
+                model="gpt-4.1",
+                mcp_servers=[],
+                tools=[add_numbers]
+            )
+            result = await Runner.run(agent, query)
+            return result
+        {{else}}
+        if mcp_servers:
+            async with mcp_servers[0] as server:
                 active_servers = [server]
                 agent = Agent(
                     name="{{ name }}",
@@ -50,6 +79,7 @@ async def main(query):
             )
             result = await Runner.run(agent, query)
             return result
+        {{/if}}
     except Exception as e:
         log.error(f"Error during agent execution: {e}", exc_info=True)
         raise e

src/assets/python/strands/base/main.py

@@ -1,7 +1,11 @@
 from strands import Agent, tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
+{{#if hasGateway}}
+from mcp_client.client import get_all_gateway_mcp_clients
+{{else}}
 from mcp_client.client import get_streamable_http_mcp_client
+{{/if}}
 {{#if hasMemory}}
 from memory.session import get_memory_session_manager
 {{/if}}
@@ -10,7 +14,11 @@
 log = app.logger
 
 # Define a Streamable HTTP MCP Client
-mcp_client = get_streamable_http_mcp_client()
+{{#if hasGateway}}
+mcp_clients = get_all_gateway_mcp_clients()
+{{else}}
+mcp_clients = [get_streamable_http_mcp_client()]
+{{/if}}
 
 # Define a collection of tools used by the model
 tools = []
@@ -23,8 +31,9 @@ def add_numbers(a: int, b: int) -> int:
 tools.append(add_numbers)
 
 # Add MCP client to tools if available
-if mcp_client:
-    tools.append(mcp_client)
+for mcp_client in mcp_clients:
+    if mcp_client:
+        tools.append(mcp_client)
 
 
 {{#if hasMemory}}

src/cli/templates/render.ts

@@ -9,7 +9,7 @@ Handlebars.registerHelper('includes', (array: unknown[], value: unknown) => {
   return array.includes(value);
 });
 Handlebars.registerHelper('snakeCase', (str: string) => {
-  return str.replace(/[- ]/g, '_').toLowerCase();
+  return str.replace(/[^a-zA-Z0-9]/g, '_').toLowerCase();
 });
 
 /**