Move kickoff callbacks to crew's domain

tests/project_test.py

@@ -1,10 +1,10 @@
-from crewai.agent import Agent
-from crewai.project import agent, task, before_crew, after_crew, crew
-from crewai.project import CrewBase
-from crewai.task import Task
-from crewai.crew import Crew
 import pytest
 
+from crewai.agent import Agent
+from crewai.crew import Crew
+from crewai.project import CrewBase, after_kickoff, agent, before_kickoff, crew, task
+from crewai.task import Task
+
 
 class SimpleCrew:
     @agent
@@ -47,13 +47,13 @@ class TestCrew:
     def reporting_task(self):
         return Task(config=self.tasks_config["reporting_task"])
 
-    @before_crew
+    @before_kickoff
     def modify_inputs(self, inputs):
         if inputs:
             inputs["topic"] = "Bicycles"
         return inputs
 
-    @after_crew
+    @after_kickoff
     def modify_outputs(self, outputs):
         outputs.raw = outputs.raw + " post processed"
         return outputs
@@ -83,6 +83,16 @@ def test_task_memoization():
     ), "Task memoization is not working as expected"
 
 
+def test_crew_memoization():
+    crew = TestCrew()
+    first_call_result = crew.crew()
+    second_call_result = crew.crew()
+
+    assert (
+        first_call_result is second_call_result
+    ), "Crew references should point to the same object"
+
+
 def test_task_name():
     simple_task = SimpleCrew().simple_task()
     assert (
@@ -96,32 +106,33 @@ def test_task_name():
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
-def test_before_crew_modification():
+def test_before_kickoff_modification():
     crew = TestCrew()
     inputs = {"topic": "LLMs"}
-    result = crew.kickoff(inputs=inputs)
-    print(result.raw)
-    assert "bicycles" in result.raw, "Before crew function did not modify inputs"
+    result = crew.crew().kickoff(inputs=inputs)
+    assert "bicycles" in result.raw, "Before kickoff function did not modify inputs"
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
-def test_after_crew_modification():
+def test_after_kickoff_modification():
     crew = TestCrew()
     # Assuming the crew execution returns a dict
-    result = crew.kickoff({"topic": "LLMs"})
+    result = crew.crew().kickoff({"topic": "LLMs"})
 
-    assert "post processed" in result.raw, "After crew function did not modify outputs"
+    assert (
+        "post processed" in result.raw
+    ), "After kickoff function did not modify outputs"
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
-def test_before_crew_with_none_input():
+def test_before_kickoff_with_none_input():
     crew = TestCrew()
     crew.crew().kickoff(None)
     # Test should pass without raising exceptions
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
-def test_multiple_before_after_crew():
+def test_multiple_before_after_kickoff():
     @CrewBase
     class MultipleHooksCrew:
         agents_config = "config/agents.yaml"
@@ -143,22 +154,22 @@ def test_multiple_before_after_crew():
         def reporting_task(self):
             return Task(config=self.tasks_config["reporting_task"])
 
-        @before_crew
+        @before_kickoff
         def first_before(self, inputs):
             inputs["topic"] = "Bicycles"
             return inputs
 
-        @before_crew
+        @before_kickoff
         def second_before(self, inputs):
             inputs["topic"] = "plants"
             return inputs
 
-        @after_crew
+        @after_kickoff
         def first_after(self, outputs):
             outputs.raw = outputs.raw + " processed first"
             return outputs
 
-        @after_crew
+        @after_kickoff
         def second_after(self, outputs):
             outputs.raw = outputs.raw + " processed second"
             return outputs
@@ -168,58 +179,8 @@ def test_multiple_before_after_crew():
             return Crew(agents=self.agents, tasks=self.tasks, verbose=True)
 
     crew = MultipleHooksCrew()
-    result = crew.kickoff({"topic": "LLMs"})
+    result = crew.crew().kickoff({"topic": "LLMs"})
 
-    assert "plants" in result.raw, "First before_crew not executed"
-    assert "processed first" in result.raw, "First after_crew not executed"
-    assert "processed second" in result.raw, "Second after_crew not executed"
-
-
-@pytest.mark.vcr(filter_headers=["authorization"])
-def test_crew_execution_order():
-    execution_order = []
-
-    @CrewBase
-    class OrderTestCrew:
-        agents_config = "config/agents.yaml"
-        tasks_config = "config/tasks.yaml"
-
-        @agent
-        def researcher(self):
-            return Agent(config=self.agents_config["researcher"])
-
-        @agent
-        def reporting_analyst(self):
-            return Agent(config=self.agents_config["reporting_analyst"])
-
-        @task
-        def research_task(self):
-            execution_order.append("task")
-            return Task(config=self.tasks_config["research_task"])
-
-        @task
-        def reporting_task(self):
-            return Task(config=self.tasks_config["reporting_task"])
-
-        @before_crew
-        def before(self, inputs):
-            execution_order.append("before")
-            return inputs
-
-        @after_crew
-        def after(self, outputs):
-            execution_order.append("after")
-            return outputs
-
-        @crew
-        def crew(self):
-            return Crew(agents=self.agents, tasks=self.tasks, verbose=True)
-
-    crew = OrderTestCrew()
-    crew.kickoff({"topic": "LLMs"})
-
-    assert execution_order == [
-        "before",
-        "task",
-        "after",
-    ], "Crew execution order is incorrect"
+    assert "plants" in result.raw, "First before_kickoff not executed"
+    assert "processed first" in result.raw, "First after_kickoff not executed"
+    assert "processed second" in result.raw, "Second after_kickoff not executed"