mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-07-01 05:08:12 +00:00
53c2284484
* Update crewAI CLI with various enhancements and fixes - Updated `create_json_crew.py` to require `crewai[tools]>=1.14.7`. - Enhanced `git.py` with improved repository initialization, including automatic initial commit creation and exclusion patterns for initial commits. - Modified `install_crew.py` to allow error handling during installation with an optional `raise_on_error` parameter. - Expanded `plus_api.py` to include methods for creating and updating crews from ZIP files. - Introduced a new `archive.py` for creating deployable ZIP archives of CrewAI projects, ensuring local artifacts are excluded. - Updated `run_crew.py` to manage JSON crew dependencies and run crews in the project's environment. - Enhanced deployment logic in `main.py` to handle ZIP uploads and improve user feedback during deployment processes. - Added tests for new functionalities and ensured existing tests reflect recent changes in behavior and requirements. * fix(cli): address deploy zip review feedback * fix(cli): sync missing lockfile before deploy * fix(cli): preserve remote deploy on git setup warnings * test(cli): use single deploy main import style * fix(cli): skip project install for json crew sync * fix(cli): load json runner from source checkout * fix(cli): skip json crew sync when locked * fix(cli): address deploy zip review feedback * fix(cli): pass env on zip redeploy * fix(cli): harden json run and zip fallback * fix(cli): validate before deploy lock install * fix(cli): respect poetry lock for json runs * fix(cli): align json zip wrapper detection * fix(deps): bump starlette audit floor * fix(cli): avoid auth retry for deploy exits * fix(cli): update json zip script entrypoints
100 lines
3.2 KiB
Python
100 lines
3.2 KiB
Python
from pathlib import Path
|
|
import subprocess
|
|
|
|
import click
|
|
|
|
from crewai_cli.deploy.validate import normalize_package_name
|
|
from crewai_cli.utils import build_env_with_all_tool_credentials, parse_toml
|
|
|
|
|
|
def _find_json_crew_file(project_root: Path | None = None) -> Path | None:
|
|
"""Return the JSON crew definition path when present."""
|
|
root = project_root or Path.cwd()
|
|
for filename in ("crew.jsonc", "crew.json"):
|
|
crew_path = root / filename
|
|
if crew_path.is_file():
|
|
return crew_path
|
|
return None
|
|
|
|
|
|
def _is_json_crew_project(project_root: Path | None = None) -> bool:
|
|
"""Return True for JSON crew projects that do not need package install."""
|
|
root = project_root or Path.cwd()
|
|
if _find_json_crew_file(root) is None:
|
|
return False
|
|
|
|
pyproject_path = root / "pyproject.toml"
|
|
if not pyproject_path.is_file():
|
|
return True
|
|
|
|
try:
|
|
pyproject = parse_toml(pyproject_path.read_text())
|
|
except Exception:
|
|
return True
|
|
if not isinstance(pyproject, dict):
|
|
return True
|
|
|
|
tool_config = pyproject.get("tool") or {}
|
|
crewai_config = tool_config.get("crewai") if isinstance(tool_config, dict) else None
|
|
declared_type = (
|
|
crewai_config.get("type") if isinstance(crewai_config, dict) else None
|
|
)
|
|
project_config = pyproject.get("project") or {}
|
|
project_name = (
|
|
project_config.get("name") if isinstance(project_config, dict) else None
|
|
)
|
|
if isinstance(project_name, str):
|
|
package_name = normalize_package_name(project_name)
|
|
if package_name and (root / "src" / package_name / "crew.py").is_file():
|
|
return False
|
|
|
|
return declared_type != "flow"
|
|
|
|
|
|
# Be mindful about changing this.
|
|
# on some environments we don't use this command but instead uv sync directly
|
|
# so if you expect this to support more things you will need to replicate it there
|
|
# ask @joaomdmoura if you are unsure
|
|
def install_crew(
|
|
proxy_options: list[str],
|
|
*,
|
|
raise_on_error: bool = False,
|
|
install_project: bool | None = None,
|
|
) -> None:
|
|
"""
|
|
Install the crew by running the UV command to lock and install.
|
|
"""
|
|
try:
|
|
if install_project is None:
|
|
install_project = not _is_json_crew_project()
|
|
|
|
command = ["uv", "sync"]
|
|
if not install_project and "--no-install-project" not in proxy_options:
|
|
command.append("--no-install-project")
|
|
command.extend(proxy_options)
|
|
|
|
# Inject tool repository credentials so uv can authenticate
|
|
# against private package indexes (e.g. crewai tool repository).
|
|
# Without this, `uv sync` fails with 401 Unauthorized when the
|
|
# project depends on tools from a private index.
|
|
env = build_env_with_all_tool_credentials()
|
|
|
|
subprocess.run( # noqa: S603
|
|
command,
|
|
check=True,
|
|
capture_output=False,
|
|
text=True,
|
|
env=env,
|
|
)
|
|
|
|
except subprocess.CalledProcessError as e:
|
|
click.echo(f"An error occurred while running the crew: {e}", err=True)
|
|
click.echo(e.output, err=True)
|
|
if raise_on_error:
|
|
raise
|
|
|
|
except Exception as e:
|
|
click.echo(f"An unexpected error occurred: {e}", err=True)
|
|
if raise_on_error:
|
|
raise
|