Merge branch 'main' into bugfix/plot_cli

docs/concepts/flows.mdx

@@ -560,40 +560,6 @@ uv run kickoff
 
 The flow will execute, and you should see the output in the console.
 
-
-### Adding Additional Crews Using the CLI
-
-Once you have created your initial flow, you can easily add additional crews to your project using the CLI. This allows you to expand your flow's capabilities by integrating new crews without starting from scratch.
-
-To add a new crew to your existing flow, use the following command:
-
-```bash
-crewai flow add-crew <crew_name>
-```
-
-This command will create a new directory for your crew within the `crews` folder of your flow project. It will include the necessary configuration files and a crew definition file, similar to the initial setup.
-
-#### Folder Structure
-
-After adding a new crew, your folder structure will look like this:
-
-name_of_flow/
-├── crews/
-│   ├── poem_crew/
-│   │   ├── config/
-│   │   │   ├── agents.yaml
-│   │   │   └── tasks.yaml
-│   │   └── poem_crew.py
-│   └── name_of_crew/
-│       ├── config/
-│       │   ├── agents.yaml
-│       │   └── tasks.yaml
-│       └── name_of_crew.py
-
-You can then customize the `agents.yaml` and `tasks.yaml` files to define the agents and tasks for your new crew. The `name_of_crew.py` file will contain the crew's logic, which you can modify to suit your needs.
-
-By using the CLI to add additional crews, you can efficiently build complex AI workflows that leverage multiple crews working together.
-
 ## Plot Flows
 
 Visualizing your AI workflows can provide valuable insights into the structure and execution paths of your flows. CrewAI offers a powerful visualization tool that allows you to generate interactive plots of your flows, making it easier to understand and optimize your AI workflows.

pyproject.toml

@@ -28,7 +28,6 @@ dependencies = [
     "uv>=0.4.25",
     "tomli-w>=1.1.0",
     "chromadb>=0.4.24",
-    "tomli>=2.0.2",
 ]
 
 [project.urls]

src/crewai/agent.py

@@ -1,6 +1,7 @@
 import os
 import shutil
 import subprocess
+from inspect import signature
 from typing import Any, List, Literal, Optional, Union
 
 from pydantic import Field, InstanceOf, PrivateAttr, model_validator
@@ -394,26 +395,26 @@ class Agent(BaseAgent):
     def _render_text_description_and_args(self, tools: List[Any]) -> str:
         """Render the tool name, description, and args in plain text.
 
-            Output will be in the format of:
+        Output will be in the format of:
 
-            .. code-block:: markdown
+        .. code-block:: markdown
 
             search: This tool is used for search, args: {"query": {"type": "string"}}
             calculator: This tool is used for math, \
-            args: {"expression": {"type": "string"}}
+    args: {"expression": {"type": "string"}}
         """
         tool_strings = []
         for tool in tools:
-            args_schema = {
-                name: {
-                    "description": field.description,
-                    "type": field.annotation.__name__,
-                }
-                for name, field in tool.args_schema.model_fields.items()
-            }
-            description = (
-                f"Tool Name: {tool.name}\nTool Description: {tool.description}"
-            )
+            args_schema = str(tool.model_fields)
+            if hasattr(tool, "func") and tool.func:
+                sig = signature(tool.func)
+                description = (
+                    f"Tool Name: {tool.name}{sig}\nTool Description: {tool.description}"
+                )
+            else:
+                description = (
+                    f"Tool Name: {tool.name}\nTool Description: {tool.description}"
+                )
             tool_strings.append(f"{description}\nTool Arguments: {args_schema}")
 
         return "\n".join(tool_strings)

src/crewai/cli/add_crew_to_flow.py

@@ -1,70 +0,0 @@
-from pathlib import Path
-
-import click
-
-from crewai.cli.utils import copy_template
-
-
-def add_crew_to_flow(crew_name: str) -> None:
-    """Add a new crew to the current flow."""
-    # Check if pyproject.toml exists in the current directory
-    if not Path("pyproject.toml").exists():
-        print("This command must be run from the root of a flow project.")
-        raise click.ClickException(
-            "This command must be run from the root of a flow project."
-        )
-
-    # Determine the flow folder based on the current directory
-    flow_folder = Path.cwd()
-    crews_folder = flow_folder / "src" / flow_folder.name / "crews"
-
-    if not crews_folder.exists():
-        print("Crews folder does not exist in the current flow.")
-        raise click.ClickException("Crews folder does not exist in the current flow.")
-
-    # Create the crew within the flow's crews directory
-    create_embedded_crew(crew_name, parent_folder=crews_folder)
-
-    click.echo(
-        f"Crew {crew_name} added to the current flow successfully!",
-    )
-
-
-def create_embedded_crew(crew_name: str, parent_folder: Path) -> None:
-    """Create a new crew within an existing flow project."""
-    folder_name = crew_name.replace(" ", "_").replace("-", "_").lower()
-    class_name = crew_name.replace("_", " ").replace("-", " ").title().replace(" ", "")
-
-    crew_folder = parent_folder / folder_name
-
-    if crew_folder.exists():
-        if not click.confirm(
-            f"Crew {folder_name} already exists. Do you want to override it?"
-        ):
-            click.secho("Operation cancelled.", fg="yellow")
-            return
-        click.secho(f"Overriding crew {folder_name}...", fg="green", bold=True)
-    else:
-        click.secho(f"Creating crew {folder_name}...", fg="green", bold=True)
-        crew_folder.mkdir(parents=True)
-
-    # Create config and crew.py files
-    config_folder = crew_folder / "config"
-    config_folder.mkdir(exist_ok=True)
-
-    templates_dir = Path(__file__).parent / "templates" / "crew"
-    config_template_files = ["agents.yaml", "tasks.yaml"]
-    crew_template_file = f"{folder_name}_crew.py"  # Updated file name
-
-    for file_name in config_template_files:
-        src_file = templates_dir / "config" / file_name
-        dst_file = config_folder / file_name
-        copy_template(src_file, dst_file, crew_name, class_name, folder_name)
-
-    src_file = templates_dir / "crew.py"
-    dst_file = crew_folder / crew_template_file
-    copy_template(src_file, dst_file, crew_name, class_name, folder_name)
-
-    click.secho(
-        f"Crew {crew_name} added to the flow successfully!", fg="green", bold=True
-    )

src/crewai/cli/cli.py

@@ -3,7 +3,6 @@ from typing import Optional
 import click
 import pkg_resources
 
-from crewai.cli.add_crew_to_flow import add_crew_to_flow
 from crewai.cli.create_crew import create_crew
 from crewai.cli.create_flow import create_flow
 from crewai.cli.create_pipeline import create_pipeline
@@ -179,16 +178,10 @@ def test(n_iterations: int, model: str):
     evaluate_crew(n_iterations, model)
 
 
-@crewai.command(
-    context_settings=dict(
-        ignore_unknown_options=True,
-        allow_extra_args=True,
-    )
-)
-@click.pass_context
-def install(context):
+@crewai.command()
+def install():
     """Install the Crew."""
-    install_crew(context.args)
+    install_crew()
 
 
 @crewai.command()
@@ -327,13 +320,5 @@ def flow_plot():
     plot_flow()
 
 
-@flow.command(name="add-crew")
-@click.argument("crew_name")
-def flow_add_crew(crew_name):
-    """Add a crew to an existing flow."""
-    click.echo(f"Adding crew {crew_name} to the flow")
-    add_crew_to_flow(crew_name)
-
-
 if __name__ == "__main__":
     crewai()

src/crewai/cli/install_crew.py

@@ -3,13 +3,12 @@ import subprocess
 import click
 
 
-def install_crew(proxy_options: list[str]) -> None:
+def install_crew() -> None:
     """
     Install the crew by running the UV command to lock and install.
     """
     try:
-        command = ["uv", "sync"] + proxy_options
-        subprocess.run(command, check=True, capture_output=False, text=True)
+        subprocess.run(["uv", "sync"], check=True, capture_output=False, text=True)
 
     except subprocess.CalledProcessError as e:
         click.echo(f"An error occurred while running the crew: {e}", err=True)

src/crewai/cli/run_crew.py

@@ -1,9 +1,10 @@
 import subprocess
 
 import click
+import tomllib
 from packaging import version
 
-from crewai.cli.utils import get_crewai_version, read_toml
+from crewai.cli.utils import get_crewai_version
 
 
 def run_crew() -> None:
@@ -14,9 +15,10 @@ def run_crew() -> None:
     crewai_version = get_crewai_version()
     min_required_version = "0.71.0"
 
-    pyproject_data = read_toml()
+    with open("pyproject.toml", "rb") as f:
+        data = tomllib.load(f)
 
-    if pyproject_data.get("tool", {}).get("poetry") and (
+    if data.get("tool", {}).get("poetry") and (
         version.parse(crewai_version) < version.parse(min_required_version)
     ):
         click.secho(
@@ -33,7 +35,10 @@ def run_crew() -> None:
         click.echo(f"An error occurred while running the crew: {e}", err=True)
         click.echo(e.output, err=True, nl=True)
 
-        if pyproject_data.get("tool", {}).get("poetry"):
+        with open("pyproject.toml", "rb") as f:
+            data = tomllib.load(f)
+
+        if data.get("tool", {}).get("poetry"):
             click.secho(
                 "It's possible that you are using an old version of crewAI that uses poetry, please run `crewai update` to update your pyproject.toml to use uv.",
                 fg="yellow",

src/crewai/cli/update_crew.py

@@ -2,8 +2,7 @@ import os
 import shutil
 
 import tomli_w
-
-from crewai.cli.utils import read_toml
+import tomllib
 
 
 def update_crew() -> None:
@@ -19,9 +18,10 @@ def migrate_pyproject(input_file, output_file):
     And it will be used to migrate the pyproject.toml to the new format when uv is used.
     When the time comes that uv supports the new format, this function will be deprecated.
     """
-    poetry_data = {}
+
     # Read the input pyproject.toml
-    pyproject_data = read_toml()
+    with open(input_file, "rb") as f:
+        pyproject = tomllib.load(f)
 
     # Initialize the new project structure
     new_pyproject = {
@@ -30,30 +30,30 @@ def migrate_pyproject(input_file, output_file):
     }
 
     # Migrate project metadata
-    if "tool" in pyproject_data and "poetry" in pyproject_data["tool"]:
-        poetry_data = pyproject_data["tool"]["poetry"]
-        new_pyproject["project"]["name"] = poetry_data.get("name")
-        new_pyproject["project"]["version"] = poetry_data.get("version")
-        new_pyproject["project"]["description"] = poetry_data.get("description")
+    if "tool" in pyproject and "poetry" in pyproject["tool"]:
+        poetry = pyproject["tool"]["poetry"]
+        new_pyproject["project"]["name"] = poetry.get("name")
+        new_pyproject["project"]["version"] = poetry.get("version")
+        new_pyproject["project"]["description"] = poetry.get("description")
         new_pyproject["project"]["authors"] = [
             {
                 "name": author.split("<")[0].strip(),
                 "email": author.split("<")[1].strip(">").strip(),
             }
-            for author in poetry_data.get("authors", [])
+            for author in poetry.get("authors", [])
         ]
-        new_pyproject["project"]["requires-python"] = poetry_data.get("python")
+        new_pyproject["project"]["requires-python"] = poetry.get("python")
     else:
         # If it's already in the new format, just copy the project section
-        new_pyproject["project"] = pyproject_data.get("project", {})
+        new_pyproject["project"] = pyproject.get("project", {})
 
     # Migrate or copy dependencies
     if "dependencies" in new_pyproject["project"]:
         # If dependencies are already in the new format, keep them as is
         pass
-    elif poetry_data and "dependencies" in poetry_data:
+    elif "dependencies" in poetry:
         new_pyproject["project"]["dependencies"] = []
-        for dep, version in poetry_data["dependencies"].items():
+        for dep, version in poetry["dependencies"].items():
             if isinstance(version, dict):  # Handle extras
                 extras = ",".join(version.get("extras", []))
                 new_dep = f"{dep}[{extras}]"
@@ -67,10 +67,10 @@ def migrate_pyproject(input_file, output_file):
             new_pyproject["project"]["dependencies"].append(new_dep)
 
     # Migrate or copy scripts
-    if poetry_data and "scripts" in poetry_data:
-        new_pyproject["project"]["scripts"] = poetry_data["scripts"]
-    elif pyproject_data.get("project", {}) and "scripts" in pyproject_data["project"]:
-        new_pyproject["project"]["scripts"] = pyproject_data["project"]["scripts"]
+    if "scripts" in poetry:
+        new_pyproject["project"]["scripts"] = poetry["scripts"]
+    elif "scripts" in pyproject.get("project", {}):
+        new_pyproject["project"]["scripts"] = pyproject["project"]["scripts"]
     else:
         new_pyproject["project"]["scripts"] = {}
 
@@ -87,8 +87,8 @@ def migrate_pyproject(input_file, output_file):
         new_pyproject["project"]["scripts"]["run_crew"] = f"{module_name}.main:run"
 
     # Migrate optional dependencies
-    if poetry_data and "extras" in poetry_data:
-        new_pyproject["project"]["optional-dependencies"] = poetry_data["extras"]
+    if "extras" in poetry:
+        new_pyproject["project"]["optional-dependencies"] = poetry["extras"]
 
     # Backup the old pyproject.toml
     backup_file = "pyproject-old.toml"

src/crewai/cli/utils.py

@@ -6,7 +6,6 @@ from functools import reduce
 from typing import Any, Dict, List
 
 import click
-import tomli
 from rich.console import Console
 
 from crewai.cli.authentication.utils import TokenManager
@@ -55,13 +54,6 @@ def simple_toml_parser(content):
     return result
 
 
-def read_toml(file_path: str = "pyproject.toml"):
-    """Read the content of a TOML file and return it as a dictionary."""
-    with open(file_path, "rb") as f:
-        toml_dict = tomli.load(f)
-    return toml_dict
-
-
 def parse_toml(content):
     if sys.version_info >= (3, 11):
         return tomllib.loads(content)

tests/cli/cli_test.py

@@ -1,9 +1,7 @@
-from pathlib import Path
 from unittest import mock
 
 import pytest
 from click.testing import CliRunner
-
 from crewai.cli.cli import (
     deploy_create,
     deploy_list,
@@ -11,7 +9,6 @@ from crewai.cli.cli import (
     deploy_push,
     deploy_remove,
     deply_status,
-    flow_add_crew,
     reset_memories,
     signup,
     test,
@@ -280,42 +277,3 @@ def test_deploy_remove_no_uuid(command, runner):
 
     assert result.exit_code == 0
     mock_deploy.remove_crew.assert_called_once_with(uuid=None)
-
-
-@mock.patch("crewai.cli.add_crew_to_flow.create_embedded_crew")
-@mock.patch("pathlib.Path.exists", return_value=True)  # Mock the existence check
-def test_flow_add_crew(mock_path_exists, mock_create_embedded_crew, runner):
-    crew_name = "new_crew"
-    result = runner.invoke(flow_add_crew, [crew_name])
-
-    # Log the output for debugging
-    print(result.output)
-
-    assert result.exit_code == 0, f"Command failed with output: {result.output}"
-    assert f"Adding crew {crew_name} to the flow" in result.output
-
-    # Verify that create_embedded_crew was called with the correct arguments
-    mock_create_embedded_crew.assert_called_once()
-    call_args, call_kwargs = mock_create_embedded_crew.call_args
-    assert call_args[0] == crew_name
-    assert "parent_folder" in call_kwargs
-    assert isinstance(call_kwargs["parent_folder"], Path)
-
-
-def test_add_crew_to_flow_not_in_root(runner):
-    # Simulate not being in the root of a flow project
-    with mock.patch("pathlib.Path.exists", autospec=True) as mock_exists:
-        # Mock Path.exists to return False when checking for pyproject.toml
-        def exists_side_effect(self):
-            if self.name == "pyproject.toml":
-                return False  # Simulate that pyproject.toml does not exist
-            return True  # All other paths exist
-
-        mock_exists.side_effect = exists_side_effect
-
-        result = runner.invoke(flow_add_crew, ["new_crew"])
-
-        assert result.exit_code != 0
-        assert "This command must be run from the root of a flow project." in str(
-            result.output
-        )

uv.lock

@@ -625,7 +625,6 @@ dependencies = [
     { name = "python-dotenv" },
     { name = "pyvis" },
     { name = "regex" },
-    { name = "tomli" },
     { name = "tomli-w" },
     { name = "uv" },
 ]
@@ -680,7 +679,6 @@ requires-dist = [
     { name = "python-dotenv", specifier = ">=1.0.0" },
     { name = "pyvis", specifier = ">=0.3.2" },
     { name = "regex", specifier = ">=2024.9.11" },
-    { name = "tomli", specifier = ">=2.0.2" },
     { name = "tomli-w", specifier = ">=1.1.0" },
     { name = "uv", specifier = ">=0.4.25" },
 ]