diff --git a/agentstack/__init__.py b/agentstack/__init__.py index 2fa66a93..531f904a 100644 --- a/agentstack/__init__.py +++ b/agentstack/__init__.py @@ -9,17 +9,42 @@ from pathlib import Path from agentstack import conf from agentstack.utils import get_framework +from agentstack.agents import get_agent +from agentstack.tasks import get_task from agentstack.inputs import get_inputs from agentstack import frameworks ___all___ = [ - "conf", - "tools", - "get_tags", - "get_framework", - "get_inputs", + "conf", + "agent", + "task", + "tools", + "get_tags", + "get_framework", + "get_agent", + "get_task", + "get_inputs", ] +def agent(func): + """ + The `agent` decorator is used to mark a method that implements an Agent. + """ + def wrap(*args, **kwargs): + """Does not alter the function's behavior; this is just a marker.""" + return func(*args, **kwargs) + return wrap + + +def task(func): + """ + The `task` decorator is used to mark a method that implements a Task. + """ + def wrap(*args, **kwargs): + """Does not alter the function's behavior; this is just a marker.""" + return func(*args, **kwargs) + return wrap + def get_tags() -> list[str]: """ diff --git a/agentstack/_tools/__init__.py b/agentstack/_tools/__init__.py index bfde9b18..a9382780 100644 --- a/agentstack/_tools/__init__.py +++ b/agentstack/_tools/__init__.py @@ -33,9 +33,8 @@ class ToolConfig(pydantic.BaseModel): @classmethod def from_tool_name(cls, name: str) -> 'ToolConfig': path = TOOLS_DIR / name / TOOLS_CONFIG_FILENAME - if not os.path.exists(path): # TODO raise exceptions and handle message/exit in cli - print(term_color(f'No known agentstack tool: {name}', 'red')) - sys.exit(1) + if not os.path.exists(path): + raise ValidationError(f'No known agentstack tool: {name}') return cls.from_json(path) @classmethod @@ -44,11 +43,10 @@ def from_json(cls, path: Path) -> 'ToolConfig': try: return cls(**data) except pydantic.ValidationError as e: - # TODO raise exceptions and handle message/exit in cli - print(term_color(f"Error validating tool config JSON: \n{path}", 'red')) + error_str = "Error validating tool config:\n" for error in e.errors(): - print(f"{' '.join([str(loc) for loc in error['loc']])}: {error['msg']}") - sys.exit(1) + error_str += f"{' '.join([str(loc) for loc in error['loc']])}: {error['msg']}\n" + raise ValidationError(f"Error loading tool from {path}.\n{error_str}") @property def type(self) -> type: diff --git a/agentstack/agents.py b/agentstack/agents.py index ed3be6fe..181ee2d7 100644 --- a/agentstack/agents.py +++ b/agentstack/agents.py @@ -5,10 +5,12 @@ from ruamel.yaml import YAML, YAMLError from ruamel.yaml.scalarstring import FoldedScalarString from agentstack import conf, log +from agentstack import frameworks from agentstack.exceptions import ValidationError AGENTS_FILENAME: Path = Path("src/config/agents.yaml") +AGENTS_PROMPT_TPL: str = "You are {role}. {backstory}\nYour personal goal is: {goal}" yaml = YAML() yaml.preserve_quotes = True # Preserve quotes in existing data @@ -67,6 +69,23 @@ def __init__(self, name: str): error_str += f"{' '.join([str(loc) for loc in error['loc']])}: {error['msg']}\n" raise ValidationError(f"Error loading agent {name} from {filename}.\n{error_str}") + @property + def provider(self) -> str: + return frameworks.parse_llm(self.llm)[0] + + @property + def model(self) -> str: + return frameworks.parse_llm(self.llm)[1] + + @property + def prompt(self) -> str: + """Concatenate the prompts for role, goal, and backstory.""" + return AGENTS_PROMPT_TPL.format(**{ + 'role': self.role, + 'goal': self.goal, + 'backstory': self.backstory, + }) + def model_dump(self, *args, **kwargs) -> dict: dump = super().model_dump(*args, **kwargs) dump.pop('name') # name is the key, so keep it out of the data @@ -106,3 +125,9 @@ def get_all_agent_names() -> list[str]: def get_all_agents() -> list[AgentConfig]: return [AgentConfig(name) for name in get_all_agent_names()] + + +def get_agent(name: str) -> Optional[AgentConfig]: + """Get an agent configuration by name.""" + return AgentConfig(name) + diff --git a/agentstack/cli/__init__.py b/agentstack/cli/__init__.py index 98d3604f..243aa474 100644 --- a/agentstack/cli/__init__.py +++ b/agentstack/cli/__init__.py @@ -1,4 +1,7 @@ -from .cli import init_project_builder, configure_default_model, export_template, welcome_message +from .cli import configure_default_model, welcome_message, get_validated_input from .init import init_project -from .tools import list_tools, add_tool +from .wizard import run_wizard from .run import run_project +from .tools import list_tools, add_tool +from .templates import insert_template, export_template + diff --git a/agentstack/cli/agentstack_data.py b/agentstack/cli/agentstack_data.py index 1520cb61..4337dd4d 100644 --- a/agentstack/cli/agentstack_data.py +++ b/agentstack/cli/agentstack_data.py @@ -58,6 +58,7 @@ def __init__( ): self.agents = [] self.tasks = [] + self.graph = [] self.inputs = {} self.method = method self.manager_agent = manager_agent @@ -68,6 +69,9 @@ def add_agent(self, agent): def add_task(self, task): self.tasks.append(task) + def add_edge(self, edge): + self.graph.append(edge) + def set_inputs(self, inputs): self.inputs = inputs @@ -77,6 +81,7 @@ def to_dict(self): 'manager_agent': self.manager_agent, 'agents': self.agents, 'tasks': self.tasks, + 'graph': self.graph, 'inputs': self.inputs, } diff --git a/agentstack/cli/cli.py b/agentstack/cli/cli.py index f529858e..6fc36742 100644 --- a/agentstack/cli/cli.py +++ b/agentstack/cli/cli.py @@ -1,33 +1,10 @@ -from typing import Optional -import os -import sys -import time -from datetime import datetime - -import json -import shutil +import os, sys from art import text2art import inquirer -from cookiecutter.main import cookiecutter - -from .agentstack_data import ( - FrameworkData, - ProjectMetadata, - ProjectStructure, - CookiecutterData, -) from agentstack import conf, log from agentstack.conf import ConfigFile -from agentstack.utils import get_package_path -from agentstack.generation.files import ProjectFile -from agentstack import frameworks -from agentstack import generation -from agentstack import inputs -from agentstack.agents import get_all_agents -from agentstack.tasks import get_all_tasks -from agentstack.utils import open_json_file, term_color, is_snake_case, get_framework, validator_not_empty -from agentstack.proj_templates import TemplateConfig from agentstack.exceptions import ValidationError +from agentstack.utils import validator_not_empty, is_snake_case PREFERRED_MODELS = [ @@ -39,72 +16,6 @@ ] -def init_project_builder( - slug_name: Optional[str] = None, - template: Optional[str] = None, - use_wizard: bool = False, -): - if not slug_name and not use_wizard: - raise Exception("Project name is required. Use `agentstack init `") - - if slug_name and not is_snake_case(slug_name): - raise Exception("Project slug name must be snake_case") - - if template is not None and use_wizard: - raise Exception("Template and wizard flags cannot be used together") - - template_data = None - if template is not None: - template_data = TemplateConfig.from_user_input(template) - - if template_data: - project_details = { - "name": slug_name or template_data.name, - "version": "0.0.1", - "description": template_data.description, - "author": "Name ", - "license": "MIT", - } - framework = template_data.framework - design = { - 'agents': [agent.model_dump() for agent in template_data.agents], - 'tasks': [task.model_dump() for task in template_data.tasks], - 'inputs': template_data.inputs, - } - tools = [tools.model_dump() for tools in template_data.tools] - - elif use_wizard: - project_details = ask_project_details(slug_name) - welcome_message() - framework = ask_framework() - design = ask_design() - tools = ask_tools() - - else: - # the user has started a new project; let's give them something to work with - default_project = TemplateConfig.from_template_name('hello_alex') - project_details = { - "name": slug_name or default_project.name, - "version": "0.0.1", - "description": default_project.description, - "author": "Name ", - "license": "MIT", - } - framework = default_project.framework - design = { - 'agents': [agent.model_dump() for agent in default_project.agents], - 'tasks': [task.model_dump() for task in default_project.tasks], - 'inputs': default_project.inputs, - } - tools = [tools.model_dump() for tools in default_project.tools] - - log.debug(f"project_details: {project_details}" f"framework: {framework}" f"design: {design}") - insert_template(project_details, framework, design, template_data) - - for tool_data in tools: - generation.add_tool(tool_data['name'], agents=tool_data['agents']) - - def welcome_message(): title = text2art("AgentStack", font="smisome1") tagline = "The easiest way to build a robust agent application!" @@ -140,32 +51,6 @@ def configure_default_model(): agentstack_config.default_model = model -def ask_framework() -> str: - framework = "CrewAI" - # framework = inquirer.list_input( - # message="What agent framework do you want to use?", - # choices=["CrewAI", "Autogen", "LiteLLM", "Learn what these are (link)"], - # ) - # - # if framework == "Learn what these are (link)": - # webbrowser.open("https://youtu.be/xvFZjo5PgG0") - # framework = inquirer.list_input( - # message="What agent framework do you want to use?", - # choices=["CrewAI", "Autogen", "LiteLLM"], - # ) - # - # while framework in ['Autogen', 'LiteLLM']: - # print(f"{framework} support coming soon!!") - # framework = inquirer.list_input( - # message="What agent framework do you want to use?", - # choices=["CrewAI", "Autogen", "LiteLLM"], - # ) - - log.success("Congrats! Your project is ready to go! Quickly add features now or skip to do it later.\n\n") - - return framework - - def get_validated_input( message: str, validate_func=None, @@ -189,290 +74,3 @@ def get_validated_input( raise ValidationError("Input must be in snake_case") return value - -def ask_agent_details(): - agent = {} - - agent['name'] = get_validated_input( - "What's the name of this agent? (snake_case)", min_length=3, snake_case=True - ) - - agent['role'] = get_validated_input("What role does this agent have?", min_length=3) - - agent['goal'] = get_validated_input("What is the goal of the agent?", min_length=10) - - agent['backstory'] = get_validated_input("Give your agent a backstory", min_length=10) - - agent['model'] = inquirer.list_input( - message="What LLM should this agent use?", choices=PREFERRED_MODELS, default=PREFERRED_MODELS[0] - ) - - return agent - - -def ask_task_details(agents: list[dict]) -> dict: - task = {} - - task['name'] = get_validated_input( - "What's the name of this task? (snake_case)", min_length=3, snake_case=True - ) - - task['description'] = get_validated_input("Describe the task in more detail", min_length=10) - - task['expected_output'] = get_validated_input( - "What do you expect the result to look like? (ex: A 5 bullet point summary of the email)", - min_length=10, - ) - - task['agent'] = inquirer.list_input( - message="Which agent should be assigned this task?", - choices=[a['name'] for a in agents], - ) - - return task - - -def ask_design() -> dict: - use_wizard = inquirer.confirm( - message="Would you like to use the CLI wizard to set up agents and tasks?", - ) - - if not use_wizard: - return {'agents': [], 'tasks': []} - - os.system("cls" if os.name == "nt" else "clear") - - title = text2art("AgentWizard", font="shimrod") - - print(title) - - print(""" -🪄 welcome to the agent builder wizard!! 🪄 - -First we need to create the agents that will work together to accomplish tasks: - """) - make_agent = True - agents = [] - while make_agent: - print('---') - print(f"Agent #{len(agents)+1}") - agent = None - agent = ask_agent_details() - agents.append(agent) - make_agent = inquirer.confirm(message="Create another agent?") - - print('') - for x in range(3): - time.sleep(0.3) - print('.') - print('Boom! We made some agents (ﾉ>ω<)ﾉ :｡･:*:･ﾟ’★,｡･:*:･ﾟ’☆') - time.sleep(0.5) - print('') - print('Now lets make some tasks for the agents to accomplish!') - print('') - - make_task = True - tasks = [] - while make_task: - print('---') - print(f"Task #{len(tasks) + 1}") - task = ask_task_details(agents) - tasks.append(task) - make_task = inquirer.confirm(message="Create another task?") - - print('') - for x in range(3): - time.sleep(0.3) - print('.') - print('Let there be tasks (ノ ˘_˘)ノ　ζ|||ζ　ζ|||ζ　ζ|||ζ') - - return {'tasks': tasks, 'agents': agents} - - -def ask_tools() -> list: - use_tools = inquirer.confirm( - message="Do you want to add agent tools now? (you can do this later with `agentstack tools add `)", - ) - - if not use_tools: - return [] - - tools_to_add = [] - - adding_tools = True - script_dir = os.path.dirname(os.path.abspath(__file__)) - tools_json_path = os.path.join(script_dir, '..', 'tools', 'tools.json') - - # Load the JSON data - tools_data = open_json_file(tools_json_path) - - while adding_tools: - tool_type = inquirer.list_input( - message="What category tool do you want to add?", - choices=list(tools_data.keys()) + ["~~ Stop adding tools ~~"], - ) - - tools_in_cat = [f"{t['name']} - {t['url']}" for t in tools_data[tool_type] if t not in tools_to_add] - tool_selection = inquirer.list_input(message="Select your tool", choices=tools_in_cat) - - tools_to_add.append(tool_selection.split(' - ')[0]) - - log.info("Adding tools:") - for t in tools_to_add: - log.info(f' - {t}') - log.info('') - adding_tools = inquirer.confirm("Add another tool?") - - return tools_to_add - - -def ask_project_details(slug_name: Optional[str] = None) -> dict: - name = inquirer.text(message="What's the name of your project (snake_case)", default=slug_name or '') - - if not is_snake_case(name): - log.error("Project name must be snake case") - return ask_project_details(slug_name) - - questions = inquirer.prompt( - [ - inquirer.Text("version", message="What's the initial version", default="0.1.0"), - inquirer.Text("description", message="Enter a description for your project"), - inquirer.Text("author", message="Who's the author (your name)?"), - ] - ) - - questions['name'] = name - - return questions - - -def insert_template( - project_details: dict, - framework_name: str, - design: dict, - template_data: Optional[TemplateConfig] = None, -): - framework = FrameworkData( - name=framework_name.lower(), - ) - project_metadata = ProjectMetadata( - project_name=project_details["name"], - description=project_details["description"], - author_name=project_details["author"], - version="0.0.1", - license="MIT", - year=datetime.now().year, - template=template_data.name if template_data else 'none', - template_version=template_data.template_version if template_data else 0, - ) - - project_structure = ProjectStructure( - method=template_data.method if template_data else "sequential", - manager_agent=template_data.manager_agent if template_data else None, - ) - project_structure.agents = design["agents"] - project_structure.tasks = design["tasks"] - project_structure.inputs = design["inputs"] - - cookiecutter_data = CookiecutterData( - project_metadata=project_metadata, - structure=project_structure, - framework=framework_name.lower(), - ) - - template_path = get_package_path() / f'templates/{framework.name}' - with open(f"{template_path}/cookiecutter.json", "w") as json_file: - json.dump(cookiecutter_data.to_dict(), json_file) - # TODO this should not be written to the package directory - - # copy .env.example to .env - shutil.copy( - f'{template_path}/{"{{cookiecutter.project_metadata.project_slug}}"}/.env.example', - f'{template_path}/{"{{cookiecutter.project_metadata.project_slug}}"}/.env', - ) - - cookiecutter(str(template_path), no_input=True, extra_context=None) - - # TODO: inits a git repo in the directory the command was run in - # TODO: not where the project is generated. Fix this - # TODO: also check if git is installed or if there are any git repos above the current dir - try: - pass - # subprocess.check_output(["git", "init"]) - # subprocess.check_output(["git", "add", "."]) - except: - print("Failed to initialize git repository. Maybe you're already in one? Do this with: git init") - - -def export_template(output_filename: str): - """ - Export the current project as a template. - """ - try: - metadata = ProjectFile() - except Exception as e: - raise Exception(f"Failed to load project metadata: {e}") - - # Read all the agents from the project's agents.yaml file - agents: list[TemplateConfig.Agent] = [] - for agent in get_all_agents(): - agents.append( - TemplateConfig.Agent( - name=agent.name, - role=agent.role, - goal=agent.goal, - backstory=agent.backstory, - allow_delegation=False, # TODO - model=agent.llm, # TODO consistent naming (llm -> model) - ) - ) - - # Read all the tasks from the project's tasks.yaml file - tasks: list[TemplateConfig.Task] = [] - for task in get_all_tasks(): - tasks.append( - TemplateConfig.Task( - name=task.name, - description=task.description, - expected_output=task.expected_output, - agent=task.agent, - ) - ) - - # Export all of the configured tools from the project - tools_agents: dict[str, list[str]] = {} - for agent_name in frameworks.get_agent_names(): - for tool_name in frameworks.get_agent_tool_names(agent_name): - if not tool_name: - continue - if tool_name not in tools_agents: - tools_agents[tool_name] = [] - tools_agents[tool_name].append(agent_name) - - tools: list[TemplateConfig.Tool] = [] - for tool_name, agent_names in tools_agents.items(): - tools.append( - TemplateConfig.Tool( - name=tool_name, - agents=agent_names, - ) - ) - - template = TemplateConfig( - template_version=3, - name=metadata.project_name, - description=metadata.project_description, - framework=get_framework(), - method="sequential", # TODO this needs to be stored in the project somewhere - manager_agent=None, # TODO - agents=agents, - tasks=tasks, - tools=tools, - inputs=inputs.get_inputs(), - ) - - try: - template.write_to_file(conf.PATH / output_filename) - log.success(f"Template saved to: {conf.PATH / output_filename}") - except Exception as e: - raise Exception(f"Failed to write template to file: {e}") diff --git a/agentstack/cli/init.py b/agentstack/cli/init.py index 1e002fc0..d0dcbb9e 100644 --- a/agentstack/cli/init.py +++ b/agentstack/cli/init.py @@ -1,14 +1,20 @@ import os, sys from typing import Optional from pathlib import Path + from agentstack import conf, log from agentstack.exceptions import EnvironmentError +from agentstack.utils import is_snake_case from agentstack import packaging -from agentstack.cli import welcome_message, init_project_builder -from agentstack.utils import term_color +from agentstack import frameworks +from agentstack import generation +from agentstack.proj_templates import TemplateConfig +from agentstack.cli import welcome_message +from agentstack.cli.wizard import run_wizard +from agentstack.cli.templates import insert_template -# TODO move the rest of the CLI init tooling into this file +DEFAULT_TEMPLATE_NAME: str = "hello_alex" def require_uv(): @@ -29,6 +35,7 @@ def require_uv(): def init_project( slug_name: Optional[str] = None, template: Optional[str] = None, + framework: Optional[str] = None, use_wizard: bool = False, ): """ @@ -37,26 +44,63 @@ def init_project( - create a new virtual environment - copy project skeleton - install dependencies + - insert Tasks, Agents and Tools """ require_uv() - # TODO prevent the user from passing the --path arguent to init + # TODO prevent the user from passing the --path argument to init if slug_name: + if not is_snake_case(slug_name): + raise Exception("Project name must be snake_case") conf.set_path(conf.PATH / slug_name) else: - raise Exception("Error: No project directory specified.\n Run `agentstack init `") + raise Exception("No project directory specified.\n Run `agentstack init `") if os.path.exists(conf.PATH): # cookiecutter requires the directory to not exist - raise Exception(f"Error: Directory already exists: {conf.PATH}") + raise Exception(f"Directory already exists: {conf.PATH}") + + if template and use_wizard: + raise Exception("Template and wizard flags cannot be used together") + + if use_wizard: + log.debug("Initializing new project with wizard.") + template_data = run_wizard(slug_name) + elif template: + log.debug(f"Initializing new project with template: {template}") + template_data = TemplateConfig.from_user_input(template) + else: + log.debug(f"Initializing new project with default template: {DEFAULT_TEMPLATE_NAME}") + template_data = TemplateConfig.from_template_name(DEFAULT_TEMPLATE_NAME) welcome_message() log.notify("🦾 Creating a new AgentStack project...") log.info(f"Using project directory: {conf.PATH.absolute()}") + if framework is None: + framework = template_data.framework + if not framework in frameworks.SUPPORTED_FRAMEWORKS: + raise Exception(f"Framework '{framework}' is not supported.") + log.info(f"Using framework: {framework}") + # copy the project skeleton, create a virtual environment, and install dependencies - init_project_builder(slug_name, template, use_wizard) + # project template is populated before the venv is created so we have a working directory + insert_template(name=slug_name, template=template_data, framework=framework) + log.info("Creating virtual environment...") packaging.create_venv() + log.info("Installing dependencies...") packaging.install_project() + + # now we can interact with the project and add Agents, Tasks, and Tools + # we allow dependencies to be installed along with these, so the project must + # be fully initialized first. + for task in template_data.tasks: + generation.add_task(**task.model_dump()) + + for agent in template_data.agents: + generation.add_agent(**agent.model_dump()) + + for tool in template_data.tools: + generation.add_tool(**tool.model_dump()) log.success("🚀 AgentStack project generated successfully!\n") log.info( diff --git a/agentstack/cli/run.py b/agentstack/cli/run.py index dc8199bb..fa82d4d2 100644 --- a/agentstack/cli/run.py +++ b/agentstack/cli/run.py @@ -9,7 +9,7 @@ from agentstack.exceptions import ValidationError from agentstack import inputs from agentstack import frameworks -from agentstack.utils import term_color, get_framework, verify_agentstack_project +from agentstack.utils import get_framework, verify_agentstack_project MAIN_FILENAME: Path = Path("src/main.py") MAIN_MODULE_NAME = "main" @@ -123,6 +123,6 @@ def run_project(command: str = 'run', cli_args: Optional[List[str]] = None): project_main = _import_project_module(conf.PATH) getattr(project_main, command)() except ImportError as e: - raise ValidationError(f"Failed to import project. Does '{MAIN_FILENAME}' exist?:\n{e}") + raise ValidationError(f"Failed to import AgentStack project at: {conf.PATH.absolute()}\n{e}") except Exception as e: raise Exception(_format_friendly_error_message(e)) diff --git a/agentstack/cli/templates.py b/agentstack/cli/templates.py new file mode 100644 index 00000000..778c7b22 --- /dev/null +++ b/agentstack/cli/templates.py @@ -0,0 +1,156 @@ +from typing import Optional +from datetime import datetime +import json +import shutil +from cookiecutter.main import cookiecutter + +from agentstack import conf, log +from agentstack.utils import get_package_path, get_framework +from agentstack import frameworks +from agentstack.agents import get_all_agents +from agentstack.tasks import get_all_tasks +from agentstack import inputs +from agentstack.proj_templates import CURRENT_VERSION, TemplateConfig +from agentstack.generation.files import ProjectFile +from .agentstack_data import ( + FrameworkData, + ProjectMetadata, + ProjectStructure, + CookiecutterData, +) + + +def insert_template(name: str, template: TemplateConfig, framework: Optional[str] = None): + if framework is None: + framework = template.framework + + framework_data = FrameworkData( + name=framework, + ) + project_metadata = ProjectMetadata( + project_name=name, + description=template.description, + author_name="Name ", + version="0.0.1", + license="MIT", + year=datetime.now().year, + template=template.name, + template_version=template.template_version, + ) + project_structure = ProjectStructure( + method=template.method or "sequential", + manager_agent=template.manager_agent or None, + ) + project_structure.agents = [a.model_dump() for a in template.agents] + project_structure.tasks = [t.model_dump() for t in template.tasks] + project_structure.inputs = template.inputs + project_structure.graph = [[e.model_dump() for e in n] for n in template.graph] + + cookiecutter_data = CookiecutterData( + project_metadata=project_metadata, + structure=project_structure, + framework=framework, + ) + + template_path = get_package_path() / f'templates/{framework}' + with open(f"{template_path}/cookiecutter.json", "w") as json_file: + json.dump(cookiecutter_data.to_dict(), json_file) + # TODO this should not be written to the package directory + + # copy .env.example to .env + shutil.copy( + f'{template_path}/{"{{cookiecutter.project_metadata.project_slug}}"}/.env.example', + f'{template_path}/{"{{cookiecutter.project_metadata.project_slug}}"}/.env', + ) + cookiecutter(str(template_path), no_input=True, extra_context=None) + + +def export_template(output_filename: str): + """ + Export the current project as a template. + """ + try: + metadata = ProjectFile() + except Exception as e: + raise Exception(f"Failed to load project metadata: {e}") + + # Read all the agents from the project's agents.yaml file + agents: list[TemplateConfig.Agent] = [] + for agent in get_all_agents(): + agents.append( + TemplateConfig.Agent( + name=agent.name, + role=agent.role, + goal=agent.goal, + backstory=agent.backstory, + allow_delegation=False, # TODO + llm=agent.llm, + ) + ) + + # Read all the tasks from the project's tasks.yaml file + tasks: list[TemplateConfig.Task] = [] + for task in get_all_tasks(): + tasks.append( + TemplateConfig.Task( + name=task.name, + description=task.description, + expected_output=task.expected_output, + agent=task.agent, + ) + ) + + # Export all of the configured tools from the project + tools_agents: dict[str, list[str]] = {} + for agent_name in frameworks.get_agent_method_names(): + for tool_name in frameworks.get_agent_tool_names(agent_name): + if not tool_name: + continue + if tool_name not in tools_agents: + tools_agents[tool_name] = [] + tools_agents[tool_name].append(agent_name) + + tools: list[TemplateConfig.Tool] = [] + for tool_name, agent_names in tools_agents.items(): + tools.append( + TemplateConfig.Tool( + name=tool_name, + agents=agent_names, + ) + ) + + # Export the graph structure from the project + graph: list[list[TemplateConfig.Node]] = [] + for node in frameworks.get_graph(): + graph.append( + [ + TemplateConfig.Node( + name=node.source.name, + type=node.source.type.value # type: ignore + ), + TemplateConfig.Node( + name=node.target.name, + type=node.target.type.value # type: ignore + ), + ] + ) + + template = TemplateConfig( + template_version=CURRENT_VERSION, + name=metadata.project_name, + description=metadata.project_description, + framework=get_framework(), + method="sequential", # TODO this needs to be stored in the project somewhere + manager_agent=None, # TODO + agents=agents, + tasks=tasks, + tools=tools, + inputs=inputs.get_inputs(), + graph=graph, + ) + + try: + template.write_to_file(conf.PATH / output_filename) + log.success(f"Template saved to: {conf.PATH / output_filename}") + except Exception as e: + raise Exception(f"Failed to write template to file: {e}") diff --git a/agentstack/cli/wizard.py b/agentstack/cli/wizard.py new file mode 100644 index 00000000..7d0cf479 --- /dev/null +++ b/agentstack/cli/wizard.py @@ -0,0 +1,261 @@ +from typing import Optional +import os +import time +import inquirer +import webbrowser +from art import text2art +from agentstack import log +from agentstack.frameworks import SUPPORTED_FRAMEWORKS +from agentstack.utils import open_json_file, is_snake_case +from agentstack.cli import welcome_message, get_validated_input +from agentstack.cli.cli import PREFERRED_MODELS +from agentstack._tools import get_all_tools, get_all_tool_names +from agentstack.proj_templates import TemplateConfig + + +class WizardData(dict): + def to_template_config(self) -> TemplateConfig: + agents = [] + for agent in self['design']['agents']: + agents.append(TemplateConfig.Agent(**{ + 'name': agent['name'], + 'role': agent['role'], + 'goal': agent['goal'], + 'backstory': agent['backstory'], + 'llm': agent['model'], + })) + + tasks = [] + for task in self['design']['tasks']: + tasks.append(TemplateConfig.Task(**{ + 'name': task['name'], + 'description': task['description'], + 'expected_output': task['expected_output'], + 'agent': task['agent'], + })) + + tools = [] + for tool in self['tools']: + tools.append(TemplateConfig.Tool(**{ + 'name': tool, + 'agents': [agent.name for agent in agents], # all agents + })) + + return TemplateConfig( + name=self['project']['name'], + description=self['project']['description'], + template_version=4, + framework=self['framework'], + method='sequential', + manager_agent=None, + agents=agents, + tasks=tasks, + tools=tools, + graph=[], + inputs={}, + ) + + +def run_wizard(slug_name: str) -> TemplateConfig: + project_details = ask_project_details(slug_name) + welcome_message() + framework = ask_framework() + design = ask_design() + tools = ask_tools() + + wizard_data = WizardData({ + 'project': project_details, + 'framework': framework, + 'design': design, + 'tools': tools, + }) + return wizard_data.to_template_config() + + +def ask_framework() -> str: + framework = inquirer.list_input( + message="What agent framework do you want to use?", + choices=SUPPORTED_FRAMEWORKS, + ) + # + # if framework == "Learn what these are (link)": + # webbrowser.open("https://youtu.be/xvFZjo5PgG0") + # framework = inquirer.list_input( + # message="What agent framework do you want to use?", + # choices=["CrewAI", "Autogen", "LiteLLM"], + # ) + # + # while framework in ['Autogen', 'LiteLLM']: + # print(f"{framework} support coming soon!!") + # framework = inquirer.list_input( + # message="What agent framework do you want to use?", + # choices=["CrewAI", "Autogen", "LiteLLM"], + # ) + + #log.success("Congrats! Your project is ready to go! Quickly add features now or skip to do it later.\n\n") + return framework + + +def ask_agent_details(): + agent = {} + + agent['name'] = get_validated_input( + "What's the name of this agent? (snake_case)", min_length=3, snake_case=True + ) + + agent['role'] = get_validated_input("What role does this agent have?", min_length=3) + + agent['goal'] = get_validated_input("What is the goal of the agent?", min_length=10) + + agent['backstory'] = get_validated_input("Give your agent a backstory", min_length=10) + + agent['model'] = inquirer.list_input( + message="What LLM should this agent use?", choices=PREFERRED_MODELS, default=PREFERRED_MODELS[0] + ) + + return agent + + +def ask_task_details(agents: list[dict]) -> dict: + task = {} + + task['name'] = get_validated_input( + "What's the name of this task? (snake_case)", min_length=3, snake_case=True + ) + + task['description'] = get_validated_input("Describe the task in more detail", min_length=10) + + task['expected_output'] = get_validated_input( + "What do you expect the result to look like? (ex: A 5 bullet point summary of the email)", + min_length=10, + ) + + task['agent'] = inquirer.list_input( + message="Which agent should be assigned this task?", + choices=[a['name'] for a in agents], + ) + + return task + + +def ask_design() -> dict: + use_wizard = inquirer.confirm( + message="Would you like to use the CLI wizard to set up agents and tasks?", + ) + + if not use_wizard: + return {'agents': [], 'tasks': []} + + os.system("cls" if os.name == "nt" else "clear") + + title = text2art("AgentWizard", font="shimrod") + + print(title) + + print(""" +🪄 welcome to the agent builder wizard!! 🪄 + +First we need to create the agents that will work together to accomplish tasks: + """) + make_agent = True + agents = [] + while make_agent: + print('---') + print(f"Agent #{len(agents)+1}") + agent = None + agent = ask_agent_details() + agents.append(agent) + make_agent = inquirer.confirm(message="Create another agent?") + + print('') + for x in range(3): + time.sleep(0.3) + print('.') + print('Boom! We made some agents (ﾉ>ω<)ﾉ :｡･:*:･ﾟ’★,｡･:*:･ﾟ’☆') + time.sleep(0.5) + print('') + print('Now lets make some tasks for the agents to accomplish!') + print('') + + make_task = True + tasks = [] + while make_task: + print('---') + print(f"Task #{len(tasks) + 1}") + task = ask_task_details(agents) + tasks.append(task) + make_task = inquirer.confirm(message="Create another task?") + + print('') + for x in range(3): + time.sleep(0.3) + print('.') + print('Let there be tasks (ノ ˘_˘)ノ　ζ|||ζ　ζ|||ζ　ζ|||ζ') + + return {'tasks': tasks, 'agents': agents} + + +def ask_tools() -> list: + use_tools = inquirer.confirm( + message="Do you want to add agent tools now? (you can do this later with `agentstack tools add `)", + ) + + if not use_tools: + return [] + + tools_to_add = [] + + adding_tools = True + tool_configs = get_all_tools() + + while adding_tools: + tool_categories = [] + for tool_config in tool_configs: + if tool_config.category not in tool_categories: + tool_categories.append(tool_config.category) + + tool_type = inquirer.list_input( + message="What category tool do you want to add?", + choices=tool_categories + ["~~ Stop adding tools ~~"], + ) + + tools_in_cat = [] + for tool_config in tool_configs: + if tool_config.category == tool_type: + tools_in_cat.append(tool_config) + + tool_selection = inquirer.list_input( + message="Select your tool", + choices=[f"{t.name} - {t.url}" for t in tools_in_cat if t not in tools_to_add], + ) + + tools_to_add.append(tool_selection.split(' - ')[0]) + + log.info("Adding tools:") + for t in tools_to_add: + log.info(f' - {t}') + log.info('') + adding_tools = inquirer.confirm("Add another tool?") + + return tools_to_add + + +def ask_project_details(slug_name: Optional[str] = None) -> dict: + name = inquirer.text(message="What's the name of your project (snake_case)", default=slug_name or '') + + if not is_snake_case(name): + log.error("Project name must be snake case") + return ask_project_details(slug_name) + + questions = inquirer.prompt( + [ + inquirer.Text("version", message="What's the initial version", default="0.1.0"), + inquirer.Text("description", message="Enter a description for your project"), + inquirer.Text("author", message="Who's the author (your name)?"), + ] + ) + + questions['name'] = name + + return questions + diff --git a/agentstack/frameworks/__init__.py b/agentstack/frameworks/__init__.py index bfdb38ee..6f738b7c 100644 --- a/agentstack/frameworks/__init__.py +++ b/agentstack/frameworks/__init__.py @@ -1,4 +1,4 @@ -from typing import Optional, Protocol, Callable +from typing import TYPE_CHECKING, Optional, Protocol, Callable from types import ModuleType from importlib import import_module from pathlib import Path @@ -6,13 +6,19 @@ from agentstack.exceptions import ValidationError from agentstack.utils import get_framework from agentstack._tools import ToolConfig -from agentstack.agents import AgentConfig -from agentstack.tasks import TaskConfig +from agentstack import graph + +if TYPE_CHECKING: + from agentstack.generation import InsertionPoint + from agentstack.agents import AgentConfig + from agentstack.tasks import TaskConfig CREWAI = 'crewai' +LANGGRAPH = 'langgraph' SUPPORTED_FRAMEWORKS = [ CREWAI, + LANGGRAPH, ] @@ -34,9 +40,9 @@ def validate_project(self) -> None: """ ... - def get_tool_names(self) -> list[str]: + def parse_llm(self, llm: str) -> tuple[str, str]: """ - Get a list of tool names in the user's project. + Parse a language model string into a provider and model. """ ... @@ -58,7 +64,7 @@ def get_tool_callables(self, tool_name: str) -> list[Callable]: """ ... - def get_agent_names(self) -> list[str]: + def get_agent_method_names(self) -> list[str]: """ Get a list of agent names in the user's project. """ @@ -70,24 +76,30 @@ def get_agent_tool_names(self, agent_name: str) -> list[str]: """ ... - def add_agent(self, agent: AgentConfig) -> None: + def add_agent(self, agent: 'AgentConfig', position: Optional['InsertionPoint'] = None) -> None: """ Add an agent to the user's project. """ ... - def add_task(self, task: TaskConfig) -> None: + def add_task(self, task: 'TaskConfig', position: Optional['InsertionPoint'] = None) -> None: """ Add a task to the user's project. """ ... - def get_task_names(self) -> list[str]: + def get_task_method_names(self) -> list[str]: """ Get a list of task names in the user's project. """ ... + def get_graph(self) -> list[graph.Edge]: + """ + Get the graph of the user's project. + """ + ... + def get_framework_module(framework: str) -> FrameworkModule: """ @@ -113,6 +125,13 @@ def validate_project(): return get_framework_module(get_framework()).validate_project() +def parse_llm(llm: str) -> tuple[str, str]: + """ + Parse a language model string into a provider and model. + """ + return get_framework_module(get_framework()).parse_llm(llm) + + def add_tool(tool: ToolConfig, agent_name: str): """ Add a tool to the user's project. @@ -136,11 +155,11 @@ def get_tool_callables(tool_name: str) -> list[Callable]: return get_framework_module(get_framework()).get_tool_callables(tool_name) -def get_agent_names() -> list[str]: +def get_agent_method_names() -> list[str]: """ Get a list of agent names in the user's project. """ - return get_framework_module(get_framework()).get_agent_names() + return get_framework_module(get_framework()).get_agent_method_names() def get_agent_tool_names(agent_name: str) -> list[str]: @@ -150,22 +169,35 @@ def get_agent_tool_names(agent_name: str) -> list[str]: return get_framework_module(get_framework()).get_agent_tool_names(agent_name) -def add_agent(agent: AgentConfig): +def add_agent(agent: 'AgentConfig', position: Optional['InsertionPoint'] = None): """ Add an agent to the user's project. """ - return get_framework_module(get_framework()).add_agent(agent) + framework = get_framework() + if agent.name in get_agent_method_names(): + raise ValidationError(f"Agent `{agent.name}` already exists in {get_entrypoint_path(framework)}") + return get_framework_module(framework).add_agent(agent, position) -def add_task(task: TaskConfig): +def add_task(task: 'TaskConfig', position: Optional['InsertionPoint'] = None): """ Add a task to the user's project. """ - return get_framework_module(get_framework()).add_task(task) + framework = get_framework() + if task.name in get_task_method_names(): + raise ValidationError(f"Task `{task.name}` already exists in {get_entrypoint_path(framework)}") + return get_framework_module(framework).add_task(task, position) -def get_task_names() -> list[str]: +def get_task_method_names() -> list[str]: """ Get a list of task names in the user's project. """ - return get_framework_module(get_framework()).get_task_names() + return get_framework_module(get_framework()).get_task_method_names() + + +def get_graph() -> list[graph.Edge]: + """ + Get the graph of the user's project. + """ + return get_framework_module(get_framework()).get_graph() diff --git a/agentstack/frameworks/crewai.py b/agentstack/frameworks/crewai.py index e4132a97..1b437d9b 100644 --- a/agentstack/frameworks/crewai.py +++ b/agentstack/frameworks/crewai.py @@ -1,12 +1,15 @@ -from typing import Optional, Any, Callable +from typing import TYPE_CHECKING, Optional, Any, Callable from pathlib import Path import ast -from agentstack import conf +from agentstack import conf, log from agentstack.exceptions import ValidationError from agentstack._tools import ToolConfig from agentstack.tasks import TaskConfig from agentstack.agents import AgentConfig from agentstack.generation import asttools +from agentstack import graph +if TYPE_CHECKING: + from agentstack.generation import InsertionPoint ENTRYPOINT: Path = Path('src/crew.py') @@ -16,9 +19,6 @@ class CrewFile(asttools.File): Parses and manipulates the CrewAI entrypoint file. All AST interactions should happen within the methods of this class. """ - - _base_class: Optional[ast.ClassDef] = None - def write(self): """ Early versions of the crew entrypoint file used tabs instead of spaces. @@ -30,12 +30,10 @@ def write(self): def get_base_class(self) -> ast.ClassDef: """A base class is a class decorated with `@CrewBase`.""" - if self._base_class is None: # Gets cached to save repeat iteration - try: - self._base_class = asttools.find_class_with_decorator(self.tree, 'CrewBase')[0] - except IndexError: - raise ValidationError(f"`@CrewBase` decorated class not found in {ENTRYPOINT}") - return self._base_class + try: + return asttools.find_class_with_decorator(self.tree, 'CrewBase')[0] + except IndexError: + raise ValidationError(f"`@CrewBase` decorated class not found in {ENTRYPOINT}") def get_crew_method(self) -> ast.FunctionDef: """A `crew` method is a method decorated with `@crew`.""" @@ -54,9 +52,6 @@ def get_task_methods(self) -> list[ast.FunctionDef]: def add_task_method(self, task: TaskConfig): """Add a new task method to the CrewAI entrypoint.""" task_methods = self.get_task_methods() - if task.name in [method.name for method in task_methods]: - # TODO this should check all methods in the class for duplicates - raise ValidationError(f"Task `{task.name}` already exists in {ENTRYPOINT}") if task_methods: # Add after the existing task methods _, pos = self.get_node_range(task_methods[-1]) @@ -70,6 +65,7 @@ def {task.name}(self) -> Task: return Task( config=self.tasks_config['{task.name}'], )""" + if not self.source[:pos].endswith('\n'): code = '\n\n' + code if not self.source[pos:].startswith('\n'): @@ -84,9 +80,6 @@ def add_agent_method(self, agent: AgentConfig): """Add a new agent method to the CrewAI entrypoint.""" # TODO do we want to pre-populate any tools? agent_methods = self.get_agent_methods() - if agent.name in [method.name for method in agent_methods]: - # TODO this should check all methods in the class for duplicates - raise ValidationError(f"Agent `{agent.name}` already exists in {ENTRYPOINT}") if agent_methods: # Add after the existing agent methods _, pos = self.get_node_range(agent_methods[-1]) @@ -102,6 +95,7 @@ def {agent.name}(self) -> Agent: tools=[], # add tools here or use `agentstack tools add verbose=True, )""" + if not self.source[:pos].endswith('\n'): code = '\n\n' + code if not self.source[pos:].startswith('\n'): @@ -143,27 +137,8 @@ def get_agent_tool_nodes(self, agent_name: str) -> list[ast.Starred]: """ Get a list of all ast nodes that define agentstack tools used by the agent. """ - tool_nodes: list[ast.Starred] = [] agent_tools_node = self.get_agent_tools(agent_name) - for node in agent_tools_node.elts: - try: - # we need to find nodes that look like: - # `*agentstack.tools['tool_name']` - assert isinstance(node, ast.Starred) - assert isinstance(node.value, ast.Subscript) - assert isinstance(node.value.slice, ast.Constant) - name_node = node.value.value - assert isinstance(name_node, ast.Attribute) - assert isinstance(name_node.value, ast.Name) - assert name_node.value.id == 'agentstack' - assert name_node.attr == 'tools' - - # This is a starred subscript node referencing agentstack.tools with - # a string slice, so it must be an agentstack tool - tool_nodes.append(node) - except AssertionError: - continue # not a matched node; that's ok - return tool_nodes + return asttools.find_tool_nodes(agent_tools_node) def get_agent_tool_names(self, agent_name: str) -> list[str]: """ @@ -194,16 +169,7 @@ def add_agent_tools(self, agent_name: str, tool: ToolConfig): new_tool_nodes: list[ast.expr] = [] if not tool.name in self.get_agent_tool_names(agent_name): - # we need to create a node that looks like: - # `*agentstack.tools['tool_name']` - # we always get a list of callables from the `agentstack.tools` module, - # so we need to wrap the node in a `Starred` node to unpack it. - node = ast.Subscript( - value=asttools.create_attribute('agentstack', 'tools'), - slice=ast.Constant(tool.name), - ctx=ast.Load(), - ) - existing_elts.append(ast.Starred(value=node, ctx=ast.Load())) + existing_elts.append(asttools.create_tool_node(tool.name)) new_node = ast.List(elts=existing_elts, ctx=ast.Load()) start, end = self.get_node_range(existing_node) @@ -264,7 +230,16 @@ def validate_project() -> None: ) -def get_task_names() -> list[str]: +def parse_llm(llm: str) -> tuple[str, str]: + """ + Parse the llm string into a `LLM` dataclass. + Crew separates providers and models with a forward slash. + """ + provider, model = llm.split('/') + return provider, model + + +def get_task_method_names() -> list[str]: """ Get a list of task names (methods with an @task decorator). """ @@ -272,15 +247,18 @@ def get_task_names() -> list[str]: return [method.name for method in crew_file.get_task_methods()] -def add_task(task: TaskConfig) -> None: +def add_task(task: TaskConfig, position: Optional['InsertionPoint'] = None) -> None: """ Add a task method to the CrewAI entrypoint. """ + if position is not None: + raise NotImplementedError("Task insertion points are not supported in CrewAI.") + with CrewFile(conf.PATH / ENTRYPOINT) as crew_file: crew_file.add_task_method(task) -def get_agent_names() -> list[str]: +def get_agent_method_names() -> list[str]: """ Get a list of agent names (methods with an @agent decorator). """ @@ -296,10 +274,13 @@ def get_agent_tool_names(agent_name: str) -> list[Any]: return crew_file.get_agent_tool_names(agent_name) -def add_agent(agent: AgentConfig) -> None: +def add_agent(agent: AgentConfig, position: Optional['InsertionPoint'] = None) -> None: """ Add an agent method to the CrewAI entrypoint. """ + if position is not None: + raise NotImplementedError("Agent insertion points are not supported in CrewAI.") + with CrewFile(conf.PATH / ENTRYPOINT) as crew_file: crew_file.add_agent_method(agent) @@ -363,3 +344,10 @@ def wrapped_method(*args, **kwargs): tool_funcs.append(crewai_wrapped) return tool_funcs + + +def get_graph() -> list[graph.Edge]: + """Get the graph of the user's project.""" + log.debug("CrewAI does not support graph generation.") + return [] + diff --git a/agentstack/frameworks/langgraph.py b/agentstack/frameworks/langgraph.py new file mode 100644 index 00000000..d3e6a38e --- /dev/null +++ b/agentstack/frameworks/langgraph.py @@ -0,0 +1,783 @@ +from functools import wraps +from typing import Optional, Union, Callable, Any +from dataclasses import dataclass +from pathlib import Path +import ast +from agentstack import conf, log +from agentstack import packaging +from agentstack.exceptions import ValidationError +from agentstack.generation import asttools, InsertionPoint +from agentstack._tools import ToolConfig +from agentstack.agents import AgentConfig, get_all_agent_names +from agentstack.tasks import TaskConfig, get_all_task_names +from agentstack import graph + +ENTRYPOINT: Path = Path('src/graph.py') + +GRAPH_NODE_START = 'START' +GRAPH_NODE_END = 'END' +GRAPH_NODE_TOOLS = 'tools' # references the `ToolNode` instance +GRAPH_NODE_TOOLS_CONDITION = 'tools_condition' +GRAPH_NODES_SPECIAL = (GRAPH_NODE_START, GRAPH_NODE_END, GRAPH_NODE_TOOLS_CONDITION, ) + + +@dataclass +class LangGraphProvider: + """An LLM provider for the LangGraph framework.""" + + class_name: str + module_name: str + dependency: str + + +PROVIDERS = { + 'openai': LangGraphProvider( + class_name='ChatOpenAI', + module_name='langchain_openai', + dependency='langchain-openai>=0.3.0', + ), + 'anthropic': LangGraphProvider( + class_name='ChatAnthropic', + module_name='langchain_anthropic', + dependency='langchain-anthropic>=0.3.1', + ), + 'google': LangGraphProvider( + class_name='ChatGoogleGenerativeAI', + module_name='langchain_google_genai', + dependency='langchain-google-genai>=2.0.8', + ), + 'huggingface': LangGraphProvider( + class_name='ChatHuggingFace', + module_name='langchain_huggingface', + dependency='langchain-huggingface', + ), + 'microsoft': LangGraphProvider( + class_name='AzureChatOpenAI', + module_name='langchain_openai', + dependency='langchain-openai', + ), + 'mistral': LangGraphProvider( + class_name='ChatMistralAI', + module_name='langchain_mistralai.chat_models', + dependency='langchain-mistralai', + ), + 'ollama': LangGraphProvider( + class_name='ChatOllama', + module_name='langchain_ollama.chat_models', + dependency='langchain-ollama', + ), +} + + +class LangGraphFile(asttools.File): + """ + Parses and manipulates the LangGraph entrypoint file. + """ + + def get_import(self, module_name: str, attributes: str) -> Optional[ast.ImportFrom]: + """ + Check if an import statement for a module and class exists in the file. + """ + for node in asttools.get_all_imports(self.tree): + names_str = ', '.join(alias.name for alias in node.names) + if node.module == module_name and names_str == attributes: + return node + return None + + def add_import(self, module_name: str, attributes: str): + """ + Add an import statement to the file. + """ + all_imports = asttools.get_all_imports(self.tree) + _, end = self.get_node_range(all_imports[-1]) if all_imports else (0, 0) + + code = f"from {module_name} import {attributes}\n" + if not self.source[:end].endswith('\n'): + code = '\n' + code + + self.edit_node_range(end, end, code) + + def get_base_class(self) -> ast.ClassDef: + """ + A base class is the first class inside of the file that follows the + naming convention: `Graph` + """ + try: + return asttools.find_class_with_regex(self.tree, r'\w+Graph$')[0] + except IndexError: + raise ValidationError(f"`Graph` class not found in {ENTRYPOINT}") + + def get_run_method(self) -> ast.FunctionDef: + """A method named `run`.""" + try: + base_class = self.get_base_class() + node = asttools.find_method_in_class(base_class, 'run')[0] + assert 'inputs' in (arg.arg for arg in node.args.args) + return node + except IndexError: + raise ValidationError(f"`run` method not found in `{base_class.name} class in {ENTRYPOINT}.") + except AssertionError: + raise ValidationError( + f"Method `run` of `{base_class.name}` must accept `inputs` as a keyword argument." + ) + + def get_task_methods(self) -> list[ast.FunctionDef]: + """A `task` method is a method decorated with `@task`.""" + return asttools.find_decorated_method_in_class(self.get_base_class(), 'task') + + def add_task_method(self, task: TaskConfig): + """Add a new task method to the LangGraph entrypoint.""" + task_methods = self.get_task_methods() + if task_methods: + # Add after the existing task methods + _, pos = self.get_node_range(task_methods[-1]) + else: + # Add before the `main` method + main_method = self.get_run_method() + pos, _ = self.get_node_range(main_method) + + code = f""" @agentstack.task + def {task.name}(self, state: State): + task_config = agentstack.get_task('{task.name}') + messages = ChatPromptTemplate.from_messages([ + ("user", task_config.prompt), + ]) + messages = messages.format_messages(**state['inputs']) + return {{'messages': messages + state['messages']}}""" + + if not self.source[:pos].endswith('\n'): + code = '\n\n' + code + if not self.source[pos:].startswith('\n'): + code += '\n\n' + self.edit_node_range(pos, pos, code) + + def get_agent_methods(self) -> list[ast.FunctionDef]: + """An `agent` method is a method decorated with `@agent`.""" + return asttools.find_decorated_method_in_class(self.get_base_class(), 'agent') + + def add_agent_method(self, agent: AgentConfig): + """Add a new agent method to the LangGraph entrypoint.""" + agent_methods = self.get_agent_methods() + if agent_methods: + # Add after the existing agent methods + _, pos = self.get_node_range(agent_methods[-1]) + else: + # Add before the `main` method + main_method = self.get_run_method() + pos, _ = self.get_node_range(main_method) + + assert agent.provider in PROVIDERS.keys() # this gets validated in `add_agent` + agent_class_name = PROVIDERS[agent.provider].class_name + code = f""" @agentstack.agent + def {agent.name}(self, state: State): + agent_config = agentstack.get_agent('{agent.name}') + messages = ChatPromptTemplate.from_messages([ + ("user", agent_config.prompt), + ]) + messages = messages.format_messages(**state['inputs']) + agent = {agent_class_name}(model=agent_config.model) + response = agent.invoke( + messages + state['messages'], + ) + return {{'messages': [response, ]}}""" + + if not self.source[:pos].endswith('\n'): + code = '\n\n' + code + if not self.source[pos:].startswith('\n'): + code += '\n\n' + self.edit_node_range(pos, pos, code) + + def get_global_tools(self) -> ast.List: + try: + method = asttools.find_method_calls(self.get_run_method(), 'ToolNode')[0] + except IndexError: + raise ValidationError(f"`run` method does not instantiate `ToolNode` in {ENTRYPOINT}") + + try: + assert isinstance(method.args[0], ast.List) + tools_list: ast.List = method.args[0] + except (IndexError, AssertionError): + raise ValidationError(f"`run` method does not pass a list to `ToolNode` in {ENTRYPOINT}") + return tools_list + + def get_global_tool_nodes(self) -> list[ast.Starred]: + """ + Get a list of all ast nodes that define global tools used by the project. + """ + global_tools_node = self.get_global_tools() + return asttools.find_tool_nodes(global_tools_node) + + def get_global_tool_names(self) -> list[str]: + """ + Get a list of all tools used by the project. + + Tools are identified by the item name of an `agentstack.tools` attribute node. + """ + tool_names: list[str] = [] + for node in self.get_global_tool_nodes(): + tool_names.append(node.value.slice.value) # type: ignore[attr-defined] + return tool_names + + def get_agent_tools(self, agent_name: str) -> ast.List: + """ + Get the tools used by an agent as AST nodes. + + Tool definitions are inside of the methods marked with an `@agent` decorator. + The method `bind_tools` is called with a list of tools to bind to the agent. + """ + method = asttools.find_method(self.get_agent_methods(), agent_name) + if method is None: + raise ValidationError(f"Agent method `{agent_name}` does not exist in {ENTRYPOINT}") + + # find the `bind_tools` method call + try: + bind_tools = asttools.find_method_calls(method, 'bind_tools')[0] + except IndexError: + raise ValidationError(f"Method `{agent_name}` does not call `bind_tools` in {ENTRYPOINT}") + + try: + assert isinstance(bind_tools.args[0], ast.List) + tools_list: ast.List = bind_tools.args[0] + except (IndexError, AssertionError): + raise ValidationError( + f"Method `{agent_name}` does not pass a list to `bind_tools` in {ENTRYPOINT}" + ) + + return tools_list + + def get_agent_tool_nodes(self, agent_name: str) -> list[ast.Starred]: + """ + Get a list of all ast nodes that define agentstack tools used by the agent. + """ + agent_tools_node = self.get_agent_tools(agent_name) + return asttools.find_tool_nodes(agent_tools_node) + + def get_agent_tool_names(self, agent_name: str) -> list[str]: + """ + Get a list of all tools used by the agent. + + Tools are identified by the item name of an `agentstack.tools` attribute node. + """ + tool_names: list[str] = [] + for node in self.get_agent_tool_nodes(agent_name): + # ignore type checking here since `get_agent_tool_nodes` is exhaustive + tool_names.append(node.value.slice.value) # type: ignore[attr-defined] + return tool_names + + def add_agent_tools(self, agent_name: str, tool: ToolConfig): + """ + Add new tools to be used by an agent to the agent's tool list and the + global ToolNode list. + """ + method = asttools.find_method(self.get_agent_methods(), agent_name) + if method is None: + raise ValidationError(f"`@agent` method `{agent_name}` does not exist in {ENTRYPOINT}") + + try: + bind_tools = asttools.find_method_calls(method, 'bind_tools')[0] + except IndexError: + # create node for the `bind_tools` method call after the Agent instantiation + # we add this when we actually add the first tool to the Agent, since + # passing an empty list to `bind_tools` throws an error. + agent_conf = AgentConfig(agent_name) + agent_class_name = PROVIDERS[agent_conf.provider].class_name + agent_instantiation = asttools.find_method_calls(method, agent_class_name)[0] + _, pos = self.get_node_range(agent_instantiation) + # TODO we could dynamically find the Agent variable name + code = """ + agent = agent.bind_tools([])""" + self.edit_node_range(pos, pos, code) + + existing_node: ast.List = self.get_agent_tools(agent_name) + existing_elts: list[ast.expr] = existing_node.elts + + new_tool_nodes: list[ast.expr] = [] + if not tool.name in self.get_agent_tool_names(agent_name): + existing_elts.append(asttools.create_tool_node(tool.name)) + + new_node = ast.List(elts=existing_elts, ctx=ast.Load()) + start, end = self.get_node_range(existing_node) + self.edit_node_range(start, end, new_node) + + # add the tool to the global tools list + existing_global_node: ast.List = self.get_global_tools() + existing_global_elts: list[ast.expr] = existing_global_node.elts + + new_global_tool_nodes: list[ast.expr] = [] + if not tool.name in self.get_global_tool_names(): + existing_global_elts.append(asttools.create_tool_node(tool.name)) + + new_global_node = ast.List(elts=existing_global_elts, ctx=ast.Load()) + global_start, global_end = self.get_node_range(existing_global_node) + self.edit_node_range(global_start, global_end, new_global_node) + + def remove_agent_tools(self, agent_name: str, tool: ToolConfig): + """ + Remove tools from an agent belonging to `tool` from the agent's tool list + and the global ToolNode list. + """ + existing_node: ast.List = self.get_agent_tools(agent_name) + start, end = self.get_node_range(existing_node) + # modify the existing node to remove any matching tools + # we're referencing the internal node list from two directions here, + # so it's important that the node tree doesn't get re-parsed in between + for node in self.get_agent_tool_nodes(agent_name): + # ignore type checking here since `get_agent_tool_nodes` is exhaustive + if tool.name == node.value.slice.value: # type: ignore[attr-defined] + existing_node.elts.remove(node) + self.edit_node_range(start, end, existing_node) + + # remove the tool from the global tools list + existing_global_node: ast.List = self.get_global_tools() + global_start, global_end = self.get_node_range(existing_global_node) + for node in self.get_global_tool_nodes(): + if tool.name == node.value.slice.value: # type: ignore[attr-defined] + existing_global_node.elts.remove(node) + self.edit_node_range(global_start, global_end, existing_global_node) + + def get_graph_nodes(self) -> list[ast.Call]: + """Get all of the AST Call nodes that create the graph nodes.""" + + def _get_node_name(node: ast.expr) -> str: + if isinstance(node, ast.Str): + return node.s + raise ValidationError(f"Could not determine name of node `{node}` in {ENTRYPOINT}") + + nodes = asttools.find_method_calls(self.get_run_method(), 'add_node') + for node in nodes: + source, target = node.args + source_name = _get_node_name(source) + #target_name = _get_node_name(target) + if source_name == GRAPH_NODE_TOOLS: # TODO this is a bit brittle + nodes.remove(node) + # if target_name == GRAPH_NODE_TOOLS: + # nodes.remove(node) + return nodes + + def get_graph_edge_nodes(self) -> list[ast.Call]: + """Get all of the AST Call nodes that create the graph edges.""" + # TODO do we need to exclude the tools? + nodes = asttools.find_method_calls(self.get_run_method(), 'add_edge') + for node in nodes: + if not len(node.args) == 2: + raise ValidationError(f"Invalid `add_edge` call in {ENTRYPOINT}") + + source, target = node.args + if isinstance(source, ast.Str) and source.s == GRAPH_NODE_TOOLS: + nodes.remove(node) + if isinstance(target, ast.Str) and target.s == GRAPH_NODE_TOOLS: + nodes.remove(node) + return nodes + + def get_graph(self) -> list[graph.Edge]: + """Get all of the edge definitions from the graph configuration.""" + graph_edges = self.get_graph_edge_nodes() + + def _get_type(name: str) -> graph.NodeType: + if name in GRAPH_NODES_SPECIAL: + return graph.NodeType.SPECIAL + if name == GRAPH_NODE_TOOLS: + return graph.NodeType.TOOLS + if name in get_all_agent_names(): + return graph.NodeType.AGENT + if name in get_all_task_names(): + return graph.NodeType.TASK + raise ValidationError(f"Could not determine type of node `{name}` in {ENTRYPOINT}") + + def _get_node(node: ast.expr) -> graph.Node: + if isinstance(node, ast.Str): # a string + return graph.Node(name=node.s, type=_get_type(node.s)) + if isinstance(node, ast.Name): # a variable + return graph.Node(name=node.id, type=_get_type(node.id)) + raise ValidationError(f"Could not determine type of node `{node}` in {ENTRYPOINT}") + + edges = [] + for edge in graph_edges: + source, target = edge.args + edges.append( + graph.Edge( + source=_get_node(source), + target=_get_node(target), + ) + ) + return edges + + def add_graph_edge(self, edge: graph.Edge): + """Add a new edge to the graph configuration.""" + existing_edges: list[ast.Call] = self.get_graph_edge_nodes() + if len(existing_edges): # add the new edge after the last existing edge + _, end = self.get_node_range(existing_edges[-1]) + else: # find the instantiation of `StateGraph` + graph_instance = asttools.find_method_calls(self.get_run_method(), 'StateGraph')[0] + _, end = self.get_node_range(graph_instance) + + source, target = edge.source.name, edge.target.name + # wrap the node names in quotes if they are not special nodes + if edge.source.type != graph.NodeType.SPECIAL: + source = f'"{source}"' + if edge.target.type != graph.NodeType.SPECIAL: + target = f'"{target}"' + + code = f""" + self.graph.add_edge({source}, {target})""" + self.edit_node_range(end, end, code) + + def add_conditional_edge(self, edge: graph.Edge): + """Add a new conditional edge to the graph configuration.""" + existing_edges: list[ast.Call] = self.get_graph_edge_nodes() + if len(existing_edges): + _, end = self.get_node_range(existing_edges[-1]) + else: + graph_instance = asttools.find_method_calls(self.get_run_method(), 'StateGraph')[0] + _, end = self.get_node_range(graph_instance) + + source, target = edge.source.name, edge.target.name + # wrap the node names in quotes if they are not special nodes + if edge.source.type != graph.NodeType.SPECIAL: + source = f'"{source}"' + if edge.target.type != graph.NodeType.SPECIAL: + target = f'"{target}"' + + code = f""" + self.graph.add_conditional_edges({source}, {target})""" + self.edit_node_range(end, end, code) + + def remove_graph_edge(self, edge: graph.Edge): + """Remove an edge from the graph configuration.""" + + def _get_node_name(node: ast.expr) -> str: + if isinstance(node, ast.Str): + return node.s + if isinstance(node, ast.Name): + return node.id + raise ValidationError(f"Could not determine name of node `{node}` in {ENTRYPOINT}") + + existing_edges: list[ast.Call] = self.get_graph_edge_nodes() + for edge_node in existing_edges: + source_node, target_node = edge_node.args + source, target = _get_node_name(source_node), _get_node_name(target_node) + if source == edge.source.name and target == edge.target.name: + return self.remove_node(edge_node) + + raise ValidationError( + f"Graph `add_edge({edge.source.name}, {edge.target.name})` not found for removal in {ENTRYPOINT}" + ) + + def add_graph_node(self, node_config: Union[AgentConfig, TaskConfig]): + """Add a new node to the graph configuration.""" + # this adds the node to the graph and relies on an existing edge + existing_nodes: list[ast.Call] = self.get_graph_nodes() + if len(existing_nodes): # add the new node after the last existing node + _, end = self.get_node_range(existing_nodes[-1]) + else: # find the instantiation of `StateGraph` + graph_instance = asttools.find_method_calls(self.get_run_method(), 'StateGraph')[0] + _, end = self.get_node_range(graph_instance) + + # node is always either an Agent or a Task so we can make this assumption + code = f""" + self.graph.add_node("{node_config.name}", self.{node_config.name})""" + self.edit_node_range(end, end, code) + + def remove_graph_node(self, node_config: Union[AgentConfig, TaskConfig]): + """Remove a node and it's edges from the graph configuration.""" + + # this just removes the node, use `remove_graph_edge` to remove the edges + def _get_node_name(node: ast.expr) -> str: + if isinstance(node, ast.Str): + return node.s + raise ValidationError(f"Could not determine name of node `{node}` in {ENTRYPOINT}") + + existing_nodes: list[ast.Call] = self.get_graph_nodes() + for node in existing_nodes: + source_node, target_node = node.args + source = _get_node_name(source_node) + if source == node_config.name: + return self.remove_node(node) + + raise ValidationError(f"Node `{node_config.name}` not found in {ENTRYPOINT}") + + +def validate_project() -> None: + """ + Validate that a langgraph project is ready to run. + Raises an `agentstack.ValidationError` if the project is not valid. + """ + graph_file = LangGraphFile(conf.PATH / ENTRYPOINT) + + # A valid project must have a class in the graph.py file that is named Graph. + # will raise a ValidationError if the class is not found + class_node = graph_file.get_base_class() + + # The base class must implement a method called `run` that accepts `inputs` + # as a keyword argument. + # will raise a ValidationError if the method is not found or does not have the correct signature + _ = graph_file.get_run_method() + + # The base class must have one or more methods decorated with `@task` + if len(graph_file.get_task_methods()) < 1: + raise ValidationError( + f"`@agentstack.task` decorated method not found in `{class_node.name}` class in {ENTRYPOINT}.\n" + "Create a new task using `agentstack generate task `." + ) + + # The base class must have one or more methods decorated with `@agent` + if len(graph_file.get_agent_methods()) < 1: + raise ValidationError( + f"`@agentstack.agent` decorated method not found in `{class_node.name}` class in {ENTRYPOINT}.\n" + "Create a new agent using `agentstack generate agent `." + ) + + +def parse_llm(llm: str) -> tuple[str, str]: + """ + Parse a language model string into a provider and model. + LangGraph separates providers and models with a forward slash. + """ + provider, model = llm.split('/') + return provider, model + + +def get_task_method_names() -> list[str]: + """ + Get a list of task names (methods with an @task decorator). + """ + entrypoint = LangGraphFile(conf.PATH / ENTRYPOINT) + return [method.name for method in entrypoint.get_task_methods()] + + +def add_task(task: TaskConfig, position: Optional[InsertionPoint] = None) -> None: + """ + Add a task method to the LangGraph entrypoint. + """ + if position is None: + position = InsertionPoint.END + if not position in (InsertionPoint.BEGIN, InsertionPoint.END): + raise ValidationError(f"Invalid insertion point: {position}") + + with LangGraphFile(conf.PATH / ENTRYPOINT) as entrypoint: + entrypoint.add_task_method(task) + entrypoint.add_graph_node(task) + + existing_nodes = entrypoint.get_graph() + if position == InsertionPoint.END: + # replace the existing END node with the new agent, and insert the + # previous END node's source as the new agent's source + prev_source = None + for node in existing_nodes: + source, target = node.source, node.target + if target.type == graph.NodeType.SPECIAL and target.name == GRAPH_NODE_END: + prev_source = source + entrypoint.remove_graph_edge(node) + break + + if prev_source: + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name=prev_source.name, type=prev_source.type), + target=graph.Node(name=task.name, type=graph.NodeType.TASK), + ) + ) + else: + log.warning(f"Could not find {GRAPH_NODE_END} node to replace in {ENTRYPOINT}") + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name=task.name, type=graph.NodeType.TASK), + target=graph.Node(name=GRAPH_NODE_END, type=graph.NodeType.SPECIAL), + ) + ) + elif position == InsertionPoint.BEGIN: + # replace the existing START node with the new agent, and insert the + # new agent as the source of the previous START node + # TODO this places the new edges at the end of the graph definition, + # so while it is functionally correct, it is not visually intuitive + prev_target = None + for node in existing_nodes: + source, target = node.source, node.target + if source.type == graph.NodeType.SPECIAL and source.name == GRAPH_NODE_START: + prev_target = target + entrypoint.remove_graph_edge(node) + break + + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name=GRAPH_NODE_START, type=graph.NodeType.SPECIAL), + target=graph.Node(name=task.name, type=graph.NodeType.TASK), + ) + ) + if prev_target: + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name=task.name, type=graph.NodeType.TASK), + target=graph.Node(name=prev_target.name, type=prev_target.type), + ) + ) + else: + log.warning(f"Could not find {GRAPH_NODE_START} node to replace in {ENTRYPOINT}") + + +def get_agent_method_names() -> list[str]: + """ + Get a list of agent names (methods with an @agent decorator). + """ + entrypoint = LangGraphFile(conf.PATH / ENTRYPOINT) + return [method.name for method in entrypoint.get_agent_methods()] + + +def get_agent_tool_names(agent_name: str) -> list[Any]: + """ + Get a list of tools used by an agent. + """ + with LangGraphFile(conf.PATH / ENTRYPOINT) as entrypoint: + return entrypoint.get_agent_tool_names(agent_name) + + +def add_agent(agent: AgentConfig, position: Optional[InsertionPoint] = None) -> None: + """ + Add an agent method to the LangGraph entrypoint. + """ + if position is None: + position = InsertionPoint.END + if not position in (InsertionPoint.BEGIN, InsertionPoint.END): + raise ValidationError(f"Invalid insertion point: {position}") + + try: + provider = PROVIDERS[agent.provider] + packaging.install(provider.dependency) + except KeyError: + raise ValidationError( + f"LangGraph provider '{provider}' has not been implemented. " + f"AgentStack currently supports: {', '.join(PROVIDERS.keys())} " + ) + + with LangGraphFile(conf.PATH / ENTRYPOINT) as entrypoint: + if not entrypoint.get_import(provider.module_name, provider.class_name): + entrypoint.add_import(provider.module_name, provider.class_name) + + entrypoint.add_agent_method(agent) + entrypoint.add_graph_node(agent) + + # add graph edge to get back from the `tools` to the Agent + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name=GRAPH_NODE_TOOLS, type=graph.NodeType.TOOLS), + target=graph.Node(name=agent.name, type=graph.NodeType.AGENT), + ) + ) + # add conditional edge for `tools_condition` + entrypoint.add_conditional_edge( + graph.Edge( + source=graph.Node(name=agent.name, type=graph.NodeType.AGENT), + target=graph.Node(name=GRAPH_NODE_TOOLS_CONDITION, type=graph.NodeType.SPECIAL), + ) + ) + + existing_nodes = entrypoint.get_graph() + if position == InsertionPoint.END: + # replace the existing END node with the new agent, and insert the + # previous END node's source as the new agent's source + prev_source = None + for node in existing_nodes: + source, target = node.source, node.target + if target.type == graph.NodeType.SPECIAL and target.name == GRAPH_NODE_END: + prev_source = source + entrypoint.remove_graph_edge(node) + break + + if prev_source: + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name=prev_source.name, type=prev_source.type), + target=graph.Node(name=agent.name, type=graph.NodeType.AGENT), + ) + ) + else: + log.warning(f"Could not find {GRAPH_NODE_END} node to replace in {ENTRYPOINT}") + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name=agent.name, type=graph.NodeType.AGENT), + target=graph.Node(name=GRAPH_NODE_END, type=graph.NodeType.SPECIAL), + ) + ) + elif position == InsertionPoint.BEGIN: + # replace the existing START node with the new agent, and insert the + # new agent as the source of the previous START node + # TODO this places the new edges at the end of the graph definition, + # so while it is functionally correct, it is not visually intuitive + prev_target = None + for node in existing_nodes: + source, target = node.source, node.target + if source.type == graph.NodeType.SPECIAL and source.name == GRAPH_NODE_START: + prev_target = target + entrypoint.remove_graph_edge(node) + break + + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name=GRAPH_NODE_START, type=graph.NodeType.SPECIAL), + target=graph.Node(name=agent.name, type=graph.NodeType.AGENT), + ) + ) + if prev_target: + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name=agent.name, type=graph.NodeType.AGENT), + target=graph.Node(name=prev_target.name, type=prev_target.type), + ) + ) + else: + log.warning(f"Could not find {GRAPH_NODE_START} node to replace in {ENTRYPOINT}") + + +def add_tool(tool: ToolConfig, agent_name: str): + """ + Add a tool to the LangGraph entrypoint for the specified agent. + The agent should already exist in the base class and have a `bind_tools` method call. + """ + with LangGraphFile(conf.PATH / ENTRYPOINT) as entrypoint: + entrypoint.add_agent_tools(agent_name, tool) + + +def remove_tool(tool: ToolConfig, agent_name: str): + """ + Remove a tool from the CrewAI framework for the specified agent. + """ + with LangGraphFile(conf.PATH / ENTRYPOINT) as entrypoint: + entrypoint.remove_agent_tools(agent_name, tool) + + +def get_tool_callables(tool_name: str) -> list[Callable]: + """ + Get a tool by name and return it as a list of framework-native callables. + """ + # LangGraph accepts functions as tools, so we can return them directly + tool_funcs = [] + tool_config = ToolConfig.from_tool_name(tool_name) + + # TODO: remove after agentops supports langgraph + # wrap method with agentops tool event + def wrap_method(method: Callable) -> Callable: + @wraps(method) # This preserves the original function's metadata + def wrapped_method(*args, **kwargs): + import agentops + tool_event = agentops.ToolEvent(method.__name__) + result = method(*args, **kwargs) + agentops.record(tool_event) + return result + + return wrapped_method + + for tool_func_name in tool_config.tools: + tool_func = getattr(tool_config.module, tool_func_name) + + assert callable(tool_func), f"Tool function {tool_func_name} is not callable." + assert tool_func.__doc__, f"Tool function {tool_func_name} is missing a docstring." + + tool_funcs.append(wrap_method(tool_func)) + + return tool_funcs + + +def get_graph() -> list[graph.Edge]: + """Get the graph structure of the project.""" + entrypoint = LangGraphFile(conf.PATH / ENTRYPOINT) + return entrypoint.get_graph() diff --git a/agentstack/generation/__init__.py b/agentstack/generation/__init__.py index ad0b3c90..b59d2c2c 100644 --- a/agentstack/generation/__init__.py +++ b/agentstack/generation/__init__.py @@ -1,3 +1,4 @@ +from .gen_utils import InsertionPoint, parse_insertion_point from .agent_generation import add_agent from .task_generation import add_task from .tool_generation import add_tool, remove_tool diff --git a/agentstack/generation/agent_generation.py b/agentstack/generation/agent_generation.py index 6099fa4e..f705ad4a 100644 --- a/agentstack/generation/agent_generation.py +++ b/agentstack/generation/agent_generation.py @@ -3,32 +3,38 @@ from agentstack import log from agentstack.exceptions import ValidationError from agentstack.conf import ConfigFile +from agentstack.generation import parse_insertion_point from agentstack import frameworks from agentstack.utils import verify_agentstack_project from agentstack.agents import AgentConfig, AGENTS_FILENAME def add_agent( - agent_name: str, + name: str, role: Optional[str] = None, goal: Optional[str] = None, backstory: Optional[str] = None, llm: Optional[str] = None, + allow_delegation: Optional[bool] = None, + position: Optional[str] = None, ): agentstack_config = ConfigFile() verify_agentstack_project() - agent = AgentConfig(agent_name) + agent = AgentConfig(name) with agent as config: config.role = role or "Add your role here" config.goal = goal or "Add your goal here" config.backstory = backstory or "Add your backstory here" config.llm = llm or agentstack_config.default_model or "" + if allow_delegation: + log.warning("Agent allow_delegation is not implemented.") + + _position = parse_insertion_point(position) try: - frameworks.add_agent(agent) - log.info(f"Added agent \"{agent_name}\" to project.") + frameworks.add_agent(agent, _position) except ValidationError as e: raise ValidationError(f"Error adding agent to project:\n{e}") - log.success(f"Added agent \"{agent_name}\" to your AgentStack project successfully!") + log.success(f"Added agent \"{agent.name}\" to your AgentStack project successfully!") diff --git a/agentstack/generation/asttools.py b/agentstack/generation/asttools.py index 7d25f1a6..72d4b368 100644 --- a/agentstack/generation/asttools.py +++ b/agentstack/generation/asttools.py @@ -11,6 +11,7 @@ from typing import TypeVar, Optional, Union, Iterable, Any from pathlib import Path +import re import ast import astor import asttokens @@ -84,6 +85,11 @@ def edit_node_range(self, start: int, end: int, node: Union[str, ast.AST]): else: raise ValidationError(f"Failed to parse {self.filename} after edit") + def remove_node(self, node: ast.AST) -> None: + """Remove a node from the source code.""" + start, end = self.get_node_range(node) + self.edit_node_range(start, end, '') + def __enter__(self: FileT) -> FileT: return self @@ -113,6 +119,34 @@ def find_method(tree: Union[Iterable[ASTT], ASTT], method_name: str) -> Optional return None +def find_method_calls(tree: Union[Iterable[ASTT], ASTT], method_name: str) -> list[ast.Call]: + """Find a method call in an AST.""" + if isinstance(tree, ast.AST): + _tree = list(ast.iter_child_nodes(tree)) + else: + _tree = list(tree) + + calls = [] + for node in _tree: + if isinstance(node, ast.Expr) and isinstance(node.value, ast.Call): + # our desired method call is not being stored in a variable + if isinstance(node.value.func, ast.Name) and node.value.func.id == method_name: + calls.append(node.value) + elif isinstance(node.value.func, ast.Attribute) and node.value.func.attr == method_name: + calls.append(node.value) + elif isinstance(node, ast.Assign) and isinstance(node.value, ast.Call): + # our desired method call is being assigned to a variable + if isinstance(node.value.func, ast.Attribute) and node.value.func.attr == method_name: + calls.append(node.value) + elif isinstance(node.value.func, ast.Name) and node.value.func.id == method_name: + calls.append(node.value) + elif isinstance(node, ast.Return) and isinstance(node.value, ast.Call): + # our desired method call is being returned + if isinstance(node.value.func, ast.Name) and node.value.func.id == method_name: + calls.append(node.value) + return calls + + def find_kwarg_in_method_call(node: ast.Call, kwarg_name: str) -> Optional[ast.keyword]: """Find a keyword argument in a method call or class instantiation.""" for arg in node.keywords: @@ -161,6 +195,27 @@ def find_class_with_decorator(tree: ast.Module, decorator_name: str) -> list[ast return nodes +def find_class_with_regex(tree: ast.Module, expr: str) -> list[ast.ClassDef]: + """Find a class definition with a name that matches the regex. """ + nodes = [] + pattern = re.compile(expr) + for node in ast.iter_child_nodes(tree): + if isinstance(node, ast.ClassDef): + if pattern.match(node.name): + nodes.append(node) + return nodes + + +def find_method_in_class(classdef: ast.ClassDef, method_name: str) -> list[ast.FunctionDef]: + """Find all methods named `method_name`.""" + nodes = [] + for node in ast.iter_child_nodes(classdef): + if isinstance(node, ast.FunctionDef): + if node.name == method_name: + nodes.append(node) + return nodes + + def find_decorated_method_in_class(classdef: ast.ClassDef, decorator_name: str) -> list[ast.FunctionDef]: """Find all method definitions in a class definition which are decorated with a specific decorator.""" nodes = [] @@ -168,6 +223,10 @@ def find_decorated_method_in_class(classdef: ast.ClassDef, decorator_name: str) if isinstance(node, ast.FunctionDef): for decorator in node.decorator_list: if isinstance(decorator, ast.Name) and decorator.id == decorator_name: + # this is a decorator that is called (e.g. @my_decorator()) + nodes.append(node) + elif isinstance(decorator, ast.Attribute) and decorator.attr == decorator_name: + # this is a decorator that is not called (e.g. @staticmethod) nodes.append(node) return nodes @@ -188,3 +247,48 @@ def get_node_value(node: Union[ast.expr, ast.Attribute, ast.Constant, ast.Str, a return node.attr else: return None + + +def find_tool_nodes(tool_list: ast.List) -> list[ast.Starred]: + """ + Find all starred nodes that reference agentstack tools in an `ast.List`. + """ + # we need to find nodes that look like: + # `*agentstack.tools['tool_name']` + tool_nodes: list[ast.Starred] = [] + for node in tool_list.elts: + try: + # we need to find nodes that look like: + # `*agentstack.tools['tool_name']` + assert isinstance(node, ast.Starred) + assert isinstance(node.value, ast.Subscript) + assert isinstance(node.value.slice, ast.Constant) + name_node = node.value.value + assert isinstance(name_node, ast.Attribute) + assert isinstance(name_node.value, ast.Name) + assert name_node.value.id == 'agentstack' + assert name_node.attr == 'tools' + + # This is a starred subscript node referencing agentstack.tools with + # a string slice, so it must be an agentstack tool + tool_nodes.append(node) + except AssertionError: + continue + return tool_nodes + + +def create_tool_node(tool_name: str) -> ast.Starred: + """ + Create a starred node that references an agentstack tool. + """ + # we need to create a node that looks like: + # `*agentstack.tools['tool_name']` + # we always get a list of callables from the `agentstack.tools` module, + # so we need to wrap the node in a `Starred` node to unpack it. + node = ast.Subscript( + value=create_attribute('agentstack', 'tools'), + slice=ast.Constant(tool_name), + ctx=ast.Load(), + ) + return ast.Starred(value=node, ctx=ast.Load()) + diff --git a/agentstack/generation/files.py b/agentstack/generation/files.py index 058a3d33..e35b446b 100644 --- a/agentstack/generation/files.py +++ b/agentstack/generation/files.py @@ -113,10 +113,25 @@ def __init__(self, filename: str = PYPROJECT_FILENAME): @property def project_metadata(self) -> dict: + """ + [project] + name = "project_name" + version = "0.0.1" + description = "foo bar" + authors = [ + { name = "Name " } + ] + license = { text = "MIT" } + requires-python = ">=3.10" + + dependencies = [ + ... + ] + """ try: - return self._data['tool']['poetry'] + return self._data['project'] except KeyError: - raise KeyError("No poetry metadata found in pyproject.toml.") + raise KeyError("No project metadata found in pyproject.toml.") @property def project_name(self) -> str: diff --git a/agentstack/generation/gen_utils.py b/agentstack/generation/gen_utils.py index 551e12cc..ec2a60bf 100644 --- a/agentstack/generation/gen_utils.py +++ b/agentstack/generation/gen_utils.py @@ -1,6 +1,17 @@ +from typing import Optional +from enum import Enum import ast +class InsertionPoint(Enum): + """ + Enum for specifying where to insert generated code. + """ + + BEGIN = 'begin' + END = 'end' + + def insert_code_after_tag(file_path, tag, code_to_insert, next_line=False): if next_line: code_to_insert = ['\n'] + code_to_insert @@ -68,3 +79,17 @@ def string_in_file(file_path: str, str_to_match: str) -> bool: with open(file_path, 'r') as file: file_content = file.read() return str_to_match in file_content + + +def parse_insertion_point(position: Optional[str] = None) -> Optional[InsertionPoint]: + """ + Parse an insertion point CLI argument into an InsertionPoint enum. + """ + if position is None: + return None # defer assumptions + + valid_positions = {x.value for x in InsertionPoint} + if position not in valid_positions: + raise ValueError(f"Position must be one of {','.join(valid_positions)}.") + + return next(x for x in InsertionPoint if x.value == position) diff --git a/agentstack/generation/task_generation.py b/agentstack/generation/task_generation.py index 05548427..93ec5465 100644 --- a/agentstack/generation/task_generation.py +++ b/agentstack/generation/task_generation.py @@ -2,34 +2,36 @@ from pathlib import Path from agentstack import log from agentstack.exceptions import ValidationError +from agentstack.generation import parse_insertion_point from agentstack import frameworks from agentstack.utils import verify_agentstack_project from agentstack.tasks import TaskConfig, TASKS_FILENAME def add_task( - task_name: str, + name: str, description: Optional[str] = None, expected_output: Optional[str] = None, agent: Optional[str] = None, + position: Optional[str] = None, ): verify_agentstack_project() - agents = frameworks.get_agent_names() + agents = frameworks.get_agent_method_names() if not agent and len(agents) == 1: # if there's only one agent, use it by default agent = agents[0] - task = TaskConfig(task_name) + task = TaskConfig(name) with task as config: config.description = description or "Add your description here" config.expected_output = expected_output or "Add your expected_output here" config.agent = agent or "agent_name" + _position = parse_insertion_point(position) try: - frameworks.add_task(task) - log.info(f"Added task \"{task_name}\" to project.") + frameworks.add_task(task, _position) except ValidationError as e: raise ValidationError(f"Error adding task to project:\n{e}") - log.success(f"Added task \"{task_name}\" to your AgentStack project successfully!") + log.success(f"Added task \"{task.name}\" to your AgentStack project successfully!") diff --git a/agentstack/generation/tool_generation.py b/agentstack/generation/tool_generation.py index 2076e4ee..19f5c1ea 100644 --- a/agentstack/generation/tool_generation.py +++ b/agentstack/generation/tool_generation.py @@ -11,12 +11,12 @@ from agentstack.generation.files import EnvFile -def add_tool(tool_name: str, agents: Optional[list[str]] = []): +def add_tool(name: str, agents: Optional[list[str]] = []): agentstack_config = ConfigFile() - tool = ToolConfig.from_tool_name(tool_name) + tool = ToolConfig.from_tool_name(name) - if tool_name in agentstack_config.tools: - log.notify(f'Tool {tool_name} is already installed') + if name in agentstack_config.tools: + log.notify(f'Tool {name} is already installed') else: # handle install if tool.dependencies: packaging.install(' '.join(tool.dependencies)) @@ -37,7 +37,7 @@ def add_tool(tool_name: str, agents: Optional[list[str]] = []): # Edit the framework entrypoint file to include the tool in the agent definition if not agents: # If no agents are specified, add the tool to all agents - agents = frameworks.get_agent_names() + agents = frameworks.get_agent_method_names() for agent_name in agents: log.info(f'Adding tool {tool.name} to agent {agent_name}') frameworks.add_tool(tool, agent_name) @@ -47,21 +47,21 @@ def add_tool(tool_name: str, agents: Optional[list[str]] = []): log.notify(f'🪩 {tool.cta}') -def remove_tool(tool_name: str, agents: Optional[list[str]] = []): +def remove_tool(name: str, agents: Optional[list[str]] = []): agentstack_config = ConfigFile() - if tool_name not in agentstack_config.tools: - raise ValidationError(f'Tool {tool_name} is not installed') + if name not in agentstack_config.tools: + raise ValidationError(f'Tool {name} is not installed') # TODO ensure other agents are not using the tool - tool = ToolConfig.from_tool_name(tool_name) + tool = ToolConfig.from_tool_name(name) if tool.dependencies: for dependency in tool.dependencies: packaging.remove(dependency) # Edit the framework entrypoint file to exclude the tool in the agent definition if not agents: # If no agents are specified, remove the tool from all agents - agents = frameworks.get_agent_names() + agents = frameworks.get_agent_method_names() for agent_name in agents: frameworks.remove_tool(tool, agent_name) @@ -72,4 +72,4 @@ def remove_tool(tool_name: str, agents: Optional[list[str]] = []): with agentstack_config as config: config.tools.remove(tool.name) - log.success(f'🔨 Tool {tool_name} removed from agentstack project successfully') + log.success(f'🔨 Tool {tool.name} removed from agentstack project successfully') diff --git a/agentstack/graph.py b/agentstack/graph.py new file mode 100644 index 00000000..8049b84c --- /dev/null +++ b/agentstack/graph.py @@ -0,0 +1,20 @@ +from typing import Literal +from enum import Enum +import pydantic + + +class NodeType(Enum): + AGENT = 'agent' + TASK = 'task' + TOOLS = 'tools' + SPECIAL = 'special' + + +class Node(pydantic.BaseModel): + name: str + type: NodeType + + +class Edge(pydantic.BaseModel): + source: Node + target: Node diff --git a/agentstack/main.py b/agentstack/main.py index 6f86cd21..9715822b 100644 --- a/agentstack/main.py +++ b/agentstack/main.py @@ -61,6 +61,7 @@ def _main(): init_parser.add_argument("slug_name", nargs="?", help="The directory name to place the project in") init_parser.add_argument("--wizard", "-w", action="store_true", help="Use the setup wizard") init_parser.add_argument("--template", "-t", help="Agent template to use") + init_parser.add_argument("--framework", "-f", help="Framework to use") # 'run' command run_parser = subparsers.add_parser( @@ -102,6 +103,7 @@ def _main(): agent_parser.add_argument("--goal", "-g", help="Goal of the agent") agent_parser.add_argument("--backstory", "-b", help="Backstory of the agent") agent_parser.add_argument("--llm", "-l", help="Language model to use") + agent_parser.add_argument("--position", help="Position to add the agent in the stack.") # 'task' command under 'generate' task_parser = generate_subparsers.add_parser( @@ -111,6 +113,7 @@ def _main(): task_parser.add_argument("--description", "-d", help="Description of the task") task_parser.add_argument("--expected_output", "-e", help="Expected output of the task") task_parser.add_argument("--agent", "-a", help="Agent associated with the task") + task_parser.add_argument("--position", help="Position to add the task in the stack.") # 'tools' command tools_parser = subparsers.add_parser("tools", aliases=["t"], help="Manage tools") @@ -170,7 +173,7 @@ def _main(): elif args.command in ["templates"]: webbrowser.open("https://docs.agentstack.sh/quickstart") elif args.command in ["init", "i"]: - init_project(args.slug_name, args.template, args.wizard) + init_project(args.slug_name, args.template, args.framework, args.wizard) elif args.command in ["tools", "t"]: if args.tools_command in ["list", "l"]: list_tools() @@ -198,9 +201,11 @@ def _main(): if args.generate_command in ['agent', 'a']: if not args.llm: configure_default_model() - generation.add_agent(args.name, args.role, args.goal, args.backstory, args.llm) + generation.add_agent(args.name, args.role, args.goal, args.backstory, args.llm, args.position) elif args.generate_command in ['task', 't']: - generation.add_task(args.name, args.description, args.expected_output, args.agent) + generation.add_task( + args.name, args.description, args.expected_output, args.agent, args.position + ) else: generate_parser.print_help() elif args.command in ['export', 'e']: diff --git a/agentstack/proj_templates.py b/agentstack/proj_templates.py index b92acd09..a0b1531b 100644 --- a/agentstack/proj_templates.py +++ b/agentstack/proj_templates.py @@ -1,4 +1,4 @@ -from typing import Optional, Literal +from typing import Optional, Literal, Union import os, sys from pathlib import Path import pydantic @@ -7,6 +7,21 @@ from agentstack.exceptions import ValidationError from agentstack.utils import get_package_path +CURRENT_VERSION: Literal[4] = 4 + + +def _model_dump_agent(agent: Union[dict, pydantic.BaseModel]) -> dict: + """Between template version 3 and 4 we fixed the naming of the model/llm field. """ + if isinstance(agent, pydantic.BaseModel): + agent = agent.model_dump() + return { + "name": agent['name'], + "role": agent['role'], + "goal": agent['goal'], + "backstory": agent['backstory'], + "llm": agent['model'], # model -> llm + } + class TemplateConfig_v1(pydantic.BaseModel): name: str @@ -19,16 +34,18 @@ class TemplateConfig_v1(pydantic.BaseModel): tools: list[dict] inputs: list[str] - def to_v2(self) -> 'TemplateConfig_v2': - return TemplateConfig_v2( + def to_v4(self) -> 'TemplateConfig': + return TemplateConfig( name=self.name, description=self.description, - template_version=2, + template_version=CURRENT_VERSION, framework=self.framework, method=self.method, - agents=[TemplateConfig_v2.Agent(**agent) for agent in self.agents], - tasks=[TemplateConfig_v2.Task(**task) for task in self.tasks], - tools=[TemplateConfig_v2.Tool(**tool) for tool in self.tools], + manager_agent=None, + agents=[TemplateConfig.Agent(**_model_dump_agent(agent)) for agent in self.agents], + tasks=[TemplateConfig.Task(**task) for task in self.tasks], + tools=[TemplateConfig.Tool(**tool) for tool in self.tools], + graph=[], inputs={key: "" for key in self.inputs}, ) @@ -61,17 +78,64 @@ class Tool(pydantic.BaseModel): tools: list[Tool] inputs: dict[str, str] - def to_v3(self) -> 'TemplateConfig': + def to_v4(self) -> 'TemplateConfig': return TemplateConfig( name=self.name, description=self.description, - template_version=3, + template_version=CURRENT_VERSION, framework=self.framework, method=self.method, manager_agent=None, - agents=[TemplateConfig.Agent(**agent.model_dump()) for agent in self.agents], + agents=[TemplateConfig.Agent(**_model_dump_agent(agent)) for agent in self.agents], tasks=[TemplateConfig.Task(**task.model_dump()) for task in self.tasks], tools=[TemplateConfig.Tool(**tool.model_dump()) for tool in self.tools], + graph=[], + inputs=self.inputs, + ) + + +class TemplateConfig_v3(pydantic.BaseModel): + class Agent(pydantic.BaseModel): + name: str + role: str + goal: str + backstory: str + allow_delegation: bool = False + model: str + + class Task(pydantic.BaseModel): + name: str + description: str + expected_output: str + agent: str + + class Tool(pydantic.BaseModel): + name: str + agents: list[str] + + name: str + description: str + template_version: Literal[3] + framework: str + method: str + manager_agent: Optional[str] + agents: list[Agent] + tasks: list[Task] + tools: list[Tool] + inputs: dict[str, str] + + def to_v4(self) -> 'TemplateConfig': + return TemplateConfig( + name=self.name, + description=self.description, + template_version=CURRENT_VERSION, + framework=self.framework, + method=self.method, + manager_agent=self.manager_agent, + agents=[TemplateConfig.Agent(**_model_dump_agent(agent)) for agent in self.agents], + tasks=[TemplateConfig.Task(**task.model_dump()) for task in self.tasks], + tools=[TemplateConfig.Tool(**tool.model_dump()) for tool in self.tools], + graph=[], inputs=self.inputs, ) @@ -102,8 +166,10 @@ class TemplateConfig(pydantic.BaseModel): A list of tasks used by the project. tools: list[TemplateConfig.Tool] A list of tools used by the project. - inputs: list[str] - A list of inputs used by the project. + graph: list[list[TemplateConfig.Node]] + A list of graph relationships. Each edge must have exactly 2 nodes. + inputs: dict[str, str] + Key/value pairs of inputs used by the project. """ class Agent(pydantic.BaseModel): @@ -112,28 +178,41 @@ class Agent(pydantic.BaseModel): goal: str backstory: str allow_delegation: bool = False - model: str + llm: str class Task(pydantic.BaseModel): name: str description: str expected_output: str - agent: str + agent: str # TODO this is redundant with the graph class Tool(pydantic.BaseModel): name: str agents: list[str] + class Node(pydantic.BaseModel): + type: Literal["agent", "task", "special"] + name: str + name: str description: str - template_version: Literal[3] + template_version: Literal[4] framework: str method: str - manager_agent: Optional[str] + manager_agent: Optional[str] = None agents: list[Agent] tasks: list[Task] tools: list[Tool] - inputs: dict[str, str] + graph: list[list[Node]] + inputs: dict[str, str] = {} + + @pydantic.field_validator('graph') + @classmethod + def validate_graph_edges(cls, value: list[list[Node]]) -> list[list[Node]]: + for i, edge in enumerate(value): + if len(edge) != 2: + raise ValueError(f"Graph edge {i} must have exactly 2 nodes.") + return value def write_to_file(self, filename: Path): if not filename.suffix == '.json': @@ -174,6 +253,8 @@ def from_file(cls, path: Path) -> 'TemplateConfig': return cls.from_json(json.load(f)) except json.JSONDecodeError as e: raise ValidationError(f"Error decoding template JSON.\n{e}") + except ValidationError as e: + raise ValidationError(f"{e}\nTemplateConfig.from_file({path})") @classmethod def from_url(cls, url: str) -> 'TemplateConfig': @@ -186,16 +267,20 @@ def from_url(cls, url: str) -> 'TemplateConfig': return cls.from_json(response.json()) except json.JSONDecodeError as e: raise ValidationError(f"Error decoding template JSON.\n{e}") + except ValidationError as e: + raise ValidationError(f"{e}\nTemplateConfig.from_url({url})") @classmethod def from_json(cls, data: dict) -> 'TemplateConfig': try: match data.get('template_version'): case 1: - return TemplateConfig_v1(**data).to_v2().to_v3() + return TemplateConfig_v1(**data).to_v4() case 2: - return TemplateConfig_v2(**data).to_v3() + return TemplateConfig_v2(**data).to_v4() case 3: + return TemplateConfig_v3(**data).to_v4() + case 4: return cls(**data) # current version case _: raise ValidationError(f"Unsupported template version: {data.get('template_version')}") diff --git a/agentstack/tasks.py b/agentstack/tasks.py index b0bca0a5..7a5c6e3a 100644 --- a/agentstack/tasks.py +++ b/agentstack/tasks.py @@ -9,6 +9,10 @@ TASKS_FILENAME: Path = Path("src/config/tasks.yaml") +TASKS_PROMPT_TPL: str = ("\nThis is the expect criteria for your final answer: {expected_output}\n " + "you MUST return the actual complete content as the final answer, not a summary. " + "\nCurrent Task: {description}\n\nBegin! This is VERY important to you, use the " + "tools available and give your best Final Answer, your job depends on it!\n\nThought:") yaml = YAML() yaml.preserve_quotes = True # Preserve quotes in existing data @@ -63,6 +67,14 @@ def __init__(self, name: str): error_str += f"{' '.join([str(loc) for loc in error['loc']])}: {error['msg']}\n" raise ValidationError(f"Error loading task {name} from {filename}.\n{error_str}") + @property + def prompt(self) -> str: + """Format a complete prompt which includes the task description and expected output.""" + return TASKS_PROMPT_TPL.format(**{ + 'description': self.description, + 'expected_output': self.expected_output, + }) + def model_dump(self, *args, **kwargs) -> dict: dump = super().model_dump(*args, **kwargs) dump.pop('name') # name is the key, so keep it out of the data @@ -102,3 +114,9 @@ def get_all_task_names() -> list[str]: def get_all_tasks() -> list[TaskConfig]: return [TaskConfig(name) for name in get_all_task_names()] + + +def get_task(name: str) -> TaskConfig: + """Get a task configuration by name.""" + return TaskConfig(name) + diff --git a/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/README.md b/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/README.md index 177242e5..6a413792 100644 --- a/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/README.md +++ b/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/README.md @@ -1,7 +1,7 @@ # {{ cookiecutter.project_metadata.project_name }} {{ cookiecutter.project_metadata.description }} -## How to build your Crew +## How to build your Crew Agent ### With the CLI Add an agent using AgentStack with the CLI: `agentstack generate agent ` @@ -15,8 +15,8 @@ Similarly, tasks can be created with `agentstack g t ` Add tools with `agentstack tools add` and view tools available with `agentstack tools list` -## How to use your Crew -In this directory, run `poetry install` +## How to use your Agent +In this directory, run `uv pip install --requirements pyproject.toml` To run your project, use the following command: `agentstack run` diff --git a/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/config/agents.yaml b/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/config/agents.yaml index 3d4c324e..eed47206 100644 --- a/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/config/agents.yaml +++ b/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/config/agents.yaml @@ -6,5 +6,5 @@ {{agent.goal}} backstory: > {{agent.backstory}} - llm: {{agent.model}} + llm: {{agent.llm}} {%- endfor %} \ No newline at end of file diff --git a/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/crew.py b/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/crew.py index 7e5ca83b..0882f1f4 100644 --- a/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/crew.py +++ b/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/crew.py @@ -6,27 +6,6 @@ class {{cookiecutter.project_metadata.project_name|replace('-', '')|replace('_', '')|capitalize}}Crew(): """{{cookiecutter.project_metadata.project_name}} crew""" - # Agent definitions - {%- for agent in cookiecutter.structure.agents %} - {% if not agent.name == cookiecutter.structure.manager_agent %}@agent{% endif %} - def {{agent.name}}(self) -> Agent: - return Agent( - config=self.agents_config['{{ agent.name }}'], - tools=[], # Pass in what tools this agent should have - verbose=True, - {% if agent.allow_delegation %}allow_delegation=True{% endif %} - ) - {%- endfor %} - - # Task definitions - {%- for task in cookiecutter.structure.tasks %} - @task - def {{task.name}}(self) -> Task: - return Task( - config=self.tasks_config['{{task.name}}'], - ) - {%- endfor %} - @crew def crew(self) -> Crew: """Creates the Test crew""" diff --git a/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/main.py b/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/main.py index 15023c89..c8c347d4 100644 --- a/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/main.py +++ b/agentstack/templates/crewai/{{cookiecutter.project_metadata.project_slug}}/src/main.py @@ -10,7 +10,7 @@ def run(): """ - Run the crew. + Run the agent. """ instance.kickoff(inputs=agentstack.get_inputs()) diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/.env.example b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/.env.example new file mode 100644 index 00000000..a642ffe5 --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/.env.example @@ -0,0 +1,4 @@ +#AGENTOPS_API_KEY=... +#OPENAI_API_KEY=... + +# Tools \ No newline at end of file diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/.gitignore b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/.gitignore new file mode 100644 index 00000000..8ce42678 --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/.gitignore @@ -0,0 +1,164 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +.agentops/ diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/LICENSE.md b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/LICENSE.md new file mode 100644 index 00000000..5ea2f54d --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/LICENSE.md @@ -0,0 +1,404 @@ +{%- if cookiecutter.project_metadata.license == "MIT" %} +MIT License + +Copyright (c) {{ cookiecutter.project_metadata.year }} {{ cookiecutter.project_metadata.author_name }} + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +{%- endif %} + + +{%- if cookiecutter.project_metadata.license == "Apache-2.0" %} + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {{ cookiecutter.project_metadata.year }} {{ cookiecutter.project_metadata.author_name }} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +{%- endif %} + +{%- if cookiecutter.project_metadata.license == "GNU" %} +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble +The GNU General Public License is a free, copyleft license for software and other kinds of works. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS +0. Definitions. +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on the Program. + +To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. + +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + +a) The work must carry prominent notices stating that you modified it, and giving a relevant date. +b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. +c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. +d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + +a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. +b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. +c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. +d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. +e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + +a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or +b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or +c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or +d) Limiting the use for publicity purposes of names of licensors or authors of the material; or +e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or +f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Use with the GNU Affero General Public License. +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. + +14. Revised Versions of this License. +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS +{%- endif %} \ No newline at end of file diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/README.md b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/README.md new file mode 100644 index 00000000..139a3bdb --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/README.md @@ -0,0 +1,26 @@ +# {{ cookiecutter.project_metadata.project_name }} +{{ cookiecutter.project_metadata.description }} + +## How to build your LangGraph Agent +### With the CLI +Add an agent using AgentStack with the CLI: +`agentstack generate agent ` +You can also shorten this to `agentstack g a ` +For wizard support use `agentstack g a --wizard` +Finally for creation in the CLI alone, use `agentstack g a --role/-r --goal/-g --backstory/-b --model/-m ` + +This will automatically create a new agent in the `agents.yaml` config as well as in your code. Either placeholder strings will be used, or data included in the wizard. + +Similarly, tasks can be created with `agentstack g t ` + +Add tools with `agentstack tools add` and view tools available with `agentstack tools list` + +## How to use your Agent +In this directory, run `uv pip install --requirements pyproject.toml` + +To run your project, use the following command: +`agentstack run` + +This will initialize your AI agent project and begin task execution as defined in your configuration in the main.py file. + +> 🪩 Project built with [AgentStack](https://github.com/AgentOps-AI/AgentStack) \ No newline at end of file diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/agentstack.json b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/agentstack.json new file mode 100644 index 00000000..5511a17a --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/agentstack.json @@ -0,0 +1,6 @@ +{ + "framework": "{{ cookiecutter.framework }}", + "agentstack_version": "{{ cookiecutter.project_metadata.agentstack_version }}", + "template": "{{ cookiecutter.project_metadata.template }}", + "template_version": "{{ cookiecutter.project_metadata.template_version }}" +} \ No newline at end of file diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/pyproject.toml b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/pyproject.toml new file mode 100644 index 00000000..f6dc4cf6 --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/pyproject.toml @@ -0,0 +1,13 @@ +[project] +name = "{{cookiecutter.project_metadata.project_name}}" +version = "{{cookiecutter.project_metadata.version}}" +description = "{{cookiecutter.project_metadata.description}}" +authors = [ + { name = "{{cookiecutter.project_metadata.author_name}}" } +] +license = { text = "{{cookiecutter.project_metadata.license}}" } +requires-python = ">=3.10" + +dependencies = [ + "agentstack[{{cookiecutter.framework}}]>={{cookiecutter.project_metadata.agentstack_version}}", +] \ No newline at end of file diff --git a/agentstack/tools.py b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/__init__.py similarity index 100% rename from agentstack/tools.py rename to agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/__init__.py diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/config/agents.yaml b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/config/agents.yaml new file mode 100644 index 00000000..eed47206 --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/config/agents.yaml @@ -0,0 +1,10 @@ +{%- for agent in cookiecutter.structure.agents %} +{{agent.name}}: + role: > + {{agent.role}} + goal: > + {{agent.goal}} + backstory: > + {{agent.backstory}} + llm: {{agent.llm}} +{%- endfor %} \ No newline at end of file diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/config/inputs.yaml b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/config/inputs.yaml new file mode 100644 index 00000000..fcac19a9 --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/config/inputs.yaml @@ -0,0 +1,4 @@ +{%- for key, value in cookiecutter.structure.inputs.items() %} +{{key}}: > + {{value}} +{%- endfor %} \ No newline at end of file diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/config/tasks.yaml b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/config/tasks.yaml new file mode 100644 index 00000000..63e43048 --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/config/tasks.yaml @@ -0,0 +1,8 @@ +{%- for task in cookiecutter.structure.tasks %} +{{task.name}}: + description: > + {{task.description}} + expected_output: > + {{task.expected_output}} + agent: {{task.agent}} +{%- endfor %} \ No newline at end of file diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/graph.py b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/graph.py new file mode 100644 index 00000000..90ff3a49 --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/graph.py @@ -0,0 +1,36 @@ +from typing import Annotated +from typing_extensions import TypedDict + +from langchain.prompts import ChatPromptTemplate +from langgraph.graph import StateGraph, START, END +from langgraph.graph.message import add_messages +from langgraph.prebuilt import ToolNode, tools_condition + +import agentstack + + +class State(TypedDict): + inputs: dict[str, str] + messages: Annotated[list, add_messages] + + +class {{ cookiecutter.project_metadata.project_name|replace('-', '')|replace('_', '')|capitalize }}Graph: + + def run(self, inputs: list[str]): + tools = ToolNode([]) + self.graph = StateGraph(State) + self.graph.add_node("tools", tools) + self.graph.add_edge(START, END) + + app = self.graph.compile() + result_generator = app.stream({ + 'inputs': inputs, + 'messages': [], + }) + + for message in result_generator: + for k, item in message.items(): + for m in item['messages']: + agentstack.log.notify(f"\n\n{k}:") + agentstack.log.info(m.content) + diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/main.py b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/main.py new file mode 100644 index 00000000..28f21bea --- /dev/null +++ b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/main.py @@ -0,0 +1,19 @@ +#!/usr/bin/env python +import sys +from graph import {{cookiecutter.project_metadata.project_name|replace('-', '')|replace('_', '')|capitalize}}Graph +import agentstack +import agentops + +agentops.init(default_tags=agentstack.get_tags()) + +instance = {{cookiecutter.project_metadata.project_name|replace('-', '')|replace('_', '')|capitalize}}Graph() + +def run(): + """ + Run the agent. + """ + instance.run(inputs=agentstack.get_inputs()) + + +if __name__ == '__main__': + run() \ No newline at end of file diff --git a/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/tools/__init__.py b/agentstack/templates/langgraph/{{cookiecutter.project_metadata.project_slug}}/src/tools/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/agentstack/templates/proj_templates/graph.json b/agentstack/templates/proj_templates/graph.json new file mode 100644 index 00000000..c9785da7 --- /dev/null +++ b/agentstack/templates/proj_templates/graph.json @@ -0,0 +1,36 @@ +{ + "name": "graph", + "description": "This is the start of your AgentStack project.", + "template_version": 4, + "framework": "langgraph", + "agents": [{ + "name": "alex", + "role": "You are a friendly assistant.", + "goal": "Help the user with any of their requests.", + "backstory": "After years traveling the world, you've decided to get back into tech, just in time for the AI boom!. You're working on AgentStack, the fastest way to get started with AI agents. You have a README file available at: ./README.md", + "llm": "openai/gpt-4o" + }], + "tasks": [{ + "name": "hello_world", + "description": "As is tradition in software, let's start by saying 'Hello, World!'. Then, pick one or two tasks that they should try to do next with AgentStack.", + "expected_output": "The sentence Hello, World! followed by two things the user should try to customize their agent further.", + "agent": "alex" + }], + "tools": [{ + "name": "file_read", + "agents": ["alex"] + }], + "graph": [ + [ + {"type": "special", "name": "START"}, + {"type": "task", "name": "hello_world"} + ], [ + {"type": "task", "name": "hello_world"}, + {"type": "agent", "name": "alex"} + ], [ + {"type": "agent", "name": "alex"}, + {"type": "special", "name": "END"} + ] + ], + "method": "hierarchical" +} diff --git a/pyproject.toml b/pyproject.toml index 2fa0a999..95669e16 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "agentstack" -version = "0.2.5.1" +version = "0.3.0" description = "The fastest way to build robust AI agents" authors = [ { name="Braelyn Boynton", email="bboynton97@gmail.com" }, @@ -26,7 +26,7 @@ dependencies = [ "astor==0.8.1", "asttokens", "pydantic>=2.10", - "packaging==23.2", + "packaging>=23.2", "requests>=2.32", "appdirs>=1.4.4", "python-dotenv>=1.0.1", @@ -47,8 +47,12 @@ crewai = [ "crewai==0.83.0", "crewai-tools==0.14.0", ] +langgraph = [ + "langgraph>=0.2.61", + "langchain>=0.3.14", +] all = [ - "agentstack[dev,test,crewai]", + "agentstack[dev,test,crewai,langgraph]", ] [tool.setuptools.package-data] diff --git a/tests/fixtures/agents_max.yaml b/tests/fixtures/agents_max.yaml index d532bbf4..fd44a6b5 100644 --- a/tests/fixtures/agents_max.yaml +++ b/tests/fixtures/agents_max.yaml @@ -5,7 +5,7 @@ agent_name: this is a goal backstory: >- backstory - llm: provider/model + llm: openai/gpt-4o second_agent_name: role: >- role @@ -13,4 +13,4 @@ second_agent_name: this is a goal backstory: >- this is a backstory - llm: provider/model \ No newline at end of file + llm: openai/gpt-4o \ No newline at end of file diff --git a/tests/fixtures/frameworks/crewai/entrypoint_max.py b/tests/fixtures/frameworks/crewai/entrypoint_max.py index 6ccb9af2..1a5e45c0 100644 --- a/tests/fixtures/frameworks/crewai/entrypoint_max.py +++ b/tests/fixtures/frameworks/crewai/entrypoint_max.py @@ -6,13 +6,13 @@ @CrewBase class TestCrew: @agent - def test_agent(self) -> Agent: - return Agent(config=self.agents_config['test_agent'], tools=[], verbose=True) + def agent_name(self) -> Agent: + return Agent(config=self.agents_config['agent_name'], tools=[], verbose=True) @task - def test_task(self) -> Task: + def task_name(self) -> Task: return Task( - config=self.tasks_config['test_task'], + config=self.tasks_config['task_name'], ) @crew diff --git a/tests/fixtures/frameworks/langgraph/entrypoint_max.py b/tests/fixtures/frameworks/langgraph/entrypoint_max.py new file mode 100644 index 00000000..8bdaaec2 --- /dev/null +++ b/tests/fixtures/frameworks/langgraph/entrypoint_max.py @@ -0,0 +1,64 @@ +from typing import Annotated +from typing_extensions import TypedDict + +from langchain_openai import ChatOpenAI +from langchain_anthropic import ChatAnthropic +from langchain.prompts import ChatPromptTemplate +from langgraph.graph import StateGraph, START, END +from langgraph.graph.message import add_messages +from langgraph.prebuilt import ToolNode, tools_condition + +import agentstack + + +class State(TypedDict): + inputs: dict[str, str] + messages: Annotated[list, add_messages] + + +class TestGraph: + @agentstack.agent + def agent_name(self, state: State): + agent_config = agentstack.get_agent('agent_name') + messages = ChatPromptTemplate.from_messages([ + ("user", agent_config.prompt), + ]) + messages = messages.format_messages(**state['inputs']) + agent = ChatOpenAI(model=agent_config.model) + agent = agent.bind_tools([]) + response = agent.invoke( + messages + state['messages'], + ) + return {'messages': [response, ]} + + @agentstack.task + def task_name(self, state: State): + task_config = agentstack.get_task('task_name') + messages = ChatPromptTemplate.from_messages([ + ("user", task_config.prompt), + ]) + messages = messages.format_messages(**state['inputs']) + return {'messages': messages + state['messages']} + + def run(self, inputs: list[str]): + self.graph = StateGraph(State) + tools = ToolNode([]) + self.graph.add_node("tools", tools) + + self.graph.add_node("agent_name", self.agent_name) + self.graph.add_edge("agent_name", "tools") + self.graph.add_conditional_edges("agent_name", tools_condition) + + self.graph.add_node("task_name", self.task_name) + + self.graph.add_edge(START, "task_name") + self.graph.add_edge("task_name", "agent_name") + self.graph.add_edge("agent_name", END) + + app = self.graph.compile() + result = app.invoke({ + 'inputs': inputs, + 'messages': [], + }) + print(result['messages'][-1].content) + diff --git a/tests/fixtures/frameworks/langgraph/entrypoint_min.py b/tests/fixtures/frameworks/langgraph/entrypoint_min.py new file mode 100644 index 00000000..4e3e0ab5 --- /dev/null +++ b/tests/fixtures/frameworks/langgraph/entrypoint_min.py @@ -0,0 +1,30 @@ +from typing import Annotated +from typing_extensions import TypedDict + +from langchain_openai import ChatOpenAI +from langchain_anthropic import ChatAnthropic +from langchain.prompts import ChatPromptTemplate +from langgraph.graph import StateGraph, START, END +from langgraph.graph.message import add_messages +from langgraph.prebuilt import ToolNode, tools_condition + +import agentstack + + +class State(TypedDict): + inputs: dict[str, str] + messages: Annotated[list, add_messages] + + +class TestGraph: + def run(self, inputs: list[str]): + self.graph = StateGraph(State) + tools = ToolNode([]) + self.graph.add_node("tools", tools) + + app = self.graph.compile() + result = app.invoke({ + 'inputs': inputs, + 'messages': [], + }) + diff --git a/tests/test_agents_config.py b/tests/test_agents_config.py index fb9acea8..8345ec2d 100644 --- a/tests/test_agents_config.py +++ b/tests/test_agents_config.py @@ -2,10 +2,18 @@ import os, sys import shutil import unittest +from parameterized import parameterized import importlib.resources from pathlib import Path from agentstack import conf -from agentstack.agents import AgentConfig, AGENTS_FILENAME, get_all_agent_names, get_all_agents +from agentstack import frameworks +from agentstack.agents import ( + AGENTS_FILENAME, + AgentConfig, + get_all_agent_names, + get_all_agents, + get_agent +) from agentstack.exceptions import ValidationError BASE_PATH = Path(__file__).parent @@ -44,7 +52,7 @@ def test_read_maximal_yaml(self): assert config.role == "role" assert config.goal == "this is a goal" assert config.backstory == "backstory" - assert config.llm == "provider/model" + assert config.llm == "openai/gpt-4o" def test_write_yaml(self): with AgentConfig("agent_name") as config: @@ -139,3 +147,29 @@ def test_get_all_agents(self): for agent in get_all_agents(): self.assertIsInstance(agent, AgentConfig) + + def test_get_agent(self): + shutil.copy(BASE_PATH / "fixtures/agents_max.yaml", self.project_dir / AGENTS_FILENAME) + + agent = get_agent("agent_name") + self.assertIsInstance(agent, AgentConfig) + self.assertEqual(agent.name, "agent_name") + + def test_get_agent_prompt(self): + shutil.copy(BASE_PATH / "fixtures/agents_max.yaml", self.project_dir / AGENTS_FILENAME) + + agent = get_agent("agent_name") + assert agent.role in agent.prompt + assert agent.goal in agent.prompt + assert agent.backstory in agent.prompt + + @parameterized.expand([(x, ) for x in frameworks.SUPPORTED_FRAMEWORKS]) + @unittest.mock.patch("agentstack.frameworks.get_framework") + def test_get_agent_model_provider(self, framework, mock_get_framework): + mock_get_framework.return_value = framework + shutil.copy(BASE_PATH / "fixtures/agents_max.yaml", self.project_dir / AGENTS_FILENAME) + + agent = get_agent("agent_name") + assert agent.llm == "openai/gpt-4o" + assert agent.provider == "openai" + assert agent.model == "gpt-4o" \ No newline at end of file diff --git a/tests/test_cli_tools.py b/tests/test_cli_tools.py index f7a01367..05c4ad67 100644 --- a/tests/test_cli_tools.py +++ b/tests/test_cli_tools.py @@ -7,7 +7,7 @@ from agentstack._tools import get_all_tool_names from cli_test_utils import run_cli from agentstack.utils import validator_not_empty -from agentstack.cli.cli import get_validated_input +from agentstack.cli import get_validated_input from unittest.mock import patch from inquirer.errors import ValidationError diff --git a/tests/test_frameworks.py b/tests/test_frameworks.py index 0a87a077..2952d916 100644 --- a/tests/test_frameworks.py +++ b/tests/test_frameworks.py @@ -1,13 +1,17 @@ +from typing import Callable import os, sys from pathlib import Path import shutil import unittest -from parameterized import parameterized_class +from parameterized import parameterized, parameterized_class from agentstack.conf import ConfigFile, set_path from agentstack.exceptions import ValidationError from agentstack import frameworks -from agentstack._tools import ToolConfig +from agentstack._tools import ToolConfig, get_all_tools +from agentstack.agents import AGENTS_FILENAME, AgentConfig +from agentstack.tasks import TASKS_FILENAME, TaskConfig +from agentstack import graph BASE_PATH = Path(__file__).parent @@ -20,10 +24,9 @@ def setUp(self): os.makedirs(self.project_dir) os.chdir(self.project_dir) # importing the crewai module requires us to be in a working directory os.makedirs(self.project_dir / 'src') - os.makedirs(self.project_dir / 'src' / 'tools') + os.makedirs(self.project_dir / 'src' / 'config') (self.project_dir / 'src' / '__init__.py').touch() - (self.project_dir / 'src' / 'tools' / '__init__.py').touch() shutil.copy(BASE_PATH / 'fixtures' / 'agentstack.json', self.project_dir / 'agentstack.json') set_path(self.project_dir) @@ -43,6 +46,14 @@ def _populate_max_entrypoint(self): entrypoint_path = frameworks.get_entrypoint_path(self.framework) shutil.copy(BASE_PATH / f"fixtures/frameworks/{self.framework}/entrypoint_max.py", entrypoint_path) + def _get_test_agent(self) -> AgentConfig: + shutil.copy(BASE_PATH / 'fixtures/agents_max.yaml', self.project_dir / AGENTS_FILENAME) + return AgentConfig('agent_name') + + def _get_test_task(self) -> TaskConfig: + shutil.copy(BASE_PATH / 'fixtures/tasks_max.yaml', self.project_dir / TASKS_FILENAME) + return TaskConfig('task_name') + def _get_test_tool(self) -> ToolConfig: return ToolConfig(name='test_tool', category='test', tools=['test_tool']) @@ -53,6 +64,15 @@ def test_get_framework_module(self): module = frameworks.get_framework_module(self.framework) assert module.__name__ == f"agentstack.frameworks.{self.framework}" + def test_framework_module_implements_protocol(self): + """Assert that the framework implementation has methods for all the protocol methods.""" + protocol = frameworks.FrameworkModule + module = frameworks.get_framework_module(self.framework) + for method_name in dir(protocol): + if method_name.startswith('_'): + continue + assert hasattr(module, method_name), f"Method {method_name} not implemented in {self.framework}" + def test_get_framework_module_invalid(self): with self.assertRaises(Exception) as context: frameworks.get_framework_module('invalid') @@ -66,44 +86,92 @@ def test_validate_project_invalid(self): with self.assertRaises(ValidationError) as context: frameworks.validate_project() + def test_validate_project_has_agent_no_task_invalid(self): + self._populate_min_entrypoint() + frameworks.add_agent(self._get_test_agent()) + with self.assertRaises(ValidationError) as context: + frameworks.validate_project() + + def test_validate_project_has_task_no_agent_invalid(self): + self._populate_min_entrypoint() + frameworks.add_task(self._get_test_task()) + with self.assertRaises(ValidationError) as context: + frameworks.validate_project() + + def test_get_agent_tool_names(self): + self._populate_max_entrypoint() + frameworks.add_tool(self._get_test_tool(), 'agent_name') + tool_names = frameworks.get_agent_tool_names('agent_name') + assert tool_names == ['test_tool'] + def test_add_tool(self): self._populate_max_entrypoint() - frameworks.add_tool(self._get_test_tool(), 'test_agent') + frameworks.add_tool(self._get_test_tool(), 'agent_name') entrypoint_src = open(frameworks.get_entrypoint_path(self.framework)).read() - # TODO these asserts are not framework agnostic - assert "tools=[*agentstack.tools['test_tool']" in entrypoint_src + assert "*agentstack.tools['test_tool']" in entrypoint_src + + def test_add_tool_duplicate(self): + """Repeated calls to add_tool should not duplicate the tool.""" + self._populate_max_entrypoint() + frameworks.add_tool(self._get_test_tool(), 'agent_name') + frameworks.add_tool(self._get_test_tool(), 'agent_name') + + assert len(frameworks.get_agent_tool_names('agent_name')) == 1 def test_add_tool_invalid(self): self._populate_min_entrypoint() with self.assertRaises(ValidationError) as context: - frameworks.add_tool(self._get_test_tool(), 'test_agent') + frameworks.add_tool(self._get_test_tool(), 'agent_name') def test_remove_tool(self): self._populate_max_entrypoint() - frameworks.add_tool(self._get_test_tool(), 'test_agent') - frameworks.remove_tool(self._get_test_tool(), 'test_agent') + frameworks.add_tool(self._get_test_tool(), 'agent_name') + frameworks.remove_tool(self._get_test_tool(), 'agent_name') entrypoint_src = open(frameworks.get_entrypoint_path(self.framework)).read() - assert "tools=[*agentstack.tools['test_tool']" not in entrypoint_src + assert "*agentstack.tools['test_tool']" not in entrypoint_src def test_add_multiple_tools(self): self._populate_max_entrypoint() - frameworks.add_tool(self._get_test_tool(), 'test_agent') - frameworks.add_tool(self._get_test_tool_alternate(), 'test_agent') + frameworks.add_tool(self._get_test_tool(), 'agent_name') + frameworks.add_tool(self._get_test_tool_alternate(), 'agent_name') entrypoint_src = open(frameworks.get_entrypoint_path(self.framework)).read() assert ( # ordering is not guaranteed - "tools=[*agentstack.tools['test_tool'], *agentstack.tools['test_tool_alt']" in entrypoint_src - or "tools=[*agentstack.tools['test_tool_alt'], *agentstack.tools['test_tool']" in entrypoint_src + "*agentstack.tools['test_tool'], *agentstack.tools['test_tool_alt']" in entrypoint_src + or "*agentstack.tools['test_tool_alt'], *agentstack.tools['test_tool']" in entrypoint_src ) def test_remove_one_tool_of_multiple(self): self._populate_max_entrypoint() - frameworks.add_tool(self._get_test_tool(), 'test_agent') - frameworks.add_tool(self._get_test_tool_alternate(), 'test_agent') - frameworks.remove_tool(self._get_test_tool(), 'test_agent') + frameworks.add_tool(self._get_test_tool(), 'agent_name') + frameworks.add_tool(self._get_test_tool_alternate(), 'agent_name') + frameworks.remove_tool(self._get_test_tool(), 'agent_name') entrypoint_src = open(frameworks.get_entrypoint_path(self.framework)).read() assert "*agentstack.tools['test_tool']" not in entrypoint_src - assert "tools=[*agentstack.tools['test_tool_alt']" in entrypoint_src + assert "*agentstack.tools['test_tool_alt']" in entrypoint_src + + @parameterized.expand([(x,) for x in get_all_tools()]) + def test_get_tool_callables(self, tool_config): + self._populate_max_entrypoint() + try: + callables = frameworks.get_tool_callables(tool_config.name) + except (Exception, ValidationError): + raise unittest.SkipTest( + f"Skipping validation of {tool_config.name} likely because dependencies required for import are not available." + ) + + assert len(callables) == len(tool_config.tools) + + def test_get_graph(self): + self._populate_max_entrypoint() + self._get_test_agent() + self._get_test_task() + + graph_ = frameworks.get_graph() + # graph can be empty if the project is not using the graph, but should still return a list + assert isinstance(graph_, list) + for edge in graph_: + assert isinstance(edge, graph.Edge) diff --git a/tests/test_frameworks_langgraph.py b/tests/test_frameworks_langgraph.py new file mode 100644 index 00000000..68d6c83d --- /dev/null +++ b/tests/test_frameworks_langgraph.py @@ -0,0 +1,577 @@ +import os, sys +import shutil +import unittest +from parameterized import parameterized +from pathlib import Path +import ast +from agentstack import conf +from agentstack.exceptions import ValidationError +from agentstack import frameworks +from agentstack.frameworks.langgraph import ENTRYPOINT, LangGraphFile +from agentstack.agents import AGENTS_FILENAME, AgentConfig +from agentstack.tasks import TASKS_FILENAME, TaskConfig +from agentstack import graph +from agentstack.generation import InsertionPoint + +BASE_PATH = Path(__file__).parent + + +class FrameworksLanggraphTest(unittest.TestCase): + def setUp(self): + self.project_dir = BASE_PATH / 'tmp/frameworks/langgraph' + conf.set_path(self.project_dir) + os.makedirs(self.project_dir / 'src/config') + + shutil.copy(BASE_PATH / 'fixtures/agentstack.json', self.project_dir / 'agentstack.json') + with conf.ConfigFile() as config: + config.framework = frameworks.LANGGRAPH + + def tearDown(self): + shutil.rmtree(self.project_dir) + + def test_get_import(self): + """Test getting the import statement""" + entrypoint_src = """ +from agentstack import agent""" + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + import_ = entrypoint.get_import('agentstack', 'agent') + assert isinstance(import_, ast.ImportFrom) + + missing = entrypoint.get_import('agentstack', 'task') + assert missing is None + + def test_add_import(self): + """Test adding an import statement""" + entrypoint_src = """ +from agentstack import agent""" + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + with LangGraphFile(self.project_dir / ENTRYPOINT) as entrypoint: + entrypoint.add_import('agentstack', 'task') + with open(self.project_dir / ENTRYPOINT, 'r') as f: + new_src = f.read() + + assert 'from agentstack import task' in new_src + assert 'from agentstack import agent' in new_src + + def test_missing_base_class(self): + """A class with the name *Graph does not exist in the entrypoint""" + entrypoint_src = """ +class FooBar: + pass + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_base_class() + + def test_missing_run_method(self): + """A method named `run` does not exist in the base class""" + entrypoint_src = """ +class TestGraph: + def foo(self): + pass + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_run_method() + + def test_invalid_run_method(self): + """The run method does not have the correct signature""" + entrypoint_src = """ +class TestGraph: + def run(self, foo): + pass + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_run_method() + + def test_global_tools_missing_toolnode(self): + """A global tool is defined but the tool node is not present""" + entrypoint_src = """ +class TestGraph: + def run(self, inputs: list): + pass + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_global_tools() + + def test_global_tools_missing_list_in_toolnode(self): + """A global tool is defined but the tool node does not have a list""" + entrypoint_src = """ +class TestGraph: + def run(self, inputs: list): + tools = ToolNode() + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_global_tools() + + def test_get_agent_tools_missing(self): + """The agent method does not exist""" + entrypoint_src = """ +class TestGraph: + def run(self, inputs: list): + pass + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_agent_tools('test_agent') + + def test_get_agent_tools_missing_bind_tools(self): + """An agent is defined but the bind_tools method is not present""" + entrypoint_src = """ +class TestGraph: + @agentstack.agent + def test_agent(self, state: State): + pass + def run(self, inputs: list): + pass + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_agent_tools('test_agent') + + def test_get_agent_tools_bind_tools_invalid(self): + """The bind_tools method call does not have the correct signature""" + entrypoint_src = """ +class TestGraph: + @agentstack.agent + def test_agent(self, state: State): + agent = agent.bind_tools() + def run(self, inputs: list): + pass + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_agent_tools('test_agent') + + def _populate_graph_entrypoint(self): + shutil.copy(BASE_PATH / "fixtures/agents_max.yaml", self.project_dir / AGENTS_FILENAME) + shutil.copy(BASE_PATH / "fixtures/tasks_max.yaml", self.project_dir / TASKS_FILENAME) + entrypoint_src = """ +class TestGraph: + @agentstack.agent + def agent_name(self, state: State): + pass + @agentstack.task + def task_name(self, state: State): + pass + def run(self, inputs: list): + self.graph = Graph() + self.graph.add_node("agent_name", self.agent_name) + self.graph.add_node("task_name", self.task_name) + self.graph.add_edge(START, "agent_name") + self.graph.add_edge("agent_name", "task_name") + self.graph.add_edge("task_name", END) + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + def test_get_graph_nodes(self): + """Test getting the graph nodes""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + nodes = entrypoint.get_graph_nodes() + assert len(nodes) == 2 + for node in nodes: + assert isinstance(node, ast.Call) + + def test_get_graph_edge_nodes(self): + """Test getting the graph edge nodes""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + nodes = entrypoint.get_graph_edge_nodes() + assert len(nodes) == 3 + for node in nodes: + assert isinstance(node, ast.Call) + + def test_get_graph_edge_nodes_invalid(self): + """Test getting the graph edge nodes with an invalid edge""" + entrypoint_src = """ +class TestGraph: + def run(self, inputs: list): + self.graph = Graph() + self.graph.add_edge(START, "agent_name", "foo") + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_graph_edge_nodes() + + def test_get_graph(self): + """Test getting the graph object""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + graph_nodes = entrypoint.get_graph() + for node in graph_nodes: + assert isinstance(node, graph.Edge) + assert isinstance(node.source, graph.Node) + assert isinstance(node.target, graph.Node) + assert node.source.name in ['START', 'agent_name', 'task_name'] + assert node.target.name in ['agent_name', 'task_name', 'END'] + if node.source.name in [ + 'agent_name', + ]: + assert node.source.type is graph.NodeType.AGENT + if node.target.name in [ + 'task_name', + ]: + assert node.target.type is graph.NodeType.TASK + if node.source.name in ['START', 'END']: + assert node.source.type is graph.NodeType.SPECIAL + if node.target.name in ['START', 'END']: + assert node.target.type is graph.NodeType.SPECIAL + + def test_add_graph_edge(self): + """Test adding an edge to the graph""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + entrypoint.add_graph_edge( + graph.Edge( + # agent and task name must exist in the agents and tasks fixtures. + source=graph.Node(name='second_agent_name', type=graph.NodeType.AGENT), + target=graph.Node(name='task_name_two', type=graph.NodeType.TASK), + ) + ) + graph_nodes = entrypoint.get_graph() + assert len(graph_nodes) == 4 + for node in graph_nodes: + assert isinstance(node, graph.Edge) + assert isinstance(node.source, graph.Node) + assert isinstance(node.target, graph.Node) + assert node.source.name in ['START', 'agent_name', 'task_name', 'second_agent_name'] + assert node.target.name in ['END', 'agent_name', 'task_name', 'task_name_two'] + + def test_remove_graph_edge(self): + """Test removing an edge from the graph""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + entrypoint.remove_graph_edge( + graph.Edge( + # agent and task name must exist in the agents and tasks fixtures. + source=graph.Node(name='agent_name', type=graph.NodeType.AGENT), + target=graph.Node(name='task_name', type=graph.NodeType.TASK), + ) + ) + graph_nodes = entrypoint.get_graph() + assert len(graph_nodes) == 2 # START -> test_agent, test_task -> END + + def test_get_graph_edge_nodes(self): + """Test getting the graph edge nodes""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + nodes = entrypoint.get_graph_edge_nodes() + assert len(nodes) == 3 + for node in nodes: + assert isinstance(node, ast.Call) + + def test_get_graph_edge_nodes_invalid(self): + """Test getting the graph edge nodes with an invalid edge""" + entrypoint_src = """ +class TestGraph: + def run(self, inputs: list): + self.graph = Graph() + self.graph.add_edge(START, "agent_name", "foo") + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_graph_edge_nodes() + + def test_get_graph(self): + """Test getting the graph object""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + graph_nodes = entrypoint.get_graph() + for node in graph_nodes: + assert isinstance(node, graph.Edge) + assert isinstance(node.source, graph.Node) + assert isinstance(node.target, graph.Node) + assert node.source.name in ['START', 'agent_name', 'task_name'] + assert node.target.name in ['agent_name', 'task_name', 'END'] + if node.source.name in [ + 'agent_name', + ]: + assert node.source.type is graph.NodeType.AGENT + if node.target.name in [ + 'task_name', + ]: + assert node.target.type is graph.NodeType.TASK + if node.source.name in ['START', 'END']: + assert node.source.type is graph.NodeType.SPECIAL + if node.target.name in ['START', 'END']: + assert node.target.type is graph.NodeType.SPECIAL + + def test_get_graph_invalid_node_type(self): + """Test getting the graph object with an unattainable node type""" + entrypoint_src = """ +class TestGraph: + def run(self, inputs: list): + self.graph.add_node("agent_name", self.agent_name) + self.graph.add_node("task_name", self.task_name) + self.graph.add_edge(START, "agent_name") + self.graph.add_edge("agent_name_invalid", "task_name") + self.graph.add_edge("task_name", END) + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_graph() + + def test_get_graph_invalid_node_content(self): + """Test getting the graph object with an unattainable node content""" + entrypoint_src = """ +class TestGraph: + def run(self, inputs: list): + self.graph.add_edge(False, "agent_name") + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.get_graph() + + def test_add_graph_edge(self): + """Test adding an edge to the graph""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name='START', type=graph.NodeType.SPECIAL), + target=graph.Node(name='second_agent_name', type=graph.NodeType.AGENT), + ) + ) + entrypoint.add_graph_edge( + graph.Edge( + # agent and task name must exist in the agents and tasks fixtures. + source=graph.Node(name='second_agent_name', type=graph.NodeType.AGENT), + target=graph.Node(name='task_name_two', type=graph.NodeType.TASK), + ) + ) + entrypoint.add_graph_edge( + graph.Edge( + source=graph.Node(name='task_name_two', type=graph.NodeType.TASK), + target=graph.Node(name='END', type=graph.NodeType.SPECIAL), + ) + ) + graph_nodes = entrypoint.get_graph() + assert len(graph_nodes) == 6 + for node in graph_nodes: + assert isinstance(node, graph.Edge) + assert isinstance(node.source, graph.Node) + assert isinstance(node.target, graph.Node) + assert node.source.name in [ + 'START', + 'agent_name', + 'task_name', + 'second_agent_name', + 'task_name_two', + ] + assert node.target.name in [ + 'agent_name', + 'task_name', + 'task_name_two', + 'second_agent_name', + 'END', + ] + + def test_remove_graph_edge(self): + """Test removing an edge from the graph""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + entrypoint.remove_graph_edge( + graph.Edge( + # agent and task name must exist in the agents and tasks fixtures. + source=graph.Node(name='agent_name', type=graph.NodeType.AGENT), + target=graph.Node(name='task_name', type=graph.NodeType.TASK), + ) + ) + graph_nodes = entrypoint.get_graph() + assert len(graph_nodes) == 2 + + def test_remove_graph_edge_invalid_node_content(self): + """Test removing an edge from the graph with an invalid node content""" + entrypoint_src = """ +class TestGraph: + def run(self, inputs: list): + self.graph = Graph() + self.graph.add_edge(False, "agent_name") + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.remove_graph_edge( + graph.Edge( + source=graph.Node(name='START', type=graph.NodeType.SPECIAL), + target=graph.Node(name='agent_name', type=graph.NodeType.AGENT), + ) + ) + + def test_remove_graph_edge_missing(self): + """Test removing an edge from the graph with a missing edge""" + self._populate_graph_entrypoint() + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.remove_graph_edge( + graph.Edge( + source=graph.Node(name='agent_name_invalid', type=graph.NodeType.AGENT), + target=graph.Node(name='agent_name', type=graph.NodeType.AGENT), + ) + ) + + # TODO move this test to test_frameworks.py once insertion points are implemented + # in other frameworks + @parameterized.expand( + [ + (None,), + (InsertionPoint.END,), + (InsertionPoint.BEGIN,), + ] + ) + def test_add_agent(self, position: InsertionPoint): + """Test adding an Agent to the graph""" + self._populate_graph_entrypoint() + + agent_config = AgentConfig('second_agent_name') + frameworks.add_agent(agent_config, position) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + graph_ = entrypoint.get_graph() + + assert len(graph_) == 4 + source_nodes = [edge.source.name for edge in graph_] + target_nodes = [edge.target.name for edge in graph_] + if position in (None, InsertionPoint.END): + assert source_nodes == ['START', 'agent_name', 'task_name', 'second_agent_name'] + assert target_nodes == [ + 'agent_name', + 'task_name', + 'second_agent_name', + 'END', + ] + elif position == InsertionPoint.BEGIN: + # TODO ordering is correct but not intuitive + assert source_nodes == ['agent_name', 'task_name', 'START', 'second_agent_name'] + assert target_nodes == ['task_name', 'END', 'second_agent_name', 'agent_name'] + + # TODO move this test to test_frameworks.py once insertion points are implemented + # in other frameworks + @parameterized.expand( + [ + (None,), + (InsertionPoint.END,), + (InsertionPoint.BEGIN,), + ] + ) + def test_add_task(self, position: InsertionPoint): + """Test adding a node to the graph""" + self._populate_graph_entrypoint() + + task_config = TaskConfig('task_name_two') + frameworks.add_task(task_config, position) + + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + graph_ = entrypoint.get_graph() + + assert len(graph_) == 4 + source_nodes = [edge.source.name for edge in graph_] + target_nodes = [edge.target.name for edge in graph_] + if position in (None, InsertionPoint.END): + assert source_nodes == ['START', 'agent_name', 'task_name', 'task_name_two'] + assert target_nodes == [ + 'agent_name', + 'task_name', + 'task_name_two', + 'END', + ] + elif position == InsertionPoint.BEGIN: + # TODO ordering is correct but not intuitive + assert source_nodes == ['agent_name', 'task_name', 'START', 'task_name_two'] + assert target_nodes == ['task_name', 'END', 'task_name_two', 'agent_name'] + + def test_remove_graph_node(self): + """Test removing a node from the graph""" + self._populate_graph_entrypoint() + + agent_config = AgentConfig('agent_name') + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + entrypoint.add_graph_node(agent_config) + graph_nodes = entrypoint.get_graph_nodes() + assert len(graph_nodes) == 3 + + entrypoint.remove_graph_node(agent_config) + graph_nodes = entrypoint.get_graph_nodes() + assert len(graph_nodes) == 2 + + def test_remove_graph_node_invalid(self): + """Test removing a node from the graph with an invalid node""" + entrypoint_src = """ +class TestGraph: + def run(self, inputs: list): + self.graph.add_node(False, self.agent_name) + """ + with open(self.project_dir / ENTRYPOINT, 'w') as f: + f.write(entrypoint_src) + + agent_config = AgentConfig('agent_name') + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.remove_graph_node(agent_config) + + def test_remove_graph_node_missing(self): + """Test removing a node from the graph with a missing node""" + self._populate_graph_entrypoint() + + agent_config = AgentConfig('second_agent_name') + entrypoint = LangGraphFile(self.project_dir / ENTRYPOINT) + with self.assertRaises(ValidationError): + entrypoint.remove_graph_node(agent_config) diff --git a/tests/test_generation_agent.py b/tests/test_generation_agent.py index 3e3e90cf..16dc08aa 100644 --- a/tests/test_generation_agent.py +++ b/tests/test_generation_agent.py @@ -8,6 +8,8 @@ from agentstack.conf import ConfigFile, set_path from agentstack import frameworks from agentstack.exceptions import ValidationError +from agentstack.agents import AGENTS_FILENAME +from agentstack.tasks import TASKS_FILENAME from agentstack.generation.agent_generation import add_agent BASE_PATH = Path(__file__).parent @@ -23,6 +25,10 @@ def setUp(self): os.makedirs(self.project_dir / 'src' / 'config') (self.project_dir / 'src' / '__init__.py').touch() + # copy agents.yaml and tasks.yaml + shutil.copy(BASE_PATH / 'fixtures/agents_max.yaml', self.project_dir / AGENTS_FILENAME) + shutil.copy(BASE_PATH / 'fixtures/tasks_max.yaml', self.project_dir / TASKS_FILENAME) + # set the framework in agentstack.json shutil.copy(BASE_PATH / 'fixtures' / 'agentstack.json', self.project_dir / 'agentstack.json') set_path(self.project_dir) @@ -42,7 +48,7 @@ def test_add_agent(self): role='role', goal='goal', backstory='backstory', - llm='llm', + llm='openai/gpt-4o', ) entrypoint_path = frameworks.get_entrypoint_path(self.framework) @@ -56,9 +62,9 @@ def test_add_agent(self): def test_add_agent_exists(self): with self.assertRaises(Exception) as context: add_agent( - 'test_agent', + 'agent_name', role='role', goal='goal', backstory='backstory', - llm='llm', + llm='openai/gpt-4o', ) diff --git a/tests/test_generation_tasks.py b/tests/test_generation_tasks.py index 2f05ebfc..e2356194 100644 --- a/tests/test_generation_tasks.py +++ b/tests/test_generation_tasks.py @@ -8,7 +8,8 @@ from agentstack.conf import ConfigFile, set_path from agentstack.exceptions import ValidationError from agentstack import frameworks -from agentstack.tasks import TaskConfig +from agentstack.agents import AGENTS_FILENAME +from agentstack.tasks import TASKS_FILENAME, TaskConfig from agentstack.generation.task_generation import add_task from agentstack.generation.agent_generation import add_agent @@ -25,6 +26,10 @@ def setUp(self): os.makedirs(self.project_dir / 'src' / 'config') (self.project_dir / 'src' / '__init__.py').touch() + # copy agents.yaml and tasks.yaml + shutil.copy(BASE_PATH / 'fixtures/agents_max.yaml', self.project_dir / AGENTS_FILENAME) + shutil.copy(BASE_PATH / 'fixtures/tasks_max.yaml', self.project_dir / TASKS_FILENAME) + # set the framework in agentstack.json shutil.copy(BASE_PATH / 'fixtures' / 'agentstack.json', self.project_dir / 'agentstack.json') set_path(self.project_dir) @@ -57,7 +62,7 @@ def test_add_task(self): def test_add_agent_exists(self): with self.assertRaises(Exception) as context: add_task( - 'test_task', + 'task_name', description='description', expected_output='expected_output', agent='agent', @@ -65,10 +70,10 @@ def test_add_agent_exists(self): def test_add_task_selects_single_agent(self): add_task( - 'task_test', + 'task_test_two', description='description', expected_output='expected_output', ) - task_config = TaskConfig('task_test') - assert task_config.agent == 'test_agent' # defined in entrypoint_max.py + task_config = TaskConfig('task_test_two') + assert task_config.agent == 'agent_name' # defined in entrypoint_max.py diff --git a/tests/test_templates_config.py b/tests/test_templates_config.py index 63779d5d..045baded 100644 --- a/tests/test_templates_config.py +++ b/tests/test_templates_config.py @@ -7,6 +7,7 @@ from parameterized import parameterized from agentstack.exceptions import ValidationError from agentstack.proj_templates import ( + CURRENT_VERSION, TemplateConfig, get_all_template_names, get_all_template_paths, @@ -88,12 +89,12 @@ def test_write_to_file_without_suffix(self): def test_from_user_input_url(self): config = TemplateConfig.from_user_input(VALID_TEMPLATE_URL) self.assertEqual(config.name, "content_creator") - self.assertEqual(config.template_version, 3) + self.assertEqual(config.template_version, CURRENT_VERSION) def test_from_user_input_name(self): config = TemplateConfig.from_user_input('content_creator') self.assertEqual(config.name, "content_creator") - self.assertEqual(config.template_version, 3) + self.assertEqual(config.template_version, CURRENT_VERSION) def test_from_user_input_local_file(self): test_file = self.project_dir / 'test_local_template.json' @@ -116,7 +117,7 @@ def test_from_user_input_local_file(self): config = TemplateConfig.from_user_input(str(test_file)) self.assertEqual(config.name, "test_local") - self.assertEqual(config.template_version, 3) + self.assertEqual(config.template_version, CURRENT_VERSION) def test_from_file_missing_file(self): non_existent_path = Path("/path/to/non_existent_file.json") @@ -158,7 +159,7 @@ def test_from_json_pydantic_validation_error(self): invalid_template = { "name": "invalid_template", "description": "A template with invalid data", - "template_version": 3, + "template_version": CURRENT_VERSION, "framework": "test", "method": "test", "manager_agent": None, diff --git a/tox.ini b/tox.ini index 4d905e52..aa870ebd 100644 --- a/tox.ini +++ b/tox.ini @@ -36,3 +36,8 @@ omit = **/tmp/** ./tmp/**/* tests/** +exclude_lines = + pragma: no cover + ^\s*\.\.\.\s*$ + pass + if TYPE_CHECKING: \ No newline at end of file