Rename event_bus to crewai_event_bus for improved clarity and specificity

- Replace all references to `event_bus` with `crewai_event_bus`
- Update import statements across multiple files
- Remove the old `event_bus.py` file
- Maintain existing event handling functionality

tests/agent_test.py

@@ -17,7 +17,7 @@ from crewai.tools import tool
 from crewai.tools.tool_calling import InstructorToolCalling
 from crewai.tools.tool_usage import ToolUsage
 from crewai.utilities import RPMController
-from crewai.utilities.events import event_bus
+from crewai.utilities.events import crewai_event_bus
 from crewai.utilities.events.tool_usage_events import ToolUsageFinishedEvent
 
 
@@ -156,11 +156,10 @@ def test_agent_execution_with_tools():
     )
     received_events = []
 
-    @event_bus.on(ToolUsageFinishedEvent)
+    @crewai_event_bus.on(ToolUsageFinishedEvent)
     def handle_tool_end(source, event):
         received_events.append(event)
 
-    # with patch.object(EventBus, "emit") as emit:
     output = agent.execute_task(task)
     assert output == "The result of the multiplication is 12."
 
@@ -256,7 +255,7 @@ def test_cache_hitting():
     }
     received_events = []
 
-    @event_bus.on(ToolUsageFinishedEvent)
+    @crewai_event_bus.on(ToolUsageFinishedEvent)
     def handle_tool_end(source, event):
         received_events.append(event)
 

tests/crew_test.py

@@ -25,7 +25,7 @@ from crewai.utilities import Logger
 from crewai.utilities.events import (
     CrewTrainCompletedEvent,
     CrewTrainStartedEvent,
-    event_bus,
+    crewai_event_bus,
 )
 from crewai.utilities.events.crew_events import (
     CrewTestCompletedEvent,
@@ -860,7 +860,7 @@ def test_crew_verbose_output(capsys):
         "[🤖 AGENT 'SENIOR WRITER' STARTED TASK]",
         "[✅ AGENT 'SENIOR WRITER' COMPLETED TASK]",
         "[✅ TASK COMPLETED: WRITE ABOUT AI IN HEALTHCARE.]",
-        "[✅ CREW 'CREW' COMPLETED]"
+        "[✅ CREW 'CREW' COMPLETED]",
     ]
     captured = capsys.readouterr()
     for log in expected_listener_logs:
@@ -2590,11 +2590,11 @@ def test_crew_train_success(
 
     received_events = []
 
-    @event_bus.on(CrewTrainStartedEvent)
+    @crewai_event_bus.on(CrewTrainStartedEvent)
     def on_crew_train_started(source, event: CrewTrainStartedEvent):
         received_events.append(event)
 
-    @event_bus.on(CrewTrainCompletedEvent)
+    @crewai_event_bus.on(CrewTrainCompletedEvent)
     def on_crew_train_completed(source, event: CrewTrainCompletedEvent):
         received_events.append(event)
 
@@ -3378,11 +3378,11 @@ def test_crew_testing_function(kickoff_mock, copy_mock, crew_evaluator):
 
     received_events = []
 
-    @event_bus.on(CrewTestStartedEvent)
+    @crewai_event_bus.on(CrewTestStartedEvent)
     def on_crew_test_started(source, event: CrewTestStartedEvent):
         received_events.append(event)
 
-    @event_bus.on(CrewTestCompletedEvent)
+    @crewai_event_bus.on(CrewTestCompletedEvent)
     def on_crew_test_completed(source, event: CrewTestCompletedEvent):
         received_events.append(event)
 

tests/flow_test.py

@@ -12,7 +12,7 @@ from crewai.utilities.events import (
     FlowStartedEvent,
     MethodExecutionFinishedEvent,
     MethodExecutionStartedEvent,
-    event_bus,
+    crewai_event_bus,
 )
 
 
@@ -440,15 +440,15 @@ def test_unstructured_flow_event_emission():
     flow = PoemFlow()
     received_events = []
 
-    @event_bus.on(FlowStartedEvent)
+    @crewai_event_bus.on(FlowStartedEvent)
     def handle_flow_start(source, event):
         received_events.append(event)
 
-    @event_bus.on(MethodExecutionStartedEvent)
+    @crewai_event_bus.on(MethodExecutionStartedEvent)
     def handle_method_start(source, event):
         received_events.append(event)
 
-    @event_bus.on(FlowFinishedEvent)
+    @crewai_event_bus.on(FlowFinishedEvent)
     def handle_flow_end(source, event):
         received_events.append(event)
 
@@ -519,19 +519,19 @@ def test_structured_flow_event_emission():
 
     received_events = []
 
-    @event_bus.on(FlowStartedEvent)
+    @crewai_event_bus.on(FlowStartedEvent)
     def handle_flow_start(source, event):
         received_events.append(event)
 
-    @event_bus.on(MethodExecutionStartedEvent)
+    @crewai_event_bus.on(MethodExecutionStartedEvent)
     def handle_method_start(source, event):
         received_events.append(event)
 
-    @event_bus.on(MethodExecutionFinishedEvent)
+    @crewai_event_bus.on(MethodExecutionFinishedEvent)
     def handle_method_end(source, event):
         received_events.append(event)
 
-    @event_bus.on(FlowFinishedEvent)
+    @crewai_event_bus.on(FlowFinishedEvent)
     def handle_flow_end(source, event):
         received_events.append(event)
 
@@ -585,19 +585,19 @@ def test_stateless_flow_event_emission():
     flow = StatelessFlow()
     received_events = []
 
-    @event_bus.on(FlowStartedEvent)
+    @crewai_event_bus.on(FlowStartedEvent)
     def handle_flow_start(source, event):
         received_events.append(event)
 
-    @event_bus.on(MethodExecutionStartedEvent)
+    @crewai_event_bus.on(MethodExecutionStartedEvent)
     def handle_method_start(source, event):
         received_events.append(event)
 
-    @event_bus.on(MethodExecutionFinishedEvent)
+    @crewai_event_bus.on(MethodExecutionFinishedEvent)
     def handle_method_end(source, event):
         received_events.append(event)
 
-    @event_bus.on(FlowFinishedEvent)
+    @crewai_event_bus.on(FlowFinishedEvent)
     def handle_flow_end(source, event):
         received_events.append(event)
 

tests/utilities/test_events.py

@@ -20,7 +20,7 @@ from crewai.utilities.events.crew_events import (
     CrewKickoffFailedEvent,
     CrewKickoffStartedEvent,
 )
-from crewai.utilities.events.event_bus import event_bus
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
 from crewai.utilities.events.event_types import ToolUsageFinishedEvent
 from crewai.utilities.events.flow_events import (
     FlowCreatedEvent,
@@ -54,9 +54,9 @@ base_task = Task(
 def test_crew_emits_start_kickoff_event():
     received_events = []
 
-    with event_bus.scoped_handlers():
+    with crewai_event_bus.scoped_handlers():
 
-        @event_bus.on(CrewKickoffStartedEvent)
+        @crewai_event_bus.on(CrewKickoffStartedEvent)
         def handle_crew_start(source, event):
             received_events.append(event)
 
@@ -74,7 +74,7 @@ def test_crew_emits_start_kickoff_event():
 def test_crew_emits_end_kickoff_event():
     received_events = []
 
-    @event_bus.on(CrewKickoffCompletedEvent)
+    @crewai_event_bus.on(CrewKickoffCompletedEvent)
     def handle_crew_end(source, event):
         received_events.append(event)
 
@@ -92,9 +92,9 @@ def test_crew_emits_end_kickoff_event():
 def test_crew_emits_kickoff_failed_event():
     received_events = []
 
-    with event_bus.scoped_handlers():
+    with crewai_event_bus.scoped_handlers():
 
-        @event_bus.on(CrewKickoffFailedEvent)
+        @crewai_event_bus.on(CrewKickoffFailedEvent)
         def handle_crew_failed(source, event):
             received_events.append(event)
 
@@ -117,7 +117,7 @@ def test_crew_emits_kickoff_failed_event():
 def test_crew_emits_start_task_event():
     received_events = []
 
-    @event_bus.on(TaskStartedEvent)
+    @crewai_event_bus.on(TaskStartedEvent)
     def handle_task_start(source, event):
         received_events.append(event)
 
@@ -134,7 +134,7 @@ def test_crew_emits_start_task_event():
 def test_crew_emits_end_task_event():
     received_events = []
 
-    @event_bus.on(TaskCompletedEvent)
+    @crewai_event_bus.on(TaskCompletedEvent)
     def handle_task_end(source, event):
         received_events.append(event)
 
@@ -152,25 +152,28 @@ def test_task_emits_failed_event_on_execution_error():
     received_events = []
     received_sources = []
 
-    @event_bus.on(TaskFailedEvent)
+    @crewai_event_bus.on(TaskFailedEvent)
     def handle_task_failed(source, event):
         received_events.append(event)
         received_sources.append(source)
-   
-    with patch.object(Task, "_execute_core",) as mock_execute:
+
+    with patch.object(
+        Task,
+        "_execute_core",
+    ) as mock_execute:
         error_message = "Simulated task failure"
         mock_execute.side_effect = Exception(error_message)
         agent = Agent(
             role="base_agent",
             goal="Just say hi",
             backstory="You are a helpful assistant that just says hi",
-        )       
+        )
         task = Task(
             description="Just say hi",
             expected_output="hi",
             agent=agent,
         )
-        
+
         with pytest.raises(Exception):
             agent.execute_task(task=task)
 
@@ -185,11 +188,11 @@ def test_task_emits_failed_event_on_execution_error():
 def test_agent_emits_execution_started_and_completed_events():
     received_events = []
 
-    @event_bus.on(AgentExecutionStartedEvent)
+    @crewai_event_bus.on(AgentExecutionStartedEvent)
     def handle_agent_start(source, event):
         received_events.append(event)
 
-    @event_bus.on(AgentExecutionCompletedEvent)
+    @crewai_event_bus.on(AgentExecutionCompletedEvent)
     def handle_agent_completed(source, event):
         received_events.append(event)
 
@@ -219,7 +222,7 @@ def test_agent_emits_execution_started_and_completed_events():
 def test_agent_emits_execution_error_event():
     received_events = []
 
-    @event_bus.on(AgentExecutionErrorEvent)
+    @crewai_event_bus.on(AgentExecutionErrorEvent)
     def handle_agent_start(source, event):
         received_events.append(event)
 
@@ -257,7 +260,7 @@ class SayHiTool(BaseTool):
 def test_tools_emits_finished_events():
     received_events = []
 
-    @event_bus.on(ToolUsageFinishedEvent)
+    @crewai_event_bus.on(ToolUsageFinishedEvent)
     def handle_tool_end(source, event):
         received_events.append(event)
 
@@ -288,7 +291,7 @@ def test_tools_emits_finished_events():
 def test_tools_emits_error_events():
     received_events = []
 
-    @event_bus.on(ToolUsageErrorEvent)
+    @crewai_event_bus.on(ToolUsageErrorEvent)
     def handle_tool_end(source, event):
         received_events.append(event)
 
@@ -333,9 +336,9 @@ def test_tools_emits_error_events():
 def test_flow_emits_start_event():
     received_events = []
 
-    with event_bus.scoped_handlers():
+    with crewai_event_bus.scoped_handlers():
 
-        @event_bus.on(FlowStartedEvent)
+        @crewai_event_bus.on(FlowStartedEvent)
         def handle_flow_start(source, event):
             received_events.append(event)
 
@@ -355,9 +358,9 @@ def test_flow_emits_start_event():
 def test_flow_emits_finish_event():
     received_events = []
 
-    with event_bus.scoped_handlers():
+    with crewai_event_bus.scoped_handlers():
 
-        @event_bus.on(FlowFinishedEvent)
+        @crewai_event_bus.on(FlowFinishedEvent)
         def handle_flow_finish(source, event):
             received_events.append(event)
 
@@ -379,9 +382,9 @@ def test_flow_emits_finish_event():
 def test_flow_emits_method_execution_started_event():
     received_events = []
 
-    with event_bus.scoped_handlers():
+    with crewai_event_bus.scoped_handlers():
 
-        @event_bus.on(MethodExecutionStartedEvent)
+        @crewai_event_bus.on(MethodExecutionStartedEvent)
         def handle_method_start(source, event):
             print("event in method name", event.method_name)
             received_events.append(event)
@@ -416,8 +419,8 @@ def test_register_handler_adds_new_handler():
     def custom_handler(source, event):
         received_events.append(event)
 
-    with event_bus.scoped_handlers():
-        event_bus.register_handler(CrewKickoffStartedEvent, custom_handler)
+    with crewai_event_bus.scoped_handlers():
+        crewai_event_bus.register_handler(CrewKickoffStartedEvent, custom_handler)
 
         crew = Crew(agents=[base_agent], tasks=[base_task], name="TestCrew")
         crew.kickoff()
@@ -438,9 +441,9 @@ def test_multiple_handlers_for_same_event():
     def handler_2(source, event):
         received_events_2.append(event)
 
-    with event_bus.scoped_handlers():
-        event_bus.register_handler(CrewKickoffStartedEvent, handler_1)
-        event_bus.register_handler(CrewKickoffStartedEvent, handler_2)
+    with crewai_event_bus.scoped_handlers():
+        crewai_event_bus.register_handler(CrewKickoffStartedEvent, handler_1)
+        crewai_event_bus.register_handler(CrewKickoffStartedEvent, handler_2)
 
         crew = Crew(agents=[base_agent], tasks=[base_task], name="TestCrew")
         crew.kickoff()
@@ -454,7 +457,7 @@ def test_multiple_handlers_for_same_event():
 def test_flow_emits_created_event():
     received_events = []
 
-    @event_bus.on(FlowCreatedEvent)
+    @crewai_event_bus.on(FlowCreatedEvent)
     def handle_flow_created(source, event):
         received_events.append(event)
 
@@ -475,7 +478,7 @@ def test_flow_emits_method_execution_failed_event():
     received_events = []
     error = Exception("Simulated method failure")
 
-    @event_bus.on(MethodExecutionFailedEvent)
+    @crewai_event_bus.on(MethodExecutionFailedEvent)
     def handle_method_failed(source, event):
         received_events.append(event)