Merge branch 'main' into framework-llamaindex

# Conflicts:
#	agentstack/cli/init.py

Author: bboynton97

agentstack/_tools/file_read/config.json

@@ -3,6 +3,6 @@
   "category": "computer-control",
   "tools": ["read_file"],
   "description": "Read contents of files",
-  "url": "https://github.com/AgentOps-AI/AgentStack/tree/main/agentstack/tools/file_read",
+  "url": "https://docs.agentstack.sh/tools/tool/file_read",
   "dependencies": []
 }

agentstack/tools/weaviate/__init__.py agentstack/_tools/weaviate/__init__.pyagentstack/tools/weaviate/__init__.py renamed to agentstack/_tools/weaviate/__init__.py

@@ -1,7 +1,9 @@
-from .cli import configure_default_model, welcome_message, get_validated_input
+from .cli import configure_default_model, welcome_message, get_validated_input, parse_insertion_point
 from .init import init_project
 from .wizard import run_wizard
 from .run import run_project
-from .tools import list_tools, add_tool
+from .tools import list_tools, add_tool, remove_tool
+from .tasks import add_task
+from .agents import add_agent
 from .templates import insert_template, export_template
 

agentstack/tools/weaviate/config.json agentstack/_tools/weaviate/config.jsonagentstack/tools/weaviate/config.json renamed to agentstack/_tools/weaviate/config.json

@@ -0,0 +1,34 @@
+from typing import Optional
+from agentstack import conf
+from agentstack import repo
+from agentstack.cli import configure_default_model, parse_insertion_point
+from agentstack import generation
+
+
+def add_agent(
+    name: str,
+    role: Optional[str] = None,
+    goal: Optional[str] = None,
+    backstory: Optional[str] = None,
+    llm: Optional[str] = None,
+    position: Optional[str] = None,
+):
+    """
+    Add an agent to the user's project.
+    """
+    conf.assert_project()
+    if not llm:
+        configure_default_model()
+    _position = parse_insertion_point(position)
+
+    repo.commit_user_changes()
+    with repo.Transaction() as commit:
+        commit.add_message(f"Added agent {name}")
+        generation.add_agent(
+            name=name,
+            role=role,
+            goal=goal,
+            backstory=backstory,
+            llm=llm,
+            position=_position,
+        )

agentstack/cli/__init__.py

@@ -1,10 +1,12 @@
+from typing import Optional
 import os, sys
 from art import text2art
 import inquirer
 from agentstack import conf, log
 from agentstack.conf import ConfigFile
 from agentstack.exceptions import ValidationError
 from agentstack.utils import validator_not_empty, is_snake_case
+from agentstack.generation import InsertionPoint
 
 
 PREFERRED_MODELS = [
@@ -78,3 +80,17 @@ def get_validated_input(
             raise ValidationError("Input must be in snake_case")
         return value
 
+
+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)
+

agentstack/cli/agents.py

@@ -10,6 +10,7 @@
 from agentstack import packaging
 from agentstack import frameworks
 from agentstack import generation
+from agentstack import repo
 from agentstack.templates import get_all_templates, TemplateConfig
 
 from agentstack.cli import welcome_message
@@ -76,24 +77,31 @@ def init_project(
     - install dependencies
     - insert Tasks, Agents and Tools
     """
-    require_uv()
-
     # 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("No project directory specified.\n Run `agentstack init <project_name>`")
-
-    if os.path.exists(conf.PATH):  # cookiecutter requires the directory to not exist
-        raise Exception(f"Directory already exists: {conf.PATH}")
-
     if template and use_wizard:
         raise Exception("Template and wizard flags cannot be used together")
 
+    require_uv()
     welcome_message()
 
+    if not slug_name:
+        log.info(
+            "Provide a project name. This will be used to create a new directory in the "
+            "current path and will be used as the project name. 🐍 Must be snake_case."
+        )
+        slug_name = inquirer.text(
+            message="Project name (snake_case)",
+        )
+
+    if not slug_name:
+        raise Exception("Project name cannot be empty")
+    if not is_snake_case(slug_name):
+        raise Exception("Project name must be snake_case")
+
+    conf.set_path(conf.PATH / slug_name)
+    if os.path.exists(conf.PATH):  # cookiecutter requires the directory to not exist
+        raise Exception(f"Directory already exists: {conf.PATH}")
+
     if use_wizard:
         log.debug("Initializing new project with wizard.")
         template_data = run_wizard(slug_name)
@@ -120,18 +128,23 @@ def init_project(
     packaging.create_venv()
     log.info("Installing dependencies...")
     packaging.install_project()
+    repo.init()  # initialize git repo
 
     # 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())
+    with repo.Transaction() as commit:
+        for task in template_data.tasks:
+            commit.add_message(f"Added task {task.name}")
+            generation.add_task(**task.model_dump())
+
+        for agent in template_data.agents:
+            commit.add_message(f"Added agent {agent.name}")
+            generation.add_agent(**agent.model_dump())
+
+        for tool in template_data.tools:
+            commit.add_message(f"Added tool {tool.name}")
+            generation.add_tool(**tool.model_dump())
 
     log.success("🚀 AgentStack project generated successfully!\n")
     log.info(

agentstack/cli/cli.py

@@ -96,6 +96,7 @@ def _import_project_module(path: Path):
 
 def run_project(command: str = 'run', cli_args: Optional[List[str]] = None):
     """Validate that the project is ready to run and then run it."""
+    conf.assert_project()
     verify_agentstack_project()
 
     if conf.get_framework() not in frameworks.SUPPORTED_FRAMEWORKS:

agentstack/cli/init.py

@@ -0,0 +1,30 @@
+from typing import Optional
+from agentstack import conf
+from agentstack import repo
+from agentstack.cli import parse_insertion_point
+from agentstack import generation
+
+
+def add_task(
+    name: str,
+    description: Optional[str] = None,
+    expected_output: Optional[str] = None,
+    agent: Optional[str] = None,
+    position: Optional[str] = None,
+):
+    """
+    Add a task to the user's project.
+    """
+    conf.assert_project()
+    _position = parse_insertion_point(position)
+
+    repo.commit_user_changes()
+    with repo.Transaction() as commit:
+        commit.add_message(f"Added task {name}")
+        generation.add_task(
+            name=name,
+            description=description,
+            expected_output=expected_output,
+            agent=agent,
+            position=_position,
+        )

agentstack/cli/run.py

@@ -69,6 +69,8 @@ def export_template(output_filename: str):
     """
     Export the current project as a template.
     """
+    conf.assert_project()
+    
     try:
         metadata = ProjectFile()
     except Exception as e: