diff --git a/src/crewai/flow/flow.py b/src/crewai/flow/flow.py index b2fcee961..c89dcc49c 100644 --- a/src/crewai/flow/flow.py +++ b/src/crewai/flow/flow.py @@ -17,7 +17,6 @@ from typing import ( ) from uuid import uuid4 -from blinker import Signal from pydantic import BaseModel, Field, ValidationError from crewai.flow.flow_visualizer import plot_flow @@ -25,11 +24,11 @@ from crewai.flow.persistence.base import FlowPersistence from crewai.flow.utils import get_possible_return_constants from crewai.telemetry import Telemetry from crewai.utilities.events import ( + FlowCreatedEvent, FlowFinishedEvent, FlowStartedEvent, MethodExecutionFinishedEvent, MethodExecutionStartedEvent, - FlowCreatedEvent, ) from crewai.utilities.events.event_bus import event_bus from crewai.utilities.printer import Printer diff --git a/src/crewai/utilities/events/__init__.py b/src/crewai/utilities/events/__init__.py index 3756d64f8..b7e49bcd3 100644 --- a/src/crewai/utilities/events/__init__.py +++ b/src/crewai/utilities/events/__init__.py @@ -22,7 +22,7 @@ from .flow_events import ( MethodExecutionStartedEvent, MethodExecutionFinishedEvent, ) -from .event_bus import EventTypes, EventBus, event_bus +from .event_bus import EventBus, event_bus from .tool_usage_events import ToolUsageFinishedEvent, ToolUsageErrorEvent # events diff --git a/src/crewai/utilities/events/event_bus.py b/src/crewai/utilities/events/event_bus.py index 067aadbb0..791c28ba4 100644 --- a/src/crewai/utilities/events/event_bus.py +++ b/src/crewai/utilities/events/event_bus.py @@ -6,8 +6,6 @@ from blinker import Signal from crewai.utilities.events.crew_events import CrewEvent -from .event_types import EventTypes - EventT = TypeVar("EventT", bound=CrewEvent) diff --git a/src/crewai/utilities/events/task_events.py b/src/crewai/utilities/events/task_events.py index a48f0b69d..6a7ad1fb9 100644 --- a/src/crewai/utilities/events/task_events.py +++ b/src/crewai/utilities/events/task_events.py @@ -1,4 +1,5 @@ from typing import Any, Optional + from crewai.utilities.events.crew_events import CrewEvent diff --git a/tests/crew_test.py b/tests/crew_test.py index 3e804ba07..0fe012728 100644 --- a/tests/crew_test.py +++ b/tests/crew_test.py @@ -6,7 +6,6 @@ from concurrent.futures import Future from unittest import mock from unittest.mock import MagicMock, patch -import instructor import pydantic_core import pytest @@ -17,24 +16,23 @@ from crewai.crews.crew_output import CrewOutput from crewai.knowledge.source.string_knowledge_source import StringKnowledgeSource from crewai.memory.contextual.contextual_memory import ContextualMemory from crewai.process import Process -from crewai.project import crew from crewai.task import Task from crewai.tasks.conditional_task import ConditionalTask from crewai.tasks.output_format import OutputFormat from crewai.tasks.task_output import TaskOutput from crewai.types.usage_metrics import UsageMetrics from crewai.utilities import Logger +from crewai.utilities.events import ( + CrewTrainCompletedEvent, + CrewTrainStartedEvent, + event_bus, +) from crewai.utilities.events.crew_events import ( CrewTestCompletedEvent, CrewTestStartedEvent, ) from crewai.utilities.rpm_controller import RPMController from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler -from crewai.utilities.events import ( - CrewTrainStartedEvent, - CrewTrainCompletedEvent, - event_bus, -) ceo = Agent( role="CEO", diff --git a/tests/utilities/test_events.py b/tests/utilities/test_events.py index ed47a32c4..4efa4377c 100644 --- a/tests/utilities/test_events.py +++ b/tests/utilities/test_events.py @@ -34,7 +34,6 @@ from crewai.utilities.events.task_events import ( TaskStartedEvent, ) from crewai.utilities.events.tool_usage_events import ToolUsageErrorEvent -from requests.exceptions import RequestException base_agent = Agent( role="base_agent",