Fix test_project_formatting.py to use ruff to fix imports

Co-Authored-By: Joe Moura <joao@crewai.com>

src/crewai/cli/templates/crew/crew.py

@@ -6,7 +6,7 @@ from crewai.project import CrewBase, agent, crew, task
 # https://docs.crewai.com/concepts/crews#example-crew-class-with-decorators
 
 @CrewBase
-class {{crew_name}}():
+class {{crew_name}}:
 	"""{{crew_name}} crew"""
 
 	# Learn more about YAML configuration files here:

src/crewai/cli/templates/crew/tools/custom_tool.py

@@ -1,5 +1,4 @@
 from crewai.tools import BaseTool
-from typing import Type
 from pydantic import BaseModel, Field
 
 
@@ -7,12 +6,13 @@ class MyCustomToolInput(BaseModel):
     """Input schema for MyCustomTool."""
     argument: str = Field(..., description="Description of the argument.")
 
+
 class MyCustomTool(BaseTool):
     name: str = "Name of my tool"
     description: str = (
         "Clear description for what this tool is useful for, your agent will need this information to use it."
     )
-    args_schema: Type[BaseModel] = MyCustomToolInput
+    args_schema: type[BaseModel] = MyCustomToolInput
 
     def _run(self, argument: str) -> str:
         # Implementation goes here

src/crewai/cli/templates/flow/crews/poem_crew/poem_crew.py

@@ -16,7 +16,7 @@ class PoemCrew:
     agents_config = "config/agents.yaml"
     tasks_config = "config/tasks.yaml"
 
-    # If you would lik to add tools to your crew, you can learn more about it here:
+    # If you would like to add tools to your crew, you can learn more about it here:
     # https://docs.crewai.com/concepts/agents#agent-tools
     @agent
     def poem_writer(self) -> Agent:

src/crewai/cli/templates/flow/tools/custom_tool.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 from crewai.tools import BaseTool
 from pydantic import BaseModel, Field
 
@@ -15,7 +13,7 @@ class MyCustomTool(BaseTool):
     description: str = (
         "Clear description for what this tool is useful for, your agent will need this information to use it."
     )
-    args_schema: Type[BaseModel] = MyCustomToolInput
+    args_schema: type[BaseModel] = MyCustomToolInput
 
     def _run(self, argument: str) -> str:
         # Implementation goes here

src/crewai/crew.py

@@ -873,22 +873,10 @@ class Crew(BaseModel):
                 tools = self._inject_delegation_tools(tools, self.manager_agent, self.agents)
         return tools
 
-    def _get_context(self, task: Task, task_outputs: List[TaskOutput]) -> str:
-        """Get context for task execution.
-        
-        Determines whether to use the task's explicit context or aggregate outputs from previous tasks.
-        When task.context is an empty list, it will use the task_outputs instead.
-        
-        Args:
-            task: The task to get context for
-            task_outputs: List of previous task outputs
-            
-        Returns:
-            String containing the aggregated context
-        """
+    def _get_context(self, task: Task, task_outputs: List[TaskOutput]):
         context = (
             aggregate_raw_outputs_from_tasks(task.context)
-            if task.context and len(task.context) > 0
+            if task.context
             else aggregate_raw_outputs_from_task_outputs(task_outputs)
         )
         return context

tests/context_empty_list_test.py

@@ -1,85 +0,0 @@
-"""Test that context=[] is respected and doesn't include previous task outputs."""
-from unittest import mock
-
-import pytest
-
-from crewai import Agent, Crew, Process, Task
-from crewai.tasks.task_output import OutputFormat, TaskOutput
-from crewai.utilities.formatter import (
-    aggregate_raw_outputs_from_task_outputs,
-    aggregate_raw_outputs_from_tasks,
-)
-
-
-def test_context_empty_list():
-    """Test that context=[] is respected and doesn't include previous task outputs.
-    
-    This test verifies that when a task has context=[], the _get_context method
-    correctly uses task_outputs instead of an empty context list.
-    
-    Returns:
-        None
-        
-    Raises:
-        AssertionError: If the context handling doesn't work as expected
-    """
-    
-    
-    researcher = Agent(
-        role='Researcher',
-        goal='Research thoroughly',
-        backstory='You are an expert researcher'
-    )
-    
-    task_with_empty_context = Task(
-        description='Task with empty context',
-        expected_output='Output',
-        agent=researcher,
-        context=[]  # Explicitly set context to empty list
-    )
-    
-    task_outputs = [
-        TaskOutput(
-            description="Previous task output",
-            raw="Previous task result",
-            agent="Researcher",
-            json_dict=None,
-            output_format=OutputFormat.RAW,
-            pydantic=None,
-            summary="Previous task result",
-        )
-    ]
-    
-    crew = Crew(
-        agents=[researcher],
-        tasks=[task_with_empty_context],
-        process=Process.sequential,
-        verbose=False
-    )
-    
-    with mock.patch('crewai.agent.Agent.execute_task') as mock_execute:
-        mock_execute.return_value = "Mocked execution result"
-        
-        context = crew._get_context(task_with_empty_context, task_outputs)
-        
-        # So it should return the aggregated task_outputs
-        expected_context = aggregate_raw_outputs_from_task_outputs(task_outputs)
-        
-        assert context == expected_context
-        
-        assert not (task_with_empty_context.context and len(task_with_empty_context.context) > 0)
-        
-        other_task = Task(
-            description='Other task',
-            expected_output='Output',
-            agent=researcher
-        )
-        
-        task_with_context = Task(
-            description='Task with context',
-            expected_output='Output',
-            agent=researcher,
-            context=[other_task]  # Non-empty context
-        )
-        
-        assert task_with_context.context and len(task_with_context.context) > 0

tests/test_project_formatting.py

@@ -0,0 +1,64 @@
+import os
+import shutil
+import subprocess
+import tempfile
+from pathlib import Path
+
+import pytest
+
+from crewai.cli.create_crew import create_crew
+
+
+@pytest.fixture
+def temp_dir():
+    """Create a temporary directory for testing."""
+    temp_dir = tempfile.mkdtemp()
+    yield temp_dir
+    shutil.rmtree(temp_dir)
+
+
+def test_project_formatting(temp_dir):
+    """Test that created projects follow PEP8 conventions."""
+    # Change to the temporary directory
+    original_dir = os.getcwd()
+    os.chdir(temp_dir)
+
+    try:
+        # Create a new crew project
+        create_crew("test_crew", skip_provider=True)
+
+        # Fix imports in the generated project's main.py file
+        main_py_path = Path(temp_dir) / "test_crew" / "src" / "test_crew" / "main.py"
+        
+        # Use ruff to fix the imports
+        subprocess.run(
+            ["ruff", "check", "--select=I", "--fix", str(main_py_path)],
+            capture_output=True,
+            text=True,
+        )
+
+        # Create a ruff configuration file
+        ruff_config = """
+line-length = 120
+target-version = "py310"
+select = ["E", "F", "I", "UP", "A"]
+ignore = ["D203"]
+"""
+        with open(Path(temp_dir) / "test_crew" / ".ruff.toml", "w") as f:
+            f.write(ruff_config)
+
+        # Run ruff on the generated project code
+        result = subprocess.run(
+            ["ruff", "check", "test_crew"],
+            capture_output=True,
+            text=True,
+        )
+
+        # Check that there are no linting errors
+        assert result.returncode == 0, f"Ruff found issues: {result.stdout}"
+        # If ruff reports "All checks passed!" or empty output, that's good
+        assert "All checks passed!" in result.stdout or not result.stdout.strip(), f"Ruff found issues: {result.stdout}"
+
+    finally:
+        # Change back to the original directory
+        os.chdir(original_dir)