Skip to content

Framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks.

Feat/watson in cli (#1535)

Brandon Hancock (bhancock_ai)3d4479547668
diff --git a/src/crewai/agent.py b/src/crewai/agent.py
index f2a0a5c31..d30746808 100644
--- a/src/crewai/agent.py
+++ b/src/crewai/agent.py
@@ -8,6 +8,7 @@ from pydantic import Field, InstanceOf, PrivateAttr, model_validator
from crewai.agents import CacheHandler
from crewai.agents.agent_builder.base_agent import BaseAgent
from crewai.agents.crew_agent_executor import CrewAgentExecutor
+from crewai.cli.constants import ENV_VARS
from crewai.llm import LLM
from crewai.memory.contextual.contextual_memory import ContextualMemory
from crewai.tools.agent_tools.agent_tools import AgentTools
@@ -131,8 +132,12 @@ class Agent(BaseAgent):
# If it's already an LLM instance, keep it as is
pass
elif self.llm is None:
- # If it's None, use environment variables or default
- model_name = os.environ.get("OPENAI_MODEL_NAME", "gpt-4o-mini")
+ # Determine the model name from environment variables or use default
+ model_name = (
+ os.environ.get("OPENAI_MODEL_NAME")
+ or os.environ.get("MODEL")
+ or "gpt-4o-mini"
+ )
llm_params = {"model": model_name}
api_base = os.environ.get("OPENAI_API_BASE") or os.environ.get(
@@ -141,9 +146,39 @@ class Agent(BaseAgent):
if api_base:
llm_params["base_url"] = api_base
- api_key = os.environ.get("OPENAI_API_KEY")
- if api_key:
- llm_params["api_key"] = api_key
+ # Iterate over all environment variables to find matching API keys or use defaults
+ for provider, env_vars in ENV_VARS.items():
+ for env_var in env_vars:
+ # Check if the environment variable is set
+ if "key_name" in env_var:
+ env_value = os.environ.get(env_var["key_name"])
+ if env_value:
+ # Map key names containing "API_KEY" to "api_key"
+ key_name = (
+ "api_key"
+ if "API_KEY" in env_var["key_name"]
+ else env_var["key_name"]
+ )
+ # Map key names containing "API_BASE" to "api_base"
+ key_name = (
+ "api_base"
+ if "API_BASE" in env_var["key_name"]
+ else key_name
+ )
+ # Map key names containing "API_VERSION" to "api_version"
+ key_name = (
+ "api_version"
+ if "API_VERSION" in env_var["key_name"]
+ else key_name
+ )
+ llm_params[key_name] = env_value
+ # Check for default values if the environment variable is not set
+ elif env_var.get("default", False):
+ for key, value in env_var.items():
+ if key not in ["prompt", "key_name", "default"]:
+ # Only add default if the key is already set in os.environ
+ if key in os.environ:
+ llm_params[key] = value
self.llm = LLM(**llm_params)
else:
diff --git a/src/crewai/cli/constants.py b/src/crewai/cli/constants.py
index 9a0b36c39..4be08fa2a 100644
--- a/src/crewai/cli/constants.py
+++ b/src/crewai/cli/constants.py
@@ -1,19 +1,168 @@
ENV_VARS = {
- 'openai': ['OPENAI_API_KEY'],
- 'anthropic': ['ANTHROPIC_API_KEY'],
- 'gemini': ['GEMINI_API_KEY'],
- 'groq': ['GROQ_API_KEY'],
- 'ollama': ['FAKE_KEY'],
+ "openai": [
+ {
+ "prompt": "Enter your OPENAI API key (press Enter to skip)",
+ "key_name": "OPENAI_API_KEY",
+ }
+ ],
+ "anthropic": [
+ {
+ "prompt": "Enter your ANTHROPIC API key (press Enter to skip)",
+ "key_name": "ANTHROPIC_API_KEY",
+ }
+ ],
+ "gemini": [
+ {
+ "prompt": "Enter your GEMINI API key (press Enter to skip)",
+ "key_name": "GEMINI_API_KEY",
+ }
+ ],
+ "groq": [
+ {
+ "prompt": "Enter your GROQ API key (press Enter to skip)",
+ "key_name": "GROQ_API_KEY",
+ }
+ ],
+ "watson": [
+ {
+ "prompt": "Enter your WATSONX URL (press Enter to skip)",
+ "key_name": "WATSONX_URL",
+ },
+ {
+ "prompt": "Enter your WATSONX API Key (press Enter to skip)",
+ "key_name": "WATSONX_APIKEY",
+ },
+ {
+ "prompt": "Enter your WATSONX Project Id (press Enter to skip)",
+ "key_name": "WATSONX_PROJECT_ID",
+ },
+ ],
+ "ollama": [
+ {
+ "default": True,
+ "API_BASE": "http://localhost:11434",
+ }
+ ],
+ "bedrock": [
+ {
+ "prompt": "Enter your AWS Access Key ID (press Enter to skip)",
+ "key_name": "AWS_ACCESS_KEY_ID",
+ },
+ {
+ "prompt": "Enter your AWS Secret Access Key (press Enter to skip)",
+ "key_name": "AWS_SECRET_ACCESS_KEY",
+ },
+ {
+ "prompt": "Enter your AWS Region Name (press Enter to skip)",
+ "key_name": "AWS_REGION_NAME",
+ },
+ ],
+ "azure": [
+ {
+ "prompt": "Enter your Azure deployment name (must start with 'azure/')",
+ "key_name": "model",
+ },
+ {
+ "prompt": "Enter your AZURE API key (press Enter to skip)",
+ "key_name": "AZURE_API_KEY",
+ },
+ {
+ "prompt": "Enter your AZURE API base URL (press Enter to skip)",
+ "key_name": "AZURE_API_BASE",
+ },
+ {
+ "prompt": "Enter your AZURE API version (press Enter to skip)",
+ "key_name": "AZURE_API_VERSION",
+ },
+ ],
+ "cerebras": [
+ {
+ "prompt": "Enter your Cerebras model name (must start with 'cerebras/')",
+ "key_name": "model",
+ },
+ {
+ "prompt": "Enter your Cerebras API version (press Enter to skip)",
+ "key_name": "CEREBRAS_API_KEY",
+ },
+ ],
}
-PROVIDERS = ['openai', 'anthropic', 'gemini', 'groq', 'ollama']
+
+PROVIDERS = [
+ "openai",
+ "anthropic",
+ "gemini",
+ "groq",
+ "ollama",
+ "watson",
+ "bedrock",
+ "azure",
+ "cerebras",
+]
MODELS = {
- 'openai': ['gpt-4', 'gpt-4o', 'gpt-4o-mini', 'o1-mini', 'o1-preview'],
- 'anthropic': ['claude-3-5-sonnet-20240620', 'claude-3-sonnet-20240229', 'claude-3-opus-20240229', 'claude-3-haiku-20240307'],
- 'gemini': ['gemini-1.5-flash', 'gemini-1.5-pro', 'gemini-gemma-2-9b-it', 'gemini-gemma-2-27b-it'],
- 'groq': ['llama-3.1-8b-instant', 'llama-3.1-70b-versatile', 'llama-3.1-405b-reasoning', 'gemma2-9b-it', 'gemma-7b-it'],
- 'ollama': ['llama3.1', 'mixtral'],
+ "openai": ["gpt-4", "gpt-4o", "gpt-4o-mini", "o1-mini", "o1-preview"],
+ "anthropic": [
+ "claude-3-5-sonnet-20240620",
+ "claude-3-sonnet-20240229",
+ "claude-3-opus-20240229",
+ "claude-3-haiku-20240307",
+ ],
+ "gemini": [
+ "gemini/gemini-1.5-flash",
+ "gemini/gemini-1.5-pro",
+ "gemini/gemini-gemma-2-9b-it",
+ "gemini/gemini-gemma-2-27b-it",
+ ],
+ "groq": [
+ "groq/llama-3.1-8b-instant",
+ "groq/llama-3.1-70b-versatile",
+ "groq/llama-3.1-405b-reasoning",
+ "groq/gemma2-9b-it",
+ "groq/gemma-7b-it",
+ ],
+ "ollama": ["ollama/llama3.1", "ollama/mixtral"],
+ "watson": [
+ "watsonx/google/flan-t5-xxl",
+ "watsonx/google/flan-ul2",
+ "watsonx/bigscience/mt0-xxl",
+ "watsonx/eleutherai/gpt-neox-20b",
+ "watsonx/ibm/mpt-7b-instruct2",
+ "watsonx/bigcode/starcoder",
+ "watsonx/meta-llama/llama-2-70b-chat",
+ "watsonx/meta-llama/llama-2-13b-chat",
+ "watsonx/ibm/granite-13b-instruct-v1",
+ "watsonx/ibm/granite-13b-chat-v1",
+ "watsonx/google/flan-t5-xl",
+ "watsonx/ibm/granite-13b-chat-v2",
+ "watsonx/ibm/granite-13b-instruct-v2",
+ "watsonx/elyza/elyza-japanese-llama-2-7b-instruct",
+ "watsonx/ibm-mistralai/mixtral-8x7b-instruct-v01-q",
+ ],
+ "bedrock": [
+ "bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0",
+ "bedrock/anthropic.claude-3-sonnet-20240229-v1:0",
+ "bedrock/anthropic.claude-3-haiku-20240307-v1:0",
+ "bedrock/anthropic.claude-3-opus-20240229-v1:0",
+ "bedrock/anthropic.claude-v2:1",
+ "bedrock/anthropic.claude-v2",
+ "bedrock/anthropic.claude-instant-v1",
+ "bedrock/meta.llama3-1-405b-instruct-v1:0",
+ "bedrock/meta.llama3-1-70b-instruct-v1:0",
+ "bedrock/meta.llama3-1-8b-instruct-v1:0",
+ "bedrock/meta.llama3-70b-instruct-v1:0",
+ "bedrock/meta.llama3-8b-instruct-v1:0",
+ "bedrock/amazon.titan-text-lite-v1",
+ "bedrock/amazon.titan-text-express-v1",
+ "bedrock/cohere.command-text-v14",
+ "bedrock/ai21.j2-mid-v1",
+ "bedrock/ai21.j2-ultra-v1",
+ "bedrock/ai21.jamba-instruct-v1:0",
+ "bedrock/meta.llama2-13b-chat-v1",
+ "bedrock/meta.llama2-70b-chat-v1",
+ "bedrock/mistral.mistral-7b-instruct-v0:2",
+ "bedrock/mistral.mixtral-8x7b-instruct-v0:1",
+ ],
}
-JSON_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json"
\ No newline at end of file
+JSON_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json"
diff --git a/src/crewai/cli/create_crew.py b/src/crewai/cli/create_crew.py
index 5767b82a1..06440d74e 100644
--- a/src/crewai/cli/create_crew.py
+++ b/src/crewai/cli/create_crew.py
@@ -1,11 +1,11 @@
+import shutil
import sys
from pathlib import Path
import click
-from crewai.cli.constants import ENV_VARS
+from crewai.cli.constants import ENV_VARS, MODELS
from crewai.cli.provider import (
- PROVIDERS,
get_provider_data,
select_model,
select_provider,
@@ -29,20 +29,20 @@ def create_folder_structure(name, parent_folder=None):
click.secho("Operation cancelled.", fg="yellow")
sys.exit(0)
click.secho(f"Overriding folder {folder_name}...", fg="green", bold=True)
- else:
- click.secho(
- f"Creating {'crew' if parent_folder else 'folder'} {folder_name}...",
- fg="green",
- bold=True,
- )
-
- if not folder_path.exists():
- folder_path.mkdir(parents=True)
- (folder_path / "tests").mkdir(exist_ok=True)
- if not parent_folder:
- (folder_path / "src" / folder_name).mkdir(parents=True)
- (folder_path / "src" / folder_name / "tools").mkdir(parents=True)
- (folder_path / "src" / folder_name / "config").mkdir(parents=True)
+ shutil.rmtree(folder_path) # Delete the existing folder and its contents
+
+ click.secho(
+ f"Creating {'crew' if parent_folder else 'folder'} {folder_name}...",
+ fg="green",
+ bold=True,
+ )
+
+ folder_path.mkdir(parents=True)
+ (folder_path / "tests").mkdir(exist_ok=True)
+ if not parent_folder:
+ (folder_path / "src" / folder_name).mkdir(parents=True)
+ (folder_path / "src" / folder_name / "tools").mkdir(parents=True)
+ (folder_path / "src" / folder_name / "config").mkdir(parents=True)
return folder_path, folder_name, class_name
@@ -92,7 +92,10 @@ def create_crew(name, provider=None, skip_provider=False, parent_folder=None):
existing_provider = None
for provider, env_keys in ENV_VARS.items():
- if any(key in env_vars for key in env_keys):
+ if any(
+ "key_name" in details and details["key_name"] in env_vars
+ for details in env_keys
+ ):
existing_provider = provider
break
@@ -118,47 +121,48 @@ def create_crew(name, provider=None, skip_provider=False, parent_folder=None):
"No provider selected. Please try again or press 'q' to exit.", fg="red"
)
- while True:
- selected_model = select_model(selected_provider, provider_models)
- if selected_model is None: # User typed 'q'
- click.secho("Exiting...", fg="yellow")
- sys.exit(0)
- if selected_model: # Valid selection
- break
- click.secho(
- "No model selected. Please try again or press 'q' to exit.", fg="red"
- )
-
- if selected_provider in PROVIDERS:
- api_key_var = ENV_VARS[selected_provider][0]
- else:
- api_key_var = click.prompt(
- f"Enter the environment variable name for your {selected_provider.capitalize()} API key",
- type=str,
- default="",
- )
-
- api_key_value = ""
- click.echo(
- f"Enter your {selected_provider.capitalize()} API key (press Enter to skip): ",
- nl=False,
- )
- try:
- api_key_value = input()
- except (KeyboardInterrupt, EOFError):
- api_key_value = ""
-
- if api_key_value.strip():
- env_vars = {api_key_var: api_key_value}
+ # Check if the selected provider has predefined models
+ if selected_provider in MODELS and MODELS[selected_provider]:
+ while True:
+ selected_model = select_model(selected_provider, provider_models)
+ if selected_model is None: # User typed 'q'
+ click.secho("Exiting...", fg="yellow")
+ sys.exit(0)
+ if selected_model: # Valid selection
+ break
+ click.secho(
+ "No model selected. Please try again or press 'q' to exit.",
+ fg="red",
+ )
+ env_vars["MODEL"] = selected_model
+
+ # Check if the selected provider requires API keys
+ if selected_provider in ENV_VARS:
+ provider_env_vars = ENV_VARS[selected_provider]
+ for details in provider_env_vars:
+ if details.get("default", False):
+ # Automatically add default key-value pairs
+ for key, value in details.items():
+ if key not in ["prompt", "key_name", "default"]:
+ env_vars[key] = value
+ elif "key_name" in details:
+ # Prompt for non-default key-value pairs
+ prompt = details["prompt"]
+ key_name = details["key_name"]
+ api_key_value = click.prompt(prompt, default="", show_default=False)
+
+ if api_key_value.strip():
+ env_vars[key_name] = api_key_value
+
+ if env_vars:
write_env_file(folder_path, env_vars)
- click.secho("API key saved to .env file", fg="green")
+ click.secho("API keys and model saved to .env file", fg="green")
else:
click.secho(
- "No API key provided. Skipping .env file creation.", fg="yellow"
+ "No API keys provided. Skipping .env file creation.", fg="yellow"
)
- env_vars["MODEL"] = selected_model
- click.secho(f"Selected model: {selected_model}", fg="green")
+ click.secho(f"Selected model: {env_vars.get('MODEL', 'N/A')}", fg="green")
package_dir = Path(__file__).parent
templates_dir = package_dir / "templates" / "crew"
diff --git a/src/crewai/cli/templates/crew/crew.py b/src/crewai/cli/templates/crew/crew.py
index f950d13d4..392e29edd 100644
--- a/src/crewai/cli/templates/crew/crew.py
+++ b/src/crewai/cli/templates/crew/crew.py
@@ -48,4 +48,4 @@ class {{crew_name}}Crew():
process=Process.sequential,
verbose=True,
# process=Process.hierarchical, # In case you wanna use that instead https://docs.crewai.com/how-to/Hierarchical/
- )
\ No newline at end of file
+ )
diff --git a/src/crewai/cli/templates/crew/main.py b/src/crewai/cli/templates/crew/main.py
index 88edfcbff..d441fa0fa 100644
--- a/src/crewai/cli/templates/crew/main.py
+++ b/src/crewai/cli/templates/crew/main.py
@@ -1,7 +1,11 @@
#!/usr/bin/env python
import sys
+import warnings
+
from {{folder_name}}.crew import {{crew_name}}Crew
+warnings.filterwarnings("ignore", category=SyntaxWarning, module="pysbd")
+
# This main file is intended to be a way for you to run your
# crew locally, so refrain from adding unnecessary logic into this file.
# Replace with inputs you want to test with, it will automatically