Move kickoff callbacks to crew's domain

src/crewai/project/__init__.py

@@ -1,5 +1,7 @@
 from .annotations import (
+    after_kickoff,
     agent,
+    before_kickoff,
     cache_handler,
     callback,
     crew,
@@ -9,8 +11,6 @@ from .annotations import (
     pipeline,
     task,
     tool,
-    before_crew,
-    after_crew,
 )
 from .crew_base import CrewBase
 from .pipeline_base import PipelineBase
@@ -28,6 +28,6 @@ __all__ = [
     "llm",
     "cache_handler",
     "pipeline",
-    "before_crew",
-    "after_crew",
+    "before_kickoff",
+    "after_kickoff",
 ]

src/crewai/project/annotations.py

@@ -5,13 +5,13 @@ from crewai import Crew
 from crewai.project.utils import memoize
 
 
-def before_crew(func):
-    func.is_before_crew = True
+def before_kickoff(func):
+    func.is_before_kickoff = True
     return func
 
 
-def after_crew(func):
-    func.is_after_crew = True
+def after_kickoff(func):
+    func.is_after_kickoff = True
     return func
 
 
@@ -109,6 +109,19 @@ def crew(func) -> Callable[..., Crew]:
         self.agents = instantiated_agents
         self.tasks = instantiated_tasks
 
-        return func(self, *args, **kwargs)
+        crew = func(self, *args, **kwargs)
 
-    return wrapper
+        def callback_wrapper(callback, instance):
+            def wrapper(*args, **kwargs):
+                return callback(instance, *args, **kwargs)
+
+            return wrapper
+
+        for _, callback in self._before_kickoff.items():
+            crew.before_kickoff_callbacks.append(callback_wrapper(callback, self))
+        for _, callback in self._after_kickoff.items():
+            crew.after_kickoff_callbacks.append(callback_wrapper(callback, self))
+
+        return crew
+
+    return memoize(wrapper)

src/crewai/project/crew_base.py

@@ -43,8 +43,8 @@ def CrewBase(cls: T) -> T:
                     for attr in [
                         "is_task",
                         "is_agent",
-                        "is_before_crew",
-                        "is_after_crew",
+                        "is_before_kickoff",
+                        "is_after_kickoff",
                         "is_kickoff",
                     ]
                 )
@@ -57,11 +57,11 @@ def CrewBase(cls: T) -> T:
             self._original_agents = self._filter_functions(
                 self._original_functions, "is_agent"
             )
-            self._before_crew = self._filter_functions(
-                self._original_functions, "is_before_crew"
+            self._before_kickoff = self._filter_functions(
+                self._original_functions, "is_before_kickoff"
             )
-            self._after_crew = self._filter_functions(
-                self._original_functions, "is_after_crew"
+            self._after_kickoff = self._filter_functions(
+                self._original_functions, "is_after_kickoff"
             )
             self._kickoff = self._filter_functions(
                 self._original_functions, "is_kickoff"
@@ -213,25 +213,4 @@ def CrewBase(cls: T) -> T:
                     callback_functions[callback]() for callback in callbacks
                 ]
 
-        def kickoff(self, inputs=None):
-            # Execute before_crew functions and allow them to modify inputs
-            for _, func in self._before_crew.items():
-                modified_inputs = func(self, inputs)
-                if modified_inputs is not None:
-                    inputs = modified_inputs
-
-            # Get the crew instance
-            crew_instance = self.crew()
-
-            # Execute the crew's tasks
-            result = crew_instance.kickoff(inputs=inputs)
-
-            # Execute after_crew functions and allow them to modify the output
-            for _, func in self._after_crew.items():
-                modified_result = func(self, result)
-                if modified_result is not None:
-                    result = modified_result
-
-            return result
-
     return cast(T, WrappedClass)