feat: monorepo restructure and test/ci updates

- Add crewai workspace member - Fix vcr cassette paths and restore test dirs - Resolve ci failures and update linter/pytest rules
2026-01-30 02:28:13 +00:00 · 2025-09-27 22:53:02 -04:00
parent 74b5c88834
commit 86f0dfc2d7
766 changed files with 937 additions and 959 deletions
--- a/lib/crewai/tests/cli/test_create_crew.py
+++ b/lib/crewai/tests/cli/test_create_crew.py
@@ -0,0 +1,330 @@
+import keyword
+import shutil
+import tempfile
+from pathlib import Path
+from unittest import mock
+
+import pytest
+from click.testing import CliRunner
+from crewai.cli.create_crew import create_crew, create_folder_structure
+
+
+@pytest.fixture
+def runner():
+    return CliRunner()
+
+
+@pytest.fixture
+def temp_dir():
+    temp_path = tempfile.mkdtemp()
+    yield temp_path
+    shutil.rmtree(temp_path)
+
+
+def test_create_folder_structure_strips_single_trailing_slash():
+    with tempfile.TemporaryDirectory() as temp_dir:
+        folder_path, folder_name, class_name = create_folder_structure(
+            "hello/", parent_folder=temp_dir
+        )
+
+        assert folder_name == "hello"
+        assert class_name == "Hello"
+        assert folder_path.name == "hello"
+        assert folder_path.exists()
+        assert folder_path.parent == Path(temp_dir)
+
+
+def test_create_folder_structure_strips_multiple_trailing_slashes():
+    with tempfile.TemporaryDirectory() as temp_dir:
+        folder_path, folder_name, class_name = create_folder_structure(
+            "hello///", parent_folder=temp_dir
+        )
+
+        assert folder_name == "hello"
+        assert class_name == "Hello"
+        assert folder_path.name == "hello"
+        assert folder_path.exists()
+        assert folder_path.parent == Path(temp_dir)
+
+
+def test_create_folder_structure_handles_complex_name_with_trailing_slash():
+    with tempfile.TemporaryDirectory() as temp_dir:
+        folder_path, folder_name, class_name = create_folder_structure(
+            "my-awesome_project/", parent_folder=temp_dir
+        )
+
+        assert folder_name == "my_awesome_project"
+        assert class_name == "MyAwesomeProject"
+        assert folder_path.name == "my_awesome_project"
+        assert folder_path.exists()
+        assert folder_path.parent == Path(temp_dir)
+
+
+def test_create_folder_structure_normal_name_unchanged():
+    with tempfile.TemporaryDirectory() as temp_dir:
+        folder_path, folder_name, class_name = create_folder_structure(
+            "hello", parent_folder=temp_dir
+        )
+
+        assert folder_name == "hello"
+        assert class_name == "Hello"
+        assert folder_path.name == "hello"
+        assert folder_path.exists()
+        assert folder_path.parent == Path(temp_dir)
+
+
+def test_create_folder_structure_with_parent_folder():
+    with tempfile.TemporaryDirectory() as temp_dir:
+        parent_path = Path(temp_dir) / "parent"
+        parent_path.mkdir()
+
+        folder_path, folder_name, class_name = create_folder_structure(
+            "child/", parent_folder=parent_path
+        )
+
+        assert folder_name == "child"
+        assert class_name == "Child"
+        assert folder_path.name == "child"
+        assert folder_path.parent == parent_path
+        assert folder_path.exists()
+
+
+@mock.patch("crewai.cli.create_crew.copy_template")
+@mock.patch("crewai.cli.create_crew.write_env_file")
+@mock.patch("crewai.cli.create_crew.load_env_vars")
+def test_create_crew_with_trailing_slash_creates_valid_project(
+    mock_load_env, mock_write_env, mock_copy_template, temp_dir
+):
+    mock_load_env.return_value = {}
+
+    with tempfile.TemporaryDirectory() as work_dir:
+        with mock.patch(
+            "crewai.cli.create_crew.create_folder_structure"
+        ) as mock_create_folder:
+            mock_folder_path = Path(work_dir) / "test_project"
+            mock_create_folder.return_value = (
+                mock_folder_path,
+                "test_project",
+                "TestProject",
+            )
+
+            create_crew("test-project/", skip_provider=True)
+
+            mock_create_folder.assert_called_once_with("test-project/", None)
+            mock_copy_template.assert_called()
+            copy_calls = mock_copy_template.call_args_list
+
+            for call in copy_calls:
+                args = call[0]
+                if len(args) >= 5:
+                    folder_name_arg = args[4]
+                    assert not folder_name_arg.endswith("/"), (
+                        f"folder_name should not end with slash: {folder_name_arg}"
+                    )
+
+
+@mock.patch("crewai.cli.create_crew.copy_template")
+@mock.patch("crewai.cli.create_crew.write_env_file")
+@mock.patch("crewai.cli.create_crew.load_env_vars")
+def test_create_crew_with_multiple_trailing_slashes(
+    mock_load_env, mock_write_env, mock_copy_template, temp_dir
+):
+    mock_load_env.return_value = {}
+
+    with tempfile.TemporaryDirectory() as work_dir:
+        with mock.patch(
+            "crewai.cli.create_crew.create_folder_structure"
+        ) as mock_create_folder:
+            mock_folder_path = Path(work_dir) / "test_project"
+            mock_create_folder.return_value = (
+                mock_folder_path,
+                "test_project",
+                "TestProject",
+            )
+
+            create_crew("test-project///", skip_provider=True)
+
+            mock_create_folder.assert_called_once_with("test-project///", None)
+
+
+@mock.patch("crewai.cli.create_crew.copy_template")
+@mock.patch("crewai.cli.create_crew.write_env_file")
+@mock.patch("crewai.cli.create_crew.load_env_vars")
+def test_create_crew_normal_name_still_works(
+    mock_load_env, mock_write_env, mock_copy_template, temp_dir
+):
+    mock_load_env.return_value = {}
+
+    with tempfile.TemporaryDirectory() as work_dir:
+        with mock.patch(
+            "crewai.cli.create_crew.create_folder_structure"
+        ) as mock_create_folder:
+            mock_folder_path = Path(work_dir) / "normal_project"
+            mock_create_folder.return_value = (
+                mock_folder_path,
+                "normal_project",
+                "NormalProject",
+            )
+
+            create_crew("normal-project", skip_provider=True)
+
+            mock_create_folder.assert_called_once_with("normal-project", None)
+
+
+def test_create_folder_structure_handles_spaces_and_dashes_with_slash():
+    with tempfile.TemporaryDirectory() as temp_dir:
+        folder_path, folder_name, class_name = create_folder_structure(
+            "My Cool-Project/", parent_folder=temp_dir
+        )
+
+        assert folder_name == "my_cool_project"
+        assert class_name == "MyCoolProject"
+        assert folder_path.name == "my_cool_project"
+        assert folder_path.exists()
+        assert folder_path.parent == Path(temp_dir)
+
+
+def test_create_folder_structure_raises_error_for_invalid_names():
+    with tempfile.TemporaryDirectory() as temp_dir:
+        invalid_cases = [
+            ("123project/", "cannot start with a digit"),
+            ("True/", "reserved Python keyword"),
+            ("False/", "reserved Python keyword"),
+            ("None/", "reserved Python keyword"),
+            ("class/", "reserved Python keyword"),
+            ("def/", "reserved Python keyword"),
+            ("   /", "empty or contain only whitespace"),
+            ("", "empty or contain only whitespace"),
+            ("@#$/", "contains no valid characters"),
+        ]
+
+        for invalid_name, expected_error in invalid_cases:
+            with pytest.raises(ValueError, match=expected_error):
+                create_folder_structure(invalid_name, parent_folder=temp_dir)
+
+
+def test_create_folder_structure_validates_names():
+    with tempfile.TemporaryDirectory() as temp_dir:
+        valid_cases = [
+            ("hello/", "hello", "Hello"),
+            ("my-project/", "my_project", "MyProject"),
+            ("hello_world/", "hello_world", "HelloWorld"),
+            ("valid123/", "valid123", "Valid123"),
+            ("hello.world/", "helloworld", "HelloWorld"),
+            ("hello@world/", "helloworld", "HelloWorld"),
+        ]
+
+        for valid_name, expected_folder, expected_class in valid_cases:
+            folder_path, folder_name, class_name = create_folder_structure(
+                valid_name, parent_folder=temp_dir
+            )
+            assert folder_name == expected_folder
+            assert class_name == expected_class
+
+            assert folder_name.isidentifier(), (
+                f"folder_name '{folder_name}' should be valid Python identifier"
+            )
+            assert not keyword.iskeyword(folder_name), (
+                f"folder_name '{folder_name}' should not be Python keyword"
+            )
+            assert not folder_name[0].isdigit(), (
+                f"folder_name '{folder_name}' should not start with digit"
+            )
+
+            assert class_name.isidentifier(), (
+                f"class_name '{class_name}' should be valid Python identifier"
+            )
+            assert not keyword.iskeyword(class_name), (
+                f"class_name '{class_name}' should not be Python keyword"
+            )
+            assert folder_path.parent == Path(temp_dir)
+
+            if folder_path.exists():
+                shutil.rmtree(folder_path)
+
+
+@mock.patch("crewai.cli.create_crew.copy_template")
+@mock.patch("crewai.cli.create_crew.write_env_file")
+@mock.patch("crewai.cli.create_crew.load_env_vars")
+def test_create_crew_with_parent_folder_and_trailing_slash(
+    mock_load_env, mock_write_env, mock_copy_template, temp_dir
+):
+    mock_load_env.return_value = {}
+
+    with tempfile.TemporaryDirectory() as work_dir:
+        parent_path = Path(work_dir) / "parent"
+        parent_path.mkdir()
+
+        create_crew("child-crew/", skip_provider=True, parent_folder=parent_path)
+
+        crew_path = parent_path / "child_crew"
+        assert crew_path.exists()
+        assert not (crew_path / "src").exists()
+
+
+def test_create_folder_structure_folder_name_validation():
+    """Test that folder names are validated as valid Python module names"""
+    with tempfile.TemporaryDirectory() as temp_dir:
+        folder_invalid_cases = [
+            ("123invalid/", "cannot start with a digit.*invalid Python module name"),
+            ("import/", "reserved Python keyword"),
+            ("class/", "reserved Python keyword"),
+            ("for/", "reserved Python keyword"),
+            ("@#$invalid/", "contains no valid characters.*Python module name"),
+        ]
+
+        for invalid_name, expected_error in folder_invalid_cases:
+            with pytest.raises(ValueError, match=expected_error):
+                create_folder_structure(invalid_name, parent_folder=temp_dir)
+
+        valid_cases = [
+            ("hello-world/", "hello_world"),
+            ("my.project/", "myproject"),
+            ("test@123/", "test123"),
+            ("valid_name/", "valid_name"),
+        ]
+
+        for valid_name, expected_folder in valid_cases:
+            folder_path, folder_name, class_name = create_folder_structure(
+                valid_name, parent_folder=temp_dir
+            )
+            assert folder_name == expected_folder
+            assert folder_name.isidentifier()
+            assert not keyword.iskeyword(folder_name)
+
+            if folder_path.exists():
+                shutil.rmtree(folder_path)
+
+
+@mock.patch("crewai.cli.create_crew.create_folder_structure")
+@mock.patch("crewai.cli.create_crew.copy_template")
+@mock.patch("crewai.cli.create_crew.load_env_vars")
+@mock.patch("crewai.cli.create_crew.get_provider_data")
+@mock.patch("crewai.cli.create_crew.select_provider")
+@mock.patch("crewai.cli.create_crew.select_model")
+@mock.patch("click.prompt")
+def test_env_vars_are_uppercased_in_env_file(
+    mock_prompt,
+    mock_select_model,
+    mock_select_provider,
+    mock_get_provider_data,
+    mock_load_env_vars,
+    mock_copy_template,
+    mock_create_folder_structure,
+    tmp_path,
+):
+    crew_path = tmp_path / "test_crew"
+    crew_path.mkdir()
+    mock_create_folder_structure.return_value = (crew_path, "test_crew", "TestCrew")
+
+    mock_load_env_vars.return_value = {}
+    mock_get_provider_data.return_value = {"openai": ["gpt-4"]}
+    mock_select_provider.return_value = "azure"
+    mock_select_model.return_value = "azure/openai"
+    mock_prompt.return_value = "fake-api-key"
+
+    create_crew("Test Crew")
+
+    env_file_path = crew_path / ".env"
+    content = env_file_path.read_text()
+    assert "MODEL=" in content