mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-01-23 07:08:14 +00:00
7b53457ef3
* Cleaned up task execution to now have separate paths for async and sync execution. Updating all kickoff functions to return CrewOutput. WIP. Waiting for Joao feedback on async task execution with task_output * Consistently storing async and sync output for context * outline tests I need to create going forward * Major rehaul of TaskOutput and CrewOutput. Updated all tests to work with new change. Need to add in a few final tricky async tests and add a few more to verify output types on TaskOutput and CrewOutput. * Encountering issues with callback. Need to test on main. WIP * working on tests. WIP * WIP. Figuring out disconnect issue. * Cleaned up logs now that I've isolated the issue to the LLM * more wip. * WIP. It looks like usage metrics has always been broken for async * Update parent crew who is managing for_each loop * Merge in main to bugfix/kickoff-for-each-usage-metrics * Clean up code for review * Add new tests * Final cleanup. Ready for review. * Moving copy functionality from Agent to BaseAgent * Fix renaming issue * Fix linting errors * use BaseAgent instead of Agent where applicable * Fixing missing function. Working on tests. * WIP. Needing team to review change * Fixing issues brought about by merge * WIP * Implement major fixes from yesterdays group conversation. Now working on tests. * The majority of tasks are working now. Need to fix converter class * Fix final failing test * Fix linting and type-checker issues * Add more tests to fully test CrewOutput and TaskOutput changes * Add in validation for async cannot depend on other async tasks. * Update validators and tests
61 lines
2.1 KiB
Python
61 lines
2.1 KiB
Python
import json
|
|
from typing import Any, Dict, Optional
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
from crewai.tasks.output_format import OutputFormat
|
|
from crewai.tasks.task_output import TaskOutput
|
|
|
|
|
|
class CrewOutput(BaseModel):
|
|
"""Class that represents the result of a crew."""
|
|
|
|
raw: str = Field(description="Raw output of crew", default="")
|
|
pydantic: Optional[BaseModel] = Field(
|
|
description="Pydantic output of Crew", default=None
|
|
)
|
|
json_dict: Optional[Dict[str, Any]] = Field(
|
|
description="JSON dict output of Crew", default=None
|
|
)
|
|
tasks_output: list[TaskOutput] = Field(
|
|
description="Output of each task", default=[]
|
|
)
|
|
token_usage: Dict[str, Any] = Field(
|
|
description="Processed token summary", default={}
|
|
)
|
|
|
|
# TODO: Joao - Adding this safety check breakes when people want to see
|
|
# The full output of a CrewOutput.
|
|
# @property
|
|
# def pydantic(self) -> Optional[BaseModel]:
|
|
# # Check if the final task output included a pydantic model
|
|
# if self.tasks_output[-1].output_format != OutputFormat.PYDANTIC:
|
|
# raise ValueError(
|
|
# "No pydantic model found in the final task. Please make sure to set the output_pydantic property in the final task in your crew."
|
|
# )
|
|
|
|
# return self._pydantic
|
|
|
|
@property
|
|
def json(self) -> Optional[str]:
|
|
if self.tasks_output[-1].output_format != OutputFormat.JSON:
|
|
raise ValueError(
|
|
"No JSON output found in the final task. Please make sure to set the output_json property in the final task in your crew."
|
|
)
|
|
|
|
return json.dumps(self.json_dict)
|
|
|
|
def to_dict(self) -> Dict[str, Any]:
|
|
if self.json_dict:
|
|
return self.json_dict
|
|
if self.pydantic:
|
|
return self.pydantic.model_dump()
|
|
raise ValueError("No output to convert to dictionary")
|
|
|
|
def __str__(self):
|
|
if self.pydantic:
|
|
return str(self.pydantic)
|
|
if self.json_dict:
|
|
return str(self.json_dict)
|
|
return self.raw
|