From 7bb8aa7a3dd0a4b7368d2f3029fc36b8c1605c31 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 12:52:31 +0000
Subject: [PATCH] fix: resolve crew class import issues with complex project
 names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix inconsistent naming between lowercase folder names and PascalCase class names
- Ensure class names are generated from folder names for import compatibility
- Add comprehensive tests for problematic project names like 'Dropbox RAG'
- Resolves issue #3528

The core issue was that create_folder_structure() generated folder names in lowercase
but class names independently from the original input, causing import mismatches.
Now class names are derived from the sanitized folder names, ensuring consistency.

Co-Authored-By: João <joao@crewai.com>
---
 src/crewai/cli/create_crew.py |  2 +-
 tests/cli/test_create_crew.py | 63 ++++++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/crewai/cli/create_crew.py b/src/crewai/cli/create_crew.py
index 1d3e3ddce..d133beedc 100644
--- a/src/crewai/cli/create_crew.py
+++ b/src/crewai/cli/create_crew.py
@@ -41,7 +41,7 @@ def create_folder_structure(name, parent_folder=None):
     if not folder_name.isidentifier():
         raise ValueError(f"Project name '{name}' would generate invalid Python module name '{folder_name}'")
     
-    class_name = name.replace("_", " ").replace("-", " ").title().replace(" ", "")
+    class_name = "".join(word.capitalize() for word in folder_name.split("_"))
     
     class_name = re.sub(r'[^a-zA-Z0-9_]', '', class_name)
     
diff --git a/tests/cli/test_create_crew.py b/tests/cli/test_create_crew.py
index 323b7aa18..7db362459 100644
--- a/tests/cli/test_create_crew.py
+++ b/tests/cli/test_create_crew.py
@@ -1,4 +1,5 @@
 import keyword
+import os
 import shutil
 import tempfile
 from pathlib import Path
@@ -275,4 +276,64 @@ def test_env_vars_are_uppercased_in_env_file(
 
     env_file_path = crew_path / ".env"
     content = env_file_path.read_text()
-    assert "MODEL=" in content
\ No newline at end of file
+    assert "MODEL=" in content
+
+
+def test_create_folder_structure_handles_problematic_names():
+    """Test names that previously caused import issues like 'Dropbox RAG'"""
+    with tempfile.TemporaryDirectory() as temp_dir:
+        test_cases = [
+            ("Dropbox RAG", "dropbox_rag", "DropboxRag"),
+            ("Migration System", "migration_system", "MigrationSystem"),
+            ("AI-ML Project", "ai_ml_project", "AiMlProject"),
+            ("Data_Processing Tool", "data_processing_tool", "DataProcessingTool"),
+            ("dropbox_to_rag_migration_system", "dropbox_to_rag_migration_system", "DropboxToRagMigrationSystem"),
+            ("My Cool-Project", "my_cool_project", "MyCoolProject"),
+            ("test.project@name", "testprojectname", "Testprojectname"),
+        ]
+        
+        for input_name, expected_folder, expected_class in test_cases:
+            folder_path, folder_name, class_name = create_folder_structure(input_name, parent_folder=temp_dir)
+            assert folder_name == expected_folder, f"Expected folder name '{expected_folder}' but got '{folder_name}' for input '{input_name}'"
+            assert class_name == expected_class, f"Expected class name '{expected_class}' but got '{class_name}' for input '{input_name}'"
+            assert folder_name.isidentifier(), f"folder_name '{folder_name}' should be valid Python identifier"
+            assert class_name.isidentifier(), f"class_name '{class_name}' should be valid Python identifier"
+            
+            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_created_project_import_consistency(mock_load_env, mock_write_env, mock_copy_template):
+    """Test that generated projects with problematic names have consistent imports"""
+    mock_load_env.return_value = {}
+    
+    with tempfile.TemporaryDirectory() as temp_dir:
+        original_cwd = os.getcwd()
+        try:
+            os.chdir(temp_dir)
+            
+            create_crew("Dropbox RAG", skip_provider=True)
+            
+            project_path = Path("dropbox_rag")
+            assert project_path.exists()
+            
+            copy_calls = mock_copy_template.call_args_list
+            main_py_calls = [call for call in copy_calls if "main.py" in str(call[0][0])]
+            assert len(main_py_calls) > 0, "main.py template should have been copied"
+            
+            for call in main_py_calls:
+                args = call[0]
+                if len(args) >= 5:
+                    name_arg = args[2]  # name parameter
+                    class_name_arg = args[3]  # class_name parameter  
+                    folder_name_arg = args[4]  # folder_name parameter
+                    
+                    assert name_arg == "Dropbox RAG"
+                    assert class_name_arg == "DropboxRag"
+                    assert folder_name_arg == "dropbox_rag"
+                    
+        finally:
+            os.chdir(original_cwd)