Brandon/cre 130 pipeline project structure (#1066)

* WIP. Procedure appears to be working well. Working on mocking properly for tests

* All tests are passing now

* rshift working

* Add back in Gui's tool_usage fix

* WIP

* Going to start refactoring for pipeline_output

* Update terminology

* new pipeline flow with traces and usage metrics working. need to add more tests and make sure PipelineOutput behaves likew CrewOutput

* Fix pipelineoutput to look more like crewoutput and taskoutput

* Implemented additional tests for pipeline. One test is failing. Need team support

* Update docs for pipeline

* Update pipeline to properly process input and ouput dictionary

* Update Pipeline docs

* Add back in commentary at top of pipeline file

* Starting to work on router

* Drop router for now. will add in separately

* In the middle of fixing router. A ton of circular dependencies. Moving over to a new design.

* WIP.

* Fix circular dependencies and updated PipelineRouter

* Add in Eduardo feedback. Still need to add in more commentary describing the design decisions for pipeline

* Add developer notes to explain what is going on in pipelines.

* Add doc strings

* Fix missing rag datatype

* WIP. Converting usage metrics from a dict to an object

* Fix tests that were checking usage metrics

* Drop todo

* Fix 1 type error in pipeline

* Update pipeline to use UsageMetric

* Add missing doc string

* WIP.

* Change names

* Rename variables based on joaos feedback

* Fix critical circular dependency issues. Now needing to fix trace issue.

* Tests working now!

* Add more tests which showed underlying issue with traces

* Fix tests

* Remove overly complicated test

* Add router example to docs

* Clean up end of docs

* Clean up docs

* Working on creating Crew templates and pipeline templates

* WIP.

* WIP

* Fix poetry install from templates

* WIP

* Restructure

* changes for lorenze

* more todos

* WIP: create pipelines cli working

* wrapped up router

* ignore mypy src on templates

* ignored signature of copy

* fix all verbose

* rm print statements

* brought back correct folders

* fixes missing folders and then rm print statements

* fixed tests

* fixed broken test

* fixed type checker

* fixed type ignore

* ignore types for templates

* needed

* revert

* exclude only required

* rm type errors on templates

* rm excluding type checks for template files on github action

* fixed missing quotes

---------

Co-authored-by: Brandon Hancock <brandon@brandonhancock.io>

src/crewai/cli/create_crew.py

@@ -1,25 +1,35 @@
-import os
 from pathlib import Path
 
 import click
 
+from crewai.cli.utils import copy_template
 
-def create_crew(name):
+
+def create_crew(name, parent_folder=None):
     """Create a new crew."""
     folder_name = name.replace(" ", "_").replace("-", "_").lower()
     class_name = name.replace("_", " ").replace("-", " ").title().replace(" ", "")
 
-    click.secho(f"Creating folder {folder_name}...", fg="green", bold=True)
+    if parent_folder:
+        folder_path = Path(parent_folder) / folder_name
+    else:
+        folder_path = Path(folder_name)
 
-    if not os.path.exists(folder_name):
-        os.mkdir(folder_name)
-        os.mkdir(folder_name + "/tests")
-        os.mkdir(folder_name + "/src")
-        os.mkdir(folder_name + f"/src/{folder_name}")
-        os.mkdir(folder_name + f"/src/{folder_name}/tools")
-        os.mkdir(folder_name + f"/src/{folder_name}/config")
-        with open(folder_name + "/.env", "w") as file:
-            file.write("OPENAI_API_KEY=YOUR_API_KEY")
+    click.secho(
+        f"Creating {'crew' if parent_folder else 'folder'} {folder_name}...",
+        fg="green",
+        bold=True,
+    )
+
+    if not folder_path.exists():
+        folder_path.mkdir(parents=True)
+        (folder_path / "tests").mkdir(exist_ok=True)
+        if not parent_folder:
+            (folder_path / "src" / folder_name).mkdir(parents=True)
+            (folder_path / "src" / folder_name / "tools").mkdir(parents=True)
+            (folder_path / "src" / folder_name / "config").mkdir(parents=True)
+            with open(folder_path / ".env", "w") as file:
+                file.write("OPENAI_API_KEY=YOUR_API_KEY")
     else:
         click.secho(
             f"\tFolder {folder_name} already exists. Please choose a different name.",
@@ -28,53 +38,34 @@ def create_crew(name):
         return
 
     package_dir = Path(__file__).parent
-    templates_dir = package_dir / "templates"
+    templates_dir = package_dir / "templates" / "crew"
 
     # List of template files to copy
-    root_template_files = [
-        ".gitignore",
-        "pyproject.toml",
-        "README.md",
-    ]
+    root_template_files = (
+        [".gitignore", "pyproject.toml", "README.md"] if not parent_folder else []
+    )
     tools_template_files = ["tools/custom_tool.py", "tools/__init__.py"]
     config_template_files = ["config/agents.yaml", "config/tasks.yaml"]
-    src_template_files = ["__init__.py", "main.py", "crew.py"]
+    src_template_files = (
+        ["__init__.py", "main.py", "crew.py"] if not parent_folder else ["crew.py"]
+    )
 
     for file_name in root_template_files:
         src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / file_name
+        dst_file = folder_path / file_name
         copy_template(src_file, dst_file, name, class_name, folder_name)
 
+    src_folder = folder_path / "src" / folder_name if not parent_folder else folder_path
+
     for file_name in src_template_files:
         src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / "src" / folder_name / file_name
+        dst_file = src_folder / file_name
         copy_template(src_file, dst_file, name, class_name, folder_name)
 
-    for file_name in tools_template_files:
-        src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / "src" / folder_name / file_name
-        copy_template(src_file, dst_file, name, class_name, folder_name)
-
-    for file_name in config_template_files:
-        src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / "src" / folder_name / file_name
-        copy_template(src_file, dst_file, name, class_name, folder_name)
+    if not parent_folder:
+        for file_name in tools_template_files + config_template_files:
+            src_file = templates_dir / file_name
+            dst_file = src_folder / file_name
+            copy_template(src_file, dst_file, name, class_name, folder_name)
 
     click.secho(f"Crew {name} created successfully!", fg="green", bold=True)
-
-
-def copy_template(src, dst, name, class_name, folder_name):
-    """Copy a file from src to dst."""
-    with open(src, "r") as file:
-        content = file.read()
-
-    # Interpolate the content
-    content = content.replace("{{name}}", name)
-    content = content.replace("{{crew_name}}", class_name)
-    content = content.replace("{{folder_name}}", folder_name)
-
-    # Write the interpolated content to the new file
-    with open(dst, "w") as file:
-        file.write(content)
-
-    click.secho(f"  - Created {dst}", fg="green")