From f737b3b3794241d1df7cb30378b50e656ad32737 Mon Sep 17 00:00:00 2001 From: Brandon Hancock Date: Tue, 16 Jul 2024 11:35:24 -0400 Subject: [PATCH] WIP --- src/crewai/crew.py | 25 +++++++++++++------------ src/crewai/procedure/procedure.py | 3 +++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/crewai/crew.py b/src/crewai/crew.py index 8b9f1162f..3878615ae 100644 --- a/src/crewai/crew.py +++ b/src/crewai/crew.py @@ -7,15 +7,15 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union from langchain_core.callbacks import BaseCallbackHandler from pydantic import ( - UUID4, - BaseModel, - ConfigDict, - Field, - InstanceOf, - Json, - PrivateAttr, - field_validator, - model_validator, + UUID4, + BaseModel, + ConfigDict, + Field, + InstanceOf, + Json, + PrivateAttr, + field_validator, + model_validator, ) from pydantic_core import PydanticCustomError @@ -34,14 +34,15 @@ from crewai.tools.agent_tools import AgentTools from crewai.utilities import I18N, FileHandler, Logger, RPMController from crewai.utilities.constants import TRAINED_AGENTS_DATA_FILE, TRAINING_DATA_FILE from crewai.utilities.evaluators.task_evaluator import TaskEvaluator -from crewai.utilities.formatter import ( - aggregate_raw_outputs_from_task_outputs, - aggregate_raw_outputs_from_tasks, from crewai.utilities.formatter import ( aggregate_raw_outputs_from_task_outputs, aggregate_raw_outputs_from_tasks, ) from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler +from crewai.utilities.training_handler import CrewTrainingHandler + +try: + import agentops except ImportError: agentops = None diff --git a/src/crewai/procedure/procedure.py b/src/crewai/procedure/procedure.py index 167416593..d6c640f9f 100644 --- a/src/crewai/procedure/procedure.py +++ b/src/crewai/procedure/procedure.py @@ -15,6 +15,7 @@ class Procedure(BaseModel): def kickoff(self, inputs: List[Dict[str, Any]]) -> List[CrewOutput]: current_inputs = inputs + crew_outputs = [] for index, crew in enumerate(self.crews): # Process all inputs for the current crew crew_outputs = self._process_crew(crew, current_inputs) @@ -30,6 +31,8 @@ class Procedure(BaseModel): async def kickoff_async(self, inputs: List[Dict[str, Any]]) -> List[CrewOutput]: current_inputs = inputs + + crew_outputs = [] for index, crew in enumerate(self.crews): # Process all inputs for the current crew crew_outputs = await self._process_crew(crew, current_inputs)