fix: remove MCP tools from CrewAI template, standardize API key env vars (#113)

Author: notgitika

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

@@ -1,9 +1,7 @@
-import os
 from crewai import Agent, Crew, Task, Process
 from crewai.tools import tool
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 from model.load import load_model
-from mcp_client.client import get_streamable_http_mcp_client
 
 app = BedrockAgentCoreApp()
 log = app.logger
@@ -24,34 +22,33 @@ def add_numbers(a: int, b: int) -> int:
 def invoke(payload, context):
     log.info("Invoking Agent.....")
 
-    with get_streamable_http_mcp_client() as mcp_tools:
-        # Define the Agent with Tools
-        agent = Agent(
-            role="Question Answering Assistant",
-            goal="Answer the users questions",
-            backstory="Always eager to answer any questions",
-            llm=load_model(),
-            tools=tools + mcp_tools,
-        )
-
-        # Define the Task
-        task = Task(
-            agent=agent,
-            description="Answer the users question: {prompt}",
-            expected_output="An answer to the users question",
-        )
-
-        # Create the Crew
-        crew = Crew(agents=[agent], tasks=[task], process=Process.sequential)
-
-        # Process the user prompt
-        prompt = payload.get("prompt", "What can you help me with?")
-
-        # Run the crew
-        result = crew.kickoff(inputs={"prompt": prompt})
-
-        # Return result
-        return {"result": result.raw}
+    # Define the Agent with Tools
+    agent = Agent(
+        role="Question Answering Assistant",
+        goal="Answer the users questions",
+        backstory="Always eager to answer any questions",
+        llm=load_model(),
+        tools=tools,
+    )
+
+    # Define the Task
+    task = Task(
+        agent=agent,
+        description="Answer the users question: {prompt}",
+        expected_output="An answer to the users question",
+    )
+
+    # Create the Crew
+    crew = Crew(agents=[agent], tasks=[task], process=Process.sequential)
+
+    # Process the user prompt
+    prompt = payload.get("prompt", "What can you help me with?")
+
+    # Run the crew
+    result = crew.kickoff(inputs={"prompt": prompt})
+
+    # Return result
+    return {"result": result.raw}
 
 
 if __name__ == "__main__":

src/assets/python/crewai/base/mcp_client/client.py

@@ -42,9 +42,12 @@ def _get_api_key() -> str:
 
 def load_model() -> LLM:
     """Get authenticated Anthropic model client."""
+    api_key = _get_api_key()
+    # CrewAI requires ANTHROPIC_API_KEY env var (ignores api_key parameter)
+    os.environ["ANTHROPIC_API_KEY"] = api_key
     return LLM(
         model="anthropic/claude-sonnet-4-5-20250929",
-        api_key=_get_api_key(),
+        api_key=api_key,
         max_tokens=4096
     )
 {{/if}}
@@ -80,9 +83,12 @@ def _get_api_key() -> str:
 
 def load_model() -> LLM:
     """Get authenticated OpenAI model client."""
+    api_key = _get_api_key()
+    # CrewAI requires OPENAI_API_KEY env var (ignores api_key parameter)
+    os.environ["OPENAI_API_KEY"] = api_key
     return LLM(
         model="openai/gpt-4o",
-        api_key=_get_api_key()
+        api_key=api_key
     )
 {{/if}}
 {{#if (eq modelProvider "Gemini")}}
@@ -117,8 +123,11 @@ def _get_api_key() -> str:
 
 def load_model() -> LLM:
     """Get authenticated Gemini model client."""
+    api_key = _get_api_key()
+    # CrewAI requires GEMINI_API_KEY env var (ignores api_key parameter)
+    os.environ["GEMINI_API_KEY"] = api_key
     return LLM(
         model="gemini/gemini-2.0-flash",
-        api_key=_get_api_key()
+        api_key=api_key
     )
 {{/if}}

src/assets/python/crewai/base/model/load.py

@@ -11,8 +11,6 @@ requires-python = ">=3.10"
 dependencies = [
     "opentelemetry-distro",
     "opentelemetry-exporter-otlp",
-    "crewai-tools[mcp] >= 1.3.0",
-    "mcp >= 1.20.0",
     "bedrock-agentcore >= 1.0.3",
     "botocore[crt] >= 1.35.0",
     "python-dotenv >= 1.0.1",