Update crewai/crew.py

crewai/crew.py

@@ -26,11 +26,9 @@ from crewai.utilities import I18N, Logger, RPMController
 class Crew(BaseModel):
     """
     Represents a group of agents, defining how they should collaborate and the tasks they should perform.
-
     Attributes:
         tasks: List of tasks assigned to the crew.
         agents: List of agents part of this crew.
-        manager_llm: The language model that will run manager agent.
         process: The process flow that the crew will follow (e.g., sequential).
         verbose: Indicates the verbosity level for logging during execution.
         config: Configuration settings for the crew.
@@ -48,9 +46,6 @@ class Crew(BaseModel):
     agents: List[Agent] = Field(default_factory=list)
     process: Process = Field(default=Process.sequential)
     verbose: Union[int, bool] = Field(default=0)
-    manager_llm: Optional[Any] = Field(
-        description="Language model that will run the agent.", default=None
-    )
     config: Optional[Union[Json, Dict[str, Any]]] = Field(default=None)
     id: UUID4 = Field(default_factory=uuid.uuid4, frozen=True)
     max_rpm: Optional[int] = Field(
@@ -94,17 +89,6 @@ class Crew(BaseModel):
         self._rpm_controller = RPMController(max_rpm=self.max_rpm, logger=self._logger)
         return self
 
-    @model_validator(mode="after")
-    def check_manager_llm(self):
-        """Validates that the language model is set when using hierarchical process."""
-        if self.process == Process.hierarchical and not self.manager_llm:
-            raise PydanticCustomError(
-                "missing_manager_llm",
-                "Attribute `manager_llm` is required when using hierarchical process.",
-                {},
-            )
-        return self
-
     @model_validator(mode="after")
     def check_config(self):
         """Validates that the crew is properly configured with agents and tasks."""
@@ -121,8 +105,7 @@ class Crew(BaseModel):
         if self.agents:
             for agent in self.agents:
                 agent.set_cache_handler(self._cache_handler)
-                if self.max_rpm:
-                    agent.set_rpm_controller(self._rpm_controller)
+                agent.set_rpm_controller(self._rpm_controller)
         return self
 
     def _setup_from_config(self):
@@ -139,10 +122,8 @@ class Crew(BaseModel):
 
     def _create_task(self, task_config: Dict[str, Any]) -> Task:
         """Creates a task instance from its configuration.
-
         Args:
             task_config: The configuration of the task.
-
         Returns:
             A task instance.
         """
@@ -158,31 +139,18 @@ class Crew(BaseModel):
             agent.i18n = I18N(language=self.language)
 
         if self.process == Process.sequential:
-            return self._run_sequential_process()
-        if self.process == Process.hierarchical:
-            return self._run_hierarchical_process()
-
-        raise NotImplementedError(
-            f"The process '{self.process}' is not implemented yet."
-        )
+            return self._sequential_loop()
+        else:
+            raise NotImplementedError(
+                f"The process '{self.process}' is not implemented yet."
+            )
 
-    def _run_sequential_process(self) -> str:
+    def _sequential_loop(self) -> str:
         """Executes tasks sequentially and returns the final output."""
         task_output = ""
         for task in self.tasks:
-            if task.agent is not None and task.agent.allow_delegation:
-                agents_for_delegation = [
-                    agent for agent in self.agents if agent != task.agent
-                ]
-                task.tools += AgentTools(agents=agents_for_delegation).tools()
-
-            role = task.agent.role if task.agent is not None else "None"
-            self._logger.log("debug", f"Working Agent: {role}")
-            self._logger.log("info", f"Starting Task: {task.description}")
-
-            output = task.execute(context=task_output)
-            if not task.async_execution:
-                task_output = output
+            self._prepare_and_execute_task(task)
+            task_output = task.execute(task_output)
 
             role = task.agent.role if task.agent is not None else "None"
             self._logger.log("debug", f"[{role}] Task output: {task_output}\n\n")
@@ -192,33 +160,14 @@ class Crew(BaseModel):
 
         return task_output
 
-    def _run_hierarchical_process(self) -> str:
-        """Creates and assigns a manager agent to make sure the crew completes the tasks."""
-
-        i18n = I18N(language=self.language)
-        manager = Agent(
-            role=i18n.retrieve("hierarchical_manager_agent", "role"),
-            goal=i18n.retrieve("hierarchical_manager_agent", "goal"),
-            backstory=i18n.retrieve("hierarchical_manager_agent", "backstory"),
-            tools=AgentTools(agents=self.agents).tools(),
-            llm=self.manager_llm,
-            verbose=True,
-        )
-
-        task_output = ""
-        for task in self.tasks:
-            self._logger.log("debug", f"Working Agent: {manager.role}")
-            self._logger.log("info", f"Starting Task: {task.description}")
-
-            task_output = task.execute(
-                agent=manager, context=task_output, tools=manager.tools
-            )
-
-            self._logger.log(
-                "debug", f"[{manager.role}] Task output: {task_output}\n\n"
-            )
-
-        if self.max_rpm:
-            self._rpm_controller.stop_rpm_counter()
+    def _prepare_and_execute_task(self, task: Task) -> None:
+        """Prepares and logs information about the task being executed.
+        Args:
+            task: The task to be executed.
+        """
+        if task.agent is not None and task.agent.allow_delegation:
+            task.tools += AgentTools(agents=self.agents).tools()
 
-        return task_output
+        role = task.agent.role if task.agent is not None else "None"
+        self._logger.log("debug", f"Working Agent: {role}")
+        self._logger.log("info", f"Starting Task: {task.description}")