wip

.gitignore

@@ -21,5 +21,4 @@ crew_tasks_output.json
 .mypy_cache
 .ruff_cache
 .venv
-agentops.log
-test_flow.html
+agentops.log

README.md

@@ -1,18 +1,10 @@
 <div align="center">
 
-![Logo of CrewAI](./docs/crewai_logo.png)
+![Logo of CrewAI, two people rowing on a boat](./docs/crewai_logo.png)
 
 # **CrewAI**
 
-**CrewAI**: Production-grade framework for orchestrating sophisticated AI agent systems. From simple automations to complex real-world applications, CrewAI provides precise control and deep customization. By fostering collaborative intelligence through flexible, production-ready architecture, CrewAI empowers agents to work together seamlessly, tackling complex business challenges with predictable, consistent results.
-
-**CrewAI Enterprise**
-Want to plan, build (+ no code), deploy, monitor and interare your agents: [CrewAI Enterprise](https://www.crewai.com/enterprise). Designed for complex, real-world applications, our enterprise solution offers:
-
-- **Seamless Integrations**
-- **Scalable & Secure Deployment**
-- **Actionable Insights**
-- **24/7 Support**
+🤖 **CrewAI**: Production-grade framework for orchestrating sophisticated AI agent systems. From simple automations to complex real-world applications, CrewAI provides precise control and deep customization. By fostering collaborative intelligence through flexible, production-ready architecture, CrewAI empowers agents to work together seamlessly, tackling complex business challenges with predictable, consistent results.
 
 <h3>
 
@@ -198,7 +190,7 @@ research_task:
   description: >
     Conduct a thorough research about {topic}
     Make sure you find any interesting and relevant information given
-    the current year is 2025.
+    the current year is 2024.
   expected_output: >
     A list with 10 bullet points of the most relevant information about {topic}
   agent: researcher
@@ -400,7 +392,7 @@ class AdvancedAnalysisFlow(Flow[MarketState]):
             goal="Gather and validate supporting market data",
             backstory="You excel at finding and correlating multiple data sources"
         )
-
+        
         analysis_task = Task(
             description="Analyze {sector} sector data for the past {timeframe}",
             expected_output="Detailed market analysis with confidence score",
@@ -411,7 +403,7 @@ class AdvancedAnalysisFlow(Flow[MarketState]):
             expected_output="Corroborating evidence and potential contradictions",
             agent=researcher
         )
-
+        
         # Demonstrate crew autonomy
         analysis_crew = Crew(
             agents=[analyst, researcher],

docs/concepts/cli.mdx

@@ -136,21 +136,17 @@ crewai test -n 5 -m gpt-3.5-turbo
 
 ### 8. Run
 
-Run the crew or flow.
+Run the crew.
 
 ```shell Terminal
 crewai run
 ```
-
-<Note>
-Starting from version 0.103.0, the `crewai run` command can be used to run both standard crews and flows. For flows, it automatically detects the type from pyproject.toml and runs the appropriate command. This is now the recommended way to run both crews and flows.
-</Note>
-
 <Note>
 Make sure to run these commands from the directory where your CrewAI project is set up. 
 Some commands may require additional configuration or setup within your project structure.
 </Note>
 
+
 ### 9. Chat
 
 Starting in version `0.98.0`, when you run the `crewai chat` command, you start an interactive session with your crew. The AI assistant will guide you by asking for necessary inputs to execute the crew. Once all inputs are provided, the crew will execute its tasks.
@@ -179,6 +175,7 @@ def crew(self) -> Crew:
 ```
 </Note>
 
+
 ### 10. API Keys
 
 When running ```crewai create crew``` command, the CLI will first show you the top 5 most common LLM providers and ask you to select one.

docs/concepts/crews.mdx

@@ -23,14 +23,14 @@ A crew in crewAI represents a collaborative group of agents working together to
 | **Language** _(optional)_             | `language`             | Language used for the crew, defaults to English.                                                                                                                                                                                                          |
 | **Language File** _(optional)_        | `language_file`        | Path to the language file to be used for the crew.                                                                                                                                                                                                        |
 | **Memory** _(optional)_               | `memory`               | Utilized for storing execution memories (short-term, long-term, entity memory).                                                                                                                                                                           |
-| **Memory Config** _(optional)_        | `memory_config`        | Configuration for the memory provider to be used by the crew.                                                                                                                                                                                             |
-| **Cache** _(optional)_                | `cache`                | Specifies whether to use a cache for storing the results of tools' execution. Defaults to `True`.                                                                                                                                                         |
-| **Embedder** _(optional)_             | `embedder`             | Configuration for the embedder to be used by the crew. Mostly used by memory for now. Default is `{"provider": "openai"}`.                                                                                                                                |
-| **Full Output** _(optional)_          | `full_output`          | Whether the crew should return the full output with all tasks outputs or just the final output. Defaults to `False`.                                                                                                                                      |
+| **Memory Config** _(optional)_        | `memory_config`        | Configuration for the memory provider to be used by the crew.                                                                                                                                                                                          |
+| **Cache** _(optional)_                | `cache`                | Specifies whether to use a cache for storing the results of tools' execution. Defaults to `True`.                                                                                                                                                          |
+| **Embedder** _(optional)_             | `embedder`             | Configuration for the embedder to be used by the crew. Mostly used by memory for now. Default is `{"provider": "openai"}`.                                                                                                                                                                     |
+| **Full Output** _(optional)_          | `full_output`          | Whether the crew should return the full output with all tasks outputs or just the final output. Defaults to `False`.                                                                                                                                       |
 | **Step Callback** _(optional)_        | `step_callback`        | A function that is called after each step of every agent. This can be used to log the agent's actions or to perform other operations; it won't override the agent-specific `step_callback`.                                                               |
 | **Task Callback** _(optional)_        | `task_callback`        | A function that is called after the completion of each task. Useful for monitoring or additional operations post-task execution.                                                                                                                          |
 | **Share Crew** _(optional)_           | `share_crew`           | Whether you want to share the complete crew information and execution with the crewAI team to make the library better, and allow us to train models.                                                                                                      |
-| **Output Log File** _(optional)_      | `output_log_file`      | Set to True to save logs as logs.txt in the current directory or provide a file path. Logs will be in JSON format if the filename ends in .json, otherwise .txt. Defautls to `None`.                                                                      |
+| **Output Log File** _(optional)_      | `output_log_file`      | Whether you want to have a file with the complete crew output and execution. You can set it using True and it will default to the folder you are currently in and it will be called logs.txt or passing a string with the full path and name of the file. |
 | **Manager Agent** _(optional)_        | `manager_agent`        | `manager` sets a custom agent that will be used as a manager.                                                                                                                                                                                             |
 | **Prompt File** _(optional)_          | `prompt_file`          | Path to the prompt JSON file to be used for the crew.                                                                                                                                                                                                     |
 | **Planning** *(optional)*             | `planning`             | Adds planning ability to the Crew. When activated before each Crew iteration, all Crew data is sent to an AgentPlanner that will plan the tasks and this plan will be added to each task description.                                                     |
@@ -240,23 +240,6 @@ print(f"Tasks Output: {crew_output.tasks_output}")
 print(f"Token Usage: {crew_output.token_usage}")
 ```
 
-## Accessing Crew Logs
-
-You can see real time log of the crew execution, by setting `output_log_file` as a `True(Boolean)` or a `file_name(str)`. Supports logging of events as both `file_name.txt` and `file_name.json`.
-In case of `True(Boolean)` will save as `logs.txt`.
-
-In case of `output_log_file` is set as `False(Booelan)` or `None`, the logs will not be populated.
-
-```python Code
-# Save crew logs
-crew = Crew(output_log_file = True)  # Logs will be saved as logs.txt
-crew = Crew(output_log_file = file_name)  # Logs will be saved as file_name.txt
-crew = Crew(output_log_file = file_name.txt)  # Logs will be saved as file_name.txt
-crew = Crew(output_log_file = file_name.json)  # Logs will be saved as file_name.json
-```
-
-
-
 ## Memory Utilization
 
 Crews can utilize memory (short-term, long-term, and entity memory) to enhance their execution and learning over time. This feature allows crews to store and recall execution memories, aiding in decision-making and task execution strategies.
@@ -296,9 +279,9 @@ print(result)
 Once your crew is assembled, initiate the workflow with the appropriate kickoff method. CrewAI provides several methods for better control over the kickoff process: `kickoff()`, `kickoff_for_each()`, `kickoff_async()`, and `kickoff_for_each_async()`.
 
 - `kickoff()`: Starts the execution process according to the defined process flow.
-- `kickoff_for_each()`: Executes tasks sequentially for each provided input event or item in the collection.
+- `kickoff_for_each()`: Executes tasks for each agent individually.
 - `kickoff_async()`: Initiates the workflow asynchronously.
-- `kickoff_for_each_async()`: Executes tasks concurrently for each provided input event or item, leveraging asynchronous processing.
+- `kickoff_for_each_async()`: Executes tasks for each agent individually in an asynchronous manner.
 
 ```python Code
 # Start the crew's task execution

docs/concepts/event-listner.mdx

@@ -1,349 +0,0 @@
----
-title: 'Event Listeners'
-description: 'Tap into CrewAI events to build custom integrations and monitoring'
----
-
-# Event Listeners
-
-CrewAI provides a powerful event system that allows you to listen for and react to various events that occur during the execution of your Crew. This feature enables you to build custom integrations, monitoring solutions, logging systems, or any other functionality that needs to be triggered based on CrewAI's internal events.
-
-## How It Works
-
-CrewAI uses an event bus architecture to emit events throughout the execution lifecycle. The event system is built on the following components:
-
-1. **CrewAIEventsBus**: A singleton event bus that manages event registration and emission
-2. **CrewEvent**: Base class for all events in the system
-3. **BaseEventListener**: Abstract base class for creating custom event listeners
-
-When specific actions occur in CrewAI (like a Crew starting execution, an Agent completing a task, or a tool being used), the system emits corresponding events. You can register handlers for these events to execute custom code when they occur.
-
-## Creating a Custom Event Listener
-
-To create a custom event listener, you need to:
-
-1. Create a class that inherits from `BaseEventListener`
-2. Implement the `setup_listeners` method
-3. Register handlers for the events you're interested in
-4. Create an instance of your listener in the appropriate file
-
-Here's a simple example of a custom event listener class:
-
-```python
-from crewai.utilities.events import (
-    CrewKickoffStartedEvent,
-    CrewKickoffCompletedEvent,
-    AgentExecutionCompletedEvent,
-)
-from crewai.utilities.events.base_event_listener import BaseEventListener
-
-class MyCustomListener(BaseEventListener):
-    def __init__(self):
-        super().__init__()
-    
-    def setup_listeners(self, crewai_event_bus):
-        @crewai_event_bus.on(CrewKickoffStartedEvent)
-        def on_crew_started(source, event):
-            print(f"Crew '{event.crew_name}' has started execution!")
-        
-        @crewai_event_bus.on(CrewKickoffCompletedEvent)
-        def on_crew_completed(source, event):
-            print(f"Crew '{event.crew_name}' has completed execution!")
-            print(f"Output: {event.output}")
-        
-        @crewai_event_bus.on(AgentExecutionCompletedEvent)
-        def on_agent_execution_completed(source, event):
-            print(f"Agent '{event.agent.role}' completed task")
-            print(f"Output: {event.output}")
-```
-
-## Properly Registering Your Listener
-
-Simply defining your listener class isn't enough. You need to create an instance of it and ensure it's imported in your application. This ensures that:
-
-1. The event handlers are registered with the event bus
-2. The listener instance remains in memory (not garbage collected)
-3. The listener is active when events are emitted
-
-### Option 1: Import and Instantiate in Your Crew or Flow Implementation
-
-The most important thing is to create an instance of your listener in the file where your Crew or Flow is defined and executed:
-
-#### For Crew-based Applications
-
-Create and import your listener at the top of your Crew implementation file:
-
-```python
-# In your crew.py file
-from crewai import Agent, Crew, Task
-from my_listeners import MyCustomListener
-
-# Create an instance of your listener
-my_listener = MyCustomListener()
-
-class MyCustomCrew:
-    # Your crew implementation...
-    
-    def crew(self):
-        return Crew(
-            agents=[...],
-            tasks=[...],
-            # ...
-        )
-```
-
-#### For Flow-based Applications
-
-Create and import your listener at the top of your Flow implementation file:
-
-```python
-# In your main.py or flow.py file
-from crewai.flow import Flow, listen, start
-from my_listeners import MyCustomListener
-
-# Create an instance of your listener
-my_listener = MyCustomListener()
-
-class MyCustomFlow(Flow):
-    # Your flow implementation...
-    
-    @start()
-    def first_step(self):
-        # ...
-```
-
-This ensures that your listener is loaded and active when your Crew or Flow is executed.
-
-### Option 2: Create a Package for Your Listeners
-
-For a more structured approach, especially if you have multiple listeners:
-
-1. Create a package for your listeners:
-
-```
-my_project/
-  ├── listeners/
-  │   ├── __init__.py
-  │   ├── my_custom_listener.py
-  │   └── another_listener.py
-```
-
-2. In `my_custom_listener.py`, define your listener class and create an instance:
-
-```python
-# my_custom_listener.py
-from crewai.utilities.events.base_event_listener import BaseEventListener
-# ... import events ...
-
-class MyCustomListener(BaseEventListener):
-    # ... implementation ...
-
-# Create an instance of your listener
-my_custom_listener = MyCustomListener()
-```
-
-3. In `__init__.py`, import the listener instances to ensure they're loaded:
-
-```python
-# __init__.py
-from .my_custom_listener import my_custom_listener
-from .another_listener import another_listener
-
-# Optionally export them if you need to access them elsewhere
-__all__ = ['my_custom_listener', 'another_listener']
-```
-
-4. Import your listeners package in your Crew or Flow file:
-
-```python
-# In your crew.py or flow.py file
-import my_project.listeners  # This loads all your listeners
-
-class MyCustomCrew:
-    # Your crew implementation...
-```
-
-This is exactly how CrewAI's built-in `agentops_listener` is registered. In the CrewAI codebase, you'll find:
-
-```python
-# src/crewai/utilities/events/third_party/__init__.py
-from .agentops_listener import agentops_listener
-```
-
-This ensures the `agentops_listener` is loaded when the `crewai.utilities.events` package is imported.
-
-## Available Event Types
-
-CrewAI provides a wide range of events that you can listen for:
-
-### Crew Events
-
-- **CrewKickoffStartedEvent**: Emitted when a Crew starts execution
-- **CrewKickoffCompletedEvent**: Emitted when a Crew completes execution
-- **CrewKickoffFailedEvent**: Emitted when a Crew fails to complete execution
-- **CrewTestStartedEvent**: Emitted when a Crew starts testing
-- **CrewTestCompletedEvent**: Emitted when a Crew completes testing
-- **CrewTestFailedEvent**: Emitted when a Crew fails to complete testing
-- **CrewTrainStartedEvent**: Emitted when a Crew starts training
-- **CrewTrainCompletedEvent**: Emitted when a Crew completes training
-- **CrewTrainFailedEvent**: Emitted when a Crew fails to complete training
-
-### Agent Events
-
-- **AgentExecutionStartedEvent**: Emitted when an Agent starts executing a task
-- **AgentExecutionCompletedEvent**: Emitted when an Agent completes executing a task
-- **AgentExecutionErrorEvent**: Emitted when an Agent encounters an error during execution
-
-### Task Events
-
-- **TaskStartedEvent**: Emitted when a Task starts execution
-- **TaskCompletedEvent**: Emitted when a Task completes execution
-- **TaskFailedEvent**: Emitted when a Task fails to complete execution
-- **TaskEvaluationEvent**: Emitted when a Task is evaluated
-
-### Tool Usage Events
-
-- **ToolUsageStartedEvent**: Emitted when a tool execution is started
-- **ToolUsageFinishedEvent**: Emitted when a tool execution is completed
-- **ToolUsageErrorEvent**: Emitted when a tool execution encounters an error
-- **ToolValidateInputErrorEvent**: Emitted when a tool input validation encounters an error
-- **ToolExecutionErrorEvent**: Emitted when a tool execution encounters an error
-- **ToolSelectionErrorEvent**: Emitted when there's an error selecting a tool
-
-### Flow Events
-
-- **FlowCreatedEvent**: Emitted when a Flow is created
-- **FlowStartedEvent**: Emitted when a Flow starts execution
-- **FlowFinishedEvent**: Emitted when a Flow completes execution
-- **FlowPlotEvent**: Emitted when a Flow is plotted
-- **MethodExecutionStartedEvent**: Emitted when a Flow method starts execution
-- **MethodExecutionFinishedEvent**: Emitted when a Flow method completes execution
-- **MethodExecutionFailedEvent**: Emitted when a Flow method fails to complete execution
-
-### LLM Events
-
-- **LLMCallStartedEvent**: Emitted when an LLM call starts
-- **LLMCallCompletedEvent**: Emitted when an LLM call completes
-- **LLMCallFailedEvent**: Emitted when an LLM call fails
-
-## Event Handler Structure
-
-Each event handler receives two parameters:
-
-1. **source**: The object that emitted the event
-2. **event**: The event instance, containing event-specific data
-
-The structure of the event object depends on the event type, but all events inherit from `CrewEvent` and include:
-
-- **timestamp**: The time when the event was emitted
-- **type**: A string identifier for the event type
-
-Additional fields vary by event type. For example, `CrewKickoffCompletedEvent` includes `crew_name` and `output` fields.
-
-## Real-World Example: Integration with AgentOps
-
-CrewAI includes an example of a third-party integration with [AgentOps](https://github.com/AgentOps-AI/agentops), a monitoring and observability platform for AI agents. Here's how it's implemented:
-
-```python
-from typing import Optional
-
-from crewai.utilities.events import (
-    CrewKickoffCompletedEvent,
-    ToolUsageErrorEvent,
-    ToolUsageStartedEvent,
-)
-from crewai.utilities.events.base_event_listener import BaseEventListener
-from crewai.utilities.events.crew_events import CrewKickoffStartedEvent
-from crewai.utilities.events.task_events import TaskEvaluationEvent
-
-try:
-    import agentops
-    AGENTOPS_INSTALLED = True
-except ImportError:
-    AGENTOPS_INSTALLED = False
-
-class AgentOpsListener(BaseEventListener):
-    tool_event: Optional["agentops.ToolEvent"] = None
-    session: Optional["agentops.Session"] = None
-
-    def __init__(self):
-        super().__init__()
-
-    def setup_listeners(self, crewai_event_bus):
-        if not AGENTOPS_INSTALLED:
-            return
-
-        @crewai_event_bus.on(CrewKickoffStartedEvent)
-        def on_crew_kickoff_started(source, event: CrewKickoffStartedEvent):
-            self.session = agentops.init()
-            for agent in source.agents:
-                if self.session:
-                    self.session.create_agent(
-                        name=agent.role,
-                        agent_id=str(agent.id),
-                    )
-
-        @crewai_event_bus.on(CrewKickoffCompletedEvent)
-        def on_crew_kickoff_completed(source, event: CrewKickoffCompletedEvent):
-            if self.session:
-                self.session.end_session(
-                    end_state="Success",
-                    end_state_reason="Finished Execution",
-                )
-
-        @crewai_event_bus.on(ToolUsageStartedEvent)
-        def on_tool_usage_started(source, event: ToolUsageStartedEvent):
-            self.tool_event = agentops.ToolEvent(name=event.tool_name)
-            if self.session:
-                self.session.record(self.tool_event)
-
-        @crewai_event_bus.on(ToolUsageErrorEvent)
-        def on_tool_usage_error(source, event: ToolUsageErrorEvent):
-            agentops.ErrorEvent(exception=event.error, trigger_event=self.tool_event)
-```
-
-This listener initializes an AgentOps session when a Crew starts, registers agents with AgentOps, tracks tool usage, and ends the session when the Crew completes.
-
-The AgentOps listener is registered in CrewAI's event system through the import in `src/crewai/utilities/events/third_party/__init__.py`:
-
-```python
-from .agentops_listener import agentops_listener
-```
-
-This ensures the `agentops_listener` is loaded when the `crewai.utilities.events` package is imported.
-
-## Advanced Usage: Scoped Handlers
-
-For temporary event handling (useful for testing or specific operations), you can use the `scoped_handlers` context manager:
-
-```python
-from crewai.utilities.events import crewai_event_bus, CrewKickoffStartedEvent
-
-with crewai_event_bus.scoped_handlers():
-    @crewai_event_bus.on(CrewKickoffStartedEvent)
-    def temp_handler(source, event):
-        print("This handler only exists within this context")
-    
-    # Do something that emits events
-    
-# Outside the context, the temporary handler is removed
-```
-
-## Use Cases
-
-Event listeners can be used for a variety of purposes:
-
-1. **Logging and Monitoring**: Track the execution of your Crew and log important events
-2. **Analytics**: Collect data about your Crew's performance and behavior
-3. **Debugging**: Set up temporary listeners to debug specific issues
-4. **Integration**: Connect CrewAI with external systems like monitoring platforms, databases, or notification services
-5. **Custom Behavior**: Trigger custom actions based on specific events
-
-## Best Practices
-
-1. **Keep Handlers Light**: Event handlers should be lightweight and avoid blocking operations
-2. **Error Handling**: Include proper error handling in your event handlers to prevent exceptions from affecting the main execution
-3. **Cleanup**: If your listener allocates resources, ensure they're properly cleaned up
-4. **Selective Listening**: Only listen for events you actually need to handle
-5. **Testing**: Test your event listeners in isolation to ensure they behave as expected
-
-By leveraging CrewAI's event system, you can extend its functionality and integrate it seamlessly with your existing infrastructure.

docs/concepts/flows.mdx

@@ -150,12 +150,12 @@ final_output = flow.kickoff()
 
 print("---- Final Output ----")
 print(final_output)
-```
+````
 
 ```text Output
 ---- Final Output ----
 Second method received: Output from first_method
-```
+````
 
 </CodeGroup>
 
@@ -232,18 +232,18 @@ class UnstructuredExampleFlow(Flow):
     def first_method(self):
         # The state automatically includes an 'id' field
         print(f"State ID: {self.state['id']}")
-        self.state['counter'] = 0
-        self.state['message'] = "Hello from structured flow"
+        self.state.message = "Hello from structured flow"
+        self.state.counter = 0
 
     @listen(first_method)
     def second_method(self):
-        self.state['counter'] += 1
-        self.state['message'] += " - updated"
+        self.state.counter += 1
+        self.state.message += " - updated"
 
     @listen(second_method)
     def third_method(self):
-        self.state['counter'] += 1
-        self.state['message'] += " - updated again"
+        self.state.counter += 1
+        self.state.message += " - updated again"
 
         print(f"State after third_method: {self.state}")
 
@@ -738,34 +738,3 @@ Also, check out our YouTube video on how to use flows in CrewAI below!
   referrerpolicy="strict-origin-when-cross-origin"
   allowfullscreen
 ></iframe>
-
-## Running Flows
-
-There are two ways to run a flow:
-
-### Using the Flow API
-
-You can run a flow programmatically by creating an instance of your flow class and calling the `kickoff()` method:
-
-```python
-flow = ExampleFlow()
-result = flow.kickoff()
-```
-
-### Using the CLI
-
-Starting from version 0.103.0, you can run flows using the `crewai run` command:
-
-```shell
-crewai run
-```
-
-This command automatically detects if your project is a flow (based on the `type = "flow"` setting in your pyproject.toml) and runs it accordingly. This is the recommended way to run flows from the command line.
-
-For backward compatibility, you can also use:
-
-```shell
-crewai flow kickoff
-```
-
-However, the `crewai run` command is now the preferred method as it works for both crews and flows.

docs/concepts/knowledge.mdx

@@ -91,7 +91,7 @@ result = crew.kickoff(inputs={"question": "What city does John live in and how o
 ```
 
 
-Here's another example with the `CrewDoclingSource`. The CrewDoclingSource is actually quite versatile and can handle multiple file formats including MD, PDF, DOCX, HTML, and more. 
+Here's another example with the `CrewDoclingSource`. The CrewDoclingSource is actually quite versatile and can handle multiple file formats including TXT, PDF, DOCX, HTML, and more. 
 
 <Note>
   You need to install `docling` for the following example to work: `uv add docling`
@@ -152,10 +152,10 @@ Here are examples of how to use different types of knowledge sources:
 
 ### Text File Knowledge Source
 ```python
-from crewai.knowledge.source.text_file_knowledge_source import TextFileKnowledgeSource
+from crewai.knowledge.source.crew_docling_source import CrewDoclingSource
 
 # Create a text file knowledge source
-text_source = TextFileKnowledgeSource(
+text_source = CrewDoclingSource(
     file_paths=["document.txt", "another.txt"]
 )
 

docs/concepts/memory.mdx

@@ -58,107 +58,41 @@ my_crew = Crew(
 ### Example: Use Custom Memory Instances e.g FAISS as the VectorDB
 
 ```python Code
-from crewai import Crew, Process
-from crewai.memory import LongTermMemory, ShortTermMemory, EntityMemory
-from crewai.memory.storage import LTMSQLiteStorage, RAGStorage
-from typing import List, Optional
+from crewai import Crew, Agent, Task, Process
 
 # Assemble your crew with memory capabilities
-my_crew: Crew = Crew(
-    agents = [...],
-    tasks = [...],
-    process = Process.sequential,
-    memory = True,
-    # Long-term memory for persistent storage across sessions
-    long_term_memory = LongTermMemory(
+my_crew = Crew(
+    agents=[...],
+    tasks=[...],
+    process="Process.sequential",
+    memory=True,
+    long_term_memory=EnhanceLongTermMemory(
         storage=LTMSQLiteStorage(
-            db_path="/my_crew1/long_term_memory_storage.db"
+            db_path="/my_data_dir/my_crew1/long_term_memory_storage.db"
         )
     ),
-    # Short-term memory for current context using RAG
-    short_term_memory = ShortTermMemory(
-        storage = RAGStorage(
-                embedder_config={
-                    "provider": "openai",
-                    "config": {
-                        "model": 'text-embedding-3-small'
-                    }
-                },
-                type="short_term",
-                path="/my_crew1/"
-            )
+    short_term_memory=EnhanceShortTermMemory(
+        storage=CustomRAGStorage(
+            crew_name="my_crew",
+            storage_type="short_term",
+            data_dir="//my_data_dir",
+            model=embedder["model"],
+            dimension=embedder["dimension"],
         ),
     ),
-    # Entity memory for tracking key information about entities
-    entity_memory = EntityMemory(
-        storage=RAGStorage(
-            embedder_config={
-                "provider": "openai",
-                "config": {
-                    "model": 'text-embedding-3-small'
-                }
-            },
-            type="short_term",
-            path="/my_crew1/"
-        )
+    entity_memory=EnhanceEntityMemory(
+        storage=CustomRAGStorage(
+            crew_name="my_crew",
+            storage_type="entities",
+            data_dir="//my_data_dir",
+            model=embedder["model"],
+            dimension=embedder["dimension"],
+        ),
     ),
     verbose=True,
 )
 ```
 
-## Security Considerations
-
-When configuring memory storage:
-- Use environment variables for storage paths (e.g., `CREWAI_STORAGE_DIR`)
-- Never hardcode sensitive information like database credentials
-- Consider access permissions for storage directories
-- Use relative paths when possible to maintain portability
-
-Example using environment variables:
-```python
-import os
-from crewai import Crew
-from crewai.memory import LongTermMemory
-from crewai.memory.storage import LTMSQLiteStorage
-
-# Configure storage path using environment variable
-storage_path = os.getenv("CREWAI_STORAGE_DIR", "./storage")
-crew = Crew(
-    memory=True,
-    long_term_memory=LongTermMemory(
-        storage=LTMSQLiteStorage(
-            db_path="{storage_path}/memory.db".format(storage_path=storage_path)
-        )
-    )
-)
-```
-
-## Configuration Examples
-
-### Basic Memory Configuration
-```python
-from crewai import Crew
-from crewai.memory import LongTermMemory
-
-# Simple memory configuration
-crew = Crew(memory=True)  # Uses default storage locations
-```
-
-### Custom Storage Configuration
-```python
-from crewai import Crew
-from crewai.memory import LongTermMemory
-from crewai.memory.storage import LTMSQLiteStorage
-
-# Configure custom storage paths
-crew = Crew(
-    memory=True,
-    long_term_memory=LongTermMemory(
-        storage=LTMSQLiteStorage(db_path="./memory.db")
-    )
-)
-```
-
 ## Integrating Mem0 for Enhanced User Memory
 
 [Mem0](https://mem0.ai/) is a self-improving memory layer for LLM applications, enabling personalized AI experiences. 
@@ -251,12 +185,7 @@ my_crew = Crew(
     process=Process.sequential,
     memory=True,
     verbose=True,
-    embedder={
-        "provider": "openai",
-        "config": {
-            "model": 'text-embedding-3-small'
-        }
-    }
+    embedder=OpenAIEmbeddingFunction(api_key=os.getenv("OPENAI_API_KEY"), model_name="text-embedding-3-small"),
 )
 ```
 
@@ -282,19 +211,6 @@ my_crew = Crew(
 
 ### Using Google AI embeddings
 
-#### Prerequisites
-Before using Google AI embeddings, ensure you have:
-- Access to the Gemini API
-- The necessary API keys and permissions
-
-You will need to update your *pyproject.toml* dependencies:
-```YAML
-dependencies = [
-    "google-generativeai>=0.8.4", #main version in January/2025 - crewai v.0.100.0 and crewai-tools 0.33.0
-    "crewai[tools]>=0.100.0,<1.0.0"
-]
-```
-
 ```python Code
 from crewai import Crew, Agent, Task, Process
 
@@ -308,7 +224,7 @@ my_crew = Crew(
         "provider": "google",
         "config": {
             "api_key": "<YOUR_API_KEY>",
-            "model": "<model_name>"
+            "model_name": "<model_name>"
         }
     }
 )
@@ -326,15 +242,13 @@ my_crew = Crew(
     process=Process.sequential,
     memory=True,
     verbose=True,
-    embedder={
-        "provider": "openai",
-        "config": {
-            "api_key": "YOUR_API_KEY",
-            "api_base": "YOUR_API_BASE_PATH",
-            "api_version": "YOUR_API_VERSION",
-            "model_name": 'text-embedding-3-small'
-        }
-    }
+    embedder=OpenAIEmbeddingFunction(
+        api_key="YOUR_API_KEY",
+        api_base="YOUR_API_BASE_PATH",
+        api_type="azure",
+        api_version="YOUR_API_VERSION",
+        model_name="text-embedding-3-small"
+    )
 )
 ```
 
@@ -350,15 +264,12 @@ my_crew = Crew(
     process=Process.sequential,
     memory=True,
     verbose=True,
-    embedder={
-        "provider": "vertexai",
-        "config": {
-            "project_id"="YOUR_PROJECT_ID",
-            "region"="YOUR_REGION",
-            "api_key"="YOUR_API_KEY",
-            "model_name"="textembedding-gecko"
-        }
-    }
+    embedder=GoogleVertexEmbeddingFunction(
+        project_id="YOUR_PROJECT_ID",
+        region="YOUR_REGION",
+        api_key="YOUR_API_KEY",
+        model_name="textembedding-gecko"
+    )
 )
 ```
 
@@ -377,7 +288,7 @@ my_crew = Crew(
         "provider": "cohere",
         "config": {
             "api_key": "YOUR_API_KEY",
-            "model": "<model_name>"
+            "model_name": "<model_name>"
         }
     }
 )
@@ -397,7 +308,7 @@ my_crew = Crew(
         "provider": "voyageai",
         "config": {
             "api_key": "YOUR_API_KEY",
-            "model": "<model_name>"
+            "model_name": "<model_name>"
         }
     }
 )
@@ -447,66 +358,7 @@ my_crew = Crew(
 )
 ```
 
-### Using Amazon Bedrock embeddings
-
-```python Code
-# Note: Ensure you have installed `boto3` for Bedrock embeddings to work.
-
-import os
-import boto3
-from crewai import Crew, Agent, Task, Process
-
-boto3_session = boto3.Session(
-    region_name=os.environ.get("AWS_REGION_NAME"),
-    aws_access_key_id=os.environ.get("AWS_ACCESS_KEY_ID"),
-    aws_secret_access_key=os.environ.get("AWS_SECRET_ACCESS_KEY")
-)
-
-my_crew = Crew(
-    agents=[...],
-    tasks=[...],
-    process=Process.sequential,
-    memory=True,
-    embedder={
-    "provider": "bedrock",
-        "config":{
-            "session": boto3_session,
-            "model": "amazon.titan-embed-text-v2:0",
-            "vector_dimension": 1024
-        }
-    }
-    verbose=True
-)
-```
-
-### Adding Custom Embedding Function
-
-```python Code
-from crewai import Crew, Agent, Task, Process
-from chromadb import Documents, EmbeddingFunction, Embeddings
-
-# Create a custom embedding function
-class CustomEmbedder(EmbeddingFunction):
-    def __call__(self, input: Documents) -> Embeddings:
-        # generate embeddings
-        return [1, 2, 3] # this is a dummy embedding
-
-my_crew = Crew(
-    agents=[...],
-    tasks=[...],
-    process=Process.sequential,
-    memory=True,
-    verbose=True,
-    embedder={
-        "provider": "custom",
-        "config": {
-            "embedder": CustomEmbedder()
-        }
-    }
-)
-```
-
-### Resetting Memory via cli
+### Resetting Memory
 
 ```shell
 crewai reset-memories [OPTIONS]
@@ -520,46 +372,8 @@ crewai reset-memories [OPTIONS]
 | `-s`, `--short`    | Reset SHORT TERM memory.         | Flag (boolean) | False   |
 | `-e`, `--entities` | Reset ENTITIES memory.           | Flag (boolean) | False   |
 | `-k`, `--kickoff-outputs` | Reset LATEST KICKOFF TASK OUTPUTS. | Flag (boolean) | False   |
-| `-kn`, `--knowledge` | Reset KNOWLEDEGE storage | Flag (boolean) | False   |
 | `-a`, `--all`      | Reset ALL memories.              | Flag (boolean) | False   |
 
-Note: To use the cli command you need to have your crew in a file called crew.py in the same directory.
-
-
-
-
-### Resetting Memory via crew object
-
-```python
-
-my_crew = Crew(
-    agents=[...],
-    tasks=[...],
-    process=Process.sequential,
-    memory=True,
-    verbose=True,
-    embedder={
-        "provider": "custom",
-        "config": {
-            "embedder": CustomEmbedder()
-        }
-    }
-)
-
-my_crew.reset_memories(command_type = 'all') # Resets all the memory
-```
-
-#### Resetting Memory Options
-
-| Command Type       | Description                      |
-| :----------------- | :------------------------------- |
-| `long`             | Reset LONG TERM memory.          | 
-| `short`            | Reset SHORT TERM memory.         | 
-| `entities`         | Reset ENTITIES memory.           | 
-| `kickoff_outputs`  | Reset LATEST KICKOFF TASK OUTPUTS. |
-| `knowledge`        | Reset KNOWLEDGE memory.          |
-| `all`              | Reset ALL memories.              |
-
 
 ## Benefits of Using CrewAI's Memory System
 

docs/concepts/planning.mdx

@@ -81,8 +81,8 @@ my_crew.kickoff()
 
 3. **Collect Data:**
 
-   - Search for the latest papers, articles, and reports published in 2024 and early 2025.
-   - Use keywords like "Large Language Models 2025", "AI LLM advancements", "AI ethics 2025", etc.
+   - Search for the latest papers, articles, and reports published in 2023 and early 2024.
+   - Use keywords like "Large Language Models 2024", "AI LLM advancements", "AI ethics 2024", etc.
 
 4. **Analyze Findings:**
 

docs/concepts/tasks.mdx

@@ -69,7 +69,7 @@ research_task:
   description: >
     Conduct a thorough research about {topic}
     Make sure you find any interesting and relevant information given
-    the current year is 2025.
+    the current year is 2024.
   expected_output: >
     A list with 10 bullet points of the most relevant information about {topic}
   agent: researcher
@@ -155,7 +155,7 @@ research_task = Task(
     description="""
         Conduct a thorough research about AI Agents.
         Make sure you find any interesting and relevant information given
-        the current year is 2025.
+        the current year is 2024.
     """,
     expected_output="""
         A list with 10 bullet points of the most relevant information about AI Agents
@@ -268,7 +268,7 @@ analysis_task = Task(
 
 Task guardrails provide a way to validate and transform task outputs before they
 are passed to the next task. This feature helps ensure data quality and provides
-feedback to agents when their output doesn't meet specific criteria.
+efeedback to agents when their output doesn't meet specific criteria.
 
 ### Using Task Guardrails
 

docs/how-to/hierarchical-process.mdx

@@ -48,6 +48,7 @@ Define a crew with a designated manager and establish a clear chain of command.
 </Tip>
 
 ```python Code
+from langchain_openai import ChatOpenAI
 from crewai import Crew, Process, Agent
 
 # Agents are defined with attributes for backstory, cache, and verbose mode
@@ -55,51 +56,38 @@ researcher = Agent(
     role='Researcher',
     goal='Conduct in-depth analysis',
     backstory='Experienced data analyst with a knack for uncovering hidden trends.',
+    cache=True,
+    verbose=False,
+    # tools=[]  # This can be optionally specified; defaults to an empty list
+    use_system_prompt=True,  # Enable or disable system prompts for this agent
+    max_rpm=30,  # Limit on the number of requests per minute
+    max_iter=5  # Maximum number of iterations for a final answer
 )
 writer = Agent(
     role='Writer',
     goal='Create engaging content',
     backstory='Creative writer passionate about storytelling in technical domains.',
+    cache=True,
+    verbose=False,
+    # tools=[]  # Optionally specify tools; defaults to an empty list
+    use_system_prompt=True,  # Enable or disable system prompts for this agent
+    max_rpm=30,  # Limit on the number of requests per minute
+    max_iter=5  # Maximum number of iterations for a final answer
 )
 
 # Establishing the crew with a hierarchical process and additional configurations
 project_crew = Crew(
     tasks=[...],  # Tasks to be delegated and executed under the manager's supervision
     agents=[researcher, writer],
-    manager_llm="gpt-4o",  # Specify which LLM the manager should use
-    process=Process.hierarchical,  
-    planning=True, 
+    manager_llm=ChatOpenAI(temperature=0, model="gpt-4"),  # Mandatory if manager_agent is not set
+    process=Process.hierarchical,  # Specifies the hierarchical management approach
+    respect_context_window=True,  # Enable respect of the context window for tasks
+    memory=True,  # Enable memory usage for enhanced task execution
+    manager_agent=None,  # Optional: explicitly set a specific agent as manager instead of the manager_llm
+    planning=True,  # Enable planning feature for pre-execution strategy
 )
 ```
 
-### Using a Custom Manager Agent
-
-Alternatively, you can create a custom manager agent with specific attributes tailored to your project's management needs. This gives you more control over the manager's behavior and capabilities.
-
-```python
-# Define a custom manager agent
-manager = Agent(
-    role="Project Manager",
-    goal="Efficiently manage the crew and ensure high-quality task completion",
-    backstory="You're an experienced project manager, skilled in overseeing complex projects and guiding teams to success.",
-    allow_delegation=True,
-)
-
-# Use the custom manager in your crew
-project_crew = Crew(
-    tasks=[...],
-    agents=[researcher, writer],
-    manager_agent=manager,  # Use your custom manager agent
-    process=Process.hierarchical,
-    planning=True,
-)
-```
-
-<Tip>
-    For more details on creating and customizing a manager agent, check out the [Custom Manager Agent documentation](https://docs.crewai.com/how-to/custom-manager-agent#custom-manager-agent).
-</Tip>
-
-
 ### Workflow in Action
 
 1. **Task Assignment**: The manager assigns tasks strategically, considering each agent's capabilities and available tools.
@@ -109,4 +97,4 @@ project_crew = Crew(
 ## Conclusion
 
 Adopting the hierarchical process in CrewAI, with the correct configurations and understanding of the system's capabilities, facilitates an organized and efficient approach to project management. 
-Utilize the advanced features and customizations to tailor the workflow to your specific needs, ensuring optimal task execution and project success.
+Utilize the advanced features and customizations to tailor the workflow to your specific needs, ensuring optimal task execution and project success.

docs/how-to/human-input-on-execution.mdx

@@ -60,12 +60,12 @@ writer = Agent(
 # Create tasks for your agents
 task1 = Task(
     description=(
-        "Conduct a comprehensive analysis of the latest advancements in AI in 2025. "
+        "Conduct a comprehensive analysis of the latest advancements in AI in 2024. "
         "Identify key trends, breakthrough technologies, and potential industry impacts. "
         "Compile your findings in a detailed report. "
         "Make sure to check with a human if the draft is good before finalizing your answer."
     ),
-    expected_output='A comprehensive full report on the latest AI advancements in 2025, leave nothing out',
+    expected_output='A comprehensive full report on the latest AI advancements in 2024, leave nothing out',
     agent=researcher,
     human_input=True
 )
@@ -76,7 +76,7 @@ task2 = Task(
         "Your post should be informative yet accessible, catering to a tech-savvy audience. "
         "Aim for a narrative that captures the essence of these breakthroughs and their implications for the future."
     ),
-    expected_output='A compelling 3 paragraphs blog post formatted as markdown about the latest AI advancements in 2025',
+    expected_output='A compelling 3 paragraphs blog post formatted as markdown about the latest AI advancements in 2024',
     agent=writer,
     human_input=True
 )

docs/how-to/kickoff-async.mdx

@@ -54,8 +54,7 @@ coding_agent = Agent(
 # Create a task that requires code execution
 data_analysis_task = Task(
     description="Analyze the given dataset and calculate the average age of participants. Ages: {ages}",
-    agent=coding_agent,
-    expected_output="The average age of the participants."
+    agent=coding_agent
 )
 
 # Create a crew and add the task
@@ -117,4 +116,4 @@ async def async_multiple_crews():
 
 # Run the async function
 asyncio.run(async_multiple_crews())
-```
+```

docs/how-to/langfuse-observability.mdx

@@ -1,100 +0,0 @@
----
-title: Agent Monitoring with Langfuse
-description: Learn how to integrate Langfuse with CrewAI via OpenTelemetry using OpenLit
-icon: magnifying-glass-chart
----
-
-# Integrate Langfuse with CrewAI
-
-This notebook demonstrates how to integrate **Langfuse** with **CrewAI** using OpenTelemetry via the **OpenLit** SDK. By the end of this notebook, you will be able to trace your CrewAI applications with Langfuse for improved observability and debugging.
-
-> **What is Langfuse?** [Langfuse](https://langfuse.com) is an open-source LLM engineering platform. It provides tracing and monitoring capabilities for LLM applications, helping developers debug, analyze, and optimize their AI systems. Langfuse integrates with various tools and frameworks via native integrations, OpenTelemetry, and APIs/SDKs.
-
-[![Langfuse Overview Video](https://github.com/user-attachments/assets/3926b288-ff61-4b95-8aa1-45d041c70866)](https://langfuse.com/watch-demo)
-
-## Get Started
-
-We'll walk through a simple example of using CrewAI and integrating it with Langfuse via OpenTelemetry using OpenLit.
-
-### Step 1: Install Dependencies
-
-
-```python
-%pip install langfuse openlit crewai crewai_tools
-```
-
-### Step 2: Set Up Environment Variables
-
-Set your Langfuse API keys and configure OpenTelemetry export settings to send traces to Langfuse. Please refer to the [Langfuse OpenTelemetry Docs](https://langfuse.com/docs/opentelemetry/get-started) for more information on the Langfuse OpenTelemetry endpoint `/api/public/otel` and authentication.
-
-
-```python
-import os
-import base64
-
-LANGFUSE_PUBLIC_KEY="pk-lf-..."
-LANGFUSE_SECRET_KEY="sk-lf-..."
-LANGFUSE_AUTH=base64.b64encode(f"{LANGFUSE_PUBLIC_KEY}:{LANGFUSE_SECRET_KEY}".encode()).decode()
-
-os.environ["OTEL_EXPORTER_OTLP_ENDPOINT"] = "https://cloud.langfuse.com/api/public/otel" # EU data region
-# os.environ["OTEL_EXPORTER_OTLP_ENDPOINT"] = "https://us.cloud.langfuse.com/api/public/otel" # US data region
-os.environ["OTEL_EXPORTER_OTLP_HEADERS"] = f"Authorization=Basic {LANGFUSE_AUTH}"
-
-# your openai key
-os.environ["OPENAI_API_KEY"] = "sk-..."
-```
-
-### Step 3: Initialize OpenLit
-
-Initialize the OpenLit OpenTelemetry instrumentation SDK to start capturing OpenTelemetry traces.
-
-
-```python
-import openlit
-
-openlit.init()
-```
-
-### Step 4: Create a Simple CrewAI Application
-
-We'll create a simple CrewAI application where multiple agents collaborate to answer a user's question.
-
-
-```python
-from crewai import Agent, Task, Crew
-
-from crewai_tools import (
-    WebsiteSearchTool
-)
-
-web_rag_tool = WebsiteSearchTool()
-
-writer = Agent(
-        role="Writer",
-        goal="You make math engaging and understandable for young children through poetry",
-        backstory="You're an expert in writing haikus but you know nothing of math.",
-        tools=[web_rag_tool],  
-    )
-
-task = Task(description=("What is {multiplication}?"),
-            expected_output=("Compose a haiku that includes the answer."),
-            agent=writer)
-
-crew = Crew(
-  agents=[writer],
-  tasks=[task],
-  share_crew=False
-)
-```
-
-### Step 5: See Traces in Langfuse
-
-After running the agent, you can view the traces generated by your CrewAI application in [Langfuse](https://cloud.langfuse.com). You should see detailed steps of the LLM interactions, which can help you debug and optimize your AI agent.
-
-![CrewAI example trace in Langfuse](https://langfuse.com/images/cookbook/integration_crewai/crewai-example-trace.png)
-
-_[Public example trace in Langfuse](https://cloud.langfuse.com/project/cloramnkj0002jz088vzn1ja4/traces/e2cf380ffc8d47d28da98f136140642b?timestamp=2025-02-05T15%3A12%3A02.717Z&observation=3b32338ee6a5d9af)_
-
-## References
-
-- [Langfuse OpenTelemetry Docs](https://langfuse.com/docs/opentelemetry/get-started)

docs/how-to/mlflow-observability.mdx

@@ -1,206 +0,0 @@
----
-title: Agent Monitoring with MLflow
-description: Quickly start monitoring your Agents with MLflow.
-icon: bars-staggered
----
-
-# MLflow Overview
-
-[MLflow](https://mlflow.org/) is an open-source platform to assist machine learning practitioners and teams in handling the complexities of the machine learning process.
-
-It provides a tracing feature that enhances LLM observability in your Generative AI applications by capturing detailed information about the execution of your application’s services. 
-Tracing provides a way to record the inputs, outputs, and metadata associated with each intermediate step of a request, enabling you to easily pinpoint the source of bugs and unexpected behaviors.
-
-![Overview of MLflow crewAI tracing usage](/images/mlflow-tracing.gif)
-
-### Features
-
-- **Tracing Dashboard**: Monitor activities of your crewAI agents with detailed dashboards that include inputs, outputs and metadata of spans.
-- **Automated Tracing**: A fully automated integration with crewAI, which can be enabled by running `mlflow.crewai.autolog()`. 
-- **Manual Trace Instrumentation with minor efforts**: Customize trace instrumentation through MLflow's high-level fluent APIs such as decorators, function wrappers and context managers.
-- **OpenTelemetry Compatibility**: MLflow Tracing supports exporting traces to an OpenTelemetry Collector, which can then be used to export traces to various backends such as Jaeger, Zipkin, and AWS X-Ray.
-- **Package and Deploy Agents**: Package and deploy your crewAI agents to an inference server with a variety of deployment targets.
-- **Securely Host LLMs**: Host multiple LLM from various providers in one unified endpoint through MFflow gateway.
-- **Evaluation**: Evaluate your crewAI agents with a wide range of metrics using a convenient API `mlflow.evaluate()`.
-
-## Setup Instructions
-
-<Steps>
-    <Step title="Install MLflow package">
-      ```shell
-      # The crewAI integration is available in mlflow>=2.19.0
-      pip install mlflow
-      ```
-    </Step>
-    <Step title="Start MFflow tracking server">
-      ```shell
-      # This process is optional, but it is recommended to use MLflow tracking server for better visualization and broader features.
-      mlflow server
-      ```
-    </Step>
-    <Step title="Initialize MLflow in Your Application">
-      Add the following two lines to your application code:
-
-      ```python
-      import mlflow
-
-      mlflow.crewai.autolog()
-
-      # Optional: Set a tracking URI and an experiment name if you have a tracking server
-      mlflow.set_tracking_uri("http://localhost:5000")
-      mlflow.set_experiment("CrewAI")
-      ```
-      
-      Example Usage for tracing CrewAI Agents:
-
-      ```python
-      from crewai import Agent, Crew, Task
-      from crewai.knowledge.source.string_knowledge_source import StringKnowledgeSource
-      from crewai_tools import SerperDevTool, WebsiteSearchTool
-
-      from textwrap import dedent
-
-      content = "Users name is John. He is 30 years old and lives in San Francisco."
-      string_source = StringKnowledgeSource(
-          content=content, metadata={"preference": "personal"}
-      )
-
-      search_tool = WebsiteSearchTool()
-
-
-      class TripAgents:
-          def city_selection_agent(self):
-              return Agent(
-                  role="City Selection Expert",
-                  goal="Select the best city based on weather, season, and prices",
-                  backstory="An expert in analyzing travel data to pick ideal destinations",
-                  tools=[
-                      search_tool,
-                  ],
-                  verbose=True,
-              )
-
-          def local_expert(self):
-              return Agent(
-                  role="Local Expert at this city",
-                  goal="Provide the BEST insights about the selected city",
-                  backstory="""A knowledgeable local guide with extensive information
-              about the city, it's attractions and customs""",
-                  tools=[search_tool],
-                  verbose=True,
-              )
-
-
-      class TripTasks:
-          def identify_task(self, agent, origin, cities, interests, range):
-              return Task(
-                  description=dedent(
-                      f"""
-                      Analyze and select the best city for the trip based
-                      on specific criteria such as weather patterns, seasonal
-                      events, and travel costs. This task involves comparing
-                      multiple cities, considering factors like current weather
-                      conditions, upcoming cultural or seasonal events, and
-                      overall travel expenses.
-                      Your final answer must be a detailed
-                      report on the chosen city, and everything you found out
-                      about it, including the actual flight costs, weather
-                      forecast and attractions.
-
-                      Traveling from: {origin}
-                      City Options: {cities}
-                      Trip Date: {range}
-                      Traveler Interests: {interests}
-                  """
-                  ),
-                  agent=agent,
-                  expected_output="Detailed report on the chosen city including flight costs, weather forecast, and attractions",
-              )
-
-          def gather_task(self, agent, origin, interests, range):
-              return Task(
-                  description=dedent(
-                      f"""
-                      As a local expert on this city you must compile an
-                      in-depth guide for someone traveling there and wanting
-                      to have THE BEST trip ever!
-                      Gather information about key attractions, local customs,
-                      special events, and daily activity recommendations.
-                      Find the best spots to go to, the kind of place only a
-                      local would know.
-                      This guide should provide a thorough overview of what
-                      the city has to offer, including hidden gems, cultural
-                      hotspots, must-visit landmarks, weather forecasts, and
-                      high level costs.
-                      The final answer must be a comprehensive city guide,
-                      rich in cultural insights and practical tips,
-                      tailored to enhance the travel experience.
-
-                      Trip Date: {range}
-                      Traveling from: {origin}
-                      Traveler Interests: {interests}
-                  """
-                  ),
-                  agent=agent,
-                  expected_output="Comprehensive city guide including hidden gems, cultural hotspots, and practical travel tips",
-              )
-
-
-      class TripCrew:
-          def __init__(self, origin, cities, date_range, interests):
-              self.cities = cities
-              self.origin = origin
-              self.interests = interests
-              self.date_range = date_range
-
-          def run(self):
-              agents = TripAgents()
-              tasks = TripTasks()
-
-              city_selector_agent = agents.city_selection_agent()
-              local_expert_agent = agents.local_expert()
-
-              identify_task = tasks.identify_task(
-                  city_selector_agent,
-                  self.origin,
-                  self.cities,
-                  self.interests,
-                  self.date_range,
-              )
-              gather_task = tasks.gather_task(
-                  local_expert_agent, self.origin, self.interests, self.date_range
-              )
-
-              crew = Crew(
-                  agents=[city_selector_agent, local_expert_agent],
-                  tasks=[identify_task, gather_task],
-                  verbose=True,
-                  memory=True,
-                  knowledge={
-                      "sources": [string_source],
-                      "metadata": {"preference": "personal"},
-                  },
-              )
-
-              result = crew.kickoff()
-              return result
-
-
-      trip_crew = TripCrew("California", "Tokyo", "Dec 12 - Dec 20", "sports")
-      result = trip_crew.run()
-
-      print(result)
-      ```
-      Refer to [MLflow Tracing Documentation](https://mlflow.org/docs/latest/llms/tracing/index.html) for more configurations and use cases.
-    </Step>
-    <Step title="Visualize Activities of Agents">
-      Now traces for your crewAI agents are captured by MLflow. 
-      Let's visit MLflow tracking server to view the traces and get insights into your Agents.
-
-      Open `127.0.0.1:5000` on your browser to visit MLflow tracking server. 
-      <Frame caption="MLflow Tracing Dashboard">
-        <img src="/images/mlflow1.png" alt="MLflow tracing example with crewai" />
-      </Frame>
-    </Step>
-</Steps> 
-

docs/how-to/multimodal-agents.mdx

@@ -45,7 +45,6 @@ image_analyst = Agent(
 # Create a task for image analysis
 task = Task(
     description="Analyze the product image at https://example.com/product.jpg and provide a detailed description",
-    expected_output="A detailed description of the product image",
     agent=image_analyst
 )
 
@@ -82,7 +81,6 @@ inspection_task = Task(
     3. Compliance with standards
     Provide a detailed report highlighting any issues found.
     """,
-    expected_output="A detailed report highlighting any issues found",
     agent=expert_analyst
 )
 

docs/how-to/portkey-observability-and-guardrails.mdx

@@ -0,0 +1,211 @@
+# Portkey Integration with CrewAI
+<img src="https://raw.githubusercontent.com/siddharthsambharia-portkey/Portkey-Product-Images/main/Portkey-CrewAI.png" alt="Portkey CrewAI Header Image" width="70%" />
+
+
+[Portkey](https://portkey.ai/?utm_source=crewai&utm_medium=crewai&utm_campaign=crewai) is a 2-line upgrade to make your CrewAI agents reliable, cost-efficient, and fast.
+
+Portkey adds 4 core production capabilities to any CrewAI agent:
+1. Routing to **200+ LLMs**
+2. Making each LLM call more robust
+3. Full-stack tracing & cost, performance analytics
+4. Real-time guardrails to enforce behavior
+
+
+
+
+
+## Getting Started
+
+1. **Install Required Packages:**
+
+```bash
+pip install -qU crewai portkey-ai
+```
+
+2. **Configure the LLM Client:**
+
+To build CrewAI Agents with Portkey, you'll need two keys:
+- **Portkey API Key**: Sign up on the [Portkey app](https://app.portkey.ai/?utm_source=crewai&utm_medium=crewai&utm_campaign=crewai) and copy your API key
+- **Virtual Key**: Virtual Keys securely manage your LLM API keys in one place. Store your LLM provider API keys securely in Portkey's vault
+
+```python
+from crewai import LLM
+from portkey_ai import createHeaders, PORTKEY_GATEWAY_URL
+
+gpt_llm = LLM(
+    model="gpt-4",
+    base_url=PORTKEY_GATEWAY_URL,
+    api_key="dummy", # We are using Virtual key
+    extra_headers=createHeaders(
+        api_key="YOUR_PORTKEY_API_KEY",
+        virtual_key="YOUR_VIRTUAL_KEY", # Enter your Virtual key from Portkey
+    )
+)
+```
+
+3. **Create and Run Your First Agent:**
+
+```python
+from crewai import Agent, Task, Crew
+
+# Define your agents with roles and goals
+coder = Agent(
+    role='Software developer',
+    goal='Write clear, concise code on demand',
+    backstory='An expert coder with a keen eye for software trends.',
+    llm=gpt_llm
+)
+
+# Create tasks for your agents
+task1 = Task(
+    description="Define the HTML for making a simple website with heading- Hello World! Portkey is working!",
+    expected_output="A clear and concise HTML code",
+    agent=coder
+)
+
+# Instantiate your crew
+crew = Crew(
+    agents=[coder],
+    tasks=[task1],
+)
+
+result = crew.kickoff()
+print(result)
+```
+
+
+## Key Features
+
+| Feature | Description |
+|---------|-------------|
+| 🌐 Multi-LLM Support | Access OpenAI, Anthropic, Gemini, Azure, and 250+ providers through a unified interface |
+| 🛡️ Production Reliability | Implement retries, timeouts, load balancing, and fallbacks |
+| 📊 Advanced Observability | Track 40+ metrics including costs, tokens, latency, and custom metadata |
+| 🔍 Comprehensive Logging | Debug with detailed execution traces and function call logs |
+| 🚧 Security Controls | Set budget limits and implement role-based access control |
+| 🔄 Performance Analytics | Capture and analyze feedback for continuous improvement |
+| 💾 Intelligent Caching | Reduce costs and latency with semantic or simple caching |
+
+
+## Production Features with Portkey Configs
+
+All features mentioned below are through Portkey's Config system. Portkey's Config system allows you to define routing strategies using simple JSON objects in your LLM API calls. You can create and manage Configs directly in your code or through the Portkey Dashboard. Each Config has a unique ID for easy reference.
+
+<Frame>
+    <img src="https://raw.githubusercontent.com/Portkey-AI/docs-core/refs/heads/main/images/libraries/libraries-3.avif"/>
+</Frame>
+
+
+### 1. Use 250+ LLMs
+Access various LLMs like Anthropic, Gemini, Mistral, Azure OpenAI, and more with minimal code changes. Switch between providers or use them together seamlessly. [Learn more about Universal API](https://portkey.ai/docs/product/ai-gateway/universal-api)
+
+
+Easily switch between different LLM providers:
+
+```python
+# Anthropic Configuration
+anthropic_llm = LLM(
+    model="claude-3-5-sonnet-latest",
+    base_url=PORTKEY_GATEWAY_URL,
+    api_key="dummy",
+    extra_headers=createHeaders(
+        api_key="YOUR_PORTKEY_API_KEY",
+        virtual_key="YOUR_ANTHROPIC_VIRTUAL_KEY", #You don't need provider when using Virtual keys
+        trace_id="anthropic_agent"
+    )
+)
+
+# Azure OpenAI Configuration
+azure_llm = LLM(
+    model="gpt-4",
+    base_url=PORTKEY_GATEWAY_URL,
+    api_key="dummy",
+    extra_headers=createHeaders(
+        api_key="YOUR_PORTKEY_API_KEY",
+        virtual_key="YOUR_AZURE_VIRTUAL_KEY", #You don't need provider when using Virtual keys
+        trace_id="azure_agent"
+    )
+)
+```
+
+
+### 2. Caching
+Improve response times and reduce costs with two powerful caching modes:
+- **Simple Cache**: Perfect for exact matches
+- **Semantic Cache**: Matches responses for requests that are semantically similar
+[Learn more about Caching](https://portkey.ai/docs/product/ai-gateway/cache-simple-and-semantic)
+
+```py
+config = {
+    "cache": {
+        "mode": "semantic",  # or "simple" for exact matching
+    }
+}
+```
+
+### 3. Production Reliability
+Portkey provides comprehensive reliability features:
+- **Automatic Retries**: Handle temporary failures gracefully
+- **Request Timeouts**: Prevent hanging operations
+- **Conditional Routing**: Route requests based on specific conditions
+- **Fallbacks**: Set up automatic provider failovers
+- **Load Balancing**: Distribute requests efficiently
+
+[Learn more about Reliability Features](https://portkey.ai/docs/product/ai-gateway/)
+
+
+
+### 4. Metrics
+
+Agent runs are complex. Portkey automatically logs **40+ comprehensive metrics** for your AI agents, including cost, tokens used, latency, etc. Whether you need a broad overview or granular insights into your agent runs, Portkey's customizable filters provide the metrics you need.
+
+
+- Cost per agent interaction
+- Response times and latency
+- Token usage and efficiency
+- Success/failure rates
+- Cache hit rates
+
+<img src="https://github.com/siddharthsambharia-portkey/Portkey-Product-Images/blob/main/Portkey-Dashboard.png?raw=true" width="70%" alt="Portkey Dashboard" />
+
+### 5. Detailed Logging
+Logs are essential for understanding agent behavior, diagnosing issues, and improving performance. They provide a detailed record of agent activities and tool use, which is crucial for debugging and optimizing processes.
+
+
+Access a dedicated section to view records of agent executions, including parameters, outcomes, function calls, and errors. Filter logs based on multiple parameters such as trace ID, model, tokens used, and metadata.
+
+<details>
+  <summary><b>Traces</b></summary>
+  <img src="https://raw.githubusercontent.com/siddharthsambharia-portkey/Portkey-Product-Images/main/Portkey-Traces.png" alt="Portkey Traces" width="70%" />
+</details>
+
+<details>
+  <summary><b>Logs</b></summary>
+  <img src="https://raw.githubusercontent.com/siddharthsambharia-portkey/Portkey-Product-Images/main/Portkey-Logs.png" alt="Portkey Logs" width="70%" />
+</details>
+
+### 6. Enterprise Security Features
+- Set budget limit and rate limts per Virtual Key (disposable API keys)
+- Implement role-based access control
+- Track system changes with audit logs
+- Configure data retention policies
+
+
+
+For detailed information on creating and managing Configs, visit the [Portkey documentation](https://docs.portkey.ai/product/ai-gateway/configs).
+
+## Resources
+
+- [📘 Portkey Documentation](https://docs.portkey.ai)
+- [📊 Portkey Dashboard](https://app.portkey.ai/?utm_source=crewai&utm_medium=crewai&utm_campaign=crewai)
+- [🐦 Twitter](https://twitter.com/portkeyai)
+- [💬 Discord Community](https://discord.gg/DD7vgKK299)
+
+
+
+
+
+
+
+
+

docs/how-to/portkey-observability.mdx

@@ -1,5 +1,5 @@
 ---
-title: Agent Monitoring with Portkey
+title: Portkey Observability and Guardrails
 description: How to use Portkey with CrewAI
 icon: key
 ---

docs/mint.json

@@ -101,10 +101,8 @@
         "how-to/conditional-tasks",
         "how-to/agentops-observability",
         "how-to/langtrace-observability",
-        "how-to/mlflow-observability",
         "how-to/openlit-observability",
-        "how-to/portkey-observability",
-        "how-to/langfuse-observability"
+        "how-to/portkey-observability"
       ]
     },
     {
@@ -139,7 +137,6 @@
         "tools/nl2sqltool",
         "tools/pdfsearchtool",
         "tools/pgsearchtool",
-        "tools/qdrantvectorsearchtool",
         "tools/scrapewebsitetool",
         "tools/seleniumscrapingtool",
         "tools/spidertool",

docs/quickstart.mdx

@@ -58,7 +58,7 @@ Follow the steps below to get crewing! 🚣‍♂️
       description: >
         Conduct a thorough research about {topic}
         Make sure you find any interesting and relevant information given
-        the current year is 2025.
+        the current year is 2024.
       expected_output: >
         A list with 10 bullet points of the most relevant information about {topic}
       agent: researcher
@@ -195,10 +195,10 @@ Follow the steps below to get crewing! 🚣‍♂️
 
   <CodeGroup>
     ```markdown output/report.md
-    # Comprehensive Report on the Rise and Impact of AI Agents in 2025
+    # Comprehensive Report on the Rise and Impact of AI Agents in 2024
 
     ## 1. Introduction to AI Agents
-    In 2025, Artificial Intelligence (AI) agents are at the forefront of innovation across various industries. As intelligent systems that can perform tasks typically requiring human cognition, AI agents are paving the way for significant advancements in operational efficiency, decision-making, and overall productivity within sectors like Human Resources (HR) and Finance. This report aims to detail the rise of AI agents, their frameworks, applications, and potential implications on the workforce.
+    In 2024, Artificial Intelligence (AI) agents are at the forefront of innovation across various industries. As intelligent systems that can perform tasks typically requiring human cognition, AI agents are paving the way for significant advancements in operational efficiency, decision-making, and overall productivity within sectors like Human Resources (HR) and Finance. This report aims to detail the rise of AI agents, their frameworks, applications, and potential implications on the workforce.
 
     ## 2. Benefits of AI Agents
     AI agents bring numerous advantages that are transforming traditional work environments. Key benefits include:
@@ -252,7 +252,7 @@ Follow the steps below to get crewing! 🚣‍♂️
     To stay competitive and harness the full potential of AI agents, organizations must remain vigilant about latest developments in AI technology and consider continuous learning and adaptation in their strategic planning.
 
     ## 8. Conclusion
-    The emergence of AI agents is undeniably reshaping the workplace landscape in 5. With their ability to automate tasks, enhance efficiency, and improve decision-making, AI agents are critical in driving operational success. Organizations must embrace and adapt to AI developments to thrive in an increasingly digital business environment.
+    The emergence of AI agents is undeniably reshaping the workplace landscape in 2024. With their ability to automate tasks, enhance efficiency, and improve decision-making, AI agents are critical in driving operational success. Organizations must embrace and adapt to AI developments to thrive in an increasingly digital business environment.
     ```
   </CodeGroup>
   </Step>

docs/tools/filewritetool.mdx

@@ -8,9 +8,9 @@ icon: file-pen
 
 ## Description
 
-The `FileWriterTool` is a component of the crewai_tools package, designed to simplify the process of writing content to files with cross-platform compatibility (Windows, Linux, macOS). 
+The `FileWriterTool` is a component of the crewai_tools package, designed to simplify the process of writing content to files. 
 It is particularly useful in scenarios such as generating reports, saving logs, creating configuration files, and more. 
-This tool handles path differences across operating systems, supports UTF-8 encoding, and automatically creates directories if they don't exist, making it easier to organize your output reliably across different platforms.
+This tool supports creating new directories if they don't exist, making it easier to organize your output.
 
 ## Installation
 
@@ -43,8 +43,6 @@ print(result)
 
 ## Conclusion
 
-By integrating the `FileWriterTool` into your crews, the agents can reliably write content to files across different operating systems. 
-This tool is essential for tasks that require saving output data, creating structured file systems, and handling cross-platform file operations. 
-It's particularly recommended for Windows users who may encounter file writing issues with standard Python file operations.
-
-By adhering to the setup and usage guidelines provided, incorporating this tool into projects is straightforward and ensures consistent file writing behavior across all platforms.
+By integrating the `FileWriterTool` into your crews, the agents can execute the process of writing content to files and creating directories. 
+This tool is essential for tasks that require saving output data, creating structured file systems, and more. By adhering to the setup and usage guidelines provided, 
+incorporating this tool into projects is straightforward and efficient.

docs/tools/qdrantvectorsearchtool.mdx

@@ -1,271 +0,0 @@
----
-title: 'Qdrant Vector Search Tool'
-description: 'Semantic search capabilities for CrewAI agents using Qdrant vector database'
-icon: magnifying-glass-plus
----
-
-# `QdrantVectorSearchTool`
-
-The Qdrant Vector Search Tool enables semantic search capabilities in your CrewAI agents by leveraging [Qdrant](https://qdrant.tech/), a vector similarity search engine. This tool allows your agents to search through documents stored in a Qdrant collection using semantic similarity.
-
-## Installation
-
-Install the required packages:
-
-```bash
-uv pip install 'crewai[tools] qdrant-client'
-```
-
-## Basic Usage
-
-Here's a minimal example of how to use the tool:
-
-```python
-from crewai import Agent
-from crewai_tools import QdrantVectorSearchTool
-
-# Initialize the tool
-qdrant_tool = QdrantVectorSearchTool(
-    qdrant_url="your_qdrant_url",
-    qdrant_api_key="your_qdrant_api_key",
-    collection_name="your_collection"
-)
-
-# Create an agent that uses the tool
-agent = Agent(
-    role="Research Assistant",
-    goal="Find relevant information in documents",
-    tools=[qdrant_tool]
-)
-
-# The tool will automatically use OpenAI embeddings
-# and return the 3 most relevant results with scores > 0.35
-```
-
-## Complete Working Example
-
-Here's a complete example showing how to:
-1. Extract text from a PDF
-2. Generate embeddings using OpenAI
-3. Store in Qdrant
-4. Create a CrewAI agentic RAG workflow for semantic search
-
-```python
-import os
-import uuid
-import pdfplumber
-from openai import OpenAI
-from dotenv import load_dotenv
-from crewai import Agent, Task, Crew, Process, LLM
-from crewai_tools import QdrantVectorSearchTool
-from qdrant_client import QdrantClient
-from qdrant_client.models import PointStruct, Distance, VectorParams
-
-# Load environment variables
-load_dotenv()
-
-# Initialize OpenAI client
-client = OpenAI(api_key=os.getenv("OPENAI_API_KEY"))
-
-# Extract text from PDF
-def extract_text_from_pdf(pdf_path):
-    text = []
-    with pdfplumber.open(pdf_path) as pdf:
-        for page in pdf.pages:
-            page_text = page.extract_text()
-            if page_text:
-                text.append(page_text.strip())
-    return text
-
-# Generate OpenAI embeddings
-def get_openai_embedding(text):
-    response = client.embeddings.create(
-        input=text,
-        model="text-embedding-3-small"
-    )
-    return response.data[0].embedding
-
-# Store text and embeddings in Qdrant
-def load_pdf_to_qdrant(pdf_path, qdrant, collection_name):
-    # Extract text from PDF
-    text_chunks = extract_text_from_pdf(pdf_path)
-    
-    # Create Qdrant collection
-    if qdrant.collection_exists(collection_name):
-        qdrant.delete_collection(collection_name)
-    qdrant.create_collection(
-        collection_name=collection_name,
-        vectors_config=VectorParams(size=1536, distance=Distance.COSINE)
-    )
-
-    # Store embeddings
-    points = []
-    for chunk in text_chunks:
-        embedding = get_openai_embedding(chunk)
-        points.append(PointStruct(
-            id=str(uuid.uuid4()),
-            vector=embedding,
-            payload={"text": chunk}
-        ))
-    qdrant.upsert(collection_name=collection_name, points=points)
-
-# Initialize Qdrant client and load data
-qdrant = QdrantClient(
-    url=os.getenv("QDRANT_URL"),
-    api_key=os.getenv("QDRANT_API_KEY")
-)
-collection_name = "example_collection"
-pdf_path = "path/to/your/document.pdf"
-load_pdf_to_qdrant(pdf_path, qdrant, collection_name)
-
-# Initialize Qdrant search tool
-qdrant_tool = QdrantVectorSearchTool(
-    qdrant_url=os.getenv("QDRANT_URL"),
-    qdrant_api_key=os.getenv("QDRANT_API_KEY"),
-    collection_name=collection_name,
-    limit=3,
-    score_threshold=0.35
-)
-
-# Create CrewAI agents
-search_agent = Agent(
-    role="Senior Semantic Search Agent",
-    goal="Find and analyze documents based on semantic search",
-    backstory="""You are an expert research assistant who can find relevant 
-    information using semantic search in a Qdrant database.""",
-    tools=[qdrant_tool],
-    verbose=True
-)
-
-answer_agent = Agent(
-    role="Senior Answer Assistant",
-    goal="Generate answers to questions based on the context provided",
-    backstory="""You are an expert answer assistant who can generate 
-    answers to questions based on the context provided.""",
-    tools=[qdrant_tool],
-    verbose=True
-)
-
-# Define tasks
-search_task = Task(
-    description="""Search for relevant documents about the {query}.
-    Your final answer should include:
-    - The relevant information found
-    - The similarity scores of the results
-    - The metadata of the relevant documents""",
-    agent=search_agent
-)
-
-answer_task = Task(
-    description="""Given the context and metadata of relevant documents,
-    generate a final answer based on the context.""",
-    agent=answer_agent
-)
-
-# Run CrewAI workflow
-crew = Crew(
-    agents=[search_agent, answer_agent],
-    tasks=[search_task, answer_task],
-    process=Process.sequential,
-    verbose=True
-)
-
-result = crew.kickoff(
-    inputs={"query": "What is the role of X in the document?"}
-)
-print(result)
-```
-
-## Tool Parameters
-
-### Required Parameters
-- `qdrant_url` (str): The URL of your Qdrant server
-- `qdrant_api_key` (str): API key for authentication with Qdrant
-- `collection_name` (str): Name of the Qdrant collection to search
-
-### Optional Parameters
-- `limit` (int): Maximum number of results to return (default: 3)
-- `score_threshold` (float): Minimum similarity score threshold (default: 0.35)
-- `custom_embedding_fn` (Callable[[str], list[float]]): Custom function for text vectorization
-
-## Search Parameters
-
-The tool accepts these parameters in its schema:
-- `query` (str): The search query to find similar documents
-- `filter_by` (str, optional): Metadata field to filter on
-- `filter_value` (str, optional): Value to filter by
-
-## Return Format
-
-The tool returns results in JSON format:
-
-```json
-[
-  {
-    "metadata": {
-      // Any metadata stored with the document
-    },
-    "context": "The actual text content of the document",
-    "distance": 0.95  // Similarity score
-  }
-]
-```
-
-## Default Embedding
-
-By default, the tool uses OpenAI's `text-embedding-3-small` model for vectorization. This requires:
-- OpenAI API key set in environment: `OPENAI_API_KEY`
-
-## Custom Embeddings
-
-Instead of using the default embedding model, you might want to use your own embedding function in cases where you:
-
-1. Want to use a different embedding model (e.g., Cohere, HuggingFace, Ollama models)
-2. Need to reduce costs by using open-source embedding models
-3. Have specific requirements for vector dimensions or embedding quality
-4. Want to use domain-specific embeddings (e.g., for medical or legal text)
-
-Here's an example using a HuggingFace model:
-
-```python
-from transformers import AutoTokenizer, AutoModel
-import torch
-
-# Load model and tokenizer
-tokenizer = AutoTokenizer.from_pretrained('sentence-transformers/all-MiniLM-L6-v2')
-model = AutoModel.from_pretrained('sentence-transformers/all-MiniLM-L6-v2')
-
-def custom_embeddings(text: str) -> list[float]:
-    # Tokenize and get model outputs
-    inputs = tokenizer(text, return_tensors="pt", padding=True, truncation=True)
-    outputs = model(**inputs)
-    
-    # Use mean pooling to get text embedding
-    embeddings = outputs.last_hidden_state.mean(dim=1)
-    
-    # Convert to list of floats and return
-    return embeddings[0].tolist()
-
-# Use custom embeddings with the tool
-tool = QdrantVectorSearchTool(
-    qdrant_url="your_url",
-    qdrant_api_key="your_key",
-    collection_name="your_collection",
-    custom_embedding_fn=custom_embeddings  # Pass your custom function
-)
-```
-
-## Error Handling
-
-The tool handles these specific errors:
-- Raises ImportError if `qdrant-client` is not installed (with option to auto-install)
-- Raises ValueError if `QDRANT_URL` is not set
-- Prompts to install `qdrant-client` if missing using `uv add qdrant-client`
-
-## Environment Variables
-
-Required environment variables:
-```bash
-export QDRANT_URL="your_qdrant_url"  # If not provided in constructor
-export QDRANT_API_KEY="your_api_key"  # If not provided in constructor
-export OPENAI_API_KEY="your_openai_key"  # If using default embeddings

mkdocs.yml

@@ -152,7 +152,6 @@ nav:
     - Agent Monitoring with AgentOps: 'how-to/AgentOps-Observability.md'
     - Agent Monitoring with LangTrace: 'how-to/Langtrace-Observability.md'
     - Agent Monitoring with OpenLIT: 'how-to/openlit-Observability.md'
-    - Agent Monitoring with MLflow: 'how-to/mlflow-Observability.md'
   - Tools Docs:
     - Browserbase Web Loader: 'tools/BrowserbaseLoadTool.md'
     - Code Docs RAG Search: 'tools/CodeDocsSearchTool.md'

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "crewai"
-version = "0.102.0"
+version = "0.100.0"
 description = "Cutting-edge framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks."
 readme = "README.md"
 requires-python = ">=3.10,<3.13"
@@ -11,8 +11,8 @@ dependencies = [
     # Core Dependencies
     "pydantic>=2.4.2",
     "openai>=1.13.3",
-    "litellm==1.60.2",
-    "instructor>=1.3.3",
+    "litellm==1.59.8",
+    "instructor>=1.7.2",
     # Text Processing
     "pdfplumber>=0.11.4",
     "regex>=2024.9.11",
@@ -45,7 +45,7 @@ Documentation = "https://docs.crewai.com"
 Repository = "https://github.com/crewAIInc/crewAI"
 
 [project.optional-dependencies]
-tools = ["crewai-tools>=0.36.0"]
+tools = ["crewai-tools>=0.32.1"]
 embeddings = [
     "tiktoken~=0.7.0"
 ]

src/crewai/__init__.py

@@ -14,7 +14,7 @@ warnings.filterwarnings(
     category=UserWarning,
     module="pydantic.main",
 )
-__version__ = "0.102.0"
+__version__ = "0.100.0"
 __all__ = [
     "Agent",
     "Crew",

src/crewai/agent.py

@@ -1,7 +1,6 @@
-import re
 import shutil
 import subprocess
-from typing import Any, Dict, List, Literal, Optional, Sequence, Union
+from typing import Any, Dict, List, Literal, Optional, Union
 
 from pydantic import Field, InstanceOf, PrivateAttr, model_validator
 
@@ -16,20 +15,29 @@ from crewai.memory.contextual.contextual_memory import ContextualMemory
 from crewai.task import Task
 from crewai.tools import BaseTool
 from crewai.tools.agent_tools.agent_tools import AgentTools
+from crewai.tools.base_tool import Tool
 from crewai.utilities import Converter, Prompts
 from crewai.utilities.constants import TRAINED_AGENTS_DATA_FILE, TRAINING_DATA_FILE
 from crewai.utilities.converter import generate_model_description
-from crewai.utilities.events.agent_events import (
-    AgentExecutionCompletedEvent,
-    AgentExecutionErrorEvent,
-    AgentExecutionStartedEvent,
-)
-from crewai.utilities.events.crewai_event_bus import crewai_event_bus
 from crewai.utilities.llm_utils import create_llm
 from crewai.utilities.token_counter_callback import TokenCalcHandler
 from crewai.utilities.training_handler import CrewTrainingHandler
 
+agentops = None
 
+try:
+    import agentops  # type: ignore # Name "agentops" is already defined
+    from agentops import track_agent  # type: ignore
+except ImportError:
+
+    def track_agent():
+        def noop(f):
+            return f
+
+        return noop
+
+
+@track_agent()
 class Agent(BaseAgent):
     """Represents an agent in a system.
 
@@ -46,6 +54,7 @@ class Agent(BaseAgent):
             llm: The language model that will run the agent.
             function_calling_llm: The language model that will handle the tool calling for this agent, it overrides the crew function_calling_llm.
             max_iter: Maximum number of iterations for an agent to execute a task.
+            memory: Whether the agent should have memory or not.
             max_rpm: Maximum number of requests per minute for the agent execution to be respected.
             verbose: Whether the agent execution should be in verbose mode.
             allow_delegation: Whether the agent is allowed to delegate tasks to other agents.
@@ -62,6 +71,9 @@ class Agent(BaseAgent):
     )
     agent_ops_agent_name: str = None  # type: ignore # Incompatible types in assignment (expression has type "None", variable has type "str")
     agent_ops_agent_id: str = None  # type: ignore # Incompatible types in assignment (expression has type "None", variable has type "str")
+    cache_handler: InstanceOf[CacheHandler] = Field(
+        default=None, description="An instance of the CacheHandler class."
+    )
     step_callback: Optional[Any] = Field(
         default=None,
         description="Callback to be executed after each step of the agent execution.",
@@ -95,6 +107,10 @@ class Agent(BaseAgent):
         default=True,
         description="Keep messages under the context window size by summarizing content.",
     )
+    max_iter: int = Field(
+        default=20,
+        description="Maximum number of iterations for an agent to execute a task before giving it's best answer",
+    )
     max_retry_limit: int = Field(
         default=2,
         description="Maximum number of retries for an agent to execute a task when an error occurs.",
@@ -114,6 +130,7 @@ class Agent(BaseAgent):
 
     @model_validator(mode="after")
     def post_init_setup(self):
+        self._set_knowledge()
         self.agent_ops_agent_name = self.role
 
         self.llm = create_llm(self.llm)
@@ -133,14 +150,10 @@ class Agent(BaseAgent):
             self.cache_handler = CacheHandler()
         self.set_cache_handler(self.cache_handler)
 
-    def set_knowledge(self, crew_embedder: Optional[Dict[str, Any]] = None):
+    def _set_knowledge(self):
         try:
-            if self.embedder is None and crew_embedder:
-                self.embedder = crew_embedder
-
             if self.knowledge_sources:
-                full_pattern = re.compile(r"[^a-zA-Z0-9\-_\r\n]|(\.\.)")
-                knowledge_agent_name = f"{re.sub(full_pattern, '_', self.role)}"
+                knowledge_agent_name = f"{self.role.replace(' ', '_')}"
                 if isinstance(self.knowledge_sources, list) and all(
                     isinstance(k, BaseKnowledgeSource) for k in self.knowledge_sources
                 ):
@@ -182,15 +195,13 @@ class Agent(BaseAgent):
             if task.output_json:
                 # schema = json.dumps(task.output_json, indent=2)
                 schema = generate_model_description(task.output_json)
-                task_prompt += "\n" + self.i18n.slice(
-                    "formatted_task_instructions"
-                ).format(output_format=schema)
 
             elif task.output_pydantic:
                 schema = generate_model_description(task.output_pydantic)
-                task_prompt += "\n" + self.i18n.slice(
-                    "formatted_task_instructions"
-                ).format(output_format=schema)
+
+            task_prompt += "\n" + self.i18n.slice("formatted_task_instructions").format(
+                output_format=schema
+            )
 
         if context:
             task_prompt = self.i18n.slice("task_with_context").format(
@@ -234,15 +245,6 @@ class Agent(BaseAgent):
             task_prompt = self._use_trained_data(task_prompt=task_prompt)
 
         try:
-            crewai_event_bus.emit(
-                self,
-                event=AgentExecutionStartedEvent(
-                    agent=self,
-                    tools=self.tools,
-                    task_prompt=task_prompt,
-                    task=task,
-                ),
-            )
             result = self.agent_executor.invoke(
                 {
                     "input": task_prompt,
@@ -254,25 +256,9 @@ class Agent(BaseAgent):
         except Exception as e:
             if e.__class__.__module__.startswith("litellm"):
                 # Do not retry on litellm errors
-                crewai_event_bus.emit(
-                    self,
-                    event=AgentExecutionErrorEvent(
-                        agent=self,
-                        task=task,
-                        error=str(e),
-                    ),
-                )
                 raise e
             self._times_executed += 1
             if self._times_executed > self.max_retry_limit:
-                crewai_event_bus.emit(
-                    self,
-                    event=AgentExecutionErrorEvent(
-                        agent=self,
-                        task=task,
-                        error=str(e),
-                    ),
-                )
                 raise e
             result = self.execute_task(task, context, tools)
 
@@ -285,10 +271,7 @@ class Agent(BaseAgent):
         for tool_result in self.tools_results:  # type: ignore # Item "None" of "list[Any] | None" has no attribute "__iter__" (not iterable)
             if tool_result.get("result_as_answer", False):
                 result = tool_result["result"]
-        crewai_event_bus.emit(
-            self,
-            event=AgentExecutionCompletedEvent(agent=self, task=task, output=result),
-        )
+
         return result
 
     def create_agent_executor(
@@ -346,14 +329,14 @@ class Agent(BaseAgent):
         tools = agent_tools.tools()
         return tools
 
-    def get_multimodal_tools(self) -> Sequence[BaseTool]:
+    def get_multimodal_tools(self) -> List[Tool]:
         from crewai.tools.agent_tools.add_image_tool import AddImageTool
 
         return [AddImageTool()]
 
     def get_code_execution_tools(self):
         try:
-            from crewai_tools import CodeInterpreterTool  # type: ignore
+            from crewai_tools import CodeInterpreterTool
 
             # Set the unsafe_mode based on the code_execution_mode attribute
             unsafe_mode = self.code_execution_mode == "unsafe"

src/crewai/agents/agent_builder/base_agent.py

@@ -20,10 +20,10 @@ from crewai.agents.cache.cache_handler import CacheHandler
 from crewai.agents.tools_handler import ToolsHandler
 from crewai.knowledge.knowledge import Knowledge
 from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource
-from crewai.tools.base_tool import BaseTool, Tool
+from crewai.tools import BaseTool
+from crewai.tools.base_tool import Tool
 from crewai.utilities import I18N, Logger, RPMController
 from crewai.utilities.config import process_config
-from crewai.utilities.converter import Converter
 
 T = TypeVar("T", bound="BaseAgent")
 
@@ -42,7 +42,7 @@ class BaseAgent(ABC, BaseModel):
         max_rpm (Optional[int]): Maximum number of requests per minute for the agent execution.
         allow_delegation (bool): Allow delegation of tasks to agents.
         tools (Optional[List[Any]]): Tools at the agent's disposal.
-        max_iter (int): Maximum iterations for an agent to execute a task.
+        max_iter (Optional[int]): Maximum iterations for an agent to execute a task.
         agent_executor (InstanceOf): An instance of the CrewAgentExecutor class.
         llm (Any): Language model that will run the agent.
         crew (Any): Crew to which the agent belongs.
@@ -111,10 +111,10 @@ class BaseAgent(ABC, BaseModel):
         default=False,
         description="Enable agent to delegate and ask questions among each other.",
     )
-    tools: Optional[List[BaseTool]] = Field(
+    tools: Optional[List[Any]] = Field(
         default_factory=list, description="Tools at agents' disposal"
     )
-    max_iter: int = Field(
+    max_iter: Optional[int] = Field(
         default=25, description="Maximum iterations for an agent to execute a task"
     )
     agent_executor: InstanceOf = Field(
@@ -125,12 +125,11 @@ class BaseAgent(ABC, BaseModel):
     )
     crew: Any = Field(default=None, description="Crew to which the agent belongs.")
     i18n: I18N = Field(default=I18N(), description="Internationalization settings.")
-    cache_handler: Optional[InstanceOf[CacheHandler]] = Field(
+    cache_handler: InstanceOf[CacheHandler] = Field(
         default=None, description="An instance of the CacheHandler class."
     )
     tools_handler: InstanceOf[ToolsHandler] = Field(
-        default_factory=ToolsHandler,
-        description="An instance of the ToolsHandler class.",
+        default=None, description="An instance of the ToolsHandler class."
     )
     max_tokens: Optional[int] = Field(
         default=None, description="Maximum number of tokens for the agent's execution."
@@ -255,7 +254,7 @@ class BaseAgent(ABC, BaseModel):
     @abstractmethod
     def get_output_converter(
         self, llm: Any, text: str, model: type[BaseModel] | None, instructions: str
-    ) -> Converter:
+    ):
         """Get the converter class for the agent to create json/pydantic outputs."""
         pass
 
@@ -351,6 +350,3 @@ class BaseAgent(ABC, BaseModel):
         if not self._rpm_controller:
             self._rpm_controller = rpm_controller
             self.create_agent_executor()
-
-    def set_knowledge(self, crew_embedder: Optional[Dict[str, Any]] = None):
-        pass

src/crewai/agents/agent_builder/base_agent_executor_mixin.py

@@ -114,15 +114,10 @@ class CrewAgentExecutorMixin:
             prompt = (
                 "\n\n=====\n"
                 "## HUMAN FEEDBACK: Provide feedback on the Final Result and Agent's actions.\n"
-                "Please follow these guidelines:\n"
-                " - If you are happy with the result, simply hit Enter without typing anything.\n"
-                " - Otherwise, provide specific improvement requests.\n"
-                " - You can provide multiple rounds of feedback until satisfied.\n"
+                "Respond with 'looks good' to accept or provide specific improvement requests.\n"
+                "You can provide multiple rounds of feedback until satisfied.\n"
                 "=====\n"
             )
 
         self._printer.print(content=prompt, color="bold_yellow")
-        response = input()
-        if response.strip() != "":
-            self._printer.print(content="\nProcessing your feedback...", color="cyan")
-        return response
+        return input()

src/crewai/agents/agent_builder/utilities/base_output_converter.py

@@ -31,11 +31,11 @@ class OutputConverter(BaseModel, ABC):
     )
 
     @abstractmethod
-    def to_pydantic(self, current_attempt=1) -> BaseModel:
+    def to_pydantic(self, current_attempt=1):
         """Convert text to pydantic."""
         pass
 
     @abstractmethod
-    def to_json(self, current_attempt=1) -> dict:
+    def to_json(self, current_attempt=1):
         """Convert text to json."""
         pass

src/crewai/agents/crew_agent_executor.py

@@ -18,12 +18,6 @@ from crewai.tools.base_tool import BaseTool
 from crewai.tools.tool_usage import ToolUsage, ToolUsageErrorException
 from crewai.utilities import I18N, Printer
 from crewai.utilities.constants import MAX_LLM_RETRY, TRAINING_DATA_FILE
-from crewai.utilities.events import (
-    ToolUsageErrorEvent,
-    ToolUsageStartedEvent,
-    crewai_event_bus,
-)
-from crewai.utilities.events.tool_usage_events import ToolUsageStartedEvent
 from crewai.utilities.exceptions.context_window_exceeding_exception import (
     LLMContextLengthExceededException,
 )
@@ -113,11 +107,11 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
             )
             raise
         except Exception as e:
-            self._handle_unknown_error(e)
             if e.__class__.__module__.startswith("litellm"):
                 # Do not retry on litellm errors
                 raise e
             else:
+                self._handle_unknown_error(e)
                 raise e
 
         if self.ask_for_human_input:
@@ -355,68 +349,40 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
                 )
 
     def _execute_tool_and_check_finality(self, agent_action: AgentAction) -> ToolResult:
-        try:
-            if self.agent:
-                crewai_event_bus.emit(
-                    self,
-                    event=ToolUsageStartedEvent(
-                        agent_key=self.agent.key,
-                        agent_role=self.agent.role,
-                        tool_name=agent_action.tool,
-                        tool_args=agent_action.tool_input,
-                        tool_class=agent_action.tool,
-                    ),
-                )
-            tool_usage = ToolUsage(
-                tools_handler=self.tools_handler,
-                tools=self.tools,
-                original_tools=self.original_tools,
-                tools_description=self.tools_description,
-                tools_names=self.tools_names,
-                function_calling_llm=self.function_calling_llm,
-                task=self.task,  # type: ignore[arg-type]
-                agent=self.agent,
-                action=agent_action,
-            )
-            tool_calling = tool_usage.parse_tool_calling(agent_action.text)
+        tool_usage = ToolUsage(
+            tools_handler=self.tools_handler,
+            tools=self.tools,
+            original_tools=self.original_tools,
+            tools_description=self.tools_description,
+            tools_names=self.tools_names,
+            function_calling_llm=self.function_calling_llm,
+            task=self.task,  # type: ignore[arg-type]
+            agent=self.agent,
+            action=agent_action,
+        )
+        tool_calling = tool_usage.parse_tool_calling(agent_action.text)
 
-            if isinstance(tool_calling, ToolUsageErrorException):
-                tool_result = tool_calling.message
-                return ToolResult(result=tool_result, result_as_answer=False)
-            else:
-                if tool_calling.tool_name.casefold().strip() in [
-                    name.casefold().strip() for name in self.tool_name_to_tool_map
-                ] or tool_calling.tool_name.casefold().replace("_", " ") in [
-                    name.casefold().strip() for name in self.tool_name_to_tool_map
-                ]:
-                    tool_result = tool_usage.use(tool_calling, agent_action.text)
-                    tool = self.tool_name_to_tool_map.get(tool_calling.tool_name)
-                    if tool:
-                        return ToolResult(
-                            result=tool_result, result_as_answer=tool.result_as_answer
-                        )
-                else:
-                    tool_result = self._i18n.errors("wrong_tool_name").format(
-                        tool=tool_calling.tool_name,
-                        tools=", ".join([tool.name.casefold() for tool in self.tools]),
+        if isinstance(tool_calling, ToolUsageErrorException):
+            tool_result = tool_calling.message
+            return ToolResult(result=tool_result, result_as_answer=False)
+        else:
+            if tool_calling.tool_name.casefold().strip() in [
+                name.casefold().strip() for name in self.tool_name_to_tool_map
+            ] or tool_calling.tool_name.casefold().replace("_", " ") in [
+                name.casefold().strip() for name in self.tool_name_to_tool_map
+            ]:
+                tool_result = tool_usage.use(tool_calling, agent_action.text)
+                tool = self.tool_name_to_tool_map.get(tool_calling.tool_name)
+                if tool:
+                    return ToolResult(
+                        result=tool_result, result_as_answer=tool.result_as_answer
                     )
-                return ToolResult(result=tool_result, result_as_answer=False)
-
-        except Exception as e:
-            # TODO: drop
-            if self.agent:
-                crewai_event_bus.emit(
-                    self,
-                    event=ToolUsageErrorEvent(  # validation error
-                        agent_key=self.agent.key,
-                        agent_role=self.agent.role,
-                        tool_name=agent_action.tool,
-                        tool_args=agent_action.tool_input,
-                        tool_class=agent_action.tool,
-                        error=str(e),
-                    ),
+            else:
+                tool_result = self._i18n.errors("wrong_tool_name").format(
+                    tool=tool_calling.tool_name,
+                    tools=", ".join([tool.name.casefold() for tool in self.tools]),
                 )
-            raise e
+        return ToolResult(result=tool_result, result_as_answer=False)
 
     def _summarize_messages(self) -> None:
         messages_groups = []
@@ -548,6 +514,10 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
         self, initial_answer: AgentFinish, feedback: str
     ) -> AgentFinish:
         """Process feedback for training scenarios with single iteration."""
+        self._printer.print(
+            content="\nProcessing training feedback.\n",
+            color="yellow",
+        )
         self._handle_crew_training_output(initial_answer, feedback)
         self.messages.append(
             self._format_msg(
@@ -567,8 +537,9 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
         answer = current_answer
 
         while self.ask_for_human_input:
-            # If the user provides a blank response, assume they are happy with the result
-            if feedback.strip() == "":
+            response = self._get_llm_feedback_response(feedback)
+
+            if not self._feedback_requires_changes(response):
                 self.ask_for_human_input = False
             else:
                 answer = self._process_feedback_iteration(feedback)
@@ -576,6 +547,27 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
 
         return answer
 
+    def _get_llm_feedback_response(self, feedback: str) -> Optional[str]:
+        """Get LLM classification of whether feedback requires changes."""
+        prompt = self._i18n.slice("human_feedback_classification").format(
+            feedback=feedback
+        )
+        message = self._format_msg(prompt, role="system")
+
+        for retry in range(MAX_LLM_RETRY):
+            try:
+                response = self.llm.call([message], callbacks=self.callbacks)
+                return response.strip().lower() if response else None
+            except Exception as error:
+                self._log_feedback_error(retry, error)
+
+        self._log_max_retries_exceeded()
+        return None
+
+    def _feedback_requires_changes(self, response: Optional[str]) -> bool:
+        """Determine if feedback response indicates need for changes."""
+        return response == "true" if response else False
+
     def _process_feedback_iteration(self, feedback: str) -> AgentFinish:
         """Process a single feedback iteration."""
         self.messages.append(

src/crewai/agents/parser.py

@@ -94,13 +94,6 @@ class CrewAgentParser:
 
         elif includes_answer:
             final_answer = text.split(FINAL_ANSWER_ACTION)[-1].strip()
-            # Check whether the final answer ends with triple backticks.
-            if final_answer.endswith("```"):
-                # Count occurrences of triple backticks in the final answer.
-                count = final_answer.count("```")
-                # If count is odd then it's an unmatched trailing set; remove it.
-                if count % 2 != 0:
-                    final_answer = final_answer[:-3].rstrip()
             return AgentFinish(thought, final_answer, text)
 
         if not re.search(r"Action\s*\d*\s*:[\s]*(.*?)", text, re.DOTALL):
@@ -124,15 +117,11 @@ class CrewAgentParser:
             )
 
     def _extract_thought(self, text: str) -> str:
-        thought_index = text.find("\n\nAction")
-        if thought_index == -1:
-            thought_index = text.find("\n\nFinal Answer")
-        if thought_index == -1:
-            return ""
-        thought = text[:thought_index].strip()
-        # Remove any triple backticks from the thought string
-        thought = thought.replace("```", "").strip()
-        return thought
+        regex = r"(.*?)(?:\n\nAction|\n\nFinal Answer)"
+        thought_match = re.search(regex, text, re.DOTALL)
+        if thought_match:
+            return thought_match.group(1).strip()
+        return ""
 
     def _clean_action(self, text: str) -> str:
         """Clean action string by removing non-essential formatting characters."""

src/crewai/cli/cli.py

@@ -203,6 +203,7 @@ def install(context):
 @crewai.command()
 def run():
     """Run the Crew."""
+    click.echo("Running the Crew")
     run_crew()
 
 

src/crewai/cli/constants.py

@@ -216,43 +216,10 @@ MODELS = {
         "watsonx/ibm/granite-3-8b-instruct",
     ],
     "bedrock": [
-        "bedrock/us.amazon.nova-pro-v1:0",
-        "bedrock/us.amazon.nova-micro-v1:0",
-        "bedrock/us.amazon.nova-lite-v1:0",
-        "bedrock/us.anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "bedrock/us.anthropic.claude-3-5-haiku-20241022-v1:0",
-        "bedrock/us.anthropic.claude-3-5-sonnet-20241022-v2:0",
-        "bedrock/us.anthropic.claude-3-7-sonnet-20250219-v1:0",
-        "bedrock/us.anthropic.claude-3-sonnet-20240229-v1:0",
-        "bedrock/us.anthropic.claude-3-opus-20240229-v1:0",
-        "bedrock/us.anthropic.claude-3-haiku-20240307-v1:0",
-        "bedrock/us.meta.llama3-2-11b-instruct-v1:0",
-        "bedrock/us.meta.llama3-2-3b-instruct-v1:0",
-        "bedrock/us.meta.llama3-2-90b-instruct-v1:0",
-        "bedrock/us.meta.llama3-2-1b-instruct-v1:0",
-        "bedrock/us.meta.llama3-1-8b-instruct-v1:0",
-        "bedrock/us.meta.llama3-1-70b-instruct-v1:0",
-        "bedrock/us.meta.llama3-3-70b-instruct-v1:0",
-        "bedrock/us.meta.llama3-1-405b-instruct-v1:0",
-        "bedrock/eu.anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "bedrock/eu.anthropic.claude-3-sonnet-20240229-v1:0",
-        "bedrock/eu.anthropic.claude-3-haiku-20240307-v1:0",
-        "bedrock/eu.meta.llama3-2-3b-instruct-v1:0",
-        "bedrock/eu.meta.llama3-2-1b-instruct-v1:0",
-        "bedrock/apac.anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "bedrock/apac.anthropic.claude-3-5-sonnet-20241022-v2:0",
-        "bedrock/apac.anthropic.claude-3-sonnet-20240229-v1:0",
-        "bedrock/apac.anthropic.claude-3-haiku-20240307-v1:0",
-        "bedrock/amazon.nova-pro-v1:0",
-        "bedrock/amazon.nova-micro-v1:0",
-        "bedrock/amazon.nova-lite-v1:0",
         "bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "bedrock/anthropic.claude-3-5-haiku-20241022-v1:0",
-        "bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0",
-        "bedrock/anthropic.claude-3-7-sonnet-20250219-v1:0",
         "bedrock/anthropic.claude-3-sonnet-20240229-v1:0",
-        "bedrock/anthropic.claude-3-opus-20240229-v1:0",
         "bedrock/anthropic.claude-3-haiku-20240307-v1:0",
+        "bedrock/anthropic.claude-3-opus-20240229-v1:0",
         "bedrock/anthropic.claude-v2:1",
         "bedrock/anthropic.claude-v2",
         "bedrock/anthropic.claude-instant-v1",
@@ -267,6 +234,8 @@ MODELS = {
         "bedrock/ai21.j2-mid-v1",
         "bedrock/ai21.j2-ultra-v1",
         "bedrock/ai21.jamba-instruct-v1:0",
+        "bedrock/meta.llama2-13b-chat-v1",
+        "bedrock/meta.llama2-70b-chat-v1",
         "bedrock/mistral.mistral-7b-instruct-v0:2",
         "bedrock/mistral.mixtral-8x7b-instruct-v0:1",
     ],

src/crewai/cli/reset_memories_command.py

@@ -2,7 +2,11 @@ import subprocess
 
 import click
 
-from crewai.cli.utils import get_crew
+from crewai.knowledge.storage.knowledge_storage import KnowledgeStorage
+from crewai.memory.entity.entity_memory import EntityMemory
+from crewai.memory.long_term.long_term_memory import LongTermMemory
+from crewai.memory.short_term.short_term_memory import ShortTermMemory
+from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler
 
 
 def reset_memories_command(
@@ -26,35 +30,30 @@ def reset_memories_command(
     """
 
     try:
-        crew = get_crew()
-        if not crew:
-            raise ValueError("No crew found.")
         if all:
-            crew.reset_memories(command_type="all")
+            ShortTermMemory().reset()
+            EntityMemory().reset()
+            LongTermMemory().reset()
+            TaskOutputStorageHandler().reset()
+            KnowledgeStorage().reset()
             click.echo("All memories have been reset.")
-            return
+        else:
+            if long:
+                LongTermMemory().reset()
+                click.echo("Long term memory has been reset.")
 
-        if not any([long, short, entity, kickoff_outputs, knowledge]):
-            click.echo(
-                "No memory type specified. Please specify at least one type to reset."
-            )
-            return
-
-        if long:
-            crew.reset_memories(command_type="long")
-            click.echo("Long term memory has been reset.")
-        if short:
-            crew.reset_memories(command_type="short")
-            click.echo("Short term memory has been reset.")
-        if entity:
-            crew.reset_memories(command_type="entity")
-            click.echo("Entity memory has been reset.")
-        if kickoff_outputs:
-            crew.reset_memories(command_type="kickoff_outputs")
-            click.echo("Latest Kickoff outputs stored has been reset.")
-        if knowledge:
-            crew.reset_memories(command_type="knowledge")
-            click.echo("Knowledge has been reset.")
+            if short:
+                ShortTermMemory().reset()
+                click.echo("Short term memory has been reset.")
+            if entity:
+                EntityMemory().reset()
+                click.echo("Entity memory has been reset.")
+            if kickoff_outputs:
+                TaskOutputStorageHandler().reset()
+                click.echo("Latest Kickoff outputs stored has been reset.")
+            if knowledge:
+                KnowledgeStorage().reset()
+                click.echo("Knowledge has been reset.")
 
     except subprocess.CalledProcessError as e:
         click.echo(f"An error occurred while resetting the memories: {e}", err=True)

src/crewai/cli/run_crew.py

@@ -1,6 +1,4 @@
 import subprocess
-from enum import Enum
-from typing import List, Optional
 
 import click
 from packaging import version
@@ -9,24 +7,16 @@ from crewai.cli.utils import read_toml
 from crewai.cli.version import get_crewai_version
 
 
-class CrewType(Enum):
-    STANDARD = "standard"
-    FLOW = "flow"
-
-
 def run_crew() -> None:
     """
-    Run the crew or flow by running a command in the UV environment.
-
-    Starting from version 0.103.0, this command can be used to run both
-    standard crews and flows. For flows, it detects the type from pyproject.toml
-    and automatically runs the appropriate command.
+    Run the crew by running a command in the UV environment.
     """
+    command = ["uv", "run", "run_crew"]
     crewai_version = get_crewai_version()
     min_required_version = "0.71.0"
+
     pyproject_data = read_toml()
 
-    # Check for legacy poetry configuration
     if pyproject_data.get("tool", {}).get("poetry") and (
         version.parse(crewai_version) < version.parse(min_required_version)
     ):
@@ -36,54 +26,18 @@ def run_crew() -> None:
             fg="red",
         )
 
-    # Determine crew type
-    is_flow = pyproject_data.get("tool", {}).get("crewai", {}).get("type") == "flow"
-    crew_type = CrewType.FLOW if is_flow else CrewType.STANDARD
-
-    # Display appropriate message
-    click.echo(f"Running the {'Flow' if is_flow else 'Crew'}")
-
-    # Execute the appropriate command
-    execute_command(crew_type)
-
-
-def execute_command(crew_type: CrewType) -> None:
-    """
-    Execute the appropriate command based on crew type.
-
-    Args:
-        crew_type: The type of crew to run
-    """
-    command = ["uv", "run", "kickoff" if crew_type == CrewType.FLOW else "run_crew"]
-
     try:
         subprocess.run(command, capture_output=False, text=True, check=True)
 
     except subprocess.CalledProcessError as e:
-        handle_error(e, crew_type)
+        click.echo(f"An error occurred while running the crew: {e}", err=True)
+        click.echo(e.output, err=True, nl=True)
+
+        if pyproject_data.get("tool", {}).get("poetry"):
+            click.secho(
+                "It's possible that you are using an old version of crewAI that uses poetry, please run `crewai update` to update your pyproject.toml to use uv.",
+                fg="yellow",
+            )
 
     except Exception as e:
         click.echo(f"An unexpected error occurred: {e}", err=True)
-
-
-def handle_error(error: subprocess.CalledProcessError, crew_type: CrewType) -> None:
-    """
-    Handle subprocess errors with appropriate messaging.
-
-    Args:
-        error: The subprocess error that occurred
-        crew_type: The type of crew that was being run
-    """
-    entity_type = "flow" if crew_type == CrewType.FLOW else "crew"
-    click.echo(f"An error occurred while running the {entity_type}: {error}", err=True)
-
-    if error.output:
-        click.echo(error.output, err=True, nl=True)
-
-    pyproject_data = read_toml()
-    if pyproject_data.get("tool", {}).get("poetry"):
-        click.secho(
-            "It's possible that you are using an old version of crewAI that uses poetry, "
-            "please run `crewai update` to update your pyproject.toml to use uv.",
-            fg="yellow",
-        )

src/crewai/cli/templates/crew/main.py

@@ -56,8 +56,7 @@ def test():
     Test the crew execution and returns the results.
     """
     inputs = {
-        "topic": "AI LLMs",
-        "current_year": str(datetime.now().year)
+        "topic": "AI LLMs"
     }
     try:
         {{crew_name}}().crew().test(n_iterations=int(sys.argv[1]), openai_model_name=sys.argv[2], inputs=inputs)

src/crewai/cli/templates/crew/pyproject.toml

@@ -5,7 +5,7 @@ description = "{{name}} using crewAI"
 authors = [{ name = "Your Name", email = "you@example.com" }]
 requires-python = ">=3.10,<3.13"
 dependencies = [
-    "crewai[tools]>=0.102.0,<1.0.0"
+    "crewai[tools]>=0.100.0,<1.0.0"
 ]
 
 [project.scripts]

src/crewai/cli/templates/flow/README.md

@@ -30,13 +30,13 @@ crewai install
 
 ## Running the Project
 
-To kickstart your flow and begin execution, run this from the root folder of your project:
+To kickstart your crew of AI agents and begin task execution, run this from the root folder of your project:
 
 ```bash
 crewai run
 ```
 
-This command initializes the {{name}} Flow as defined in your configuration.
+This command initializes the {{name}} Crew, assembling the agents and assigning them tasks as defined in your configuration.
 
 This example, unmodified, will run the create a `report.md` file with the output of a research on LLMs in the root folder.
 

src/crewai/cli/templates/flow/pyproject.toml

@@ -5,7 +5,7 @@ description = "{{name}} using crewAI"
 authors = [{ name = "Your Name", email = "you@example.com" }]
 requires-python = ">=3.10,<3.13"
 dependencies = [
-    "crewai[tools]>=0.102.0,<1.0.0",
+    "crewai[tools]>=0.100.0,<1.0.0",
 ]
 
 [project.scripts]

src/crewai/cli/templates/tool/pyproject.toml

@@ -5,7 +5,7 @@ description = "Power up your crews with {{folder_name}}"
 readme = "README.md"
 requires-python = ">=3.10,<3.13"
 dependencies = [
-    "crewai[tools]>=0.102.0"
+    "crewai[tools]>=0.100.0"
 ]
 
 [tool.crewai]

src/crewai/cli/utils.py

@@ -9,7 +9,6 @@ import tomli
 from rich.console import Console
 
 from crewai.cli.constants import ENV_VARS
-from crewai.crew import Crew
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -248,66 +247,3 @@ def write_env_file(folder_path, env_vars):
     with open(env_file_path, "w") as file:
         for key, value in env_vars.items():
             file.write(f"{key}={value}\n")
-
-
-def get_crew(crew_path: str = "crew.py", require: bool = False) -> Crew | None:
-    """Get the crew instance from the crew.py file."""
-    try:
-        import importlib.util
-        import os
-
-        for root, _, files in os.walk("."):
-            if crew_path in files:
-                crew_os_path = os.path.join(root, crew_path)
-                try:
-                    spec = importlib.util.spec_from_file_location(
-                        "crew_module", crew_os_path
-                    )
-                    if not spec or not spec.loader:
-                        continue
-                    module = importlib.util.module_from_spec(spec)
-                    try:
-                        sys.modules[spec.name] = module
-                        spec.loader.exec_module(module)
-
-                        for attr_name in dir(module):
-                            attr = getattr(module, attr_name)
-                            try:
-                                if isinstance(attr, Crew) and hasattr(attr, "kickoff"):
-                                    print(
-                                        f"Found valid crew object in attribute '{attr_name}' at {crew_os_path}."
-                                    )
-                                    return attr
-
-                            except Exception as e:
-                                print(f"Error processing attribute {attr_name}: {e}")
-                                continue
-
-                    except Exception as exec_error:
-                        print(f"Error executing module: {exec_error}")
-                        import traceback
-
-                        print(f"Traceback: {traceback.format_exc()}")
-
-                except (ImportError, AttributeError) as e:
-                    if require:
-                        console.print(
-                            f"Error importing crew from {crew_path}: {str(e)}",
-                            style="bold red",
-                        )
-                        continue
-
-                break
-
-        if require:
-            console.print("No valid Crew instance found in crew.py", style="bold red")
-            raise SystemExit
-        return None
-
-    except Exception as e:
-        if require:
-            console.print(
-                f"Unexpected error while loading crew: {str(e)}", style="bold red"
-            )
-            raise SystemExit
-        return None

src/crewai/crew.py

@@ -35,6 +35,7 @@ from crewai.process import Process
 from crewai.task import Task
 from crewai.tasks.conditional_task import ConditionalTask
 from crewai.tasks.task_output import TaskOutput
+from crewai.telemetry import Telemetry
 from crewai.tools.agent_tools.agent_tools import AgentTools
 from crewai.tools.base_tool import Tool
 from crewai.types.usage_metrics import UsageMetrics
@@ -42,18 +43,6 @@ from crewai.utilities import I18N, FileHandler, Logger, RPMController
 from crewai.utilities.constants import TRAINING_DATA_FILE
 from crewai.utilities.evaluators.crew_evaluator_handler import CrewEvaluator
 from crewai.utilities.evaluators.task_evaluator import TaskEvaluator
-from crewai.utilities.events.crew_events import (
-    CrewKickoffCompletedEvent,
-    CrewKickoffFailedEvent,
-    CrewKickoffStartedEvent,
-    CrewTestCompletedEvent,
-    CrewTestFailedEvent,
-    CrewTestStartedEvent,
-    CrewTrainCompletedEvent,
-    CrewTrainFailedEvent,
-    CrewTrainStartedEvent,
-)
-from crewai.utilities.events.crewai_event_bus import crewai_event_bus
 from crewai.utilities.formatter import (
     aggregate_raw_outputs_from_task_outputs,
     aggregate_raw_outputs_from_tasks,
@@ -63,6 +52,12 @@ from crewai.utilities.planning_handler import CrewPlanner
 from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler
 from crewai.utilities.training_handler import CrewTrainingHandler
 
+try:
+    import agentops  # type: ignore
+except ImportError:
+    agentops = None
+
+
 warnings.filterwarnings("ignore", category=SyntaxWarning, module="pysbd")
 
 
@@ -188,9 +183,9 @@ class Crew(BaseModel):
         default=None,
         description="Path to the prompt json file to be used for the crew.",
     )
-    output_log_file: Optional[Union[bool, str]] = Field(
+    output_log_file: Optional[str] = Field(
         default=None,
-        description="Path to the log file to be saved",
+        description="output_log_file",
     )
     planning: Optional[bool] = Field(
         default=False,
@@ -256,6 +251,8 @@ class Crew(BaseModel):
         if self.function_calling_llm and not isinstance(self.function_calling_llm, LLM):
             self.function_calling_llm = create_llm(self.function_calling_llm)
 
+        self._telemetry = Telemetry()
+        self._telemetry.set_tracer()
         return self
 
     @model_validator(mode="after")
@@ -278,26 +275,12 @@ class Crew(BaseModel):
                 if self.entity_memory
                 else EntityMemory(crew=self, embedder_config=self.embedder)
             )
-            if (
-                self.memory_config and "user_memory" in self.memory_config
-            ):  # Check for user_memory in config
-                user_memory_config = self.memory_config["user_memory"]
-                if isinstance(
-                    user_memory_config, UserMemory
-                ):  # Check if it is already an instance
-                    self._user_memory = user_memory_config
-                elif isinstance(
-                    user_memory_config, dict
-                ):  # Check if it's a configuration dict
-                    self._user_memory = UserMemory(
-                        crew=self, **user_memory_config
-                    )  # Initialize with config
-                else:
-                    raise TypeError(
-                        "user_memory must be a UserMemory instance or a configuration dictionary"
-                    )
+            if hasattr(self, "memory_config") and self.memory_config is not None:
+                self._user_memory = (
+                    self.user_memory if self.user_memory else UserMemory(crew=self)
+                )
             else:
-                self._user_memory = None  # No user memory if not in config
+                self._user_memory = None
         return self
 
     @model_validator(mode="after")
@@ -310,7 +293,7 @@ class Crew(BaseModel):
                 ):
                     self.knowledge = Knowledge(
                         sources=self.knowledge_sources,
-                        embedder=self.embedder,
+                        embedder_config=self.embedder,
                         collection_name="crew",
                     )
 
@@ -397,22 +380,6 @@ class Crew(BaseModel):
 
         return self
 
-    @model_validator(mode="after")
-    def validate_must_have_non_conditional_task(self) -> "Crew":
-        """Ensure that a crew has at least one non-conditional task."""
-        if not self.tasks:
-            return self
-        non_conditional_count = sum(
-            1 for task in self.tasks if not isinstance(task, ConditionalTask)
-        )
-        if non_conditional_count == 0:
-            raise PydanticCustomError(
-                "only_conditional_tasks",
-                "Crew must include at least one non-conditional task",
-                {},
-            )
-        return self
-
     @model_validator(mode="after")
     def validate_first_task(self) -> "Crew":
         """Ensure the first task is not a ConditionalTask."""
@@ -524,19 +491,10 @@ class Crew(BaseModel):
         self, n_iterations: int, filename: str, inputs: Optional[Dict[str, Any]] = {}
     ) -> None:
         """Trains the crew for a given number of iterations."""
-        try:
-            crewai_event_bus.emit(
-                self,
-                CrewTrainStartedEvent(
-                    crew_name=self.name or "crew",
-                    n_iterations=n_iterations,
-                    filename=filename,
-                    inputs=inputs,
-                ),
-            )
-            train_crew = self.copy()
-            train_crew._setup_for_training(filename)
+        train_crew = self.copy()
+        train_crew._setup_for_training(filename)
 
+        try:
             for n_iteration in range(n_iterations):
                 train_crew._train_iteration = n_iteration
                 train_crew.kickoff(inputs=inputs)
@@ -551,20 +509,7 @@ class Crew(BaseModel):
                     CrewTrainingHandler(filename).save_trained_data(
                         agent_id=str(agent.role), trained_data=result.model_dump()
                     )
-
-            crewai_event_bus.emit(
-                self,
-                CrewTrainCompletedEvent(
-                    crew_name=self.name or "crew",
-                    n_iterations=n_iterations,
-                    filename=filename,
-                ),
-            )
         except Exception as e:
-            crewai_event_bus.emit(
-                self,
-                CrewTrainFailedEvent(error=str(e), crew_name=self.name or "crew"),
-            )
             self._logger.log("error", f"Training failed: {e}", color="red")
             CrewTrainingHandler(TRAINING_DATA_FILE).clear()
             CrewTrainingHandler(filename).clear()
@@ -574,71 +519,60 @@ class Crew(BaseModel):
         self,
         inputs: Optional[Dict[str, Any]] = None,
     ) -> CrewOutput:
-        try:
-            for before_callback in self.before_kickoff_callbacks:
-                if inputs is None:
-                    inputs = {}
-                inputs = before_callback(inputs)
+        for before_callback in self.before_kickoff_callbacks:
+            if inputs is None:
+                inputs = {}
+            inputs = before_callback(inputs)
 
-            crewai_event_bus.emit(
-                self,
-                CrewKickoffStartedEvent(crew_name=self.name or "crew", inputs=inputs),
+        """Starts the crew to work on its assigned tasks."""
+        self._execution_span = self._telemetry.crew_execution_span(self, inputs)
+        self._task_output_handler.reset()
+        self._logging_color = "bold_purple"
+
+        if inputs is not None:
+            self._inputs = inputs
+            self._interpolate_inputs(inputs)
+        self._set_tasks_callbacks()
+
+        i18n = I18N(prompt_file=self.prompt_file)
+
+        for agent in self.agents:
+            agent.i18n = i18n
+            # type: ignore[attr-defined] # Argument 1 to "_interpolate_inputs" of "Crew" has incompatible type "dict[str, Any] | None"; expected "dict[str, Any]"
+            agent.crew = self  # type: ignore[attr-defined]
+            # TODO: Create an AgentFunctionCalling protocol for future refactoring
+            if not agent.function_calling_llm:  # type: ignore # "BaseAgent" has no attribute "function_calling_llm"
+                agent.function_calling_llm = self.function_calling_llm  # type: ignore # "BaseAgent" has no attribute "function_calling_llm"
+
+            if not agent.step_callback:  # type: ignore # "BaseAgent" has no attribute "step_callback"
+                agent.step_callback = self.step_callback  # type: ignore # "BaseAgent" has no attribute "step_callback"
+
+            agent.create_agent_executor()
+
+        if self.planning:
+            self._handle_crew_planning()
+
+        metrics: List[UsageMetrics] = []
+
+        if self.process == Process.sequential:
+            result = self._run_sequential_process()
+        elif self.process == Process.hierarchical:
+            result = self._run_hierarchical_process()
+        else:
+            raise NotImplementedError(
+                f"The process '{self.process}' is not implemented yet."
             )
 
-            # Starts the crew to work on its assigned tasks.
-            self._task_output_handler.reset()
-            self._logging_color = "bold_purple"
+        for after_callback in self.after_kickoff_callbacks:
+            result = after_callback(result)
 
-            if inputs is not None:
-                self._inputs = inputs
-                self._interpolate_inputs(inputs)
-            self._set_tasks_callbacks()
+        metrics += [agent._token_process.get_summary() for agent in self.agents]
 
-            i18n = I18N(prompt_file=self.prompt_file)
+        self.usage_metrics = UsageMetrics()
+        for metric in metrics:
+            self.usage_metrics.add_usage_metrics(metric)
 
-            for agent in self.agents:
-                agent.i18n = i18n
-                # type: ignore[attr-defined] # Argument 1 to "_interpolate_inputs" of "Crew" has incompatible type "dict[str, Any] | None"; expected "dict[str, Any]"
-                agent.crew = self  # type: ignore[attr-defined]
-                agent.set_knowledge(crew_embedder=self.embedder)
-                # TODO: Create an AgentFunctionCalling protocol for future refactoring
-                if not agent.function_calling_llm:  # type: ignore # "BaseAgent" has no attribute "function_calling_llm"
-                    agent.function_calling_llm = self.function_calling_llm  # type: ignore # "BaseAgent" has no attribute "function_calling_llm"
-
-                if not agent.step_callback:  # type: ignore # "BaseAgent" has no attribute "step_callback"
-                    agent.step_callback = self.step_callback  # type: ignore # "BaseAgent" has no attribute "step_callback"
-
-                agent.create_agent_executor()
-
-            if self.planning:
-                self._handle_crew_planning()
-
-            metrics: List[UsageMetrics] = []
-
-            if self.process == Process.sequential:
-                result = self._run_sequential_process()
-            elif self.process == Process.hierarchical:
-                result = self._run_hierarchical_process()
-            else:
-                raise NotImplementedError(
-                    f"The process '{self.process}' is not implemented yet."
-                )
-
-            for after_callback in self.after_kickoff_callbacks:
-                result = after_callback(result)
-
-            metrics += [agent._token_process.get_summary() for agent in self.agents]
-
-            self.usage_metrics = UsageMetrics()
-            for metric in metrics:
-                self.usage_metrics.add_usage_metrics(metric)
-            return result
-        except Exception as e:
-            crewai_event_bus.emit(
-                self,
-                CrewKickoffFailedEvent(error=str(e), crew_name=self.name or "crew"),
-            )
-            raise
+        return result
 
     def kickoff_for_each(self, inputs: List[Dict[str, Any]]) -> List[CrewOutput]:
         """Executes the Crew's workflow for each input in the list and aggregates results."""
@@ -747,7 +681,12 @@ class Crew(BaseModel):
                 manager.tools = []
                 raise Exception("Manager agent should not have tools")
         else:
-            self.manager_llm = create_llm(self.manager_llm)
+            self.manager_llm = (
+                getattr(self.manager_llm, "model_name", None)
+                or getattr(self.manager_llm, "model", None)
+                or getattr(self.manager_llm, "deployment_name", None)
+                or self.manager_llm
+            )
             manager = Agent(
                 role=i18n.retrieve("hierarchical_manager_agent", "role"),
                 goal=i18n.retrieve("hierarchical_manager_agent", "goal"),
@@ -807,7 +746,6 @@ class Crew(BaseModel):
                     task, task_outputs, futures, task_index, was_replayed
                 )
                 if skipped_task_output:
-                    task_outputs.append(skipped_task_output)
                     continue
 
             if task.async_execution:
@@ -831,7 +769,7 @@ class Crew(BaseModel):
                     context=context,
                     tools=tools_for_task,
                 )
-                task_outputs.append(task_output)
+                task_outputs = [task_output]
                 self._process_task_result(task, task_output)
                 self._store_execution_log(task, task_output, task_index, was_replayed)
 
@@ -852,7 +790,7 @@ class Crew(BaseModel):
             task_outputs = self._process_async_tasks(futures, was_replayed)
             futures.clear()
 
-        previous_output = task_outputs[-1] if task_outputs else None
+        previous_output = task_outputs[task_index - 1] if task_outputs else None
         if previous_output is not None and not task.should_execute(previous_output):
             self._logger.log(
                 "debug",
@@ -974,29 +912,20 @@ class Crew(BaseModel):
             )
 
     def _create_crew_output(self, task_outputs: List[TaskOutput]) -> CrewOutput:
-        if not task_outputs:
-            raise ValueError("No task outputs available to create crew output.")
-
-        # Filter out empty outputs and get the last valid one as the main output
-        valid_outputs = [t for t in task_outputs if t.raw]
-        if not valid_outputs:
-            raise ValueError("No valid task outputs available to create crew output.")
-        final_task_output = valid_outputs[-1]
-
+        if len(task_outputs) != 1:
+            raise ValueError(
+                "Something went wrong. Kickoff should return only one task output."
+            )
+        final_task_output = task_outputs[0]
         final_string_output = final_task_output.raw
         self._finish_execution(final_string_output)
         token_usage = self.calculate_usage_metrics()
-        crewai_event_bus.emit(
-            self,
-            CrewKickoffCompletedEvent(
-                crew_name=self.name or "crew", output=final_task_output
-            ),
-        )
+
         return CrewOutput(
             raw=final_task_output.raw,
             pydantic=final_task_output.pydantic,
             json_dict=final_task_output.json_dict,
-            tasks_output=task_outputs,
+            tasks_output=[task.output for task in self.tasks if task.output],
             token_usage=token_usage,
         )
 
@@ -1111,6 +1040,7 @@ class Crew(BaseModel):
             "_short_term_memory",
             "_long_term_memory",
             "_entity_memory",
+            "_telemetry",
             "agents",
             "tasks",
             "knowledge_sources",
@@ -1176,6 +1106,13 @@ class Crew(BaseModel):
     def _finish_execution(self, final_string_output: str) -> None:
         if self.max_rpm:
             self._rpm_controller.stop_rpm_counter()
+        if agentops:
+            agentops.end_session(
+                end_state="Success",
+                end_state_reason="Finished Execution",
+                is_auto_end=True,
+            )
+        self._telemetry.end_crew(self, final_string_output)
 
     def calculate_usage_metrics(self) -> UsageMetrics:
         """Calculates and returns the usage metrics."""
@@ -1193,122 +1130,25 @@ class Crew(BaseModel):
     def test(
         self,
         n_iterations: int,
-        eval_llm: Union[str, InstanceOf[LLM]],
+        openai_model_name: Optional[str] = None,
         inputs: Optional[Dict[str, Any]] = None,
     ) -> None:
         """Test and evaluate the Crew with the given inputs for n iterations concurrently using concurrent.futures."""
-        try:
-            eval_llm = create_llm(eval_llm)
-            if not eval_llm:
-                raise ValueError("Failed to create LLM instance.")
+        test_crew = self.copy()
 
-            crewai_event_bus.emit(
-                self,
-                CrewTestStartedEvent(
-                    crew_name=self.name or "crew",
-                    n_iterations=n_iterations,
-                    eval_llm=eval_llm,
-                    inputs=inputs,
-                ),
-            )
-            test_crew = self.copy()
-            evaluator = CrewEvaluator(test_crew, eval_llm)  # type: ignore[arg-type]
+        self._test_execution_span = test_crew._telemetry.test_execution_span(
+            test_crew,
+            n_iterations,
+            inputs,
+            openai_model_name,  # type: ignore[arg-type]
+        )  # type: ignore[arg-type]
+        evaluator = CrewEvaluator(test_crew, openai_model_name)  # type: ignore[arg-type]
 
-            for i in range(1, n_iterations + 1):
-                evaluator.set_iteration(i)
-                test_crew.kickoff(inputs=inputs)
+        for i in range(1, n_iterations + 1):
+            evaluator.set_iteration(i)
+            test_crew.kickoff(inputs=inputs)
 
-            evaluator.print_crew_evaluation_result()
-
-            crewai_event_bus.emit(
-                self,
-                CrewTestCompletedEvent(
-                    crew_name=self.name or "crew",
-                ),
-            )
-        except Exception as e:
-            crewai_event_bus.emit(
-                self,
-                CrewTestFailedEvent(error=str(e), crew_name=self.name or "crew"),
-            )
-            raise
+        evaluator.print_crew_evaluation_result()
 
     def __repr__(self):
         return f"Crew(id={self.id}, process={self.process}, number_of_agents={len(self.agents)}, number_of_tasks={len(self.tasks)})"
-
-    def reset_memories(self, command_type: str) -> None:
-        """Reset specific or all memories for the crew.
-
-        Args:
-            command_type: Type of memory to reset.
-                Valid options: 'long', 'short', 'entity', 'knowledge',
-                'kickoff_outputs', or 'all'
-
-        Raises:
-            ValueError: If an invalid command type is provided.
-            RuntimeError: If memory reset operation fails.
-        """
-        VALID_TYPES = frozenset(
-            ["long", "short", "entity", "knowledge", "kickoff_outputs", "all"]
-        )
-
-        if command_type not in VALID_TYPES:
-            raise ValueError(
-                f"Invalid command type. Must be one of: {', '.join(sorted(VALID_TYPES))}"
-            )
-
-        try:
-            if command_type == "all":
-                self._reset_all_memories()
-            else:
-                self._reset_specific_memory(command_type)
-
-            self._logger.log("info", f"{command_type} memory has been reset")
-
-        except Exception as e:
-            error_msg = f"Failed to reset {command_type} memory: {str(e)}"
-            self._logger.log("error", error_msg)
-            raise RuntimeError(error_msg) from e
-
-    def _reset_all_memories(self) -> None:
-        """Reset all available memory systems."""
-        memory_systems = [
-            ("short term", getattr(self, "_short_term_memory", None)),
-            ("entity", getattr(self, "_entity_memory", None)),
-            ("long term", getattr(self, "_long_term_memory", None)),
-            ("task output", getattr(self, "_task_output_handler", None)),
-            ("knowledge", getattr(self, "knowledge", None)),
-        ]
-
-        for name, system in memory_systems:
-            if system is not None:
-                try:
-                    system.reset()
-                except Exception as e:
-                    raise RuntimeError(f"Failed to reset {name} memory") from e
-
-    def _reset_specific_memory(self, memory_type: str) -> None:
-        """Reset a specific memory system.
-
-        Args:
-            memory_type: Type of memory to reset
-
-        Raises:
-            RuntimeError: If the specified memory system fails to reset
-        """
-        reset_functions = {
-            "long": (self._long_term_memory, "long term"),
-            "short": (self._short_term_memory, "short term"),
-            "entity": (self._entity_memory, "entity"),
-            "knowledge": (self.knowledge, "knowledge"),
-            "kickoff_outputs": (self._task_output_handler, "task output"),
-        }
-
-        memory_system, name = reset_functions[memory_type]
-        if memory_system is None:
-            raise RuntimeError(f"{name} memory system is not initialized")
-
-        try:
-            memory_system.reset()
-        except Exception as e:
-            raise RuntimeError(f"Failed to reset {name} memory") from e

src/crewai/flow/flow.py

@@ -1,5 +1,4 @@
 import asyncio
-import copy
 import inspect
 import logging
 from typing import (
@@ -17,21 +16,19 @@ 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
-from crewai.flow.persistence.base import FlowPersistence
-from crewai.flow.utils import get_possible_return_constants
-from crewai.utilities.events.crewai_event_bus import crewai_event_bus
-from crewai.utilities.events.flow_events import (
-    FlowCreatedEvent,
+from crewai.flow.flow_events import (
     FlowFinishedEvent,
-    FlowPlotEvent,
     FlowStartedEvent,
-    MethodExecutionFailedEvent,
     MethodExecutionFinishedEvent,
     MethodExecutionStartedEvent,
 )
+from crewai.flow.flow_visualizer import plot_flow
+from crewai.flow.persistence.base import FlowPersistence
+from crewai.flow.utils import get_possible_return_constants
+from crewai.telemetry import Telemetry
 from crewai.utilities.printer import Printer
 
 logger = logging.getLogger(__name__)
@@ -397,6 +394,7 @@ class FlowMeta(type):
                 or hasattr(attr_value, "__trigger_methods__")
                 or hasattr(attr_value, "__is_router__")
             ):
+
                 # Register start methods
                 if hasattr(attr_value, "__is_start_method__"):
                     start_methods.append(attr_name)
@@ -429,6 +427,7 @@ class Flow(Generic[T], metaclass=FlowMeta):
 
     Type parameter T must be either Dict[str, Any] or a subclass of BaseModel."""
 
+    _telemetry = Telemetry()
     _printer = Printer()
 
     _start_methods: List[str] = []
@@ -436,6 +435,7 @@ class Flow(Generic[T], metaclass=FlowMeta):
     _routers: Set[str] = set()
     _router_paths: Dict[str, List[str]] = {}
     initial_state: Union[Type[T], T, None] = None
+    event_emitter = Signal("event_emitter")
 
     def __class_getitem__(cls: Type["Flow"], item: Type[T]) -> Type["Flow"]:
         class _FlowGeneric(cls):  # type: ignore
@@ -469,13 +469,7 @@ class Flow(Generic[T], metaclass=FlowMeta):
         if kwargs:
             self._initialize_state(kwargs)
 
-        crewai_event_bus.emit(
-            self,
-            FlowCreatedEvent(
-                type="flow_created",
-                flow_name=self.__class__.__name__,
-            ),
-        )
+        self._telemetry.flow_creation_span(self.__class__.__name__)
 
         # Register all flow-related methods
         for method_name in dir(self):
@@ -575,9 +569,6 @@ class Flow(Generic[T], metaclass=FlowMeta):
             f"Initial state must be dict or BaseModel, got {type(self.initial_state)}"
         )
 
-    def _copy_state(self) -> T:
-        return copy.deepcopy(self._state)
-
     @property
     def state(self) -> T:
         return self._state
@@ -609,7 +600,7 @@ class Flow(Generic[T], metaclass=FlowMeta):
             ```
         """
         try:
-            if not hasattr(self, "_state"):
+            if not hasattr(self, '_state'):
                 return ""
 
             if isinstance(self._state, dict):
@@ -709,77 +700,58 @@ class Flow(Generic[T], metaclass=FlowMeta):
             raise TypeError(f"State must be dict or BaseModel, got {type(self._state)}")
 
     def kickoff(self, inputs: Optional[Dict[str, Any]] = None) -> Any:
-        """
-        Start the flow execution in a synchronous context.
-
-        This method wraps kickoff_async so that all state initialization and event
-        emission is handled in the asynchronous method.
-        """
-
-        async def run_flow():
-            return await self.kickoff_async(inputs)
-
-        return asyncio.run(run_flow())
-
-    async def kickoff_async(self, inputs: Optional[Dict[str, Any]] = None) -> Any:
-        """
-        Start the flow execution asynchronously.
-
-        This method performs state restoration (if an 'id' is provided and persistence is available)
-        and updates the flow state with any additional inputs. It then emits the FlowStartedEvent,
-        logs the flow startup, and executes all start methods. Once completed, it emits the
-        FlowFinishedEvent and returns the final output.
+        """Start the flow execution.
 
         Args:
-            inputs: Optional dictionary containing input values and/or a state ID for restoration.
-
-        Returns:
-            The final output from the flow, which is the result of the last executed method.
+            inputs: Optional dictionary containing input values and potentially a state ID to restore
         """
-        if inputs:
+        # Handle state restoration if ID is provided in inputs
+        if inputs and 'id' in inputs and self._persistence is not None:
+            restore_uuid = inputs['id']
+            stored_state = self._persistence.load_state(restore_uuid)
+
             # Override the id in the state if it exists in inputs
-            if "id" in inputs:
+            if 'id' in inputs:
                 if isinstance(self._state, dict):
-                    self._state["id"] = inputs["id"]
+                    self._state['id'] = inputs['id']
                 elif isinstance(self._state, BaseModel):
-                    setattr(self._state, "id", inputs["id"])
+                    setattr(self._state, 'id', inputs['id'])
 
-            # If persistence is enabled, attempt to restore the stored state using the provided id.
-            if "id" in inputs and self._persistence is not None:
-                restore_uuid = inputs["id"]
-                stored_state = self._persistence.load_state(restore_uuid)
-                if stored_state:
-                    self._log_flow_event(
-                        f"Loading flow state from memory for UUID: {restore_uuid}",
-                        color="yellow",
-                    )
-                    self._restore_state(stored_state)
-                else:
-                    self._log_flow_event(
-                        f"No flow state found for UUID: {restore_uuid}", color="red"
-                    )
+            if stored_state:
+                self._log_flow_event(f"Loading flow state from memory for UUID: {restore_uuid}", color="yellow")
+                # Restore the state
+                self._restore_state(stored_state)
+            else:
+                self._log_flow_event(f"No flow state found for UUID: {restore_uuid}", color="red")
 
-            # Update state with any additional inputs (ignoring the 'id' key)
-            filtered_inputs = {k: v for k, v in inputs.items() if k != "id"}
+            # Apply any additional inputs after restoration
+            filtered_inputs = {k: v for k, v in inputs.items() if k != 'id'}
             if filtered_inputs:
                 self._initialize_state(filtered_inputs)
 
-        # Emit FlowStartedEvent and log the start of the flow.
-        crewai_event_bus.emit(
+        # Start flow execution
+        self.event_emitter.send(
             self,
-            FlowStartedEvent(
+            event=FlowStartedEvent(
                 type="flow_started",
                 flow_name=self.__class__.__name__,
-                inputs=inputs,
             ),
         )
-        self._log_flow_event(
-            f"Flow started with ID: {self.flow_id}", color="bold_magenta"
-        )
+        self._log_flow_event(f"Flow started with ID: {self.flow_id}", color="bold_magenta")
 
-        if inputs is not None and "id" not in inputs:
+        if inputs is not None and 'id' not in inputs:
             self._initialize_state(inputs)
 
+        return asyncio.run(self.kickoff_async())
+
+    async def kickoff_async(self, inputs: Optional[Dict[str, Any]] = None) -> Any:
+        if not self._start_methods:
+            raise ValueError("No start method defined")
+
+        self._telemetry.flow_execution_span(
+            self.__class__.__name__, list(self._methods.keys())
+        )
+
         tasks = [
             self._execute_start_method(start_method)
             for start_method in self._start_methods
@@ -788,15 +760,14 @@ class Flow(Generic[T], metaclass=FlowMeta):
 
         final_output = self._method_outputs[-1] if self._method_outputs else None
 
-        crewai_event_bus.emit(
+        self.event_emitter.send(
             self,
-            FlowFinishedEvent(
+            event=FlowFinishedEvent(
                 type="flow_finished",
                 flow_name=self.__class__.__name__,
                 result=final_output,
             ),
         )
-
         return final_output
 
     async def _execute_start_method(self, start_method_name: str) -> None:
@@ -825,55 +796,16 @@ class Flow(Generic[T], metaclass=FlowMeta):
     async def _execute_method(
         self, method_name: str, method: Callable, *args: Any, **kwargs: Any
     ) -> Any:
-        try:
-            dumped_params = {f"_{i}": arg for i, arg in enumerate(args)} | (
-                kwargs or {}
-            )
-            crewai_event_bus.emit(
-                self,
-                MethodExecutionStartedEvent(
-                    type="method_execution_started",
-                    method_name=method_name,
-                    flow_name=self.__class__.__name__,
-                    params=dumped_params,
-                    state=self._copy_state(),
-                ),
-            )
-
-            result = (
-                await method(*args, **kwargs)
-                if asyncio.iscoroutinefunction(method)
-                else method(*args, **kwargs)
-            )
-
-            self._method_outputs.append(result)
-            self._method_execution_counts[method_name] = (
-                self._method_execution_counts.get(method_name, 0) + 1
-            )
-
-            crewai_event_bus.emit(
-                self,
-                MethodExecutionFinishedEvent(
-                    type="method_execution_finished",
-                    method_name=method_name,
-                    flow_name=self.__class__.__name__,
-                    state=self._copy_state(),
-                    result=result,
-                ),
-            )
-
-            return result
-        except Exception as e:
-            crewai_event_bus.emit(
-                self,
-                MethodExecutionFailedEvent(
-                    type="method_execution_failed",
-                    method_name=method_name,
-                    flow_name=self.__class__.__name__,
-                    error=e,
-                ),
-            )
-            raise e
+        result = (
+            await method(*args, **kwargs)
+            if asyncio.iscoroutinefunction(method)
+            else method(*args, **kwargs)
+        )
+        self._method_outputs.append(result)
+        self._method_execution_counts[method_name] = (
+            self._method_execution_counts.get(method_name, 0) + 1
+        )
+        return result
 
     async def _execute_listeners(self, trigger_method: str, result: Any) -> None:
         """
@@ -894,45 +826,35 @@ class Flow(Generic[T], metaclass=FlowMeta):
         Notes
         -----
         - Routers are executed sequentially to maintain flow control
-        - Each router's result becomes a new trigger_method
+        - Each router's result becomes the new trigger_method
         - Normal listeners are executed in parallel for efficiency
         - Listeners can receive the trigger method's result as a parameter
         """
         # First, handle routers repeatedly until no router triggers anymore
-        router_results = []
-        current_trigger = trigger_method
-
         while True:
             routers_triggered = self._find_triggered_methods(
-                current_trigger, router_only=True
+                trigger_method, router_only=True
             )
             if not routers_triggered:
                 break
-
             for router_name in routers_triggered:
                 await self._execute_single_listener(router_name, result)
                 # After executing router, the router's result is the path
-                router_result = self._method_outputs[-1]
-                if router_result:  # Only add non-None results
-                    router_results.append(router_result)
-                current_trigger = (
-                    router_result  # Update for next iteration of router chain
-                )
+                # The last router executed sets the trigger_method
+                # The router result is the last element in self._method_outputs
+                trigger_method = self._method_outputs[-1]
 
-        # Now execute normal listeners for all router results and the original trigger
-        all_triggers = [trigger_method] + router_results
-
-        for current_trigger in all_triggers:
-            if current_trigger:  # Skip None results
-                listeners_triggered = self._find_triggered_methods(
-                    current_trigger, router_only=False
-                )
-                if listeners_triggered:
-                    tasks = [
-                        self._execute_single_listener(listener_name, result)
-                        for listener_name in listeners_triggered
-                    ]
-                    await asyncio.gather(*tasks)
+        # Now that no more routers are triggered by current trigger_method,
+        # execute normal listeners
+        listeners_triggered = self._find_triggered_methods(
+            trigger_method, router_only=False
+        )
+        if listeners_triggered:
+            tasks = [
+                self._execute_single_listener(listener_name, result)
+                for listener_name in listeners_triggered
+            ]
+            await asyncio.gather(*tasks)
 
     def _find_triggered_methods(
         self, trigger_method: str, router_only: bool
@@ -1022,6 +944,15 @@ class Flow(Generic[T], metaclass=FlowMeta):
         try:
             method = self._methods[listener_name]
 
+            self.event_emitter.send(
+                self,
+                event=MethodExecutionStartedEvent(
+                    type="method_execution_started",
+                    method_name=listener_name,
+                    flow_name=self.__class__.__name__,
+                ),
+            )
+
             sig = inspect.signature(method)
             params = list(sig.parameters.values())
             method_params = [p for p in params if p.name != "self"]
@@ -1033,6 +964,15 @@ class Flow(Generic[T], metaclass=FlowMeta):
             else:
                 listener_result = await self._execute_method(listener_name, method)
 
+            self.event_emitter.send(
+                self,
+                event=MethodExecutionFinishedEvent(
+                    type="method_execution_finished",
+                    method_name=listener_name,
+                    flow_name=self.__class__.__name__,
+                ),
+            )
+
             # Execute listeners (and possibly routers) of this listener
             await self._execute_listeners(listener_name, listener_result)
 
@@ -1044,9 +984,7 @@ class Flow(Generic[T], metaclass=FlowMeta):
 
             traceback.print_exc()
 
-    def _log_flow_event(
-        self, message: str, color: str = "yellow", level: str = "info"
-    ) -> None:
+    def _log_flow_event(self, message: str, color: str = "yellow", level: str = "info") -> None:
         """Centralized logging method for flow events.
 
         This method provides a consistent interface for logging flow-related events,
@@ -1071,11 +1009,7 @@ class Flow(Generic[T], metaclass=FlowMeta):
             logger.warning(message)
 
     def plot(self, filename: str = "crewai_flow") -> None:
-        crewai_event_bus.emit(
-            self,
-            FlowPlotEvent(
-                type="flow_plot",
-                flow_name=self.__class__.__name__,
-            ),
+        self._telemetry.flow_plotting_span(
+            self.__class__.__name__, list(self._methods.keys())
         )
         plot_flow(self, filename)

src/crewai/flow/flow_events.py

@@ -0,0 +1,33 @@
+from dataclasses import dataclass, field
+from datetime import datetime
+from typing import Any, Optional
+
+
+@dataclass
+class Event:
+    type: str
+    flow_name: str
+    timestamp: datetime = field(init=False)
+
+    def __post_init__(self):
+        self.timestamp = datetime.now()
+
+
+@dataclass
+class FlowStartedEvent(Event):
+    pass
+
+
+@dataclass
+class MethodExecutionStartedEvent(Event):
+    method_name: str
+
+
+@dataclass
+class MethodExecutionFinishedEvent(Event):
+    method_name: str
+
+
+@dataclass
+class FlowFinishedEvent(Event):
+    result: Optional[Any] = None

src/crewai/flow/persistence/decorators.py

@@ -58,7 +58,7 @@ class PersistenceDecorator:
     _printer = Printer()  # Class-level printer instance
 
     @classmethod
-    def persist_state(cls, flow_instance: Any, method_name: str, persistence_instance: FlowPersistence, verbose: bool = False) -> None:
+    def persist_state(cls, flow_instance: Any, method_name: str, persistence_instance: FlowPersistence) -> None:
         """Persist flow state with proper error handling and logging.
 
         This method handles the persistence of flow state data, including proper
@@ -68,7 +68,6 @@ class PersistenceDecorator:
             flow_instance: The flow instance whose state to persist
             method_name: Name of the method that triggered persistence
             persistence_instance: The persistence backend to use
-            verbose: Whether to log persistence operations
 
         Raises:
             ValueError: If flow has no state or state lacks an ID
@@ -89,10 +88,9 @@ class PersistenceDecorator:
             if not flow_uuid:
                 raise ValueError("Flow state must have an 'id' field for persistence")
 
-            # Log state saving only if verbose is True
-            if verbose:
-                cls._printer.print(LOG_MESSAGES["save_state"].format(flow_uuid), color="cyan")
-                logger.info(LOG_MESSAGES["save_state"].format(flow_uuid))
+            # Log state saving with consistent message
+            cls._printer.print(LOG_MESSAGES["save_state"].format(flow_uuid), color="cyan")
+            logger.info(LOG_MESSAGES["save_state"].format(flow_uuid))
 
             try:
                 persistence_instance.save_state(
@@ -117,7 +115,7 @@ class PersistenceDecorator:
             raise ValueError(error_msg) from e
 
 
-def persist(persistence: Optional[FlowPersistence] = None, verbose: bool = False):
+def persist(persistence: Optional[FlowPersistence] = None):
     """Decorator to persist flow state.
 
     This decorator can be applied at either the class level or method level.
@@ -128,7 +126,6 @@ def persist(persistence: Optional[FlowPersistence] = None, verbose: bool = False
     Args:
         persistence: Optional FlowPersistence implementation to use.
                     If not provided, uses SQLiteFlowPersistence.
-        verbose: Whether to log persistence operations. Defaults to False.
 
     Returns:
         A decorator that can be applied to either a class or method
@@ -138,12 +135,13 @@ def persist(persistence: Optional[FlowPersistence] = None, verbose: bool = False
         RuntimeError: If state persistence fails
 
     Example:
-        @persist(verbose=True)  # Class-level persistence with logging
+        @persist  # Class-level persistence with default SQLite
         class MyFlow(Flow[MyState]):
             @start()
             def begin(self):
                 pass
     """
+
     def decorator(target: Union[Type, Callable[..., T]]) -> Union[Type, Callable[..., T]]:
         """Decorator that handles both class and method decoration."""
         actual_persistence = persistence or SQLiteFlowPersistence()
@@ -181,7 +179,7 @@ def persist(persistence: Optional[FlowPersistence] = None, verbose: bool = False
                         @functools.wraps(original_method)
                         async def method_wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
                             result = await original_method(self, *args, **kwargs)
-                            PersistenceDecorator.persist_state(self, method_name, actual_persistence, verbose)
+                            PersistenceDecorator.persist_state(self, method_name, actual_persistence)
                             return result
                         return method_wrapper
 
@@ -201,7 +199,7 @@ def persist(persistence: Optional[FlowPersistence] = None, verbose: bool = False
                         @functools.wraps(original_method)
                         def method_wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
                             result = original_method(self, *args, **kwargs)
-                            PersistenceDecorator.persist_state(self, method_name, actual_persistence, verbose)
+                            PersistenceDecorator.persist_state(self, method_name, actual_persistence)
                             return result
                         return method_wrapper
 
@@ -230,7 +228,7 @@ def persist(persistence: Optional[FlowPersistence] = None, verbose: bool = False
                         result = await method_coro
                     else:
                         result = method_coro
-                    PersistenceDecorator.persist_state(flow_instance, method.__name__, actual_persistence, verbose)
+                    PersistenceDecorator.persist_state(flow_instance, method.__name__, actual_persistence)
                     return result
 
                 for attr in ["__is_start_method__", "__trigger_methods__", "__condition_type__", "__is_router__"]:
@@ -242,7 +240,7 @@ def persist(persistence: Optional[FlowPersistence] = None, verbose: bool = False
                 @functools.wraps(method)
                 def method_sync_wrapper(flow_instance: Any, *args: Any, **kwargs: Any) -> T:
                     result = method(flow_instance, *args, **kwargs)
-                    PersistenceDecorator.persist_state(flow_instance, method.__name__, actual_persistence, verbose)
+                    PersistenceDecorator.persist_state(flow_instance, method.__name__, actual_persistence)
                     return result
 
                 for attr in ["__is_start_method__", "__trigger_methods__", "__condition_type__", "__is_router__"]:

src/crewai/flow/persistence/sqlite.py

@@ -4,7 +4,7 @@ SQLite-based implementation of flow state persistence.
 
 import json
 import sqlite3
-from datetime import datetime, timezone
+from datetime import datetime
 from pathlib import Path
 from typing import Any, Dict, Optional, Union
 
@@ -34,7 +34,6 @@ class SQLiteFlowPersistence(FlowPersistence):
             ValueError: If db_path is invalid
         """
         from crewai.utilities.paths import db_storage_path
-
         # Get path from argument or default location
         path = db_path or str(Path(db_storage_path()) / "flow_states.db")
 
@@ -47,8 +46,7 @@ class SQLiteFlowPersistence(FlowPersistence):
     def init_db(self) -> None:
         """Create the necessary tables if they don't exist."""
         with sqlite3.connect(self.db_path) as conn:
-            conn.execute(
-                """
+            conn.execute("""
             CREATE TABLE IF NOT EXISTS flow_states (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
                 flow_uuid TEXT NOT NULL,
@@ -56,15 +54,12 @@ class SQLiteFlowPersistence(FlowPersistence):
                 timestamp DATETIME NOT NULL,
                 state_json TEXT NOT NULL
             )
-            """
-            )
+            """)
             # Add index for faster UUID lookups
-            conn.execute(
-                """
+            conn.execute("""
             CREATE INDEX IF NOT EXISTS idx_flow_states_uuid
             ON flow_states(flow_uuid)
-            """
-            )
+            """)
 
     def save_state(
         self,
@@ -90,22 +85,19 @@ class SQLiteFlowPersistence(FlowPersistence):
             )
 
         with sqlite3.connect(self.db_path) as conn:
-            conn.execute(
-                """
+            conn.execute("""
             INSERT INTO flow_states (
                 flow_uuid,
                 method_name,
                 timestamp,
                 state_json
             ) VALUES (?, ?, ?, ?)
-            """,
-                (
-                    flow_uuid,
-                    method_name,
-                    datetime.now(timezone.utc).isoformat(),
-                    json.dumps(state_dict),
-                ),
-            )
+            """, (
+                flow_uuid,
+                method_name,
+                datetime.utcnow().isoformat(),
+                json.dumps(state_dict),
+            ))
 
     def load_state(self, flow_uuid: str) -> Optional[Dict[str, Any]]:
         """Load the most recent state for a given flow UUID.
@@ -117,16 +109,13 @@ class SQLiteFlowPersistence(FlowPersistence):
             The most recent state as a dictionary, or None if no state exists
         """
         with sqlite3.connect(self.db_path) as conn:
-            cursor = conn.execute(
-                """
+            cursor = conn.execute("""
             SELECT state_json
             FROM flow_states
             WHERE flow_uuid = ?
             ORDER BY id DESC
             LIMIT 1
-            """,
-                (flow_uuid,),
-            )
+            """, (flow_uuid,))
             row = cursor.fetchone()
 
         if row:

src/crewai/flow/state_utils.py

@@ -1,91 +0,0 @@
-import json
-from datetime import date, datetime
-from typing import Any, Dict, List, Union
-
-from pydantic import BaseModel
-
-from crewai.flow import Flow
-
-SerializablePrimitive = Union[str, int, float, bool, None]
-Serializable = Union[
-    SerializablePrimitive, List["Serializable"], Dict[str, "Serializable"]
-]
-
-
-def export_state(flow: Flow) -> dict[str, Serializable]:
-    """Exports the Flow's internal state as JSON-compatible data structures.
-
-    Performs a one-way transformation of a Flow's state into basic Python types
-    that can be safely serialized to JSON. To prevent infinite recursion with
-    circular references, the conversion is limited to a depth of 5 levels.
-
-    Args:
-        flow: The Flow object whose state needs to be exported
-
-    Returns:
-        dict[str, Any]: The transformed state using JSON-compatible Python
-            types.
-    """
-    result = to_serializable(flow._state)
-    assert isinstance(result, dict)
-    return result
-
-
-def to_serializable(
-    obj: Any, max_depth: int = 5, _current_depth: int = 0
-) -> Serializable:
-    """Converts a Python object into a JSON-compatible representation.
-
-    Supports primitives, datetime objects, collections, dictionaries, and
-    Pydantic models. Recursion depth is limited to prevent infinite nesting.
-    Non-convertible objects default to their string representations.
-
-    Args:
-        obj (Any): Object to transform.
-        max_depth (int, optional): Maximum recursion depth. Defaults to 5.
-
-    Returns:
-        Serializable: A JSON-compatible structure.
-    """
-    if _current_depth >= max_depth:
-        return repr(obj)
-
-    if isinstance(obj, (str, int, float, bool, type(None))):
-        return obj
-    elif isinstance(obj, (date, datetime)):
-        return obj.isoformat()
-    elif isinstance(obj, (list, tuple, set)):
-        return [to_serializable(item, max_depth, _current_depth + 1) for item in obj]
-    elif isinstance(obj, dict):
-        return {
-            _to_serializable_key(key): to_serializable(
-                value, max_depth, _current_depth + 1
-            )
-            for key, value in obj.items()
-        }
-    elif isinstance(obj, BaseModel):
-        return to_serializable(obj.model_dump(), max_depth, _current_depth + 1)
-    else:
-        return repr(obj)
-
-
-def _to_serializable_key(key: Any) -> str:
-    if isinstance(key, (str, int)):
-        return str(key)
-    return f"key_{id(key)}_{repr(key)}"
-
-
-def to_string(obj: Any) -> str | None:
-    """Serializes an object into a JSON string.
-
-    Args:
-        obj (Any): Object to serialize.
-
-    Returns:
-        str | None: A JSON-formatted string or `None` if empty.
-    """
-    serializable = to_serializable(obj)
-    if serializable is None:
-        return None
-    else:
-        return json.dumps(serializable)

src/crewai/flow/utils.py

@@ -16,8 +16,7 @@ Example
 import ast
 import inspect
 import textwrap
-from collections import defaultdict, deque
-from typing import Any, Deque, Dict, List, Optional, Set, Union
+from typing import Any, Dict, List, Optional, Set, Union
 
 
 def get_possible_return_constants(function: Any) -> Optional[List[str]]:
@@ -119,7 +118,7 @@ def calculate_node_levels(flow: Any) -> Dict[str, int]:
     - Processes router paths separately
     """
     levels: Dict[str, int] = {}
-    queue: Deque[str] = deque()
+    queue: List[str] = []
     visited: Set[str] = set()
     pending_and_listeners: Dict[str, Set[str]] = {}
 
@@ -129,35 +128,28 @@ def calculate_node_levels(flow: Any) -> Dict[str, int]:
             levels[method_name] = 0
             queue.append(method_name)
 
-    # Precompute listener dependencies
-    or_listeners = defaultdict(list)
-    and_listeners = defaultdict(set)
-    for listener_name, (condition_type, trigger_methods) in flow._listeners.items():
-        if condition_type == "OR":
-            for method in trigger_methods:
-                or_listeners[method].append(listener_name)
-        elif condition_type == "AND":
-            and_listeners[listener_name] = set(trigger_methods)
-
     # Breadth-first traversal to assign levels
     while queue:
-        current = queue.popleft()
+        current = queue.pop(0)
         current_level = levels[current]
         visited.add(current)
 
-        for listener_name in or_listeners[current]:
-            if listener_name not in levels or levels[listener_name] > current_level + 1:
-                levels[listener_name] = current_level + 1
-                if listener_name not in visited:
-                    queue.append(listener_name)
-
-        for listener_name, required_methods in and_listeners.items():
-            if current in required_methods:
+        for listener_name, (condition_type, trigger_methods) in flow._listeners.items():
+            if condition_type == "OR":
+                if current in trigger_methods:
+                    if (
+                        listener_name not in levels
+                        or levels[listener_name] > current_level + 1
+                    ):
+                        levels[listener_name] = current_level + 1
+                        if listener_name not in visited:
+                            queue.append(listener_name)
+            elif condition_type == "AND":
                 if listener_name not in pending_and_listeners:
                     pending_and_listeners[listener_name] = set()
-                pending_and_listeners[listener_name].add(current)
-
-                if required_methods == pending_and_listeners[listener_name]:
+                if current in trigger_methods:
+                    pending_and_listeners[listener_name].add(current)
+                if set(trigger_methods) == pending_and_listeners[listener_name]:
                     if (
                         listener_name not in levels
                         or levels[listener_name] > current_level + 1
@@ -167,7 +159,22 @@ def calculate_node_levels(flow: Any) -> Dict[str, int]:
                             queue.append(listener_name)
 
         # Handle router connections
-        process_router_paths(flow, current, current_level, levels, queue)
+        if current in flow._routers:
+            router_method_name = current
+            paths = flow._router_paths.get(router_method_name, [])
+            for path in paths:
+                for listener_name, (
+                    condition_type,
+                    trigger_methods,
+                ) in flow._listeners.items():
+                    if path in trigger_methods:
+                        if (
+                            listener_name not in levels
+                            or levels[listener_name] > current_level + 1
+                        ):
+                            levels[listener_name] = current_level + 1
+                            if listener_name not in visited:
+                                queue.append(listener_name)
 
     return levels
 
@@ -220,7 +227,10 @@ def build_ancestor_dict(flow: Any) -> Dict[str, Set[str]]:
 
 
 def dfs_ancestors(
-    node: str, ancestors: Dict[str, Set[str]], visited: Set[str], flow: Any
+    node: str,
+    ancestors: Dict[str, Set[str]],
+    visited: Set[str],
+    flow: Any
 ) -> None:
     """
     Perform depth-first search to build ancestor relationships.
@@ -264,9 +274,7 @@ def dfs_ancestors(
                     dfs_ancestors(listener_name, ancestors, visited, flow)
 
 
-def is_ancestor(
-    node: str, ancestor_candidate: str, ancestors: Dict[str, Set[str]]
-) -> bool:
+def is_ancestor(node: str, ancestor_candidate: str, ancestors: Dict[str, Set[str]]) -> bool:
     """
     Check if one node is an ancestor of another.
 
@@ -331,9 +339,7 @@ def build_parent_children_dict(flow: Any) -> Dict[str, List[str]]:
     return parent_children
 
 
-def get_child_index(
-    parent: str, child: str, parent_children: Dict[str, List[str]]
-) -> int:
+def get_child_index(parent: str, child: str, parent_children: Dict[str, List[str]]) -> int:
     """
     Get the index of a child node in its parent's sorted children list.
 
@@ -354,23 +360,3 @@ def get_child_index(
     children = parent_children.get(parent, [])
     children.sort()
     return children.index(child)
-
-
-def process_router_paths(flow, current, current_level, levels, queue):
-    """
-    Handle the router connections for the current node.
-    """
-    if current in flow._routers:
-        paths = flow._router_paths.get(current, [])
-        for path in paths:
-            for listener_name, (
-                condition_type,
-                trigger_methods,
-            ) in flow._listeners.items():
-                if path in trigger_methods:
-                    if (
-                        listener_name not in levels
-                        or levels[listener_name] > current_level + 1
-                    ):
-                        levels[listener_name] = current_level + 1
-                        queue.append(listener_name)

src/crewai/knowledge/knowledge.py

@@ -67,9 +67,3 @@ class Knowledge(BaseModel):
                 source.add()
         except Exception as e:
             raise e
-
-    def reset(self) -> None:
-        if self.storage:
-            self.storage.reset()
-        else:
-            raise ValueError("Storage is not initialized.")

src/crewai/knowledge/source/excel_knowledge_source.py

@@ -1,138 +1,28 @@
 from pathlib import Path
-from typing import Dict, Iterator, List, Optional, Union
-from urllib.parse import urlparse
+from typing import Dict, List
 
-from pydantic import Field, field_validator
-
-from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource
-from crewai.utilities.constants import KNOWLEDGE_DIRECTORY
-from crewai.utilities.logger import Logger
+from crewai.knowledge.source.base_file_knowledge_source import BaseFileKnowledgeSource
 
 
-class ExcelKnowledgeSource(BaseKnowledgeSource):
+class ExcelKnowledgeSource(BaseFileKnowledgeSource):
     """A knowledge source that stores and queries Excel file content using embeddings."""
 
-    # override content to be a dict of file paths to sheet names to csv content
-
-    _logger: Logger = Logger(verbose=True)
-
-    file_path: Optional[Union[Path, List[Path], str, List[str]]] = Field(
-        default=None,
-        description="[Deprecated] The path to the file. Use file_paths instead.",
-    )
-    file_paths: Optional[Union[Path, List[Path], str, List[str]]] = Field(
-        default_factory=list, description="The path to the file"
-    )
-    chunks: List[str] = Field(default_factory=list)
-    content: Dict[Path, Dict[str, str]] = Field(default_factory=dict)
-    safe_file_paths: List[Path] = Field(default_factory=list)
-
-    @field_validator("file_path", "file_paths", mode="before")
-    def validate_file_path(cls, v, info):
-        """Validate that at least one of file_path or file_paths is provided."""
-        # Single check if both are None, O(1) instead of nested conditions
-        if (
-            v is None
-            and info.data.get(
-                "file_path" if info.field_name == "file_paths" else "file_paths"
-            )
-            is None
-        ):
-            raise ValueError("Either file_path or file_paths must be provided")
-        return v
-
-    def _process_file_paths(self) -> List[Path]:
-        """Convert file_path to a list of Path objects."""
-
-        if hasattr(self, "file_path") and self.file_path is not None:
-            self._logger.log(
-                "warning",
-                "The 'file_path' attribute is deprecated and will be removed in a future version. Please use 'file_paths' instead.",
-                color="yellow",
-            )
-            self.file_paths = self.file_path
-
-        if self.file_paths is None:
-            raise ValueError("Your source must be provided with a file_paths: []")
-
-        # Convert single path to list
-        path_list: List[Union[Path, str]] = (
-            [self.file_paths]
-            if isinstance(self.file_paths, (str, Path))
-            else list(self.file_paths)
-            if isinstance(self.file_paths, list)
-            else []
-        )
-
-        if not path_list:
-            raise ValueError(
-                "file_path/file_paths must be a Path, str, or a list of these types"
-            )
-
-        return [self.convert_to_path(path) for path in path_list]
-
-    def validate_content(self):
-        """Validate the paths."""
-        for path in self.safe_file_paths:
-            if not path.exists():
-                self._logger.log(
-                    "error",
-                    f"File not found: {path}. Try adding sources to the knowledge directory. If it's inside the knowledge directory, use the relative path.",
-                    color="red",
-                )
-                raise FileNotFoundError(f"File not found: {path}")
-            if not path.is_file():
-                self._logger.log(
-                    "error",
-                    f"Path is not a file: {path}",
-                    color="red",
-                )
-
-    def model_post_init(self, _) -> None:
-        if self.file_path:
-            self._logger.log(
-                "warning",
-                "The 'file_path' attribute is deprecated and will be removed in a future version. Please use 'file_paths' instead.",
-                color="yellow",
-            )
-            self.file_paths = self.file_path
-        self.safe_file_paths = self._process_file_paths()
-        self.validate_content()
-        self.content = self._load_content()
-
-    def _load_content(self) -> Dict[Path, Dict[str, str]]:
-        """Load and preprocess Excel file content from multiple sheets.
-
-        Each sheet's content is converted to CSV format and stored.
-
-        Returns:
-            Dict[Path, Dict[str, str]]: A mapping of file paths to their respective sheet contents.
-
-        Raises:
-            ImportError: If required dependencies are missing.
-            FileNotFoundError: If the specified Excel file cannot be opened.
-        """
+    def load_content(self) -> Dict[Path, str]:
+        """Load and preprocess Excel file content."""
         pd = self._import_dependencies()
+
         content_dict = {}
         for file_path in self.safe_file_paths:
             file_path = self.convert_to_path(file_path)
-            with pd.ExcelFile(file_path) as xl:
-                sheet_dict = {
-                    str(sheet_name): str(
-                        pd.read_excel(xl, sheet_name).to_csv(index=False)
-                    )
-                    for sheet_name in xl.sheet_names
-                }
-            content_dict[file_path] = sheet_dict
+            df = pd.read_excel(file_path)
+            content = df.to_csv(index=False)
+            content_dict[file_path] = content
         return content_dict
 
-    def convert_to_path(self, path: Union[Path, str]) -> Path:
-        """Convert a path to a Path object."""
-        return Path(KNOWLEDGE_DIRECTORY + "/" + path) if isinstance(path, str) else path
-
     def _import_dependencies(self):
         """Dynamically import dependencies."""
         try:
+            import openpyxl  # noqa
             import pandas as pd
 
             return pd
@@ -148,14 +38,10 @@ class ExcelKnowledgeSource(BaseKnowledgeSource):
         and save the embeddings.
         """
         # Convert dictionary values to a single string if content is a dictionary
-        # Updated to account for .xlsx workbooks with multiple tabs/sheets
-        content_str = ""
-        for value in self.content.values():
-            if isinstance(value, dict):
-                for sheet_value in value.values():
-                    content_str += str(sheet_value) + "\n"
-            else:
-                content_str += str(value) + "\n"
+        if isinstance(self.content, dict):
+            content_str = "\n".join(str(value) for value in self.content.values())
+        else:
+            content_str = str(self.content)
 
         new_chunks = self._chunk_text(content_str)
         self.chunks.extend(new_chunks)

src/crewai/knowledge/storage/knowledge_storage.py

@@ -76,7 +76,7 @@ class KnowledgeStorage(BaseKnowledgeStorage):
                         "context": fetched["documents"][0][i],  # type: ignore
                         "score": fetched["distances"][0][i],  # type: ignore
                     }
-                    if result["score"] >= score_threshold:
+                    if result["score"] >= score_threshold:  # type: ignore
                         results.append(result)
                 return results
             else:

src/crewai/llm.py

@@ -5,28 +5,20 @@ import sys
 import threading
 import warnings
 from contextlib import contextmanager
-from typing import Any, Dict, List, Literal, Optional, Type, Union, cast
+from typing import Any, Dict, List, Optional, Union, cast
 
+import instructor
 from dotenv import load_dotenv
+from openai.types.chat import ChatCompletionMessageParam
 from pydantic import BaseModel
 
-from crewai.utilities.events.llm_events import (
-    LLMCallCompletedEvent,
-    LLMCallFailedEvent,
-    LLMCallStartedEvent,
-    LLMCallType,
-)
-from crewai.utilities.events.tool_usage_events import ToolExecutionErrorEvent
-
 with warnings.catch_warnings():
     warnings.simplefilter("ignore", UserWarning)
     import litellm
-    from litellm import Choices
+    from litellm import Choices, get_supported_openai_params
     from litellm.types.utils import ModelResponse
-    from litellm.utils import get_supported_openai_params, supports_response_schema
 
 
-from crewai.utilities.events import crewai_event_bus
 from crewai.utilities.exceptions.context_window_exceeding_exception import (
     LLMContextLengthExceededException,
 )
@@ -64,7 +56,6 @@ LLM_CONTEXT_WINDOW_SIZES = {
     "gpt-4-turbo": 128000,
     "o1-preview": 128000,
     "o1-mini": 128000,
-    "o3-mini": 200000,  # Based on official o3-mini specifications
     # gemini
     "gemini-2.0-flash": 1048576,
     "gemini-1.5-pro": 2097152,
@@ -140,7 +131,7 @@ class LLM:
         presence_penalty: Optional[float] = None,
         frequency_penalty: Optional[float] = None,
         logit_bias: Optional[Dict[int, float]] = None,
-        response_format: Optional[Type[BaseModel]] = None,
+        response_format: Optional[Dict[str, Any]] = None,
         seed: Optional[int] = None,
         logprobs: Optional[int] = None,
         top_logprobs: Optional[int] = None,
@@ -149,7 +140,6 @@ class LLM:
         api_version: Optional[str] = None,
         api_key: Optional[str] = None,
         callbacks: List[Any] = [],
-        reasoning_effort: Optional[Literal["none", "low", "medium", "high"]] = None,
         **kwargs,
     ):
         self.model = model
@@ -172,9 +162,7 @@ class LLM:
         self.api_key = api_key
         self.callbacks = callbacks
         self.context_window_size = 0
-        self.reasoning_effort = reasoning_effort
         self.additional_params = kwargs
-        self.is_anthropic = self._is_anthropic_model(model)
 
         litellm.drop_params = True
 
@@ -189,124 +177,127 @@ class LLM:
         self.set_callbacks(callbacks)
         self.set_env_callbacks()
 
-    def _is_anthropic_model(self, model: str) -> bool:
-        """Determine if the model is from Anthropic provider.
-
-        Args:
-            model: The model identifier string.
-
-        Returns:
-            bool: True if the model is from Anthropic, False otherwise.
-        """
-        ANTHROPIC_PREFIXES = ("anthropic/", "claude-", "claude/")
-        return any(prefix in model.lower() for prefix in ANTHROPIC_PREFIXES)
-
     def call(
         self,
         messages: Union[str, List[Dict[str, str]]],
         tools: Optional[List[dict]] = None,
         callbacks: Optional[List[Any]] = None,
         available_functions: Optional[Dict[str, Any]] = None,
-    ) -> Union[str, Any]:
-        """High-level LLM call method.
+    ) -> str:
+        """
+        High-level LLM call method that handles:
+        1. Multiple input formats (string or message list)
+        2. Structured responses via Instructor integration
+        3. Tool/function calling with optional structured output
+        4. Callback integration
 
-        Args:
-            messages: Input messages for the LLM.
-                     Can be a string or list of message dictionaries.
-                     If string, it will be converted to a single user message.
-                     If list, each dict must have 'role' and 'content' keys.
-            tools: Optional list of tool schemas for function calling.
-                  Each tool should define its name, description, and parameters.
-            callbacks: Optional list of callback functions to be executed
-                      during and after the LLM call.
-            available_functions: Optional dict mapping function names to callables
-                               that can be invoked by the LLM.
+        Parameters:
+            messages: Input prompt(s) as either:
+                - String (converted to single user message)
+                - List of message dicts with 'role' and 'content'
+
+            tools: List of tool schemas for function calling
+            callbacks: List of callback handlers
+            available_functions: Mapping of function names to callables
+            response_format: Pydantic model for structured responses
 
         Returns:
-            Union[str, Any]: Either a text response from the LLM (str) or
-                           the result of a tool function call (Any).
+            str: Can be:
+            - Plain text response
+            - Structured response (if response_format provided)
+            - Tool function result (raw or structured)
 
-        Raises:
-            TypeError: If messages format is invalid
-            ValueError: If response format is not supported
-            LLMContextLengthExceededException: If input exceeds model's context limit
+        Behavior:
+        - With response_format and no tools: Direct structured response
+        - With tools: Initial LLM call → Tool execution → Optional secondary structured call
+        - Without tools/response_format: Standard text completion
 
         Examples:
-            # Example 1: Simple string input
-            >>> response = llm.call("Return the name of a random city.")
-            >>> print(response)
-            "Paris"
+            # Basic text completion
+            llm.call("Hello world")
 
-            # Example 2: Message list with system and user messages
-            >>> messages = [
-            ...     {"role": "system", "content": "You are a geography expert"},
-            ...     {"role": "user", "content": "What is France's capital?"}
-            ... ]
-            >>> response = llm.call(messages)
-            >>> print(response)
-            "The capital of France is Paris."
+            # Structured response without tools
+            class City(BaseModel):
+                name: str
+                population: int
+
+            response = llm.call(
+                "Name a major US city",
+                response_format=City
+            )
+            print(response.name)  # Structured access
+
+            # Tool usage with raw output
+            llm.call(
+                "What's 5 squared?",
+                tools=[math_tools],
+                available_functions={"square": square_number}
+            )
+
+            # Tool usage with structured output
+            response = llm.call(
+                "Analyze this data",
+                tools=[data_tools],
+                available_functions={"analyze": analyze_data},
+                response_format=AnalysisResult
+            )
+            print(response.metrics)  # Structured access
         """
-        crewai_event_bus.emit(
-            self,
-            event=LLMCallStartedEvent(
-                messages=messages,
-                tools=tools,
-                callbacks=callbacks,
-                available_functions=available_functions,
-            ),
-        )
-        # Validate parameters before proceeding with the call.
-        self._validate_call_params()
-
         if isinstance(messages, str):
             messages = [{"role": "user", "content": messages}]
 
-        # For O1 models, system messages are not supported.
-        # Convert any system messages into assistant messages.
-        if "o1" in self.model.lower():
-            for message in messages:
-                if message.get("role") == "system":
-                    message["role"] = "assistant"
-
         with suppress_warnings():
             if callbacks and len(callbacks) > 0:
                 self.set_callbacks(callbacks)
 
+            # Prepare the parameters for the completion call.
+            params = {
+                "model": self.model,
+                "messages": messages,
+                "timeout": self.timeout,
+                "temperature": self.temperature,
+                "top_p": self.top_p,
+                "n": self.n,
+                "stop": self.stop,
+                "max_tokens": self.max_tokens or self.max_completion_tokens,
+                "presence_penalty": self.presence_penalty,
+                "frequency_penalty": self.frequency_penalty,
+                "logit_bias": self.logit_bias,
+                "seed": self.seed,
+                "logprobs": self.logprobs,
+                "top_logprobs": self.top_logprobs,
+                "api_base": self.api_base,
+                "base_url": self.base_url,
+                "api_version": self.api_version,
+                "api_key": self.api_key,
+                "stream": False,
+                "tools": tools,
+                **self.additional_params,
+            }
+
+            # Remove any keys with None values.
+            params = {k: v for k, v in params.items() if v is not None}
+
+            # --- Direct structured response if no tools are provided.
+            if self.response_format is not None and (tools is None or len(tools) == 0):
+                print("Direct structured response")
+                try:
+                    # Cast messages to required type and remove model param
+                    params["messages"] = cast(
+                        List[ChatCompletionMessageParam], messages
+                    )
+                    params.pop("model", None)
+
+                    client = instructor.from_litellm(litellm.completion)
+                    response = client.chat.completions.create(**params)
+                    return response
+                except Exception as e:
+                    logging.error(f"LiteLLM call failed: {str(e)}")
+                    raise
+
+            # --- Standard flow with potential tool calls.
             try:
-                # --- 1) Format messages according to provider requirements
-                formatted_messages = self._format_messages_for_provider(messages)
-
-                # --- 2) Prepare the parameters for the completion call
-                params = {
-                    "model": self.model,
-                    "messages": formatted_messages,
-                    "timeout": self.timeout,
-                    "temperature": self.temperature,
-                    "top_p": self.top_p,
-                    "n": self.n,
-                    "stop": self.stop,
-                    "max_tokens": self.max_tokens or self.max_completion_tokens,
-                    "presence_penalty": self.presence_penalty,
-                    "frequency_penalty": self.frequency_penalty,
-                    "logit_bias": self.logit_bias,
-                    "response_format": self.response_format,
-                    "seed": self.seed,
-                    "logprobs": self.logprobs,
-                    "top_logprobs": self.top_logprobs,
-                    "api_base": self.api_base,
-                    "base_url": self.base_url,
-                    "api_version": self.api_version,
-                    "api_key": self.api_key,
-                    "stream": False,
-                    "tools": tools,
-                    "reasoning_effort": self.reasoning_effort,
-                    **self.additional_params,
-                }
-
-                # Remove None values from params
-                params = {k: v for k, v in params.items() if v is not None}
-
-                # --- 2) Make the completion call
+                print("NOT DIRECT STRUCTURED RESPONSE")
                 response = litellm.completion(**params)
                 response_message = cast(Choices, cast(ModelResponse, response).choices)[
                     0
@@ -314,7 +305,6 @@ class LLM:
                 text_response = response_message.content or ""
                 tool_calls = getattr(response_message, "tool_calls", [])
 
-                # --- 3) Handle callbacks with usage info
                 if callbacks and len(callbacks) > 0:
                     for callback in callbacks:
                         if hasattr(callback, "log_success_event"):
@@ -327,12 +317,11 @@ class LLM:
                                     end_time=0,
                                 )
 
-                # --- 4) If no tool calls, return the text response
+                # If no tool call is requested or available_functions is not provided, return the text response.
                 if not tool_calls or not available_functions:
-                    self._handle_emit_call_events(text_response, LLMCallType.LLM_CALL)
                     return text_response
 
-                # --- 5) Handle the tool call
+                # --- Handle tool calls.
                 tool_call = tool_calls[0]
                 function_name = tool_call.function.name
 
@@ -345,131 +334,51 @@ class LLM:
 
                     fn = available_functions[function_name]
                     try:
-                        # Call the actual tool function
                         result = fn(**function_args)
-                        self._handle_emit_call_events(result, LLMCallType.TOOL_CALL)
-                        return result
-
                     except Exception as e:
                         logging.error(
                             f"Error executing function '{function_name}': {e}"
                         )
-                        crewai_event_bus.emit(
-                            self,
-                            event=ToolExecutionErrorEvent(
-                                tool_name=function_name,
-                                tool_args=function_args,
-                                tool_class=fn,
-                                error=str(e),
-                            ),
-                        )
-                        crewai_event_bus.emit(
-                            self,
-                            event=LLMCallFailedEvent(
-                                error=f"Tool execution error: {str(e)}"
-                            ),
-                        )
                         return text_response
 
+                    # If a structured response is requested, perform a secondary call using the tool result.
+                    if self.response_format is not None:
+                        new_params = dict(params)
+                        # Cast tool result message to required type
+                        new_params["messages"] = cast(
+                            List[ChatCompletionMessageParam],
+                            [{"role": "user", "content": result}],
+                        )
+                        new_params.pop("model", None)
+                        if "tools" in new_params:
+                            del new_params["tools"]
+                        try:
+                            client = instructor.from_litellm(litellm.completion)
+                            final_response = client.chat.completions.create(
+                                **new_params, response_model=response_format
+                            )
+                            return final_response
+                        except Exception as e:
+                            logging.error(f"LiteLLM structured call failed: {e}")
+                            return result
+                    else:
+                        return result
                 else:
                     logging.warning(
                         f"Tool call requested unknown function '{function_name}'"
                     )
                     return text_response
-
             except Exception as e:
-                crewai_event_bus.emit(
-                    self,
-                    event=LLMCallFailedEvent(error=str(e)),
-                )
                 if not LLMContextLengthExceededException(
                     str(e)
                 )._is_context_limit_error(str(e)):
                     logging.error(f"LiteLLM call failed: {str(e)}")
                 raise
 
-    def _handle_emit_call_events(self, response: Any, call_type: LLMCallType):
-        """Handle the events for the LLM call.
-
-        Args:
-            response (str): The response from the LLM call.
-            call_type (str): The type of call, either "tool_call" or "llm_call".
-        """
-        crewai_event_bus.emit(
-            self,
-            event=LLMCallCompletedEvent(response=response, call_type=call_type),
-        )
-
-    def _format_messages_for_provider(
-        self, messages: List[Dict[str, str]]
-    ) -> List[Dict[str, str]]:
-        """Format messages according to provider requirements.
-
-        Args:
-            messages: List of message dictionaries with 'role' and 'content' keys.
-                     Can be empty or None.
-
-        Returns:
-            List of formatted messages according to provider requirements.
-            For Anthropic models, ensures first message has 'user' role.
-
-        Raises:
-            TypeError: If messages is None or contains invalid message format.
-        """
-        if messages is None:
-            raise TypeError("Messages cannot be None")
-
-        # Validate message format first
-        for msg in messages:
-            if not isinstance(msg, dict) or "role" not in msg or "content" not in msg:
-                raise TypeError(
-                    "Invalid message format. Each message must be a dict with 'role' and 'content' keys"
-                )
-
-        if not self.is_anthropic:
-            return messages
-
-        # Anthropic requires messages to start with 'user' role
-        if not messages or messages[0]["role"] == "system":
-            # If first message is system or empty, add a placeholder user message
-            return [{"role": "user", "content": "."}, *messages]
-
-        return messages
-
-    def _get_custom_llm_provider(self) -> str:
-        """
-        Derives the custom_llm_provider from the model string.
-        - For example, if the model is "openrouter/deepseek/deepseek-chat", returns "openrouter".
-        - If the model is "gemini/gemini-1.5-pro", returns "gemini".
-        - If there is no '/', defaults to "openai".
-        """
-        if "/" in self.model:
-            return self.model.split("/")[0]
-        return "openai"
-
-    def _validate_call_params(self) -> None:
-        """
-        Validate parameters before making a call. Currently this only checks if
-        a response_format is provided and whether the model supports it.
-        The custom_llm_provider is dynamically determined from the model:
-          - E.g., "openrouter/deepseek/deepseek-chat" yields "openrouter"
-          - "gemini/gemini-1.5-pro" yields "gemini"
-          - If no slash is present, "openai" is assumed.
-        """
-        provider = self._get_custom_llm_provider()
-        if self.response_format is not None and not supports_response_schema(
-            model=self.model,
-            custom_llm_provider=provider,
-        ):
-            raise ValueError(
-                f"The model {self.model} does not support response_format for provider '{provider}'. "
-                "Please remove response_format or use a supported model."
-            )
-
     def supports_function_calling(self) -> bool:
         try:
             params = get_supported_openai_params(model=self.model)
-            return params is not None and "tools" in params
+            return "response_format" in params
         except Exception as e:
             logging.error(f"Failed to get supported params: {str(e)}")
             return False
@@ -477,7 +386,7 @@ class LLM:
     def supports_stop_words(self) -> bool:
         try:
             params = get_supported_openai_params(model=self.model)
-            return params is not None and "stop" in params
+            return "stop" in params
         except Exception as e:
             logging.error(f"Failed to get supported params: {str(e)}")
             return False
@@ -486,23 +395,10 @@ class LLM:
         """
         Returns the context window size, using 75% of the maximum to avoid
         cutting off messages mid-thread.
-
-        Raises:
-            ValueError: If a model's context window size is outside valid bounds (1024-2097152)
         """
         if self.context_window_size != 0:
             return self.context_window_size
 
-        MIN_CONTEXT = 1024
-        MAX_CONTEXT = 2097152  # Current max from gemini-1.5-pro
-
-        # Validate all context window sizes
-        for key, value in LLM_CONTEXT_WINDOW_SIZES.items():
-            if value < MIN_CONTEXT or value > MAX_CONTEXT:
-                raise ValueError(
-                    f"Context window for {key} must be between {MIN_CONTEXT} and {MAX_CONTEXT}"
-                )
-
         self.context_window_size = int(
             DEFAULT_CONTEXT_WINDOW_SIZE * CONTEXT_WINDOW_USAGE_RATIO
         )

src/crewai/memory/entity/entity_memory.py

@@ -1,7 +1,3 @@
-from typing import Optional
-
-from pydantic import PrivateAttr
-
 from crewai.memory.entity.entity_memory_item import EntityMemoryItem
 from crewai.memory.memory import Memory
 from crewai.memory.storage.rag_storage import RAGStorage
@@ -14,15 +10,13 @@ class EntityMemory(Memory):
     Inherits from the Memory class.
     """
 
-    _memory_provider: Optional[str] = PrivateAttr()
-
     def __init__(self, crew=None, embedder_config=None, storage=None, path=None):
-        if crew and hasattr(crew, "memory_config") and crew.memory_config is not None:
-            memory_provider = crew.memory_config.get("provider")
+        if hasattr(crew, "memory_config") and crew.memory_config is not None:
+            self.memory_provider = crew.memory_config.get("provider")
         else:
-            memory_provider = None
+            self.memory_provider = None
 
-        if memory_provider == "mem0":
+        if self.memory_provider == "mem0":
             try:
                 from crewai.memory.storage.mem0_storage import Mem0Storage
             except ImportError:
@@ -42,13 +36,11 @@ class EntityMemory(Memory):
                     path=path,
                 )
             )
-
-        super().__init__(storage=storage)
-        self._memory_provider = memory_provider
+        super().__init__(storage)
 
     def save(self, item: EntityMemoryItem) -> None:  # type: ignore # BUG?: Signature of "save" incompatible with supertype "Memory"
         """Saves an entity item into the SQLite storage."""
-        if self._memory_provider == "mem0":
+        if self.memory_provider == "mem0":
             data = f"""
             Remember details about the following entity:
             Name: {item.name}

src/crewai/memory/long_term/long_term_memory.py

@@ -17,7 +17,7 @@ class LongTermMemory(Memory):
     def __init__(self, storage=None, path=None):
         if not storage:
             storage = LTMSQLiteStorage(db_path=path) if path else LTMSQLiteStorage()
-        super().__init__(storage=storage)
+        super().__init__(storage)
 
     def save(self, item: LongTermMemoryItem) -> None:  # type: ignore # BUG?: Signature of "save" incompatible with supertype "Memory"
         metadata = item.metadata

src/crewai/memory/memory.py

@@ -1,19 +1,15 @@
 from typing import Any, Dict, List, Optional
 
-from pydantic import BaseModel
+from crewai.memory.storage.rag_storage import RAGStorage
 
 
-class Memory(BaseModel):
+class Memory:
     """
     Base class for memory, now supporting agent tags and generic metadata.
     """
 
-    embedder_config: Optional[Dict[str, Any]] = None
-
-    storage: Any
-
-    def __init__(self, storage: Any, **data: Any):
-        super().__init__(storage=storage, **data)
+    def __init__(self, storage: RAGStorage):
+        self.storage = storage
 
     def save(
         self,

src/crewai/memory/short_term/short_term_memory.py

@@ -1,7 +1,5 @@
 from typing import Any, Dict, Optional
 
-from pydantic import PrivateAttr
-
 from crewai.memory.memory import Memory
 from crewai.memory.short_term.short_term_memory_item import ShortTermMemoryItem
 from crewai.memory.storage.rag_storage import RAGStorage
@@ -16,15 +14,13 @@ class ShortTermMemory(Memory):
     MemoryItem instances.
     """
 
-    _memory_provider: Optional[str] = PrivateAttr()
-
     def __init__(self, crew=None, embedder_config=None, storage=None, path=None):
-        if crew and hasattr(crew, "memory_config") and crew.memory_config is not None:
-            memory_provider = crew.memory_config.get("provider")
+        if hasattr(crew, "memory_config") and crew.memory_config is not None:
+            self.memory_provider = crew.memory_config.get("provider")
         else:
-            memory_provider = None
+            self.memory_provider = None
 
-        if memory_provider == "mem0":
+        if self.memory_provider == "mem0":
             try:
                 from crewai.memory.storage.mem0_storage import Mem0Storage
             except ImportError:
@@ -43,8 +39,7 @@ class ShortTermMemory(Memory):
                     path=path,
                 )
             )
-        super().__init__(storage=storage)
-        self._memory_provider = memory_provider
+        super().__init__(storage)
 
     def save(
         self,
@@ -53,7 +48,7 @@ class ShortTermMemory(Memory):
         agent: Optional[str] = None,
     ) -> None:
         item = ShortTermMemoryItem(data=value, metadata=metadata, agent=agent)
-        if self._memory_provider == "mem0":
+        if self.memory_provider == "mem0":
             item.data = f"Remember the following insights from Agent run: {item.data}"
 
         super().save(value=item.data, metadata=item.metadata, agent=item.agent)

src/crewai/memory/storage/base_rag_storage.py

@@ -13,7 +13,7 @@ class BaseRAGStorage(ABC):
         self,
         type: str,
         allow_reset: bool = True,
-        embedder_config: Optional[Dict[str, Any]] = None,
+        embedder_config: Optional[Any] = None,
         crew: Any = None,
     ):
         self.type = type

src/crewai/task.py

@@ -21,6 +21,7 @@ from typing import (
     Union,
 )
 
+from opentelemetry.trace import Span
 from pydantic import (
     UUID4,
     BaseModel,
@@ -35,15 +36,10 @@ from crewai.agents.agent_builder.base_agent import BaseAgent
 from crewai.tasks.guardrail_result import GuardrailResult
 from crewai.tasks.output_format import OutputFormat
 from crewai.tasks.task_output import TaskOutput
+from crewai.telemetry.telemetry import Telemetry
 from crewai.tools.base_tool import BaseTool
 from crewai.utilities.config import process_config
 from crewai.utilities.converter import Converter, convert_to_model
-from crewai.utilities.events import (
-    TaskCompletedEvent,
-    TaskFailedEvent,
-    TaskStartedEvent,
-)
-from crewai.utilities.events.crewai_event_bus import crewai_event_bus
 from crewai.utilities.i18n import I18N
 from crewai.utilities.printer import Printer
 
@@ -187,6 +183,8 @@ class Task(BaseModel):
                     )
         return v
 
+    _telemetry: Telemetry = PrivateAttr(default_factory=Telemetry)
+    _execution_span: Optional[Span] = PrivateAttr(default=None)
     _original_description: Optional[str] = PrivateAttr(default=None)
     _original_expected_output: Optional[str] = PrivateAttr(default=None)
     _original_output_file: Optional[str] = PrivateAttr(default=None)
@@ -350,103 +348,96 @@ class Task(BaseModel):
         tools: Optional[List[Any]],
     ) -> TaskOutput:
         """Run the core execution logic of the task."""
-        try:
-            agent = agent or self.agent
-            self.agent = agent
-            if not agent:
-                raise Exception(
-                    f"The task '{self.description}' has no agent assigned, therefore it can't be executed directly and should be executed in a Crew using a specific process that support that, like hierarchical."
-                )
-
-            self.start_time = datetime.datetime.now()
-
-            self.prompt_context = context
-            tools = tools or self.tools or []
-
-            self.processed_by_agents.add(agent.role)
-            crewai_event_bus.emit(self, TaskStartedEvent(context=context))
-            result = agent.execute_task(
-                task=self,
-                context=context,
-                tools=tools,
+        agent = agent or self.agent
+        self.agent = agent
+        if not agent:
+            raise Exception(
+                f"The task '{self.description}' has no agent assigned, therefore it can't be executed directly and should be executed in a Crew using a specific process that support that, like hierarchical."
             )
 
-            pydantic_output, json_output = self._export_output(result)
-            task_output = TaskOutput(
-                key=self.key,
-                name=self.name,
-                description=self.description,
-                expected_output=self.expected_output,
-                raw=result,
-                pydantic=pydantic_output,
-                json_dict=json_output,
-                agent=agent.role,
-                output_format=self._get_output_format(),
-            )
+        self.start_time = datetime.datetime.now()
+        self._execution_span = self._telemetry.task_started(crew=agent.crew, task=self)
 
-            if self.guardrail:
-                guardrail_result = GuardrailResult.from_tuple(
-                    self.guardrail(task_output)
-                )
-                if not guardrail_result.success:
-                    if self.retry_count >= self.max_retries:
-                        raise Exception(
-                            f"Task failed guardrail validation after {self.max_retries} retries. "
-                            f"Last error: {guardrail_result.error}"
-                        )
+        self.prompt_context = context
+        tools = tools or self.tools or []
 
-                    self.retry_count += 1
-                    context = self.i18n.errors("validation_error").format(
-                        guardrail_result_error=guardrail_result.error,
-                        task_output=task_output.raw,
-                    )
-                    printer = Printer()
-                    printer.print(
-                        content=f"Guardrail blocked, retrying, due to: {guardrail_result.error}\n",
-                        color="yellow",
-                    )
-                    return self._execute_core(agent, context, tools)
+        self.processed_by_agents.add(agent.role)
 
-                if guardrail_result.result is None:
+        result = agent.execute_task(
+            task=self,
+            context=context,
+            tools=tools,
+        )
+
+        pydantic_output, json_output = self._export_output(result)
+        task_output = TaskOutput(
+            name=self.name,
+            description=self.description,
+            expected_output=self.expected_output,
+            raw=result,
+            pydantic=pydantic_output,
+            json_dict=json_output,
+            agent=agent.role,
+            output_format=self._get_output_format(),
+        )
+
+        if self.guardrail:
+            guardrail_result = GuardrailResult.from_tuple(self.guardrail(task_output))
+            if not guardrail_result.success:
+                if self.retry_count >= self.max_retries:
                     raise Exception(
-                        "Task guardrail returned None as result. This is not allowed."
+                        f"Task failed guardrail validation after {self.max_retries} retries. "
+                        f"Last error: {guardrail_result.error}"
                     )
 
-                if isinstance(guardrail_result.result, str):
-                    task_output.raw = guardrail_result.result
-                    pydantic_output, json_output = self._export_output(
-                        guardrail_result.result
-                    )
-                    task_output.pydantic = pydantic_output
-                    task_output.json_dict = json_output
-                elif isinstance(guardrail_result.result, TaskOutput):
-                    task_output = guardrail_result.result
-
-            self.output = task_output
-            self.end_time = datetime.datetime.now()
-
-            if self.callback:
-                self.callback(self.output)
-
-            crew = self.agent.crew  # type: ignore[union-attr]
-            if crew and crew.task_callback and crew.task_callback != self.callback:
-                crew.task_callback(self.output)
-
-            if self.output_file:
-                content = (
-                    json_output
-                    if json_output
-                    else pydantic_output.model_dump_json()
-                    if pydantic_output
-                    else result
+                self.retry_count += 1
+                context = self.i18n.errors("validation_error").format(
+                    guardrail_result_error=guardrail_result.error,
+                    task_output=task_output.raw,
                 )
-                self._save_file(content)
-            crewai_event_bus.emit(self, TaskCompletedEvent(output=task_output))
-            return task_output
-        except Exception as e:
-            self.end_time = datetime.datetime.now()
-            crewai_event_bus.emit(self, TaskFailedEvent(error=str(e)))
-            raise e  # Re-raise the exception after emitting the event
+                printer = Printer()
+                printer.print(
+                    content=f"Guardrail blocked, retrying, due to: {guardrail_result.error}\n",
+                    color="yellow",
+                )
+                return self._execute_core(agent, context, tools)
+
+            if guardrail_result.result is None:
+                raise Exception(
+                    "Task guardrail returned None as result. This is not allowed."
+                )
+
+            if isinstance(guardrail_result.result, str):
+                task_output.raw = guardrail_result.result
+                pydantic_output, json_output = self._export_output(
+                    guardrail_result.result
+                )
+                task_output.pydantic = pydantic_output
+                task_output.json_dict = json_output
+            elif isinstance(guardrail_result.result, TaskOutput):
+                task_output = guardrail_result.result
+
+        self.output = task_output
+        self.end_time = datetime.datetime.now()
+
+        if self.callback:
+            self.callback(self.output)
+
+        if self._execution_span:
+            self._telemetry.task_ended(self._execution_span, self, agent.crew)
+            self._execution_span = None
+
+        if self.output_file:
+            content = (
+                json_output
+                if json_output
+                else pydantic_output.model_dump_json()
+                if pydantic_output
+                else result
+            )
+            self._save_file(content)
+
+        return task_output
 
     def prompt(self) -> str:
         """Prompt the task.
@@ -679,32 +670,19 @@ class Task(BaseModel):
             return OutputFormat.PYDANTIC
         return OutputFormat.RAW
 
-    def _save_file(self, result: Union[Dict, str, Any]) -> None:
+    def _save_file(self, result: Any) -> None:
         """Save task output to a file.
 
-        Note:
-            For cross-platform file writing, especially on Windows, consider using FileWriterTool
-            from the crewai_tools package:
-                pip install 'crewai[tools]'
-                from crewai_tools import FileWriterTool
-
         Args:
             result: The result to save to the file. Can be a dict or any stringifiable object.
 
         Raises:
             ValueError: If output_file is not set
-            RuntimeError: If there is an error writing to the file. For cross-platform
-                compatibility, especially on Windows, use FileWriterTool from crewai_tools
-                package.
+            RuntimeError: If there is an error writing to the file
         """
         if self.output_file is None:
             raise ValueError("output_file is not set.")
 
-        FILEWRITER_RECOMMENDATION = (
-            "For cross-platform file writing, especially on Windows, "
-            "use FileWriterTool from crewai_tools package."
-        )
-
         try:
             resolved_path = Path(self.output_file).expanduser().resolve()
             directory = resolved_path.parent
@@ -720,11 +698,7 @@ class Task(BaseModel):
                 else:
                     file.write(str(result))
         except (OSError, IOError) as e:
-            raise RuntimeError(
-                "\n".join(
-                    [f"Failed to save output file: {e}", FILEWRITER_RECOMMENDATION]
-                )
-            )
+            raise RuntimeError(f"Failed to save output file: {e}")
         return None
 
     def __repr__(self):

src/crewai/tasks/task_output.py

@@ -9,7 +9,6 @@ from crewai.tasks.output_format import OutputFormat
 class TaskOutput(BaseModel):
     """Class that represents the result of a task."""
 
-    key: Optional[str] = Field(description="Key of the task", default=None)
     description: str = Field(description="Description of the task")
     name: Optional[str] = Field(description="Name of the task", default=None)
     expected_output: Optional[str] = Field(

src/crewai/tools/agent_tools/add_image_tool.py

@@ -7,11 +7,11 @@ from crewai.utilities import I18N
 
 i18n = I18N()
 
-
 class AddImageToolSchema(BaseModel):
     image_url: str = Field(..., description="The URL or path of the image to add")
     action: Optional[str] = Field(
-        default=None, description="Optional context or question about the image"
+        default=None,
+        description="Optional context or question about the image"
     )
 
 
@@ -36,7 +36,10 @@ class AddImageTool(BaseTool):
                 "image_url": {
                     "url": image_url,
                 },
-            },
+            }
         ]
 
-        return {"role": "user", "content": content}
+        return {
+            "role": "user",
+            "content": content
+        }

src/crewai/tools/tool_usage.py

@@ -10,21 +10,20 @@ from typing import Any, Dict, List, Optional, Union
 import json5
 from json_repair import repair_json
 
+import crewai.utilities.events as events
 from crewai.agents.tools_handler import ToolsHandler
 from crewai.task import Task
 from crewai.telemetry import Telemetry
 from crewai.tools import BaseTool
 from crewai.tools.structured_tool import CrewStructuredTool
 from crewai.tools.tool_calling import InstructorToolCalling, ToolCalling
+from crewai.tools.tool_usage_events import ToolUsageError, ToolUsageFinished
 from crewai.utilities import I18N, Converter, ConverterError, Printer
-from crewai.utilities.events.crewai_event_bus import crewai_event_bus
-from crewai.utilities.events.tool_usage_events import (
-    ToolSelectionErrorEvent,
-    ToolUsageErrorEvent,
-    ToolUsageFinishedEvent,
-    ToolValidateInputErrorEvent,
-)
 
+try:
+    import agentops  # type: ignore
+except ImportError:
+    agentops = None
 OPENAI_BIGGER_MODELS = [
     "gpt-4",
     "gpt-4o",
@@ -137,6 +136,7 @@ class ToolUsage:
         tool: Any,
         calling: Union[ToolCalling, InstructorToolCalling],
     ) -> str:  # TODO: Fix this return type
+        tool_event = agentops.ToolEvent(name=calling.tool_name) if agentops else None  # type: ignore
         if self._check_tool_repeated_usage(calling=calling):  # type: ignore # _check_tool_repeated_usage of "ToolUsage" does not return a value (it only ever returns None)
             try:
                 result = self._i18n.errors("task_repeated_usage").format(
@@ -212,6 +212,10 @@ class ToolUsage:
                     return error  # type: ignore # No return value expected
 
                 self.task.increment_tools_errors()
+                if agentops:
+                    agentops.record(
+                        agentops.ErrorEvent(exception=e, trigger_event=tool_event)
+                    )
                 return self.use(calling=calling, tool_string=tool_string)  # type: ignore # No return value expected
 
             if self.tools_handler:
@@ -227,6 +231,9 @@ class ToolUsage:
                 self.tools_handler.on_tool_use(
                     calling=calling, output=result, should_cache=should_cache
                 )
+
+        if agentops:
+            agentops.record(tool_event)
         self._telemetry.tool_usage(
             llm=self.function_calling_llm,
             tool_name=tool.name,
@@ -301,33 +308,14 @@ class ToolUsage:
             ):
                 return tool
         self.task.increment_tools_errors()
-        tool_selection_data = {
-            "agent_key": self.agent.key,
-            "agent_role": self.agent.role,
-            "tool_name": tool_name,
-            "tool_args": {},
-            "tool_class": self.tools_description,
-        }
         if tool_name and tool_name != "":
-            error = f"Action '{tool_name}' don't exist, these are the only available Actions:\n{self.tools_description}"
-            crewai_event_bus.emit(
-                self,
-                ToolSelectionErrorEvent(
-                    **tool_selection_data,
-                    error=error,
-                ),
+            raise Exception(
+                f"Action '{tool_name}' don't exist, these are the only available Actions:\n{self.tools_description}"
             )
-            raise Exception(error)
         else:
-            error = f"I forgot the Action name, these are the only available Actions: {self.tools_description}"
-            crewai_event_bus.emit(
-                self,
-                ToolSelectionErrorEvent(
-                    **tool_selection_data,
-                    error=error,
-                ),
+            raise Exception(
+                f"I forgot the Action name, these are the only available Actions: {self.tools_description}"
             )
-            raise Exception(error)
 
     def _render(self) -> str:
         """Render the tool name and description in plain text."""
@@ -463,33 +451,18 @@ class ToolUsage:
             if isinstance(arguments, dict):
                 return arguments
         except Exception as e:
-            error = f"Failed to repair JSON: {e}"
-            self._printer.print(content=error, color="red")
+            self._printer.print(content=f"Failed to repair JSON: {e}", color="red")
 
-        error_message = (
-            "Tool input must be a valid dictionary in JSON or Python literal format"
-        )
-        self._emit_validate_input_error(error_message)
         # If all parsing attempts fail, raise an error
-        raise Exception(error_message)
-
-    def _emit_validate_input_error(self, final_error: str):
-        tool_selection_data = {
-            "agent_key": self.agent.key,
-            "agent_role": self.agent.role,
-            "tool_name": self.action.tool,
-            "tool_args": str(self.action.tool_input),
-            "tool_class": self.__class__.__name__,
-        }
-
-        crewai_event_bus.emit(
-            self,
-            ToolValidateInputErrorEvent(**tool_selection_data, error=final_error),
+        raise Exception(
+            "Tool input must be a valid dictionary in JSON or Python literal format"
         )
 
     def on_tool_error(self, tool: Any, tool_calling: ToolCalling, e: Exception) -> None:
         event_data = self._prepare_event_data(tool, tool_calling)
-        crewai_event_bus.emit(self, ToolUsageErrorEvent(**{**event_data, "error": e}))
+        events.emit(
+            source=self, event=ToolUsageError(**{**event_data, "error": str(e)})
+        )
 
     def on_tool_use_finished(
         self, tool: Any, tool_calling: ToolCalling, from_cache: bool, started_at: float
@@ -503,7 +476,7 @@ class ToolUsage:
                 "from_cache": from_cache,
             }
         )
-        crewai_event_bus.emit(self, ToolUsageFinishedEvent(**event_data))
+        events.emit(source=self, event=ToolUsageFinished(**event_data))
 
     def _prepare_event_data(self, tool: Any, tool_calling: ToolCalling) -> dict:
         return {

src/crewai/tools/tool_usage_events.py

@@ -0,0 +1,24 @@
+from datetime import datetime
+from typing import Any, Dict
+
+from pydantic import BaseModel
+
+
+class ToolUsageEvent(BaseModel):
+    agent_key: str
+    agent_role: str
+    tool_name: str
+    tool_args: Dict[str, Any]
+    tool_class: str
+    run_attempts: int | None = None
+    delegations: int | None = None
+
+
+class ToolUsageFinished(ToolUsageEvent):
+    started_at: datetime
+    finished_at: datetime
+    from_cache: bool = False
+
+
+class ToolUsageError(ToolUsageEvent):
+    error: str

src/crewai/translations/en.json

@@ -15,7 +15,7 @@
     "final_answer_format": "If you don't need to use any more tools, you must give your best complete final answer, make sure it satisfies the expected criteria, use the EXACT format below:\n\n```\nThought: I now can give a great answer\nFinal Answer: my best complete final answer to the task.\n\n```",
     "format_without_tools": "\nSorry, I didn't use the right format. I MUST either use a tool (among the available ones), OR give my best final answer.\nHere is the expected format I must follow:\n\n```\nQuestion: the input question you must answer\nThought: you should always think about what to do\nAction: the action to take, should be one of [{tool_names}]\nAction Input: the input to the action\nObservation: the result of the action\n```\n This Thought/Action/Action Input/Result process can repeat N times. Once I know the final answer, I must return the following format:\n\n```\nThought: I now can give a great answer\nFinal Answer: Your final answer must be the great and the most complete as possible, it must be outcome described\n\n```",
     "task_with_context": "{task}\n\nThis is the context you're working with:\n{context}",
-    "expected_output": "\nThis is the expected criteria for your final answer: {expected_output}\nyou MUST return the actual complete content as the final answer, not a summary.",
+    "expected_output": "\nThis is the expect criteria for your final answer: {expected_output}\nyou MUST return the actual complete content as the final answer, not a summary.",
     "human_feedback": "You got human feedback on your work, re-evaluate it and give a new Final Answer when ready.\n {human_feedback}",
     "getting_input": "This is the agent's final answer: {final_answer}\n\n",
     "summarizer_system_message": "You are a helpful assistant that summarizes text.",
@@ -23,6 +23,7 @@
     "summary": "This is a summary of our conversation so far:\n{merged_summary}",
     "manager_request": "Your best answer to your coworker asking you this, accounting for the context shared.",
     "formatted_task_instructions": "Ensure your final answer contains only the content in the following format: {output_format}\n\nEnsure the final output does not include any code block markers like ```json or ```python.",
+    "human_feedback_classification": "Determine if the following feedback indicates that the user is satisfied or if further changes are needed. Respond with 'True' if further changes are needed, or 'False' if the user is satisfied. **Important** Do not include any additional commentary outside of your 'True' or 'False' response.\n\nFeedback: \"{feedback}\"",
     "conversation_history_instruction": "You are a member of a crew collaborating to achieve a common goal. Your task is a specific action that contributes to this larger objective. For additional context, please review the conversation history between you and the user that led to the initiation of this crew. Use any relevant information or feedback from the conversation to inform your task execution and ensure your response aligns with both the immediate task and the crew's overall goals.",
     "feedback_instructions": "User feedback: {feedback}\nInstructions: Use this feedback to enhance the next output iteration.\nNote: Do not respond or add commentary."
   },
@@ -39,8 +40,8 @@
     "validation_error": "### Previous attempt failed validation: {guardrail_result_error}\n\n\n### Previous result:\n{task_output}\n\n\nTry again, making sure to address the validation error."
   },
   "tools": {
-    "delegate_work": "Delegate a specific task to one of the following coworkers: {coworkers}\nThe input to this tool should be the coworker, the task you want them to do, and ALL necessary context to execute the task, they know nothing about the task, so share absolutely everything you know, don't reference things but instead explain them.",
-    "ask_question": "Ask a specific question to one of the following coworkers: {coworkers}\nThe input to this tool should be the coworker, the question you have for them, and ALL necessary context to ask the question properly, they know nothing about the question, so share absolutely everything you know, don't reference things but instead explain them.",
+    "delegate_work": "Delegate a specific task to one of the following coworkers: {coworkers}\nThe input to this tool should be the coworker, the task you want them to do, and ALL necessary context to execute the task, they know nothing about the task, so share absolute everything you know, don't reference things but instead explain them.",
+    "ask_question": "Ask a specific question to one of the following coworkers: {coworkers}\nThe input to this tool should be the coworker, the question you have for them, and ALL necessary context to ask the question properly, they know nothing about the question, so share absolute everything you know, don't reference things but instead explain them.",
     "add_image": {
       "name": "Add image to content",
       "description": "See image to understand its content, you can optionally ask a question about the image",

src/crewai/utilities/constants.py

@@ -4,4 +4,3 @@ DEFAULT_SCORE_THRESHOLD = 0.35
 KNOWLEDGE_DIRECTORY = "knowledge"
 MAX_LLM_RETRY = 3
 MAX_FILE_NAME_LENGTH = 255
-EMITTER_COLOR = "bold_blue"

src/crewai/utilities/converter.py

@@ -20,11 +20,11 @@ class ConverterError(Exception):
 class Converter(OutputConverter):
     """Class that converts text into either pydantic or json."""
 
-    def to_pydantic(self, current_attempt=1) -> BaseModel:
+    def to_pydantic(self, current_attempt=1):
         """Convert text to pydantic."""
         try:
             if self.llm.supports_function_calling():
-                result = self._create_instructor().to_pydantic()
+                return self._create_instructor().to_pydantic()
             else:
                 response = self.llm.call(
                     [
@@ -32,40 +32,18 @@ class Converter(OutputConverter):
                         {"role": "user", "content": self.text},
                     ]
                 )
-                try:
-                    # Try to directly validate the response JSON
-                    result = self.model.model_validate_json(response)
-                except ValidationError:
-                    # If direct validation fails, attempt to extract valid JSON
-                    result = handle_partial_json(response, self.model, False, None)
-                    # Ensure result is a BaseModel instance
-                    if not isinstance(result, BaseModel):
-                        if isinstance(result, dict):
-                            result = self.model.parse_obj(result)
-                        elif isinstance(result, str):
-                            try:
-                                parsed = json.loads(result)
-                                result = self.model.parse_obj(parsed)
-                            except Exception as parse_err:
-                                raise ConverterError(
-                                    f"Failed to convert partial JSON result into Pydantic: {parse_err}"
-                                )
-                        else:
-                            raise ConverterError(
-                                "handle_partial_json returned an unexpected type."
-                            )
-            return result
+                return self.model.model_validate_json(response)
         except ValidationError as e:
             if current_attempt < self.max_attempts:
                 return self.to_pydantic(current_attempt + 1)
             raise ConverterError(
-                f"Failed to convert text into a Pydantic model due to validation error: {e}"
+                f"Failed to convert text into a Pydantic model due to the following validation error: {e}"
             )
         except Exception as e:
             if current_attempt < self.max_attempts:
                 return self.to_pydantic(current_attempt + 1)
             raise ConverterError(
-                f"Failed to convert text into a Pydantic model due to error: {e}"
+                f"Failed to convert text into a Pydantic model due to the following error: {e}"
             )
 
     def to_json(self, current_attempt=1):
@@ -219,15 +197,11 @@ def get_conversion_instructions(model: Type[BaseModel], llm: Any) -> str:
     if llm.supports_function_calling():
         model_schema = PydanticSchemaParser(model=model).get_schema()
         instructions += (
-            f"\n\nOutput ONLY the valid JSON and nothing else.\n\n"
-            f"The JSON must follow this schema exactly:\n```json\n{model_schema}\n```"
+            f"\n\nThe JSON should follow this schema:\n```json\n{model_schema}\n```"
         )
     else:
         model_description = generate_model_description(model)
-        instructions += (
-            f"\n\nOutput ONLY the valid JSON and nothing else.\n\n"
-            f"The JSON must follow this format exactly:\n{model_description}"
-        )
+        instructions += f"\n\nThe JSON should follow this format:\n{model_description}"
     return instructions
 
 

src/crewai/utilities/embedding_configurator.py

@@ -1,5 +1,5 @@
 import os
-from typing import Any, Dict, Optional, cast
+from typing import Any, Dict, cast
 
 from chromadb import Documents, EmbeddingFunction, Embeddings
 from chromadb.api.types import validate_embedding_function
@@ -18,12 +18,11 @@ class EmbeddingConfigurator:
             "bedrock": self._configure_bedrock,
             "huggingface": self._configure_huggingface,
             "watson": self._configure_watson,
-            "custom": self._configure_custom,
         }
 
     def configure_embedder(
         self,
-        embedder_config: Optional[Dict[str, Any]] = None,
+        embedder_config: Dict[str, Any] | None = None,
     ) -> EmbeddingFunction:
         """Configures and returns an embedding function based on the provided config."""
         if embedder_config is None:
@@ -31,19 +30,20 @@ class EmbeddingConfigurator:
 
         provider = embedder_config.get("provider")
         config = embedder_config.get("config", {})
-        model_name = config.get("model") if provider != "custom" else None
+        model_name = config.get("model")
+
+        if isinstance(provider, EmbeddingFunction):
+            try:
+                validate_embedding_function(provider)
+                return provider
+            except Exception as e:
+                raise ValueError(f"Invalid custom embedding function: {str(e)}")
 
         if provider not in self.embedding_functions:
             raise Exception(
                 f"Unsupported embedding provider: {provider}, supported providers: {list(self.embedding_functions.keys())}"
             )
-
-        embedding_function = self.embedding_functions[provider]
-        return (
-            embedding_function(config)
-            if provider == "custom"
-            else embedding_function(config, model_name)
-        )
+        return self.embedding_functions[provider](config, model_name)
 
     @staticmethod
     def _create_default_embedding_function():
@@ -64,13 +64,6 @@ class EmbeddingConfigurator:
         return OpenAIEmbeddingFunction(
             api_key=config.get("api_key") or os.getenv("OPENAI_API_KEY"),
             model_name=model_name,
-            api_base=config.get("api_base", None),
-            api_type=config.get("api_type", None),
-            api_version=config.get("api_version", None),
-            default_headers=config.get("default_headers", None),
-            dimensions=config.get("dimensions", None),
-            deployment_id=config.get("deployment_id", None),
-            organization_id=config.get("organization_id", None),
         )
 
     @staticmethod
@@ -85,10 +78,6 @@ class EmbeddingConfigurator:
             api_type=config.get("api_type", "azure"),
             api_version=config.get("api_version"),
             model_name=model_name,
-            default_headers=config.get("default_headers"),
-            dimensions=config.get("dimensions"),
-            deployment_id=config.get("deployment_id"),
-            organization_id=config.get("organization_id"),
         )
 
     @staticmethod
@@ -111,8 +100,6 @@ class EmbeddingConfigurator:
         return GoogleVertexEmbeddingFunction(
             model_name=model_name,
             api_key=config.get("api_key"),
-            project_id=config.get("project_id"),
-            region=config.get("region"),
         )
 
     @staticmethod
@@ -124,7 +111,6 @@ class EmbeddingConfigurator:
         return GoogleGenerativeAiEmbeddingFunction(
             model_name=model_name,
             api_key=config.get("api_key"),
-            task_type=config.get("task_type"),
         )
 
     @staticmethod
@@ -155,11 +141,9 @@ class EmbeddingConfigurator:
             AmazonBedrockEmbeddingFunction,
         )
 
-        # Allow custom model_name override with backwards compatibility
-        kwargs = {"session": config.get("session")}
-        if model_name is not None:
-            kwargs["model_name"] = model_name
-        return AmazonBedrockEmbeddingFunction(**kwargs)
+        return AmazonBedrockEmbeddingFunction(
+            session=config.get("session"),
+        )
 
     @staticmethod
     def _configure_huggingface(config, model_name):
@@ -209,28 +193,3 @@ class EmbeddingConfigurator:
                     raise e
 
         return WatsonEmbeddingFunction()
-
-    @staticmethod
-    def _configure_custom(config):
-        custom_embedder = config.get("embedder")
-        if isinstance(custom_embedder, EmbeddingFunction):
-            try:
-                validate_embedding_function(custom_embedder)
-                return custom_embedder
-            except Exception as e:
-                raise ValueError(f"Invalid custom embedding function: {str(e)}")
-        elif callable(custom_embedder):
-            try:
-                instance = custom_embedder()
-                if isinstance(instance, EmbeddingFunction):
-                    validate_embedding_function(instance)
-                    return instance
-                raise ValueError(
-                    "Custom embedder does not create an EmbeddingFunction instance"
-                )
-            except Exception as e:
-                raise ValueError(f"Error instantiating custom embedder: {str(e)}")
-        else:
-            raise ValueError(
-                "Custom embedder must be an instance of `EmbeddingFunction` or a callable that creates one"
-            )

src/crewai/utilities/evaluators/crew_evaluator_handler.py

@@ -1,12 +1,11 @@
 from collections import defaultdict
 
-from pydantic import BaseModel, Field, InstanceOf
+from pydantic import BaseModel, Field
 from rich.box import HEAVY_EDGE
 from rich.console import Console
 from rich.table import Table
 
 from crewai.agent import Agent
-from crewai.llm import LLM
 from crewai.task import Task
 from crewai.tasks.task_output import TaskOutput
 from crewai.telemetry import Telemetry
@@ -24,7 +23,7 @@ class CrewEvaluator:
 
     Attributes:
         crew (Crew): The crew of agents to evaluate.
-        eval_llm (LLM): Language model instance to use for evaluations
+        openai_model_name (str): The model to use for evaluating the performance of the agents (for now ONLY OpenAI accepted).
         tasks_scores (defaultdict): A dictionary to store the scores of the agents for each task.
         iteration (int): The current iteration of the evaluation.
     """
@@ -33,9 +32,9 @@ class CrewEvaluator:
     run_execution_times: defaultdict = defaultdict(list)
     iteration: int = 0
 
-    def __init__(self, crew, eval_llm: InstanceOf[LLM]):
+    def __init__(self, crew, openai_model_name: str):
         self.crew = crew
-        self.llm = eval_llm
+        self.openai_model_name = openai_model_name
         self._telemetry = Telemetry()
         self._setup_for_evaluating()
 
@@ -52,7 +51,7 @@ class CrewEvaluator:
             ),
             backstory="Evaluator agent for crew evaluation with precise capabilities to evaluate the performance of the agents in the crew based on the tasks they have performed",
             verbose=False,
-            llm=self.llm,
+            llm=self.openai_model_name,
         )
 
     def _evaluation_task(
@@ -182,7 +181,7 @@ class CrewEvaluator:
                 self.crew,
                 evaluation_result.pydantic.quality,
                 current_task.execution_duration,
-                self.llm.model,
+                self.openai_model_name,
             )
             self.tasks_scores[self.iteration].append(evaluation_result.pydantic.quality)
             self.run_execution_times[self.iteration].append(

src/crewai/utilities/evaluators/task_evaluator.py

@@ -3,9 +3,19 @@ from typing import List
 from pydantic import BaseModel, Field
 
 from crewai.utilities import Converter
-from crewai.utilities.events import TaskEvaluationEvent, crewai_event_bus
 from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser
 
+agentops = None
+try:
+    from agentops import track_agent  # type: ignore
+except ImportError:
+
+    def track_agent(name):
+        def noop(f):
+            return f
+
+        return noop
+
 
 class Entity(BaseModel):
     name: str = Field(description="The name of the entity.")
@@ -38,15 +48,12 @@ class TrainingTaskEvaluation(BaseModel):
     )
 
 
+@track_agent(name="Task Evaluator")
 class TaskEvaluator:
     def __init__(self, original_agent):
         self.llm = original_agent.llm
-        self.original_agent = original_agent
 
     def evaluate(self, task, output) -> TaskEvaluation:
-        crewai_event_bus.emit(
-            self, TaskEvaluationEvent(evaluation_type="task_evaluation")
-        )
         evaluation_query = (
             f"Assess the quality of the task completed based on the description, expected output, and actual results.\n\n"
             f"Task Description:\n{task.description}\n\n"
@@ -83,9 +90,6 @@ class TaskEvaluator:
             - training_data (dict): The training data to be evaluated.
             - agent_id (str): The ID of the agent.
         """
-        crewai_event_bus.emit(
-            self, TaskEvaluationEvent(evaluation_type="training_data_evaluation")
-        )
 
         output_training_data = training_data[agent_id]
         final_aggregated_data = ""

src/crewai/utilities/events.py

@@ -0,0 +1,44 @@
+from functools import wraps
+from typing import Any, Callable, Dict, Generic, List, Type, TypeVar
+
+from pydantic import BaseModel
+
+T = TypeVar("T")
+EVT = TypeVar("EVT", bound=BaseModel)
+
+
+class Emitter(Generic[T, EVT]):
+    _listeners: Dict[Type[EVT], List[Callable]] = {}
+
+    def on(self, event_type: Type[EVT]):
+        def decorator(func: Callable):
+            @wraps(func)
+            def wrapper(*args, **kwargs):
+                return func(*args, **kwargs)
+
+            self._listeners.setdefault(event_type, []).append(wrapper)
+            return wrapper
+
+        return decorator
+
+    def emit(self, source: T, event: EVT) -> None:
+        event_type = type(event)
+        for func in self._listeners.get(event_type, []):
+            func(source, event)
+
+
+default_emitter = Emitter[Any, BaseModel]()
+
+
+def emit(source: Any, event: BaseModel, raise_on_error: bool = False) -> None:
+    try:
+        default_emitter.emit(source, event)
+    except Exception as e:
+        if raise_on_error:
+            raise e
+        else:
+            print(f"Error emitting event: {e}")
+
+
+def on(event_type: Type[BaseModel]) -> Callable:
+    return default_emitter.on(event_type)

src/crewai/utilities/events/__init__.py

@@ -1,41 +0,0 @@
-from .crew_events import (
-    CrewKickoffStartedEvent,
-    CrewKickoffCompletedEvent,
-    CrewKickoffFailedEvent,
-    CrewTrainStartedEvent,
-    CrewTrainCompletedEvent,
-    CrewTrainFailedEvent,
-    CrewTestStartedEvent,
-    CrewTestCompletedEvent,
-    CrewTestFailedEvent,
-)
-from .agent_events import (
-    AgentExecutionStartedEvent,
-    AgentExecutionCompletedEvent,
-    AgentExecutionErrorEvent,
-)
-from .task_events import TaskStartedEvent, TaskCompletedEvent, TaskFailedEvent, TaskEvaluationEvent
-from .flow_events import (
-    FlowCreatedEvent,
-    FlowStartedEvent,
-    FlowFinishedEvent,
-    FlowPlotEvent,
-    MethodExecutionStartedEvent,
-    MethodExecutionFinishedEvent,
-    MethodExecutionFailedEvent,
-)
-from .crewai_event_bus import CrewAIEventsBus, crewai_event_bus
-from .tool_usage_events import (
-    ToolUsageFinishedEvent,
-    ToolUsageErrorEvent,
-    ToolUsageStartedEvent,
-    ToolExecutionErrorEvent,
-    ToolSelectionErrorEvent,
-    ToolUsageEvent,
-    ToolValidateInputErrorEvent,
-)
-from .llm_events import LLMCallCompletedEvent, LLMCallFailedEvent, LLMCallStartedEvent
-
-# events
-from .event_listener import EventListener
-from .third_party.agentops_listener import agentops_listener

src/crewai/utilities/events/agent_events.py

@@ -1,40 +0,0 @@
-from typing import TYPE_CHECKING, Any, Dict, Optional, Sequence, Union
-
-from crewai.agents.agent_builder.base_agent import BaseAgent
-from crewai.tools.base_tool import BaseTool
-from crewai.tools.structured_tool import CrewStructuredTool
-
-from .base_events import CrewEvent
-
-if TYPE_CHECKING:
-    from crewai.agents.agent_builder.base_agent import BaseAgent
-
-
-class AgentExecutionStartedEvent(CrewEvent):
-    """Event emitted when an agent starts executing a task"""
-
-    agent: BaseAgent
-    task: Any
-    tools: Optional[Sequence[Union[BaseTool, CrewStructuredTool]]]
-    task_prompt: str
-    type: str = "agent_execution_started"
-
-    model_config = {"arbitrary_types_allowed": True}
-
-
-class AgentExecutionCompletedEvent(CrewEvent):
-    """Event emitted when an agent completes executing a task"""
-
-    agent: BaseAgent
-    task: Any
-    output: str
-    type: str = "agent_execution_completed"
-
-
-class AgentExecutionErrorEvent(CrewEvent):
-    """Event emitted when an agent encounters an error during execution"""
-
-    agent: BaseAgent
-    task: Any
-    error: str
-    type: str = "agent_execution_error"

src/crewai/utilities/events/base_event_listener.py

@@ -1,14 +0,0 @@
-from abc import ABC, abstractmethod
-from logging import Logger
-
-from crewai.utilities.events.crewai_event_bus import CrewAIEventsBus, crewai_event_bus
-
-
-class BaseEventListener(ABC):
-    def __init__(self):
-        super().__init__()
-        self.setup_listeners(crewai_event_bus)
-
-    @abstractmethod
-    def setup_listeners(self, crewai_event_bus: CrewAIEventsBus):
-        pass

src/crewai/utilities/events/base_events.py

@@ -1,10 +0,0 @@
-from datetime import datetime
-
-from pydantic import BaseModel, Field
-
-
-class CrewEvent(BaseModel):
-    """Base class for all crew events"""
-
-    timestamp: datetime = Field(default_factory=datetime.now)
-    type: str

src/crewai/utilities/events/crew_events.py

@@ -1,81 +0,0 @@
-from typing import Any, Dict, Optional, Union
-
-from pydantic import InstanceOf
-
-from crewai.utilities.events.base_events import CrewEvent
-
-
-class CrewKickoffStartedEvent(CrewEvent):
-    """Event emitted when a crew starts execution"""
-
-    crew_name: Optional[str]
-    inputs: Optional[Dict[str, Any]]
-    type: str = "crew_kickoff_started"
-
-
-class CrewKickoffCompletedEvent(CrewEvent):
-    """Event emitted when a crew completes execution"""
-
-    crew_name: Optional[str]
-    output: Any
-    type: str = "crew_kickoff_completed"
-
-
-class CrewKickoffFailedEvent(CrewEvent):
-    """Event emitted when a crew fails to complete execution"""
-
-    error: str
-    crew_name: Optional[str]
-    type: str = "crew_kickoff_failed"
-
-
-class CrewTrainStartedEvent(CrewEvent):
-    """Event emitted when a crew starts training"""
-
-    crew_name: Optional[str]
-    n_iterations: int
-    filename: str
-    inputs: Optional[Dict[str, Any]]
-    type: str = "crew_train_started"
-
-
-class CrewTrainCompletedEvent(CrewEvent):
-    """Event emitted when a crew completes training"""
-
-    crew_name: Optional[str]
-    n_iterations: int
-    filename: str
-    type: str = "crew_train_completed"
-
-
-class CrewTrainFailedEvent(CrewEvent):
-    """Event emitted when a crew fails to complete training"""
-
-    error: str
-    crew_name: Optional[str]
-    type: str = "crew_train_failed"
-
-
-class CrewTestStartedEvent(CrewEvent):
-    """Event emitted when a crew starts testing"""
-
-    crew_name: Optional[str]
-    n_iterations: int
-    eval_llm: Optional[Union[str, Any]]
-    inputs: Optional[Dict[str, Any]]
-    type: str = "crew_test_started"
-
-
-class CrewTestCompletedEvent(CrewEvent):
-    """Event emitted when a crew completes testing"""
-
-    crew_name: Optional[str]
-    type: str = "crew_test_completed"
-
-
-class CrewTestFailedEvent(CrewEvent):
-    """Event emitted when a crew fails to complete testing"""
-
-    error: str
-    crew_name: Optional[str]
-    type: str = "crew_test_failed"

src/crewai/utilities/events/crewai_event_bus.py

@@ -1,113 +0,0 @@
-import threading
-from contextlib import contextmanager
-from typing import Any, Callable, Dict, List, Type, TypeVar, cast
-
-from blinker import Signal
-
-from crewai.utilities.events.base_events import CrewEvent
-from crewai.utilities.events.event_types import EventTypes
-
-EventT = TypeVar("EventT", bound=CrewEvent)
-
-
-class CrewAIEventsBus:
-    """
-    A singleton event bus that uses blinker signals for event handling.
-    Allows both internal (Flow/Crew) and external event handling.
-    """
-
-    _instance = None
-    _lock = threading.Lock()
-
-    def __new__(cls):
-        if cls._instance is None:
-            with cls._lock:
-                if cls._instance is None:  # prevent race condition
-                    cls._instance = super(CrewAIEventsBus, cls).__new__(cls)
-                    cls._instance._initialize()
-        return cls._instance
-
-    def _initialize(self) -> None:
-        """Initialize the event bus internal state"""
-        self._signal = Signal("crewai_event_bus")
-        self._handlers: Dict[Type[CrewEvent], List[Callable]] = {}
-
-    def on(
-        self, event_type: Type[EventT]
-    ) -> Callable[[Callable[[Any, EventT], None]], Callable[[Any, EventT], None]]:
-        """
-        Decorator to register an event handler for a specific event type.
-
-        Usage:
-            @crewai_event_bus.on(AgentExecutionCompletedEvent)
-            def on_agent_execution_completed(
-                source: Any, event: AgentExecutionCompletedEvent
-            ):
-                print(f"👍 Agent '{event.agent}' completed task")
-                print(f"   Output: {event.output}")
-        """
-
-        def decorator(
-            handler: Callable[[Any, EventT], None],
-        ) -> Callable[[Any, EventT], None]:
-            if event_type not in self._handlers:
-                self._handlers[event_type] = []
-            self._handlers[event_type].append(
-                cast(Callable[[Any, EventT], None], handler)
-            )
-            return handler
-
-        return decorator
-
-    def emit(self, source: Any, event: CrewEvent) -> None:
-        """
-        Emit an event to all registered handlers
-
-        Args:
-            source: The object emitting the event
-            event: The event instance to emit
-        """
-        event_type = type(event)
-        if event_type in self._handlers:
-            for handler in self._handlers[event_type]:
-                handler(source, event)
-        self._signal.send(source, event=event)
-
-    def clear_handlers(self) -> None:
-        """Clear all registered event handlers - useful for testing"""
-        self._handlers.clear()
-
-    def register_handler(
-        self, event_type: Type[EventTypes], handler: Callable[[Any, EventTypes], None]
-    ) -> None:
-        """Register an event handler for a specific event type"""
-        if event_type not in self._handlers:
-            self._handlers[event_type] = []
-        self._handlers[event_type].append(
-            cast(Callable[[Any, EventTypes], None], handler)
-        )
-
-    @contextmanager
-    def scoped_handlers(self):
-        """
-        Context manager for temporary event handling scope.
-        Useful for testing or temporary event handling.
-
-        Usage:
-            with crewai_event_bus.scoped_handlers():
-                @crewai_event_bus.on(CrewKickoffStarted)
-                def temp_handler(source, event):
-                    print("Temporary handler")
-                # Do stuff...
-            # Handlers are cleared after the context
-        """
-        previous_handlers = self._handlers.copy()
-        self._handlers.clear()
-        try:
-            yield
-        finally:
-            self._handlers = previous_handlers
-
-
-# Global instance
-crewai_event_bus = CrewAIEventsBus()

src/crewai/utilities/events/event_listener.py

@@ -1,288 +0,0 @@
-from typing import Any, Dict
-
-from pydantic import Field, PrivateAttr
-
-from crewai.task import Task
-from crewai.telemetry.telemetry import Telemetry
-from crewai.utilities import Logger
-from crewai.utilities.constants import EMITTER_COLOR
-from crewai.utilities.events.base_event_listener import BaseEventListener
-from crewai.utilities.events.llm_events import (
-    LLMCallCompletedEvent,
-    LLMCallFailedEvent,
-    LLMCallStartedEvent,
-)
-
-from .agent_events import AgentExecutionCompletedEvent, AgentExecutionStartedEvent
-from .crew_events import (
-    CrewKickoffCompletedEvent,
-    CrewKickoffFailedEvent,
-    CrewKickoffStartedEvent,
-    CrewTestCompletedEvent,
-    CrewTestFailedEvent,
-    CrewTestStartedEvent,
-    CrewTrainCompletedEvent,
-    CrewTrainFailedEvent,
-    CrewTrainStartedEvent,
-)
-from .flow_events import (
-    FlowCreatedEvent,
-    FlowFinishedEvent,
-    FlowStartedEvent,
-    MethodExecutionFailedEvent,
-    MethodExecutionFinishedEvent,
-    MethodExecutionStartedEvent,
-)
-from .task_events import TaskCompletedEvent, TaskFailedEvent, TaskStartedEvent
-from .tool_usage_events import (
-    ToolUsageErrorEvent,
-    ToolUsageFinishedEvent,
-    ToolUsageStartedEvent,
-)
-
-
-class EventListener(BaseEventListener):
-    _instance = None
-    _telemetry: Telemetry = PrivateAttr(default_factory=lambda: Telemetry())
-    logger = Logger(verbose=True, default_color=EMITTER_COLOR)
-    execution_spans: Dict[Task, Any] = Field(default_factory=dict)
-
-    def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super().__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-
-    def __init__(self):
-        if not hasattr(self, "_initialized") or not self._initialized:
-            super().__init__()
-            self._telemetry = Telemetry()
-            self._telemetry.set_tracer()
-            self.execution_spans = {}
-            self._initialized = True
-
-    # ----------- CREW EVENTS -----------
-
-    def setup_listeners(self, crewai_event_bus):
-        @crewai_event_bus.on(CrewKickoffStartedEvent)
-        def on_crew_started(source, event: CrewKickoffStartedEvent):
-            self.logger.log(
-                f"🚀 Crew '{event.crew_name}' started, {source.id}",
-                event.timestamp,
-            )
-            self._telemetry.crew_execution_span(source, event.inputs)
-
-        @crewai_event_bus.on(CrewKickoffCompletedEvent)
-        def on_crew_completed(source, event: CrewKickoffCompletedEvent):
-            final_string_output = event.output.raw
-            self._telemetry.end_crew(source, final_string_output)
-            self.logger.log(
-                f"✅ Crew '{event.crew_name}' completed, {source.id}",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(CrewKickoffFailedEvent)
-        def on_crew_failed(source, event: CrewKickoffFailedEvent):
-            self.logger.log(
-                f"❌ Crew '{event.crew_name}' failed, {source.id}",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(CrewTestStartedEvent)
-        def on_crew_test_started(source, event: CrewTestStartedEvent):
-            cloned_crew = source.copy()
-            self._telemetry.test_execution_span(
-                cloned_crew,
-                event.n_iterations,
-                event.inputs,
-                event.eval_llm or "",
-            )
-            self.logger.log(
-                f"🚀 Crew '{event.crew_name}' started test, {source.id}",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(CrewTestCompletedEvent)
-        def on_crew_test_completed(source, event: CrewTestCompletedEvent):
-            self.logger.log(
-                f"✅ Crew '{event.crew_name}' completed test",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(CrewTestFailedEvent)
-        def on_crew_test_failed(source, event: CrewTestFailedEvent):
-            self.logger.log(
-                f"❌ Crew '{event.crew_name}' failed test",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(CrewTrainStartedEvent)
-        def on_crew_train_started(source, event: CrewTrainStartedEvent):
-            self.logger.log(
-                f"📋 Crew '{event.crew_name}' started train",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(CrewTrainCompletedEvent)
-        def on_crew_train_completed(source, event: CrewTrainCompletedEvent):
-            self.logger.log(
-                f"✅ Crew '{event.crew_name}' completed train",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(CrewTrainFailedEvent)
-        def on_crew_train_failed(source, event: CrewTrainFailedEvent):
-            self.logger.log(
-                f"❌ Crew '{event.crew_name}' failed train",
-                event.timestamp,
-            )
-
-        # ----------- TASK EVENTS -----------
-
-        @crewai_event_bus.on(TaskStartedEvent)
-        def on_task_started(source, event: TaskStartedEvent):
-            span = self._telemetry.task_started(crew=source.agent.crew, task=source)
-            self.execution_spans[source] = span
-
-            self.logger.log(
-                f"📋 Task started: {source.description}",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(TaskCompletedEvent)
-        def on_task_completed(source, event: TaskCompletedEvent):
-            span = self.execution_spans.get(source)
-            if span:
-                self._telemetry.task_ended(span, source, source.agent.crew)
-            self.logger.log(
-                f"✅ Task completed: {source.description}",
-                event.timestamp,
-            )
-            self.execution_spans[source] = None
-
-        @crewai_event_bus.on(TaskFailedEvent)
-        def on_task_failed(source, event: TaskFailedEvent):
-            span = self.execution_spans.get(source)
-            if span:
-                if source.agent and source.agent.crew:
-                    self._telemetry.task_ended(span, source, source.agent.crew)
-                self.execution_spans[source] = None
-            self.logger.log(
-                f"❌ Task failed: {source.description}",
-                event.timestamp,
-            )
-
-        # ----------- AGENT EVENTS -----------
-
-        @crewai_event_bus.on(AgentExecutionStartedEvent)
-        def on_agent_execution_started(source, event: AgentExecutionStartedEvent):
-            self.logger.log(
-                f"🤖 Agent '{event.agent.role}' started task",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(AgentExecutionCompletedEvent)
-        def on_agent_execution_completed(source, event: AgentExecutionCompletedEvent):
-            self.logger.log(
-                f"✅ Agent '{event.agent.role}' completed task",
-                event.timestamp,
-            )
-
-        # ----------- FLOW EVENTS -----------
-
-        @crewai_event_bus.on(FlowCreatedEvent)
-        def on_flow_created(source, event: FlowCreatedEvent):
-            self._telemetry.flow_creation_span(event.flow_name)
-            self.logger.log(
-                f"🌊 Flow Created: '{event.flow_name}'",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(FlowStartedEvent)
-        def on_flow_started(source, event: FlowStartedEvent):
-            self._telemetry.flow_execution_span(
-                event.flow_name, list(source._methods.keys())
-            )
-            self.logger.log(
-                f"🤖 Flow Started: '{event.flow_name}', {source.flow_id}",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(FlowFinishedEvent)
-        def on_flow_finished(source, event: FlowFinishedEvent):
-            self.logger.log(
-                f"👍 Flow Finished: '{event.flow_name}', {source.flow_id}",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(MethodExecutionStartedEvent)
-        def on_method_execution_started(source, event: MethodExecutionStartedEvent):
-            self.logger.log(
-                f"🤖 Flow Method Started: '{event.method_name}'",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(MethodExecutionFailedEvent)
-        def on_method_execution_failed(source, event: MethodExecutionFailedEvent):
-            self.logger.log(
-                f"❌ Flow Method Failed: '{event.method_name}'",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(MethodExecutionFinishedEvent)
-        def on_method_execution_finished(source, event: MethodExecutionFinishedEvent):
-            self.logger.log(
-                f"👍 Flow Method Finished: '{event.method_name}'",
-                event.timestamp,
-            )
-
-        # ----------- TOOL USAGE EVENTS -----------
-
-        @crewai_event_bus.on(ToolUsageStartedEvent)
-        def on_tool_usage_started(source, event: ToolUsageStartedEvent):
-            self.logger.log(
-                f"🤖 Tool Usage Started: '{event.tool_name}'",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(ToolUsageFinishedEvent)
-        def on_tool_usage_finished(source, event: ToolUsageFinishedEvent):
-            self.logger.log(
-                f"✅ Tool Usage Finished: '{event.tool_name}'",
-                event.timestamp,
-                #
-            )
-
-        @crewai_event_bus.on(ToolUsageErrorEvent)
-        def on_tool_usage_error(source, event: ToolUsageErrorEvent):
-            self.logger.log(
-                f"❌ Tool Usage Error: '{event.tool_name}'",
-                event.timestamp,
-                #
-            )
-
-        # ----------- LLM EVENTS -----------
-
-        @crewai_event_bus.on(LLMCallStartedEvent)
-        def on_llm_call_started(source, event: LLMCallStartedEvent):
-            self.logger.log(
-                f"🤖 LLM Call Started",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(LLMCallCompletedEvent)
-        def on_llm_call_completed(source, event: LLMCallCompletedEvent):
-            self.logger.log(
-                f"✅ LLM Call Completed",
-                event.timestamp,
-            )
-
-        @crewai_event_bus.on(LLMCallFailedEvent)
-        def on_llm_call_failed(source, event: LLMCallFailedEvent):
-            self.logger.log(
-                f"❌ LLM Call Failed: '{event.error}'",
-                event.timestamp,
-            )
-
-
-event_listener = EventListener()

src/crewai/utilities/events/event_types.py

@@ -1,61 +0,0 @@
-from typing import Union
-
-from .agent_events import (
-    AgentExecutionCompletedEvent,
-    AgentExecutionErrorEvent,
-    AgentExecutionStartedEvent,
-)
-from .crew_events import (
-    CrewKickoffCompletedEvent,
-    CrewKickoffFailedEvent,
-    CrewKickoffStartedEvent,
-    CrewTestCompletedEvent,
-    CrewTestFailedEvent,
-    CrewTestStartedEvent,
-    CrewTrainCompletedEvent,
-    CrewTrainFailedEvent,
-    CrewTrainStartedEvent,
-)
-from .flow_events import (
-    FlowFinishedEvent,
-    FlowStartedEvent,
-    MethodExecutionFailedEvent,
-    MethodExecutionFinishedEvent,
-    MethodExecutionStartedEvent,
-)
-from .task_events import (
-    TaskCompletedEvent,
-    TaskFailedEvent,
-    TaskStartedEvent,
-)
-from .tool_usage_events import (
-    ToolUsageErrorEvent,
-    ToolUsageFinishedEvent,
-    ToolUsageStartedEvent,
-)
-
-EventTypes = Union[
-    CrewKickoffStartedEvent,
-    CrewKickoffCompletedEvent,
-    CrewKickoffFailedEvent,
-    CrewTestStartedEvent,
-    CrewTestCompletedEvent,
-    CrewTestFailedEvent,
-    CrewTrainStartedEvent,
-    CrewTrainCompletedEvent,
-    CrewTrainFailedEvent,
-    AgentExecutionStartedEvent,
-    AgentExecutionCompletedEvent,
-    TaskStartedEvent,
-    TaskCompletedEvent,
-    TaskFailedEvent,
-    FlowStartedEvent,
-    FlowFinishedEvent,
-    MethodExecutionStartedEvent,
-    MethodExecutionFinishedEvent,
-    MethodExecutionFailedEvent,
-    AgentExecutionErrorEvent,
-    ToolUsageFinishedEvent,
-    ToolUsageErrorEvent,
-    ToolUsageStartedEvent,
-]

src/crewai/utilities/events/flow_events.py

@@ -1,71 +0,0 @@
-from typing import Any, Dict, Optional, Union
-
-from pydantic import BaseModel
-
-from .base_events import CrewEvent
-
-
-class FlowEvent(CrewEvent):
-    """Base class for all flow events"""
-
-    type: str
-    flow_name: str
-
-
-class FlowStartedEvent(FlowEvent):
-    """Event emitted when a flow starts execution"""
-
-    flow_name: str
-    inputs: Optional[Dict[str, Any]] = None
-    type: str = "flow_started"
-
-
-class FlowCreatedEvent(FlowEvent):
-    """Event emitted when a flow is created"""
-
-    flow_name: str
-    type: str = "flow_created"
-
-
-class MethodExecutionStartedEvent(FlowEvent):
-    """Event emitted when a flow method starts execution"""
-
-    flow_name: str
-    method_name: str
-    state: Union[Dict[str, Any], BaseModel]
-    params: Optional[Dict[str, Any]] = None
-    type: str = "method_execution_started"
-
-
-class MethodExecutionFinishedEvent(FlowEvent):
-    """Event emitted when a flow method completes execution"""
-
-    flow_name: str
-    method_name: str
-    result: Any = None
-    state: Union[Dict[str, Any], BaseModel]
-    type: str = "method_execution_finished"
-
-
-class MethodExecutionFailedEvent(FlowEvent):
-    """Event emitted when a flow method fails execution"""
-
-    flow_name: str
-    method_name: str
-    error: Any
-    type: str = "method_execution_failed"
-
-
-class FlowFinishedEvent(FlowEvent):
-    """Event emitted when a flow completes execution"""
-
-    flow_name: str
-    result: Optional[Any] = None
-    type: str = "flow_finished"
-
-
-class FlowPlotEvent(FlowEvent):
-    """Event emitted when a flow plot is created"""
-
-    flow_name: str
-    type: str = "flow_plot"

src/crewai/utilities/events/llm_events.py

@@ -1,36 +0,0 @@
-from enum import Enum
-from typing import Any, Dict, List, Optional, Union
-
-from crewai.utilities.events.base_events import CrewEvent
-
-
-class LLMCallType(Enum):
-    """Type of LLM call being made"""
-
-    TOOL_CALL = "tool_call"
-    LLM_CALL = "llm_call"
-
-
-class LLMCallStartedEvent(CrewEvent):
-    """Event emitted when a LLM call starts"""
-
-    type: str = "llm_call_started"
-    messages: Union[str, List[Dict[str, str]]]
-    tools: Optional[List[dict]] = None
-    callbacks: Optional[List[Any]] = None
-    available_functions: Optional[Dict[str, Any]] = None
-
-
-class LLMCallCompletedEvent(CrewEvent):
-    """Event emitted when a LLM call completes"""
-
-    type: str = "llm_call_completed"
-    response: Any
-    call_type: LLMCallType
-
-
-class LLMCallFailedEvent(CrewEvent):
-    """Event emitted when a LLM call fails"""
-
-    error: str
-    type: str = "llm_call_failed"

src/crewai/utilities/events/task_events.py

@@ -1,32 +0,0 @@
-from typing import Optional
-
-from crewai.tasks.task_output import TaskOutput
-from crewai.utilities.events.base_events import CrewEvent
-
-
-class TaskStartedEvent(CrewEvent):
-    """Event emitted when a task starts"""
-
-    type: str = "task_started"
-    context: Optional[str]
-
-
-class TaskCompletedEvent(CrewEvent):
-    """Event emitted when a task completes"""
-
-    output: TaskOutput
-    type: str = "task_completed"
-
-
-class TaskFailedEvent(CrewEvent):
-    """Event emitted when a task fails"""
-
-    error: str
-    type: str = "task_failed"
-
-
-class TaskEvaluationEvent(CrewEvent):
-    """Event emitted when a task evaluation is completed"""
-
-    type: str = "task_evaluation"
-    evaluation_type: str

src/crewai/utilities/events/third_party/__init__.py

@@ -1 +0,0 @@
-from .agentops_listener import agentops_listener

src/crewai/utilities/events/third_party/agentops_listener.py

@@ -1,67 +0,0 @@
-from typing import Optional
-
-from crewai.utilities.events import (
-    CrewKickoffCompletedEvent,
-    ToolUsageErrorEvent,
-    ToolUsageStartedEvent,
-)
-from crewai.utilities.events.base_event_listener import BaseEventListener
-from crewai.utilities.events.crew_events import CrewKickoffStartedEvent
-from crewai.utilities.events.task_events import TaskEvaluationEvent
-
-try:
-    import agentops
-
-    AGENTOPS_INSTALLED = True
-except ImportError:
-    AGENTOPS_INSTALLED = False
-
-
-class AgentOpsListener(BaseEventListener):
-    tool_event: Optional["agentops.ToolEvent"] = None
-    session: Optional["agentops.Session"] = None
-
-    def __init__(self):
-        super().__init__()
-
-    def setup_listeners(self, crewai_event_bus):
-        if not AGENTOPS_INSTALLED:
-            return
-
-        @crewai_event_bus.on(CrewKickoffStartedEvent)
-        def on_crew_kickoff_started(source, event: CrewKickoffStartedEvent):
-            self.session = agentops.init()
-            for agent in source.agents:
-                if self.session:
-                    self.session.create_agent(
-                        name=agent.role,
-                        agent_id=str(agent.id),
-                    )
-
-        @crewai_event_bus.on(CrewKickoffCompletedEvent)
-        def on_crew_kickoff_completed(source, event: CrewKickoffCompletedEvent):
-            if self.session:
-                self.session.end_session(
-                    end_state="Success",
-                    end_state_reason="Finished Execution",
-                )
-
-        @crewai_event_bus.on(ToolUsageStartedEvent)
-        def on_tool_usage_started(source, event: ToolUsageStartedEvent):
-            self.tool_event = agentops.ToolEvent(name=event.tool_name)
-            if self.session:
-                self.session.record(self.tool_event)
-
-        @crewai_event_bus.on(ToolUsageErrorEvent)
-        def on_tool_usage_error(source, event: ToolUsageErrorEvent):
-            agentops.ErrorEvent(exception=event.error, trigger_event=self.tool_event)
-
-        @crewai_event_bus.on(TaskEvaluationEvent)
-        def on_task_evaluation(source, event: TaskEvaluationEvent):
-            if self.session:
-                self.session.create_agent(
-                    name="Task Evaluator", agent_id=str(source.original_agent.id)
-                )
-
-
-agentops_listener = AgentOpsListener()

src/crewai/utilities/events/tool_usage_events.py

@@ -1,64 +0,0 @@
-from datetime import datetime
-from typing import Any, Callable, Dict
-
-from .base_events import CrewEvent
-
-
-class ToolUsageEvent(CrewEvent):
-    """Base event for tool usage tracking"""
-
-    agent_key: str
-    agent_role: str
-    tool_name: str
-    tool_args: Dict[str, Any] | str
-    tool_class: str
-    run_attempts: int | None = None
-    delegations: int | None = None
-
-    model_config = {"arbitrary_types_allowed": True}
-
-
-class ToolUsageStartedEvent(ToolUsageEvent):
-    """Event emitted when a tool execution is started"""
-
-    type: str = "tool_usage_started"
-
-
-class ToolUsageFinishedEvent(ToolUsageEvent):
-    """Event emitted when a tool execution is completed"""
-
-    started_at: datetime
-    finished_at: datetime
-    from_cache: bool = False
-    type: str = "tool_usage_finished"
-
-
-class ToolUsageErrorEvent(ToolUsageEvent):
-    """Event emitted when a tool execution encounters an error"""
-
-    error: Any
-    type: str = "tool_usage_error"
-
-
-class ToolValidateInputErrorEvent(ToolUsageEvent):
-    """Event emitted when a tool input validation encounters an error"""
-
-    error: Any
-    type: str = "tool_validate_input_error"
-
-
-class ToolSelectionErrorEvent(ToolUsageEvent):
-    """Event emitted when a tool selection encounters an error"""
-
-    error: Any
-    type: str = "tool_selection_error"
-
-
-class ToolExecutionErrorEvent(CrewEvent):
-    """Event emitted when a tool execution encounters an error"""
-
-    error: Any
-    type: str = "tool_execution_error"
-    tool_name: str
-    tool_args: Dict[str, Any]
-    tool_class: Callable

src/crewai/utilities/file_handler.py

@@ -1,64 +1,30 @@
-import json
 import os
 import pickle
 from datetime import datetime
-from typing import Union
 
 
 class FileHandler:
-    """Handler for file operations supporting both JSON and text-based logging.
-    
-    Args:
-        file_path (Union[bool, str]): Path to the log file or boolean flag
-    """
+    """take care of file operations, currently it only logs messages to a file"""
 
-    def __init__(self, file_path: Union[bool, str]):
-        self._initialize_path(file_path)
-        
-    def _initialize_path(self, file_path: Union[bool, str]):
-        if file_path is True:  # File path is boolean True
+    def __init__(self, file_path):
+        if isinstance(file_path, bool):
             self._path = os.path.join(os.curdir, "logs.txt")
-        
-        elif isinstance(file_path, str):  # File path is a string
-            if file_path.endswith((".json", ".txt")):
-                self._path = file_path  # No modification if the file ends with .json or .txt
-            else:
-                self._path = file_path + ".txt"  # Append .txt if the file doesn't end with .json or .txt
-        
+        elif isinstance(file_path, str):
+            self._path = file_path
         else:
-            raise ValueError("file_path must be a string or boolean.")  # Handle the case where file_path isn't valid
-        
+            raise ValueError("file_path must be either a boolean or a string.")
+
     def log(self, **kwargs):
-        try:
-            now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-            log_entry = {"timestamp": now, **kwargs}
+        now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        message = (
+            f"{now}: "
+            + ", ".join([f'{key}="{value}"' for key, value in kwargs.items()])
+            + "\n"
+        )
+        with open(self._path, "a", encoding="utf-8") as file:
+            file.write(message + "\n")
 
-            if self._path.endswith(".json"):
-                # Append log in JSON format
-                with open(self._path, "a", encoding="utf-8") as file:
-                    # If the file is empty, start with a list; else, append to it
-                    try:
-                        # Try reading existing content to avoid overwriting
-                        with open(self._path, "r", encoding="utf-8") as read_file:
-                            existing_data = json.load(read_file)
-                            existing_data.append(log_entry)
-                    except (json.JSONDecodeError, FileNotFoundError):
-                        # If no valid JSON or file doesn't exist, start with an empty list
-                        existing_data = [log_entry]
-                    
-                    with open(self._path, "w", encoding="utf-8") as write_file:
-                        json.dump(existing_data, write_file, indent=4)
-                        write_file.write("\n")
-            
-            else:
-                # Append log in plain text format
-                message = f"{now}: " + ", ".join([f"{key}=\"{value}\"" for key, value in kwargs.items()]) + "\n"
-                with open(self._path, "a", encoding="utf-8") as file:
-                    file.write(message)
 
-        except Exception as e:
-            raise ValueError(f"Failed to log message: {str(e)}")
-        
 class PickleHandler:
     def __init__(self, file_name: str) -> None:
         """

src/crewai/utilities/llm_utils.py

@@ -44,7 +44,6 @@ def create_llm(
         # Extract attributes with explicit types
         model = (
             getattr(llm_value, "model_name", None)
-            or getattr(llm_value, "model", None)
             or getattr(llm_value, "deployment_name", None)
             or str(llm_value)
         )

src/crewai/utilities/logger.py

@@ -8,11 +8,8 @@ from crewai.utilities.printer import Printer
 class Logger(BaseModel):
     verbose: bool = Field(default=False)
     _printer: Printer = PrivateAttr(default_factory=Printer)
-    default_color: str = Field(default="bold_yellow")
 
-    def log(self, level, message, color=None):
-        if color is None:
-            color = self.default_color
+    def log(self, level, message, color="bold_yellow"):
         if self.verbose:
             timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
             self._printer.print(

src/crewai/utilities/token_counter_callback.py

@@ -30,14 +30,8 @@ class TokenCalcHandler(CustomLogger):
                     if hasattr(usage, "prompt_tokens"):
                         self.token_cost_process.sum_prompt_tokens(usage.prompt_tokens)
                     if hasattr(usage, "completion_tokens"):
-                        self.token_cost_process.sum_completion_tokens(
-                            usage.completion_tokens
-                        )
-                    if (
-                        hasattr(usage, "prompt_tokens_details")
-                        and usage.prompt_tokens_details
-                        and usage.prompt_tokens_details.cached_tokens
-                    ):
+                        self.token_cost_process.sum_completion_tokens(usage.completion_tokens)
+                    if hasattr(usage, "prompt_tokens_details") and usage.prompt_tokens_details:
                         self.token_cost_process.sum_cached_prompt_tokens(
                             usage.prompt_tokens_details.cached_tokens
                         )

tests/agent_test.py

@@ -8,7 +8,7 @@ import pytest
 
 from crewai import Agent, Crew, Task
 from crewai.agents.cache import CacheHandler
-from crewai.agents.crew_agent_executor import AgentFinish, CrewAgentExecutor
+from crewai.agents.crew_agent_executor import CrewAgentExecutor
 from crewai.agents.parser import AgentAction, CrewAgentParser, OutputParserException
 from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource
 from crewai.knowledge.source.string_knowledge_source import StringKnowledgeSource
@@ -16,9 +16,9 @@ from crewai.llm import LLM
 from crewai.tools import tool
 from crewai.tools.tool_calling import InstructorToolCalling
 from crewai.tools.tool_usage import ToolUsage
+from crewai.tools.tool_usage_events import ToolUsageFinished
 from crewai.utilities import RPMController
-from crewai.utilities.events import crewai_event_bus
-from crewai.utilities.events.tool_usage_events import ToolUsageFinishedEvent
+from crewai.utilities.events import Emitter
 
 
 def test_agent_llm_creation_with_env_vars():
@@ -154,19 +154,15 @@ def test_agent_execution_with_tools():
         agent=agent,
         expected_output="The result of the multiplication.",
     )
-    received_events = []
-
-    @crewai_event_bus.on(ToolUsageFinishedEvent)
-    def handle_tool_end(source, event):
-        received_events.append(event)
-
-    output = agent.execute_task(task)
-    assert output == "The result of the multiplication is 12."
-
-    assert len(received_events) == 1
-    assert isinstance(received_events[0], ToolUsageFinishedEvent)
-    assert received_events[0].tool_name == "multiplier"
-    assert received_events[0].tool_args == {"first_number": 3, "second_number": 4}
+    with patch.object(Emitter, "emit") as emit:
+        output = agent.execute_task(task)
+        assert output == "The result of the multiplication is 12."
+        assert emit.call_count == 1
+        args, _ = emit.call_args
+        assert isinstance(args[1], ToolUsageFinished)
+        assert not args[1].from_cache
+        assert args[1].tool_name == "multiplier"
+        assert args[1].tool_args == {"first_number": 3, "second_number": 4}
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
@@ -253,14 +249,10 @@ def test_cache_hitting():
         "multiplier-{'first_number': 3, 'second_number': 3}": 9,
         "multiplier-{'first_number': 12, 'second_number': 3}": 36,
     }
-    received_events = []
-
-    @crewai_event_bus.on(ToolUsageFinishedEvent)
-    def handle_tool_end(source, event):
-        received_events.append(event)
 
     with (
         patch.object(CacheHandler, "read") as read,
+        patch.object(Emitter, "emit") as emit,
     ):
         read.return_value = "0"
         task = Task(
@@ -273,9 +265,10 @@ def test_cache_hitting():
         read.assert_called_with(
             tool="multiplier", input={"first_number": 2, "second_number": 6}
         )
-        assert len(received_events) == 1
-        assert isinstance(received_events[0], ToolUsageFinishedEvent)
-        assert received_events[0].from_cache
+        assert emit.call_count == 1
+        args, _ = emit.call_args
+        assert isinstance(args[1], ToolUsageFinished)
+        assert args[1].from_cache
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
@@ -990,35 +983,23 @@ def test_agent_human_input():
     # Side effect function for _ask_human_input to simulate multiple feedback iterations
     feedback_responses = iter(
         [
-            "Don't say hi, say Hello instead!",  # First feedback: instruct change
-            "",  # Second feedback: empty string signals acceptance
+            "Don't say hi, say Hello instead!",  # First feedback
+            "looks good",  # Second feedback to exit loop
         ]
     )
 
     def ask_human_input_side_effect(*args, **kwargs):
         return next(feedback_responses)
 
-    # Patch both _ask_human_input and _invoke_loop to avoid real API/network calls.
-    with (
-        patch.object(
-            CrewAgentExecutor,
-            "_ask_human_input",
-            side_effect=ask_human_input_side_effect,
-        ) as mock_human_input,
-        patch.object(
-            CrewAgentExecutor,
-            "_invoke_loop",
-            return_value=AgentFinish(output="Hello", thought="", text=""),
-        ) as mock_invoke_loop,
-    ):
+    with patch.object(
+        CrewAgentExecutor, "_ask_human_input", side_effect=ask_human_input_side_effect
+    ) as mock_human_input:
         # Execute the task
         output = agent.execute_task(task)
 
-        # Assertions to ensure the agent behaves correctly.
-        # It should have requested feedback twice.
-        assert mock_human_input.call_count == 2
-        # The final result should be processed to "Hello"
-        assert output.strip().lower() == "hello"
+        # Assertions to ensure the agent behaves correctly
+        assert mock_human_input.call_count == 2  # Should have asked for feedback twice
+        assert output.strip().lower() == "hello"  # Final output should be 'Hello'
 
 
 def test_interpolate_inputs():
@@ -1202,7 +1183,7 @@ def test_agent_max_retry_limit():
             [
                 mock.call(
                     {
-                        "input": "Say the word: Hi\n\nThis is the expected criteria for your final answer: The word: Hi\nyou MUST return the actual complete content as the final answer, not a summary.",
+                        "input": "Say the word: Hi\n\nThis is the expect criteria for your final answer: The word: Hi\nyou MUST return the actual complete content as the final answer, not a summary.",
                         "tool_names": "",
                         "tools": "",
                         "ask_for_human_input": True,
@@ -1210,7 +1191,7 @@ def test_agent_max_retry_limit():
                 ),
                 mock.call(
                     {
-                        "input": "Say the word: Hi\n\nThis is the expected criteria for your final answer: The word: Hi\nyou MUST return the actual complete content as the final answer, not a summary.",
+                        "input": "Say the word: Hi\n\nThis is the expect criteria for your final answer: The word: Hi\nyou MUST return the actual complete content as the final answer, not a summary.",
                         "tool_names": "",
                         "tools": "",
                         "ask_for_human_input": True,

tests/cassettes/test_agent_human_input.yaml

@@ -0,0 +1,520 @@
+interactions:
+- request:
+    body: !!binary |
+      CqcXCiQKIgoMc2VydmljZS5uYW1lEhIKEGNyZXdBSS10ZWxlbWV0cnkS/hYKEgoQY3Jld2FpLnRl
+      bGVtZXRyeRJ5ChBuJJtOdNaB05mOW/p3915eEgj2tkAd3rZcASoQVG9vbCBVc2FnZSBFcnJvcjAB
+      OYa7/URvKBUYQUpcFEVvKBUYShoKDmNyZXdhaV92ZXJzaW9uEggKBjAuODYuMEoPCgNsbG0SCAoG
+      Z3B0LTRvegIYAYUBAAEAABLJBwoQifhX01E5i+5laGdALAlZBBIIBuGM1aN+OPgqDENyZXcgQ3Jl
+      YXRlZDABORVGruBvKBUYQaipwOBvKBUYShoKDmNyZXdhaV92ZXJzaW9uEggKBjAuODYuMEoaCg5w
+      eXRob25fdmVyc2lvbhIICgYzLjEyLjdKLgoIY3Jld19rZXkSIgogN2U2NjA4OTg5ODU5YTY3ZWVj
+      ODhlZWY3ZmNlODUyMjVKMQoHY3Jld19pZBImCiRiOThiNWEwMC01YTI1LTQxMDctYjQwNS1hYmYz
+      MjBhOGYzYThKHAoMY3Jld19wcm9jZXNzEgwKCnNlcXVlbnRpYWxKEQoLY3Jld19tZW1vcnkSAhAA
+      ShoKFGNyZXdfbnVtYmVyX29mX3Rhc2tzEgIYAUobChVjcmV3X251bWJlcl9vZl9hZ2VudHMSAhgB
+      SuQCCgtjcmV3X2FnZW50cxLUAgrRAlt7ImtleSI6ICIyMmFjZDYxMWU0NGVmNWZhYzA1YjUzM2Q3
+      NWU4ODkzYiIsICJpZCI6ICJkNWIyMzM1YS0yMmIyLTQyZWEtYmYwNS03OTc3NmU3MmYzOTIiLCAi
+      cm9sZSI6ICJEYXRhIFNjaWVudGlzdCIsICJ2ZXJib3NlPyI6IGZhbHNlLCAibWF4X2l0ZXIiOiAy
+      MCwgIm1heF9ycG0iOiBudWxsLCAiZnVuY3Rpb25fY2FsbGluZ19sbG0iOiAiIiwgImxsbSI6ICJn
+      cHQtNG8tbWluaSIsICJkZWxlZ2F0aW9uX2VuYWJsZWQ/IjogZmFsc2UsICJhbGxvd19jb2RlX2V4
+      ZWN1dGlvbj8iOiBmYWxzZSwgIm1heF9yZXRyeV9saW1pdCI6IDIsICJ0b29sc19uYW1lcyI6IFsi
+      Z2V0IGdyZWV0aW5ncyJdfV1KkgIKCmNyZXdfdGFza3MSgwIKgAJbeyJrZXkiOiAiYTI3N2IzNGIy
+      YzE0NmYwYzU2YzVlMTM1NmU4ZjhhNTciLCAiaWQiOiAiMjJiZWMyMzEtY2QyMS00YzU4LTgyN2Ut
+      MDU4MWE4ZjBjMTExIiwgImFzeW5jX2V4ZWN1dGlvbj8iOiBmYWxzZSwgImh1bWFuX2lucHV0PyI6
+      IGZhbHNlLCAiYWdlbnRfcm9sZSI6ICJEYXRhIFNjaWVudGlzdCIsICJhZ2VudF9rZXkiOiAiMjJh
+      Y2Q2MTFlNDRlZjVmYWMwNWI1MzNkNzVlODg5M2IiLCAidG9vbHNfbmFtZXMiOiBbImdldCBncmVl
+      dGluZ3MiXX1degIYAYUBAAEAABKOAgoQ5WYoxRtTyPjge4BduhL0rRIIv2U6rvWALfwqDFRhc2sg
+      Q3JlYXRlZDABOX068uBvKBUYQZkv8+BvKBUYSi4KCGNyZXdfa2V5EiIKIDdlNjYwODk4OTg1OWE2
+      N2VlYzg4ZWVmN2ZjZTg1MjI1SjEKB2NyZXdfaWQSJgokYjk4YjVhMDAtNWEyNS00MTA3LWI0MDUt
+      YWJmMzIwYThmM2E4Si4KCHRhc2tfa2V5EiIKIGEyNzdiMzRiMmMxNDZmMGM1NmM1ZTEzNTZlOGY4
+      YTU3SjEKB3Rhc2tfaWQSJgokMjJiZWMyMzEtY2QyMS00YzU4LTgyN2UtMDU4MWE4ZjBjMTExegIY
+      AYUBAAEAABKQAQoQXyeDtJDFnyp2Fjk9YEGTpxIIaNE7gbhPNYcqClRvb2wgVXNhZ2UwATkaXTvj
+      bygVGEGvx0rjbygVGEoaCg5jcmV3YWlfdmVyc2lvbhIICgYwLjg2LjBKHAoJdG9vbF9uYW1lEg8K
+      DUdldCBHcmVldGluZ3NKDgoIYXR0ZW1wdHMSAhgBegIYAYUBAAEAABLVBwoQMWfznt0qwauEzl7T
+      UOQxRBII9q+pUS5EdLAqDENyZXcgQ3JlYXRlZDABORONPORvKBUYQSAoS+RvKBUYShoKDmNyZXdh
+      aV92ZXJzaW9uEggKBjAuODYuMEoaCg5weXRob25fdmVyc2lvbhIICgYzLjEyLjdKLgoIY3Jld19r
+      ZXkSIgogYzMwNzYwMDkzMjY3NjE0NDRkNTdjNzFkMWRhM2YyN2NKMQoHY3Jld19pZBImCiQ3OTQw
+      MTkyNS1iOGU5LTQ3MDgtODUzMC00NDhhZmEzYmY4YjBKHAoMY3Jld19wcm9jZXNzEgwKCnNlcXVl
+      bnRpYWxKEQoLY3Jld19tZW1vcnkSAhAAShoKFGNyZXdfbnVtYmVyX29mX3Rhc2tzEgIYAUobChVj
+      cmV3X251bWJlcl9vZl9hZ2VudHMSAhgBSuoCCgtjcmV3X2FnZW50cxLaAgrXAlt7ImtleSI6ICI5
+      OGYzYjFkNDdjZTk2OWNmMDU3NzI3Yjc4NDE0MjVjZCIsICJpZCI6ICI5OTJkZjYyZi1kY2FiLTQy
+      OTUtOTIwNi05MDBkNDExNGIxZTkiLCAicm9sZSI6ICJGcmllbmRseSBOZWlnaGJvciIsICJ2ZXJi
+      b3NlPyI6IGZhbHNlLCAibWF4X2l0ZXIiOiAyMCwgIm1heF9ycG0iOiBudWxsLCAiZnVuY3Rpb25f
+      Y2FsbGluZ19sbG0iOiAiIiwgImxsbSI6ICJncHQtNG8tbWluaSIsICJkZWxlZ2F0aW9uX2VuYWJs
+      ZWQ/IjogZmFsc2UsICJhbGxvd19jb2RlX2V4ZWN1dGlvbj8iOiBmYWxzZSwgIm1heF9yZXRyeV9s
+      aW1pdCI6IDIsICJ0b29sc19uYW1lcyI6IFsiZGVjaWRlIGdyZWV0aW5ncyJdfV1KmAIKCmNyZXdf
+      dGFza3MSiQIKhgJbeyJrZXkiOiAiODBkN2JjZDQ5MDk5MjkwMDgzODMyZjBlOTgzMzgwZGYiLCAi
+      aWQiOiAiMmZmNjE5N2UtYmEyNy00YjczLWI0YTctNGZhMDQ4ZTYyYjQ3IiwgImFzeW5jX2V4ZWN1
+      dGlvbj8iOiBmYWxzZSwgImh1bWFuX2lucHV0PyI6IGZhbHNlLCAiYWdlbnRfcm9sZSI6ICJGcmll
+      bmRseSBOZWlnaGJvciIsICJhZ2VudF9rZXkiOiAiOThmM2IxZDQ3Y2U5NjljZjA1NzcyN2I3ODQx
+      NDI1Y2QiLCAidG9vbHNfbmFtZXMiOiBbImRlY2lkZSBncmVldGluZ3MiXX1degIYAYUBAAEAABKO
+      AgoQnjTp5boK7/+DQxztYIpqihIIgGnMUkBtzHEqDFRhc2sgQ3JlYXRlZDABOcpYcuRvKBUYQalE
+      c+RvKBUYSi4KCGNyZXdfa2V5EiIKIGMzMDc2MDA5MzI2NzYxNDQ0ZDU3YzcxZDFkYTNmMjdjSjEK
+      B2NyZXdfaWQSJgokNzk0MDE5MjUtYjhlOS00NzA4LTg1MzAtNDQ4YWZhM2JmOGIwSi4KCHRhc2tf
+      a2V5EiIKIDgwZDdiY2Q0OTA5OTI5MDA4MzgzMmYwZTk4MzM4MGRmSjEKB3Rhc2tfaWQSJgokMmZm
+      NjE5N2UtYmEyNy00YjczLWI0YTctNGZhMDQ4ZTYyYjQ3egIYAYUBAAEAABKTAQoQ26H9pLUgswDN
+      p9XhJwwL6BIIx3bw7mAvPYwqClRvb2wgVXNhZ2UwATmy7NPlbygVGEEvb+HlbygVGEoaCg5jcmV3
+      YWlfdmVyc2lvbhIICgYwLjg2LjBKHwoJdG9vbF9uYW1lEhIKEERlY2lkZSBHcmVldGluZ3NKDgoI
+      YXR0ZW1wdHMSAhgBegIYAYUBAAEAAA==
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '2986'
+      Content-Type:
+      - application/x-protobuf
+      User-Agent:
+      - OTel-OTLP-Exporter-Python/1.27.0
+    method: POST
+    uri: https://telemetry.crewai.com:4319/v1/traces
+  response:
+    body:
+      string: "\n\0"
+    headers:
+      Content-Length:
+      - '2'
+      Content-Type:
+      - application/x-protobuf
+      Date:
+      - Fri, 27 Dec 2024 22:14:53 GMT
+    status:
+      code: 200
+      message: OK
+- request:
+    body: '{"messages": [{"role": "system", "content": "You are test role. test backstory\nYour
+      personal goal is: test goal\nTo give my best complete final answer to the task
+      use the exact following format:\n\nThought: I now can give a great answer\nFinal
+      Answer: Your final answer must be the great and the most complete as possible,
+      it must be outcome described.\n\nI MUST use these formats, my job depends on
+      it!"}, {"role": "user", "content": "\nCurrent Task: Say the word: Hi\n\nThis
+      is the expect criteria for your final answer: The word: Hi\nyou MUST return
+      the actual complete content as the final answer, not a summary.\n\nBegin! This
+      is VERY important to you, use the tools available and give your best Final Answer,
+      your job depends on it!\n\nThought:"}], "model": "gpt-4o-mini", "stop": ["\nObservation:"],
+      "stream": false}'
+    headers:
+      accept:
+      - application/json
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '824'
+      content-type:
+      - application/json
+      cookie:
+      - _cfuvid=ePJSDFdHag2D8lj21_ijAMWjoA6xfnPNxN4uekvC728-1727226247743-0.0.1.1-604800000
+      host:
+      - api.openai.com
+      user-agent:
+      - OpenAI/Python 1.52.1
+      x-stainless-arch:
+      - x64
+      x-stainless-async:
+      - 'false'
+      x-stainless-lang:
+      - python
+      x-stainless-os:
+      - Linux
+      x-stainless-package-version:
+      - 1.52.1
+      x-stainless-raw-response:
+      - 'true'
+      x-stainless-retry-count:
+      - '0'
+      x-stainless-runtime:
+      - CPython
+      x-stainless-runtime-version:
+      - 3.12.7
+    method: POST
+    uri: https://api.openai.com/v1/chat/completions
+  response:
+    content: "{\n  \"id\": \"chatcmpl-AjCtZLLrWi8ZASpP9bz6HaCV7xBIn\",\n  \"object\":
+      \"chat.completion\",\n  \"created\": 1735337693,\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n
+      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
+      \"assistant\",\n        \"content\": \"I now can give a great answer  \\nFinal
+      Answer: Hi\",\n        \"refusal\": null\n      },\n      \"logprobs\": null,\n
+      \     \"finish_reason\": \"stop\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\":
+      158,\n    \"completion_tokens\": 12,\n    \"total_tokens\": 170,\n    \"prompt_tokens_details\":
+      {\n      \"cached_tokens\": 0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\":
+      {\n      \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
+      0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"system_fingerprint\":
+      \"fp_0aa8d3e20b\"\n}\n"
+    headers:
+      CF-Cache-Status:
+      - DYNAMIC
+      CF-RAY:
+      - 8f8caa83deca756b-SEA
+      Connection:
+      - keep-alive
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 27 Dec 2024 22:14:53 GMT
+      Server:
+      - cloudflare
+      Set-Cookie:
+      - __cf_bm=wJkq_yLkzE3OdxE0aMJz.G0kce969.9JxRmZ0ratl4c-1735337693-1.0.1.1-OKpUoRrSPFGvWv5Hp5ET1PNZ7iZNHPKEAuakpcQUxxPSeisUIIR3qIOZ31MGmYugqB5.wkvidgbxOAagqJvmnw;
+        path=/; expires=Fri, 27-Dec-24 22:44:53 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=A_ASCLNAVfQoyucWOAIhecWtEpNotYoZr0bAFihgNxs-1735337693273-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      Transfer-Encoding:
+      - chunked
+      X-Content-Type-Options:
+      - nosniff
+      access-control-expose-headers:
+      - X-Request-ID
+      alt-svc:
+      - h3=":443"; ma=86400
+      openai-organization:
+      - crewai-iuxna1
+      openai-processing-ms:
+      - '404'
+      openai-version:
+      - '2020-10-01'
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains; preload
+      x-ratelimit-limit-requests:
+      - '30000'
+      x-ratelimit-limit-tokens:
+      - '150000000'
+      x-ratelimit-remaining-requests:
+      - '29999'
+      x-ratelimit-remaining-tokens:
+      - '149999816'
+      x-ratelimit-reset-requests:
+      - 2ms
+      x-ratelimit-reset-tokens:
+      - 0s
+      x-request-id:
+      - req_6ac84634bff9193743c4b0911c09b4a6
+    http_version: HTTP/1.1
+    status_code: 200
+- request:
+    body: '{"messages": [{"role": "system", "content": "Determine if the following
+      feedback indicates that the user is satisfied or if further changes are needed.
+      Respond with ''True'' if further changes are needed, or ''False'' if the user
+      is satisfied. **Important** Do not include any additional commentary outside
+      of your ''True'' or ''False'' response.\n\nFeedback: \"Don''t say hi, say Hello
+      instead!\""}], "model": "gpt-4o-mini", "stop": ["\nObservation:"], "stream":
+      false}'
+    headers:
+      accept:
+      - application/json
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '461'
+      content-type:
+      - application/json
+      cookie:
+      - _cfuvid=A_ASCLNAVfQoyucWOAIhecWtEpNotYoZr0bAFihgNxs-1735337693273-0.0.1.1-604800000;
+        __cf_bm=wJkq_yLkzE3OdxE0aMJz.G0kce969.9JxRmZ0ratl4c-1735337693-1.0.1.1-OKpUoRrSPFGvWv5Hp5ET1PNZ7iZNHPKEAuakpcQUxxPSeisUIIR3qIOZ31MGmYugqB5.wkvidgbxOAagqJvmnw
+      host:
+      - api.openai.com
+      user-agent:
+      - OpenAI/Python 1.52.1
+      x-stainless-arch:
+      - x64
+      x-stainless-async:
+      - 'false'
+      x-stainless-lang:
+      - python
+      x-stainless-os:
+      - Linux
+      x-stainless-package-version:
+      - 1.52.1
+      x-stainless-raw-response:
+      - 'true'
+      x-stainless-retry-count:
+      - '0'
+      x-stainless-runtime:
+      - CPython
+      x-stainless-runtime-version:
+      - 3.12.7
+    method: POST
+    uri: https://api.openai.com/v1/chat/completions
+  response:
+    content: "{\n  \"id\": \"chatcmpl-AjCtZNlWdrrPZhq0MJDqd16sMuQEJ\",\n  \"object\":
+      \"chat.completion\",\n  \"created\": 1735337693,\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n
+      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
+      \"assistant\",\n        \"content\": \"True\",\n        \"refusal\": null\n
+      \     },\n      \"logprobs\": null,\n      \"finish_reason\": \"stop\"\n    }\n
+      \ ],\n  \"usage\": {\n    \"prompt_tokens\": 78,\n    \"completion_tokens\":
+      1,\n    \"total_tokens\": 79,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\":
+      0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n
+      \     \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
+      0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"system_fingerprint\":
+      \"fp_0aa8d3e20b\"\n}\n"
+    headers:
+      CF-Cache-Status:
+      - DYNAMIC
+      CF-RAY:
+      - 8f8caa87094f756b-SEA
+      Connection:
+      - keep-alive
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 27 Dec 2024 22:14:53 GMT
+      Server:
+      - cloudflare
+      Transfer-Encoding:
+      - chunked
+      X-Content-Type-Options:
+      - nosniff
+      access-control-expose-headers:
+      - X-Request-ID
+      alt-svc:
+      - h3=":443"; ma=86400
+      openai-organization:
+      - crewai-iuxna1
+      openai-processing-ms:
+      - '156'
+      openai-version:
+      - '2020-10-01'
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains; preload
+      x-ratelimit-limit-requests:
+      - '30000'
+      x-ratelimit-limit-tokens:
+      - '150000000'
+      x-ratelimit-remaining-requests:
+      - '29999'
+      x-ratelimit-remaining-tokens:
+      - '149999898'
+      x-ratelimit-reset-requests:
+      - 2ms
+      x-ratelimit-reset-tokens:
+      - 0s
+      x-request-id:
+      - req_ec74bef2a9ef7b2144c03fd7f7bbeab0
+    http_version: HTTP/1.1
+    status_code: 200
+- request:
+    body: '{"messages": [{"role": "system", "content": "You are test role. test backstory\nYour
+      personal goal is: test goal\nTo give my best complete final answer to the task
+      use the exact following format:\n\nThought: I now can give a great answer\nFinal
+      Answer: Your final answer must be the great and the most complete as possible,
+      it must be outcome described.\n\nI MUST use these formats, my job depends on
+      it!"}, {"role": "user", "content": "\nCurrent Task: Say the word: Hi\n\nThis
+      is the expect criteria for your final answer: The word: Hi\nyou MUST return
+      the actual complete content as the final answer, not a summary.\n\nBegin! This
+      is VERY important to you, use the tools available and give your best Final Answer,
+      your job depends on it!\n\nThought:"}, {"role": "assistant", "content": "I now
+      can give a great answer  \nFinal Answer: Hi"}, {"role": "user", "content": "Feedback:
+      Don''t say hi, say Hello instead!"}], "model": "gpt-4o-mini", "stop": ["\nObservation:"],
+      "stream": false}'
+    headers:
+      accept:
+      - application/json
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '986'
+      content-type:
+      - application/json
+      cookie:
+      - _cfuvid=A_ASCLNAVfQoyucWOAIhecWtEpNotYoZr0bAFihgNxs-1735337693273-0.0.1.1-604800000;
+        __cf_bm=wJkq_yLkzE3OdxE0aMJz.G0kce969.9JxRmZ0ratl4c-1735337693-1.0.1.1-OKpUoRrSPFGvWv5Hp5ET1PNZ7iZNHPKEAuakpcQUxxPSeisUIIR3qIOZ31MGmYugqB5.wkvidgbxOAagqJvmnw
+      host:
+      - api.openai.com
+      user-agent:
+      - OpenAI/Python 1.52.1
+      x-stainless-arch:
+      - x64
+      x-stainless-async:
+      - 'false'
+      x-stainless-lang:
+      - python
+      x-stainless-os:
+      - Linux
+      x-stainless-package-version:
+      - 1.52.1
+      x-stainless-raw-response:
+      - 'true'
+      x-stainless-retry-count:
+      - '0'
+      x-stainless-runtime:
+      - CPython
+      x-stainless-runtime-version:
+      - 3.12.7
+    method: POST
+    uri: https://api.openai.com/v1/chat/completions
+  response:
+    content: "{\n  \"id\": \"chatcmpl-AjCtZGv4f3h7GDdhyOy9G0sB1lRgC\",\n  \"object\":
+      \"chat.completion\",\n  \"created\": 1735337693,\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n
+      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
+      \"assistant\",\n        \"content\": \"Thought: I understand the feedback and
+      will adjust my response accordingly.  \\nFinal Answer: Hello\",\n        \"refusal\":
+      null\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"stop\"\n
+      \   }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 188,\n    \"completion_tokens\":
+      18,\n    \"total_tokens\": 206,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\":
+      0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n
+      \     \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
+      0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"system_fingerprint\":
+      \"fp_0aa8d3e20b\"\n}\n"
+    headers:
+      CF-Cache-Status:
+      - DYNAMIC
+      CF-RAY:
+      - 8f8caa88cac4756b-SEA
+      Connection:
+      - keep-alive
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 27 Dec 2024 22:14:54 GMT
+      Server:
+      - cloudflare
+      Transfer-Encoding:
+      - chunked
+      X-Content-Type-Options:
+      - nosniff
+      access-control-expose-headers:
+      - X-Request-ID
+      alt-svc:
+      - h3=":443"; ma=86400
+      openai-organization:
+      - crewai-iuxna1
+      openai-processing-ms:
+      - '358'
+      openai-version:
+      - '2020-10-01'
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains; preload
+      x-ratelimit-limit-requests:
+      - '30000'
+      x-ratelimit-limit-tokens:
+      - '150000000'
+      x-ratelimit-remaining-requests:
+      - '29999'
+      x-ratelimit-remaining-tokens:
+      - '149999793'
+      x-ratelimit-reset-requests:
+      - 2ms
+      x-ratelimit-reset-tokens:
+      - 0s
+      x-request-id:
+      - req_ae1ab6b206d28ded6fee3c83ed0c2ab7
+    http_version: HTTP/1.1
+    status_code: 200
+- request:
+    body: '{"messages": [{"role": "system", "content": "Determine if the following
+      feedback indicates that the user is satisfied or if further changes are needed.
+      Respond with ''True'' if further changes are needed, or ''False'' if the user
+      is satisfied. **Important** Do not include any additional commentary outside
+      of your ''True'' or ''False'' response.\n\nFeedback: \"looks good\""}], "model":
+      "gpt-4o-mini", "stop": ["\nObservation:"], "stream": false}'
+    headers:
+      accept:
+      - application/json
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '439'
+      content-type:
+      - application/json
+      cookie:
+      - _cfuvid=A_ASCLNAVfQoyucWOAIhecWtEpNotYoZr0bAFihgNxs-1735337693273-0.0.1.1-604800000;
+        __cf_bm=wJkq_yLkzE3OdxE0aMJz.G0kce969.9JxRmZ0ratl4c-1735337693-1.0.1.1-OKpUoRrSPFGvWv5Hp5ET1PNZ7iZNHPKEAuakpcQUxxPSeisUIIR3qIOZ31MGmYugqB5.wkvidgbxOAagqJvmnw
+      host:
+      - api.openai.com
+      user-agent:
+      - OpenAI/Python 1.52.1
+      x-stainless-arch:
+      - x64
+      x-stainless-async:
+      - 'false'
+      x-stainless-lang:
+      - python
+      x-stainless-os:
+      - Linux
+      x-stainless-package-version:
+      - 1.52.1
+      x-stainless-raw-response:
+      - 'true'
+      x-stainless-retry-count:
+      - '0'
+      x-stainless-runtime:
+      - CPython
+      x-stainless-runtime-version:
+      - 3.12.7
+    method: POST
+    uri: https://api.openai.com/v1/chat/completions
+  response:
+    content: "{\n  \"id\": \"chatcmpl-AjCtaiHL4TY8Dssk0j2miqmjrzquy\",\n  \"object\":
+      \"chat.completion\",\n  \"created\": 1735337694,\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n
+      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
+      \"assistant\",\n        \"content\": \"False\",\n        \"refusal\": null\n
+      \     },\n      \"logprobs\": null,\n      \"finish_reason\": \"stop\"\n    }\n
+      \ ],\n  \"usage\": {\n    \"prompt_tokens\": 73,\n    \"completion_tokens\":
+      1,\n    \"total_tokens\": 74,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\":
+      0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n
+      \     \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
+      0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"system_fingerprint\":
+      \"fp_0aa8d3e20b\"\n}\n"
+    headers:
+      CF-Cache-Status:
+      - DYNAMIC
+      CF-RAY:
+      - 8f8caa8bdd26756b-SEA
+      Connection:
+      - keep-alive
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/json
+      Date:
+      - Fri, 27 Dec 2024 22:14:54 GMT
+      Server:
+      - cloudflare
+      Transfer-Encoding:
+      - chunked
+      X-Content-Type-Options:
+      - nosniff
+      access-control-expose-headers:
+      - X-Request-ID
+      alt-svc:
+      - h3=":443"; ma=86400
+      openai-organization:
+      - crewai-iuxna1
+      openai-processing-ms:
+      - '184'
+      openai-version:
+      - '2020-10-01'
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains; preload
+      x-ratelimit-limit-requests:
+      - '30000'
+      x-ratelimit-limit-tokens:
+      - '150000000'
+      x-ratelimit-remaining-requests:
+      - '29999'
+      x-ratelimit-remaining-tokens:
+      - '149999902'
+      x-ratelimit-reset-requests:
+      - 2ms
+      x-ratelimit-reset-tokens:
+      - 0s
+      x-request-id:
+      - req_652891f79c1104a7a8436275d78a69f1
+    http_version: HTTP/1.1
+    status_code: 200
+version: 1

tests/cassettes/test_deepseek_r1_with_open_router.yaml

@@ -1,100 +0,0 @@
-interactions:
-- request:
-    body: '{"model": "deepseek/deepseek-r1", "messages": [{"role": "user", "content":
-      "What is the capital of France?"}], "stop": [], "stream": false}'
-    headers:
-      accept:
-      - '*/*'
-      accept-encoding:
-      - gzip, deflate
-      connection:
-      - keep-alive
-      content-length:
-      - '139'
-      host:
-      - openrouter.ai
-      http-referer:
-      - https://litellm.ai
-      user-agent:
-      - litellm/1.60.2
-      x-title:
-      - liteLLM
-    method: POST
-    uri: https://openrouter.ai/api/v1/chat/completions
-  response:
-    content: "\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n\n
-      \        \n\n         \n\n         \n\n         \n\n         \n\n         \n{\"id\":\"gen-1738684300-YnD5WOSczQWsW0vQG78a\",\"provider\":\"Nebius\",\"model\":\"deepseek/deepseek-r1\",\"object\":\"chat.completion\",\"created\":1738684300,\"choices\":[{\"logprobs\":null,\"index\":0,\"message\":{\"role\":\"assistant\",\"content\":\"The
-      capital of France is **Paris**. Known for its iconic landmarks such as the Eiffel
-      Tower, Notre-Dame Cathedral, and the Louvre Museum, Paris has served as the
-      political and cultural center of France for centuries. \U0001F1EB\U0001F1F7\",\"refusal\":null}}],\"usage\":{\"prompt_tokens\":10,\"completion_tokens\":261,\"total_tokens\":271}}"
-    headers:
-      Access-Control-Allow-Origin:
-      - '*'
-      CF-RAY:
-      - 90cbd2ceaf3ead5e-ATL
-      Connection:
-      - keep-alive
-      Content-Encoding:
-      - gzip
-      Content-Type:
-      - application/json
-      Date:
-      - Tue, 04 Feb 2025 15:51:40 GMT
-      Server:
-      - cloudflare
-      Transfer-Encoding:
-      - chunked
-      Vary:
-      - Accept-Encoding
-      x-clerk-auth-message:
-      - Invalid JWT form. A JWT consists of three parts separated by dots. (reason=token-invalid,
-        token-carrier=header)
-      x-clerk-auth-reason:
-      - token-invalid
-      x-clerk-auth-status:
-      - signed-out
-    http_version: HTTP/1.1
-    status_code: 200
-version: 1

tests/cassettes/test_o3_mini_reasoning_effort_high.yaml

@@ -1,107 +0,0 @@
-interactions:
-- request:
-    body: '{"messages": [{"role": "user", "content": "What is the capital of France?"}],
-      "model": "o3-mini", "reasoning_effort": "high", "stop": []}'
-    headers:
-      accept:
-      - application/json
-      accept-encoding:
-      - gzip, deflate
-      connection:
-      - keep-alive
-      content-length:
-      - '137'
-      content-type:
-      - application/json
-      cookie:
-      - _cfuvid=etTqqA9SBOnENmrFAUBIexdW0v2ZeO1x9_Ek_WChlfU-1737568920137-0.0.1.1-604800000
-      host:
-      - api.openai.com
-      user-agent:
-      - OpenAI/Python 1.61.0
-      x-stainless-arch:
-      - arm64
-      x-stainless-async:
-      - 'false'
-      x-stainless-lang:
-      - python
-      x-stainless-os:
-      - MacOS
-      x-stainless-package-version:
-      - 1.61.0
-      x-stainless-raw-response:
-      - 'true'
-      x-stainless-retry-count:
-      - '0'
-      x-stainless-runtime:
-      - CPython
-      x-stainless-runtime-version:
-      - 3.12.7
-    method: POST
-    uri: https://api.openai.com/v1/chat/completions
-  response:
-    content: "{\n  \"id\": \"chatcmpl-AxFNUz7l4pwtY9xhFSPIGlwNfE4Sj\",\n  \"object\":
-      \"chat.completion\",\n  \"created\": 1738683828,\n  \"model\": \"o3-mini-2025-01-31\",\n
-      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
-      \"assistant\",\n        \"content\": \"The capital of France is Paris.\",\n
-      \       \"refusal\": null\n      },\n      \"finish_reason\": \"stop\"\n    }\n
-      \ ],\n  \"usage\": {\n    \"prompt_tokens\": 13,\n    \"completion_tokens\":
-      81,\n    \"total_tokens\": 94,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\":
-      0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n
-      \     \"reasoning_tokens\": 64,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
-      0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"service_tier\":
-      \"default\",\n  \"system_fingerprint\": \"fp_8bcaa0ca21\"\n}\n"
-    headers:
-      CF-RAY:
-      - 90cbc745d91fb0ca-ATL
-      Connection:
-      - keep-alive
-      Content-Encoding:
-      - gzip
-      Content-Type:
-      - application/json
-      Date:
-      - Tue, 04 Feb 2025 15:43:50 GMT
-      Server:
-      - cloudflare
-      Set-Cookie:
-      - __cf_bm=.AP74BirsYr.lu61bSaimK2HRF6126qr5vCrr3HC6ak-1738683830-1.0.1.1-feh.bcMOv9wYnitoPpr.7UR7JrzCsbRLlzct09xCDm2SwmnRQQk5ZSSV41Ywer2S0rptbvufFwklV9wo9ATvWw;
-        path=/; expires=Tue, 04-Feb-25 16:13:50 GMT; domain=.api.openai.com; HttpOnly;
-        Secure; SameSite=None
-      - _cfuvid=JBfx8Sl7w82A0S_K1tQd5ZcwzWaZP5Gg5W1dqAdgwNU-1738683830528-0.0.1.1-604800000;
-        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
-      Transfer-Encoding:
-      - chunked
-      X-Content-Type-Options:
-      - nosniff
-      access-control-expose-headers:
-      - X-Request-ID
-      alt-svc:
-      - h3=":443"; ma=86400
-      cf-cache-status:
-      - DYNAMIC
-      openai-organization:
-      - crewai-iuxna1
-      openai-processing-ms:
-      - '2169'
-      openai-version:
-      - '2020-10-01'
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains; preload
-      x-ratelimit-limit-requests:
-      - '30000'
-      x-ratelimit-limit-tokens:
-      - '150000000'
-      x-ratelimit-remaining-requests:
-      - '29999'
-      x-ratelimit-remaining-tokens:
-      - '149999974'
-      x-ratelimit-reset-requests:
-      - 2ms
-      x-ratelimit-reset-tokens:
-      - 0s
-      x-request-id:
-      - req_163e7bd79cb5a5e62d4688245b97d1d9
-    http_version: HTTP/1.1
-    status_code: 200
-version: 1

tests/cassettes/test_o3_mini_reasoning_effort_low.yaml

@@ -1,102 +0,0 @@
-interactions:
-- request:
-    body: '{"messages": [{"role": "user", "content": "What is the capital of France?"}],
-      "model": "o3-mini", "reasoning_effort": "low", "stop": []}'
-    headers:
-      accept:
-      - application/json
-      accept-encoding:
-      - gzip, deflate
-      connection:
-      - keep-alive
-      content-length:
-      - '136'
-      content-type:
-      - application/json
-      cookie:
-      - _cfuvid=JBfx8Sl7w82A0S_K1tQd5ZcwzWaZP5Gg5W1dqAdgwNU-1738683830528-0.0.1.1-604800000;
-        __cf_bm=.AP74BirsYr.lu61bSaimK2HRF6126qr5vCrr3HC6ak-1738683830-1.0.1.1-feh.bcMOv9wYnitoPpr.7UR7JrzCsbRLlzct09xCDm2SwmnRQQk5ZSSV41Ywer2S0rptbvufFwklV9wo9ATvWw
-      host:
-      - api.openai.com
-      user-agent:
-      - OpenAI/Python 1.61.0
-      x-stainless-arch:
-      - arm64
-      x-stainless-async:
-      - 'false'
-      x-stainless-lang:
-      - python
-      x-stainless-os:
-      - MacOS
-      x-stainless-package-version:
-      - 1.61.0
-      x-stainless-raw-response:
-      - 'true'
-      x-stainless-retry-count:
-      - '0'
-      x-stainless-runtime:
-      - CPython
-      x-stainless-runtime-version:
-      - 3.12.7
-    method: POST
-    uri: https://api.openai.com/v1/chat/completions
-  response:
-    content: "{\n  \"id\": \"chatcmpl-AxFNWljEYFrf5qRwYj73OPQtAnPbF\",\n  \"object\":
-      \"chat.completion\",\n  \"created\": 1738683830,\n  \"model\": \"o3-mini-2025-01-31\",\n
-      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
-      \"assistant\",\n        \"content\": \"The capital of France is Paris.\",\n
-      \       \"refusal\": null\n      },\n      \"finish_reason\": \"stop\"\n    }\n
-      \ ],\n  \"usage\": {\n    \"prompt_tokens\": 13,\n    \"completion_tokens\":
-      17,\n    \"total_tokens\": 30,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\":
-      0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n
-      \     \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
-      0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"service_tier\":
-      \"default\",\n  \"system_fingerprint\": \"fp_8bcaa0ca21\"\n}\n"
-    headers:
-      CF-RAY:
-      - 90cbc7551fe0b0ca-ATL
-      Connection:
-      - keep-alive
-      Content-Encoding:
-      - gzip
-      Content-Type:
-      - application/json
-      Date:
-      - Tue, 04 Feb 2025 15:43:51 GMT
-      Server:
-      - cloudflare
-      Transfer-Encoding:
-      - chunked
-      X-Content-Type-Options:
-      - nosniff
-      access-control-expose-headers:
-      - X-Request-ID
-      alt-svc:
-      - h3=":443"; ma=86400
-      cf-cache-status:
-      - DYNAMIC
-      openai-organization:
-      - crewai-iuxna1
-      openai-processing-ms:
-      - '1103'
-      openai-version:
-      - '2020-10-01'
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains; preload
-      x-ratelimit-limit-requests:
-      - '30000'
-      x-ratelimit-limit-tokens:
-      - '150000000'
-      x-ratelimit-remaining-requests:
-      - '29999'
-      x-ratelimit-remaining-tokens:
-      - '149999974'
-      x-ratelimit-reset-requests:
-      - 2ms
-      x-ratelimit-reset-tokens:
-      - 0s
-      x-request-id:
-      - req_fd7178a0e5060216d04f3bd023e8bca1
-    http_version: HTTP/1.1
-    status_code: 200
-version: 1

tests/cassettes/test_o3_mini_reasoning_effort_medium.yaml

@@ -1,102 +0,0 @@
-interactions:
-- request:
-    body: '{"messages": [{"role": "user", "content": "What is the capital of France?"}],
-      "model": "o3-mini", "reasoning_effort": "medium", "stop": []}'
-    headers:
-      accept:
-      - application/json
-      accept-encoding:
-      - gzip, deflate
-      connection:
-      - keep-alive
-      content-length:
-      - '139'
-      content-type:
-      - application/json
-      cookie:
-      - _cfuvid=JBfx8Sl7w82A0S_K1tQd5ZcwzWaZP5Gg5W1dqAdgwNU-1738683830528-0.0.1.1-604800000;
-        __cf_bm=.AP74BirsYr.lu61bSaimK2HRF6126qr5vCrr3HC6ak-1738683830-1.0.1.1-feh.bcMOv9wYnitoPpr.7UR7JrzCsbRLlzct09xCDm2SwmnRQQk5ZSSV41Ywer2S0rptbvufFwklV9wo9ATvWw
-      host:
-      - api.openai.com
-      user-agent:
-      - OpenAI/Python 1.61.0
-      x-stainless-arch:
-      - arm64
-      x-stainless-async:
-      - 'false'
-      x-stainless-lang:
-      - python
-      x-stainless-os:
-      - MacOS
-      x-stainless-package-version:
-      - 1.61.0
-      x-stainless-raw-response:
-      - 'true'
-      x-stainless-retry-count:
-      - '0'
-      x-stainless-runtime:
-      - CPython
-      x-stainless-runtime-version:
-      - 3.12.7
-    method: POST
-    uri: https://api.openai.com/v1/chat/completions
-  response:
-    content: "{\n  \"id\": \"chatcmpl-AxFS8IuMeYs6Rky2UbG8wH8P5PR4k\",\n  \"object\":
-      \"chat.completion\",\n  \"created\": 1738684116,\n  \"model\": \"o3-mini-2025-01-31\",\n
-      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
-      \"assistant\",\n        \"content\": \"The capital of France is Paris.\",\n
-      \       \"refusal\": null\n      },\n      \"finish_reason\": \"stop\"\n    }\n
-      \ ],\n  \"usage\": {\n    \"prompt_tokens\": 13,\n    \"completion_tokens\":
-      145,\n    \"total_tokens\": 158,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\":
-      0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n
-      \     \"reasoning_tokens\": 128,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
-      0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"service_tier\":
-      \"default\",\n  \"system_fingerprint\": \"fp_8bcaa0ca21\"\n}\n"
-    headers:
-      CF-RAY:
-      - 90cbce51b946afb4-ATL
-      Connection:
-      - keep-alive
-      Content-Encoding:
-      - gzip
-      Content-Type:
-      - application/json
-      Date:
-      - Tue, 04 Feb 2025 15:48:39 GMT
-      Server:
-      - cloudflare
-      Transfer-Encoding:
-      - chunked
-      X-Content-Type-Options:
-      - nosniff
-      access-control-expose-headers:
-      - X-Request-ID
-      alt-svc:
-      - h3=":443"; ma=86400
-      cf-cache-status:
-      - DYNAMIC
-      openai-organization:
-      - crewai-iuxna1
-      openai-processing-ms:
-      - '2365'
-      openai-version:
-      - '2020-10-01'
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains; preload
-      x-ratelimit-limit-requests:
-      - '30000'
-      x-ratelimit-limit-tokens:
-      - '150000000'
-      x-ratelimit-remaining-requests:
-      - '29999'
-      x-ratelimit-remaining-tokens:
-      - '149999974'
-      x-ratelimit-reset-requests:
-      - 2ms
-      x-ratelimit-reset-tokens:
-      - 0s
-      x-request-id:
-      - req_bfd83679e674c3894991477f1fb043b2
-    http_version: HTTP/1.1
-    status_code: 200
-version: 1

tests/cassettes/test_tool_execution_error_event.yaml

@@ -1,112 +0,0 @@
-interactions:
-- request:
-    body: '{"messages": [{"role": "user", "content": "Use the failing tool"}], "model":
-      "gpt-4o-mini", "stop": [], "tools": [{"type": "function", "function": {"name":
-      "failing_tool", "description": "This tool always fails.", "parameters": {"type":
-      "object", "properties": {"param": {"type": "string", "description": "A test
-      parameter"}}, "required": ["param"]}}}]}'
-    headers:
-      accept:
-      - application/json
-      accept-encoding:
-      - gzip, deflate
-      connection:
-      - keep-alive
-      content-length:
-      - '353'
-      content-type:
-      - application/json
-      host:
-      - api.openai.com
-      user-agent:
-      - OpenAI/Python 1.61.0
-      x-stainless-arch:
-      - arm64
-      x-stainless-async:
-      - 'false'
-      x-stainless-lang:
-      - python
-      x-stainless-os:
-      - MacOS
-      x-stainless-package-version:
-      - 1.61.0
-      x-stainless-raw-response:
-      - 'true'
-      x-stainless-retry-count:
-      - '0'
-      x-stainless-runtime:
-      - CPython
-      x-stainless-runtime-version:
-      - 3.12.8
-    method: POST
-    uri: https://api.openai.com/v1/chat/completions
-  response:
-    content: "{\n  \"id\": \"chatcmpl-B2P4zoJZuES7Aom8ugEq1modz5Vsl\",\n  \"object\":
-      \"chat.completion\",\n  \"created\": 1739912761,\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n
-      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
-      \"assistant\",\n        \"content\": null,\n        \"tool_calls\": [\n          {\n
-      \           \"id\": \"call_F6fJxISpMKUBIGV6dd2vjRNG\",\n            \"type\":
-      \"function\",\n            \"function\": {\n              \"name\": \"failing_tool\",\n
-      \             \"arguments\": \"{\\\"param\\\":\\\"test\\\"}\"\n            }\n
-      \         }\n        ],\n        \"refusal\": null\n      },\n      \"logprobs\":
-      null,\n      \"finish_reason\": \"tool_calls\"\n    }\n  ],\n  \"usage\": {\n
-      \   \"prompt_tokens\": 51,\n    \"completion_tokens\": 15,\n    \"total_tokens\":
-      66,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"audio_tokens\":
-      0\n    },\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\":
-      0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\": 0,\n      \"rejected_prediction_tokens\":
-      0\n    }\n  },\n  \"service_tier\": \"default\",\n  \"system_fingerprint\":
-      \"fp_00428b782a\"\n}\n"
-    headers:
-      CF-RAY:
-      - 9140fa827f38eb1e-SJC
-      Connection:
-      - keep-alive
-      Content-Encoding:
-      - gzip
-      Content-Type:
-      - application/json
-      Date:
-      - Tue, 18 Feb 2025 21:06:02 GMT
-      Server:
-      - cloudflare
-      Set-Cookie:
-      - __cf_bm=xbuu3IQpCMh.43ZrqL1TRMECOc6QldgHV0hzOX1GrWI-1739912762-1.0.1.1-t7iyq5xMioPrwfeaHLvPT9rwRPp7Q9A9uIm69icH9dPxRD4xMA3cWqb1aXj1_e2IyAEQQWFe1UWjlmJ22aHh3Q;
-        path=/; expires=Tue, 18-Feb-25 21:36:02 GMT; domain=.api.openai.com; HttpOnly;
-        Secure; SameSite=None
-      - _cfuvid=x9l.Rhja8_wXDN.j8qcEU1PvvEqAwZp4Fd3s_aj4qwM-1739912762161-0.0.1.1-604800000;
-        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
-      Transfer-Encoding:
-      - chunked
-      X-Content-Type-Options:
-      - nosniff
-      access-control-expose-headers:
-      - X-Request-ID
-      alt-svc:
-      - h3=":443"; ma=86400
-      cf-cache-status:
-      - DYNAMIC
-      openai-organization:
-      - crewai-iuxna1
-      openai-processing-ms:
-      - '861'
-      openai-version:
-      - '2020-10-01'
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains; preload
-      x-ratelimit-limit-requests:
-      - '30000'
-      x-ratelimit-limit-tokens:
-      - '150000000'
-      x-ratelimit-remaining-requests:
-      - '29999'
-      x-ratelimit-remaining-tokens:
-      - '149999978'
-      x-ratelimit-reset-requests:
-      - 2ms
-      x-ratelimit-reset-tokens:
-      - 0s
-      x-request-id:
-      - req_8666ec3aa6677cb346ba00993556051d
-    http_version: HTTP/1.1
-    status_code: 200
-version: 1

tests/cli/cli_test.py

@@ -55,83 +55,72 @@ def test_train_invalid_string_iterations(train_crew, runner):
     )
 
 
-@mock.patch("crewai.cli.reset_memories_command.get_crew")
-def test_reset_all_memories(mock_get_crew, runner):
-    mock_crew = mock.Mock()
-    mock_get_crew.return_value = mock_crew
-    result = runner.invoke(reset_memories, ["-a"])
+@mock.patch("crewai.cli.reset_memories_command.ShortTermMemory")
+@mock.patch("crewai.cli.reset_memories_command.EntityMemory")
+@mock.patch("crewai.cli.reset_memories_command.LongTermMemory")
+@mock.patch("crewai.cli.reset_memories_command.TaskOutputStorageHandler")
+def test_reset_all_memories(
+    MockTaskOutputStorageHandler,
+    MockLongTermMemory,
+    MockEntityMemory,
+    MockShortTermMemory,
+    runner,
+):
+    result = runner.invoke(reset_memories, ["--all"])
+    MockShortTermMemory().reset.assert_called_once()
+    MockEntityMemory().reset.assert_called_once()
+    MockLongTermMemory().reset.assert_called_once()
+    MockTaskOutputStorageHandler().reset.assert_called_once()
 
-    mock_crew.reset_memories.assert_called_once_with(command_type="all")
     assert result.output == "All memories have been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.get_crew")
-def test_reset_short_term_memories(mock_get_crew, runner):
-    mock_crew = mock.Mock()
-    mock_get_crew.return_value = mock_crew
+@mock.patch("crewai.cli.reset_memories_command.ShortTermMemory")
+def test_reset_short_term_memories(MockShortTermMemory, runner):
     result = runner.invoke(reset_memories, ["-s"])
-
-    mock_crew.reset_memories.assert_called_once_with(command_type="short")
+    MockShortTermMemory().reset.assert_called_once()
     assert result.output == "Short term memory has been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.get_crew")
-def test_reset_entity_memories(mock_get_crew, runner):
-    mock_crew = mock.Mock()
-    mock_get_crew.return_value = mock_crew
+@mock.patch("crewai.cli.reset_memories_command.EntityMemory")
+def test_reset_entity_memories(MockEntityMemory, runner):
     result = runner.invoke(reset_memories, ["-e"])
-
-    mock_crew.reset_memories.assert_called_once_with(command_type="entity")
+    MockEntityMemory().reset.assert_called_once()
     assert result.output == "Entity memory has been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.get_crew")
-def test_reset_long_term_memories(mock_get_crew, runner):
-    mock_crew = mock.Mock()
-    mock_get_crew.return_value = mock_crew
+@mock.patch("crewai.cli.reset_memories_command.LongTermMemory")
+def test_reset_long_term_memories(MockLongTermMemory, runner):
     result = runner.invoke(reset_memories, ["-l"])
-
-    mock_crew.reset_memories.assert_called_once_with(command_type="long")
+    MockLongTermMemory().reset.assert_called_once()
     assert result.output == "Long term memory has been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.get_crew")
-def test_reset_kickoff_outputs(mock_get_crew, runner):
-    mock_crew = mock.Mock()
-    mock_get_crew.return_value = mock_crew
+@mock.patch("crewai.cli.reset_memories_command.TaskOutputStorageHandler")
+def test_reset_kickoff_outputs(MockTaskOutputStorageHandler, runner):
     result = runner.invoke(reset_memories, ["-k"])
-
-    mock_crew.reset_memories.assert_called_once_with(command_type="kickoff_outputs")
+    MockTaskOutputStorageHandler().reset.assert_called_once()
     assert result.output == "Latest Kickoff outputs stored has been reset.\n"
 
 
-@mock.patch("crewai.cli.reset_memories_command.get_crew")
-def test_reset_multiple_memory_flags(mock_get_crew, runner):
-    mock_crew = mock.Mock()
-    mock_get_crew.return_value = mock_crew
-    result = runner.invoke(reset_memories, ["-s", "-l"])
-
-    # Check that reset_memories was called twice with the correct arguments
-    assert mock_crew.reset_memories.call_count == 2
-    mock_crew.reset_memories.assert_has_calls(
-        [mock.call(command_type="long"), mock.call(command_type="short")]
+@mock.patch("crewai.cli.reset_memories_command.ShortTermMemory")
+@mock.patch("crewai.cli.reset_memories_command.LongTermMemory")
+def test_reset_multiple_memory_flags(MockShortTermMemory, MockLongTermMemory, runner):
+    result = runner.invoke(
+        reset_memories,
+        [
+            "-s",
+            "-l",
+        ],
     )
+    MockShortTermMemory().reset.assert_called_once()
+    MockLongTermMemory().reset.assert_called_once()
     assert (
         result.output
         == "Long term memory has been reset.\nShort term memory has been reset.\n"
     )
 
 
-@mock.patch("crewai.cli.reset_memories_command.get_crew")
-def test_reset_knowledge(mock_get_crew, runner):
-    mock_crew = mock.Mock()
-    mock_get_crew.return_value = mock_crew
-    result = runner.invoke(reset_memories, ["--knowledge"])
-
-    mock_crew.reset_memories.assert_called_once_with(command_type="knowledge")
-    assert result.output == "Knowledge has been reset.\n"
-
-
 def test_reset_no_memory_flags(runner):
     result = runner.invoke(
         reset_memories,

tests/config/tasks.yaml

@@ -2,7 +2,7 @@ research_task:
   description: >
     Conduct a thorough research about {topic}
     Make sure you find any interesting and relevant information given
-    the current year is 2025.
+    the current year is 2024.
   expected_output: >
     A list with 10 bullet points of the most relevant information about {topic}
   agent: researcher

tests/crew_test.py

@@ -6,6 +6,7 @@ from concurrent.futures import Future
 from unittest import mock
 from unittest.mock import MagicMock, patch
 
+import instructor
 import pydantic_core
 import pytest
 
@@ -14,24 +15,15 @@ from crewai.agents.cache import CacheHandler
 from crewai.crew import Crew
 from crewai.crews.crew_output import CrewOutput
 from crewai.knowledge.source.string_knowledge_source import StringKnowledgeSource
-from crewai.llm import LLM
 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,
-    crewai_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
 
@@ -57,41 +49,6 @@ writer = Agent(
 )
 
 
-def test_crew_with_only_conditional_tasks_raises_error():
-    """Test that creating a crew with only conditional tasks raises an error."""
-
-    def condition_func(task_output: TaskOutput) -> bool:
-        return True
-
-    conditional1 = ConditionalTask(
-        description="Conditional task 1",
-        expected_output="Output 1",
-        agent=researcher,
-        condition=condition_func,
-    )
-    conditional2 = ConditionalTask(
-        description="Conditional task 2",
-        expected_output="Output 2",
-        agent=researcher,
-        condition=condition_func,
-    )
-    conditional3 = ConditionalTask(
-        description="Conditional task 3",
-        expected_output="Output 3",
-        agent=researcher,
-        condition=condition_func,
-    )
-
-    with pytest.raises(
-        pydantic_core._pydantic_core.ValidationError,
-        match="Crew must include at least one non-conditional task",
-    ):
-        Crew(
-            agents=[researcher],
-            tasks=[conditional1, conditional2, conditional3],
-        )
-
-
 def test_crew_config_conditional_requirement():
     with pytest.raises(ValueError):
         Crew(process=Process.sequential)
@@ -599,12 +556,12 @@ def test_crew_with_delegating_agents_should_not_override_task_tools():
         _, kwargs = mock_execute_sync.call_args
         tools = kwargs["tools"]
 
-        assert any(
-            isinstance(tool, TestTool) for tool in tools
-        ), "TestTool should be present"
-        assert any(
-            "delegate" in tool.name.lower() for tool in tools
-        ), "Delegation tool should be present"
+        assert any(isinstance(tool, TestTool) for tool in tools), (
+            "TestTool should be present"
+        )
+        assert any("delegate" in tool.name.lower() for tool in tools), (
+            "Delegation tool should be present"
+        )
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
@@ -663,12 +620,12 @@ def test_crew_with_delegating_agents_should_not_override_agent_tools():
         _, kwargs = mock_execute_sync.call_args
         tools = kwargs["tools"]
 
-        assert any(
-            isinstance(tool, TestTool) for tool in new_ceo.tools
-        ), "TestTool should be present"
-        assert any(
-            "delegate" in tool.name.lower() for tool in tools
-        ), "Delegation tool should be present"
+        assert any(isinstance(tool, TestTool) for tool in new_ceo.tools), (
+            "TestTool should be present"
+        )
+        assert any("delegate" in tool.name.lower() for tool in tools), (
+            "Delegation tool should be present"
+        )
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
@@ -792,17 +749,17 @@ def test_task_tools_override_agent_tools_with_allow_delegation():
         used_tools = kwargs["tools"]
 
         # Confirm AnotherTestTool is present but TestTool is not
-        assert any(
-            isinstance(tool, AnotherTestTool) for tool in used_tools
-        ), "AnotherTestTool should be present"
-        assert not any(
-            isinstance(tool, TestTool) for tool in used_tools
-        ), "TestTool should not be present among used tools"
+        assert any(isinstance(tool, AnotherTestTool) for tool in used_tools), (
+            "AnotherTestTool should be present"
+        )
+        assert not any(isinstance(tool, TestTool) for tool in used_tools), (
+            "TestTool should not be present among used tools"
+        )
 
         # Confirm delegation tool(s) are present
-        assert any(
-            "delegate" in tool.name.lower() for tool in used_tools
-        ), "Delegation tool should be present"
+        assert any("delegate" in tool.name.lower() for tool in used_tools), (
+            "Delegation tool should be present"
+        )
 
     # Finally, make sure the agent's original tools remain unchanged
     assert len(researcher_with_delegation.tools) == 1
@@ -833,12 +790,6 @@ def test_crew_verbose_output(capsys):
 
     crew.kickoff()
     captured = capsys.readouterr()
-
-    # Filter out event listener logs (lines starting with '[')
-    filtered_output = "\n".join(
-        line for line in captured.out.split("\n") if not line.startswith("[")
-    )
-
     expected_strings = [
         "\x1b[1m\x1b[95m# Agent:\x1b[00m \x1b[1m\x1b[92mResearcher",
         "\x1b[00m\n\x1b[95m## Task:\x1b[00m \x1b[92mResearch AI advancements.",
@@ -851,19 +802,14 @@ def test_crew_verbose_output(capsys):
     ]
 
     for expected_string in expected_strings:
-        assert expected_string in filtered_output
+        assert expected_string in captured.out
 
     # Now test with verbose set to False
     crew.verbose = False
     crew._logger = Logger(verbose=False)
     crew.kickoff()
     captured = capsys.readouterr()
-    filtered_output = "\n".join(
-        line
-        for line in captured.out.split("\n")
-        if not line.startswith("[") and line.strip() and not line.startswith("\x1b")
-    )
-    assert filtered_output == ""
+    assert captured.out == ""
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
@@ -1301,9 +1247,9 @@ def test_kickoff_for_each_invalid_input():
 
     crew = Crew(agents=[agent], tasks=[task])
 
-    with pytest.raises(pydantic_core._pydantic_core.ValidationError):
+    with pytest.raises(TypeError):
         # Pass a string instead of a list
-        crew.kickoff_for_each(["invalid input"])
+        crew.kickoff_for_each("invalid input")
 
 
 def test_kickoff_for_each_error_handling():
@@ -1614,9 +1560,9 @@ def test_code_execution_flag_adds_code_tool_upon_kickoff():
 
         # Verify that exactly one tool was used and it was a CodeInterpreterTool
         assert len(used_tools) == 1, "Should have exactly one tool"
-        assert isinstance(
-            used_tools[0], CodeInterpreterTool
-        ), "Tool should be CodeInterpreterTool"
+        assert isinstance(used_tools[0], CodeInterpreterTool), (
+            "Tool should be CodeInterpreterTool"
+        )
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
@@ -1971,78 +1917,6 @@ def test_task_callback_on_crew():
         assert isinstance(args[0], TaskOutput)
 
 
-def test_task_callback_both_on_task_and_crew():
-    from unittest.mock import MagicMock, patch
-
-    mock_callback_on_task = MagicMock()
-    mock_callback_on_crew = MagicMock()
-
-    researcher_agent = Agent(
-        role="Researcher",
-        goal="Make the best research and analysis on content about AI and AI agents",
-        backstory="You're an expert researcher, specialized in technology, software engineering, AI and startups. You work as a freelancer and is now working on doing research and analysis for a new customer.",
-        allow_delegation=False,
-    )
-
-    list_ideas = Task(
-        description="Give me a list of 5 interesting ideas to explore for na article, what makes them unique and interesting.",
-        expected_output="Bullet point list of 5 important events.",
-        agent=researcher_agent,
-        async_execution=True,
-        callback=mock_callback_on_task,
-    )
-
-    crew = Crew(
-        agents=[researcher_agent],
-        process=Process.sequential,
-        tasks=[list_ideas],
-        task_callback=mock_callback_on_crew,
-    )
-
-    with patch.object(Agent, "execute_task") as execute:
-        execute.return_value = "ok"
-        crew.kickoff()
-
-        assert list_ideas.callback is not None
-        mock_callback_on_task.assert_called_once_with(list_ideas.output)
-        mock_callback_on_crew.assert_called_once_with(list_ideas.output)
-
-
-def test_task_same_callback_both_on_task_and_crew():
-    from unittest.mock import MagicMock, patch
-
-    mock_callback = MagicMock()
-
-    researcher_agent = Agent(
-        role="Researcher",
-        goal="Make the best research and analysis on content about AI and AI agents",
-        backstory="You're an expert researcher, specialized in technology, software engineering, AI and startups. You work as a freelancer and is now working on doing research and analysis for a new customer.",
-        allow_delegation=False,
-    )
-
-    list_ideas = Task(
-        description="Give me a list of 5 interesting ideas to explore for na article, what makes them unique and interesting.",
-        expected_output="Bullet point list of 5 important events.",
-        agent=researcher_agent,
-        async_execution=True,
-        callback=mock_callback,
-    )
-
-    crew = Crew(
-        agents=[researcher_agent],
-        process=Process.sequential,
-        tasks=[list_ideas],
-        task_callback=mock_callback,
-    )
-
-    with patch.object(Agent, "execute_task") as execute:
-        execute.return_value = "ok"
-        crew.kickoff()
-
-        assert list_ideas.callback is not None
-        mock_callback.assert_called_once_with(list_ideas.output)
-
-
 @pytest.mark.vcr(filter_headers=["authorization"])
 def test_tools_with_custom_caching():
     from unittest.mock import patch
@@ -2115,210 +1989,6 @@ def test_tools_with_custom_caching():
             assert result.raw == "3"
 
 
-@pytest.mark.vcr(filter_headers=["authorization"])
-def test_conditional_task_uses_last_output():
-    """Test that conditional tasks use the last task output for condition evaluation."""
-    task1 = Task(
-        description="First task",
-        expected_output="First output",
-        agent=researcher,
-    )
-
-    def condition_fails(task_output: TaskOutput) -> bool:
-        # This condition will never be met
-        return "never matches" in task_output.raw.lower()
-
-    def condition_succeeds(task_output: TaskOutput) -> bool:
-        # This condition will match first task's output
-        return "first success" in task_output.raw.lower()
-
-    conditional_task1 = ConditionalTask(
-        description="Second task - conditional that fails condition",
-        expected_output="Second output",
-        agent=researcher,
-        condition=condition_fails,
-    )
-
-    conditional_task2 = ConditionalTask(
-        description="Third task - conditional that succeeds using first task output",
-        expected_output="Third output",
-        agent=writer,
-        condition=condition_succeeds,
-    )
-
-    crew = Crew(
-        agents=[researcher, writer],
-        tasks=[task1, conditional_task1, conditional_task2],
-    )
-
-    # Mock outputs for tasks
-    mock_first = TaskOutput(
-        description="First task output",
-        raw="First success output",  # Will be used by third task's condition
-        agent=researcher.role,
-    )
-    mock_third = TaskOutput(
-        description="Third task output",
-        raw="Third task executed",  # Output when condition succeeds using first task output
-        agent=writer.role,
-    )
-
-    # Set up mocks for task execution and conditional logic
-    with patch.object(ConditionalTask, "should_execute") as mock_should_execute:
-        # First conditional fails, second succeeds
-        mock_should_execute.side_effect = [False, True]
-        with patch.object(Task, "execute_sync") as mock_execute:
-            mock_execute.side_effect = [mock_first, mock_third]
-            result = crew.kickoff()
-
-            # Verify execution behavior
-            assert mock_execute.call_count == 2  # Only first and third tasks execute
-            assert mock_should_execute.call_count == 2  # Both conditionals checked
-
-            # Verify outputs collection:
-            # First executed task output, followed by an automatically generated (skipped) output, then the conditional execution
-            assert len(result.tasks_output) == 3
-            assert (
-                result.tasks_output[0].raw == "First success output"
-            )  # First task succeeded
-            assert (
-                result.tasks_output[1].raw == ""
-            )  # Second task skipped (condition failed)
-            assert (
-                result.tasks_output[2].raw == "Third task executed"
-            )  # Third task used first task's output
-
-
-@pytest.mark.vcr(filter_headers=["authorization"])
-def test_conditional_tasks_result_collection():
-    """Test that task outputs are properly collected based on execution status."""
-    task1 = Task(
-        description="Normal task that always executes",
-        expected_output="First output",
-        agent=researcher,
-    )
-
-    def condition_never_met(task_output: TaskOutput) -> bool:
-        return "never matches" in task_output.raw.lower()
-
-    def condition_always_met(task_output: TaskOutput) -> bool:
-        return "success" in task_output.raw.lower()
-
-    task2 = ConditionalTask(
-        description="Conditional task that never executes",
-        expected_output="Second output",
-        agent=researcher,
-        condition=condition_never_met,
-    )
-
-    task3 = ConditionalTask(
-        description="Conditional task that always executes",
-        expected_output="Third output",
-        agent=writer,
-        condition=condition_always_met,
-    )
-
-    crew = Crew(
-        agents=[researcher, writer],
-        tasks=[task1, task2, task3],
-    )
-
-    # Mock outputs for different execution paths
-    mock_success = TaskOutput(
-        description="Success output",
-        raw="Success output",  # Triggers third task's condition
-        agent=researcher.role,
-    )
-    mock_conditional = TaskOutput(
-        description="Conditional output",
-        raw="Conditional task executed",
-        agent=writer.role,
-    )
-
-    # Set up mocks for task execution and conditional logic
-    with patch.object(ConditionalTask, "should_execute") as mock_should_execute:
-        # First conditional fails, second succeeds
-        mock_should_execute.side_effect = [False, True]
-        with patch.object(Task, "execute_sync") as mock_execute:
-            mock_execute.side_effect = [mock_success, mock_conditional]
-            result = crew.kickoff()
-
-            # Verify execution behavior
-            assert mock_execute.call_count == 2  # Only first and third tasks execute
-            assert mock_should_execute.call_count == 2  # Both conditionals checked
-
-            # Verify task output collection:
-            # There should be three outputs: normal task, skipped conditional task (empty output),
-            # and the conditional task that executed.
-            assert len(result.tasks_output) == 3
-            assert (
-                result.tasks_output[0].raw == "Success output"
-            )  # Normal task executed
-            assert result.tasks_output[1].raw == ""  # Second task skipped
-            assert (
-                result.tasks_output[2].raw == "Conditional task executed"
-            )  # Third task executed
-
-            # Verify task output collection
-            assert len(result.tasks_output) == 3
-            assert (
-                result.tasks_output[0].raw == "Success output"
-            )  # Normal task executed
-            assert result.tasks_output[1].raw == ""  # Second task skipped
-            assert (
-                result.tasks_output[2].raw == "Conditional task executed"
-            )  # Third task executed
-
-
-@pytest.mark.vcr(filter_headers=["authorization"])
-def test_multiple_conditional_tasks():
-    """Test that having multiple conditional tasks in sequence works correctly."""
-    task1 = Task(
-        description="Initial research task",
-        expected_output="Research output",
-        agent=researcher,
-    )
-
-    def condition1(task_output: TaskOutput) -> bool:
-        return "success" in task_output.raw.lower()
-
-    def condition2(task_output: TaskOutput) -> bool:
-        return "proceed" in task_output.raw.lower()
-
-    task2 = ConditionalTask(
-        description="First conditional task",
-        expected_output="Conditional output 1",
-        agent=writer,
-        condition=condition1,
-    )
-
-    task3 = ConditionalTask(
-        description="Second conditional task",
-        expected_output="Conditional output 2",
-        agent=writer,
-        condition=condition2,
-    )
-
-    crew = Crew(
-        agents=[researcher, writer],
-        tasks=[task1, task2, task3],
-    )
-
-    # Mock different task outputs to test conditional logic
-    mock_success = TaskOutput(
-        description="Mock success",
-        raw="Success and proceed output",
-        agent=researcher.role,
-    )
-
-    # Set up mocks for task execution
-    with patch.object(Task, "execute_sync", return_value=mock_success) as mock_execute:
-        result = crew.kickoff()
-        # Verify all tasks were executed (no IndexError)
-        assert mock_execute.call_count == 3
-        assert len(result.tasks_output) == 3
-
-
 @pytest.mark.vcr(filter_headers=["authorization"])
 def test_using_contextual_memory():
     from unittest.mock import patch
@@ -2587,16 +2257,6 @@ def test_crew_train_success(
     # Create a mock for the copied crew
     copy_mock.return_value = crew
 
-    received_events = []
-
-    @crewai_event_bus.on(CrewTrainStartedEvent)
-    def on_crew_train_started(source, event: CrewTrainStartedEvent):
-        received_events.append(event)
-
-    @crewai_event_bus.on(CrewTrainCompletedEvent)
-    def on_crew_train_completed(source, event: CrewTrainCompletedEvent):
-        received_events.append(event)
-
     crew.train(
         n_iterations=2, inputs={"topic": "AI"}, filename="trained_agents_data.pkl"
     )
@@ -2642,10 +2302,6 @@ def test_crew_train_success(
         ]
     )
 
-    assert len(received_events) == 2
-    assert isinstance(received_events[0], CrewTrainStartedEvent)
-    assert isinstance(received_events[1], CrewTrainCompletedEvent)
-
 
 def test_crew_train_error():
     task = Task(
@@ -3374,19 +3030,7 @@ def test_crew_testing_function(kickoff_mock, copy_mock, crew_evaluator):
     copy_mock.return_value = crew
 
     n_iterations = 2
-    llm_instance = LLM("gpt-4o-mini")
-
-    received_events = []
-
-    @crewai_event_bus.on(CrewTestStartedEvent)
-    def on_crew_test_started(source, event: CrewTestStartedEvent):
-        received_events.append(event)
-
-    @crewai_event_bus.on(CrewTestCompletedEvent)
-    def on_crew_test_completed(source, event: CrewTestCompletedEvent):
-        received_events.append(event)
-
-    crew.test(n_iterations, llm_instance, inputs={"topic": "AI"})
+    crew.test(n_iterations, openai_model_name="gpt-4o-mini", inputs={"topic": "AI"})
 
     # Ensure kickoff is called on the copied crew
     kickoff_mock.assert_has_calls(
@@ -3395,17 +3039,13 @@ def test_crew_testing_function(kickoff_mock, copy_mock, crew_evaluator):
 
     crew_evaluator.assert_has_calls(
         [
-            mock.call(crew, llm_instance),
+            mock.call(crew, "gpt-4o-mini"),
             mock.call().set_iteration(1),
             mock.call().set_iteration(2),
             mock.call().print_crew_evaluation_result(),
         ]
     )
 
-    assert len(received_events) == 2
-    assert isinstance(received_events[0], CrewTestStartedEvent)
-    assert isinstance(received_events[1], CrewTestCompletedEvent)
-
 
 @pytest.mark.vcr(filter_headers=["authorization"])
 def test_hierarchical_verbose_manager_agent():
@@ -3467,9 +3107,9 @@ def test_fetch_inputs():
     expected_placeholders = {"role_detail", "topic", "field"}
     actual_placeholders = crew.fetch_inputs()
 
-    assert (
-        actual_placeholders == expected_placeholders
-    ), f"Expected {expected_placeholders}, but got {actual_placeholders}"
+    assert actual_placeholders == expected_placeholders, (
+        f"Expected {expected_placeholders}, but got {actual_placeholders}"
+    )
 
 
 def test_task_tools_preserve_code_execution_tools():
@@ -3542,20 +3182,20 @@ def test_task_tools_preserve_code_execution_tools():
         used_tools = kwargs["tools"]
 
         # Verify all expected tools are present
-        assert any(
-            isinstance(tool, TestTool) for tool in used_tools
-        ), "Task's TestTool should be present"
-        assert any(
-            isinstance(tool, CodeInterpreterTool) for tool in used_tools
-        ), "CodeInterpreterTool should be present"
-        assert any(
-            "delegate" in tool.name.lower() for tool in used_tools
-        ), "Delegation tool should be present"
+        assert any(isinstance(tool, TestTool) for tool in used_tools), (
+            "Task's TestTool should be present"
+        )
+        assert any(isinstance(tool, CodeInterpreterTool) for tool in used_tools), (
+            "CodeInterpreterTool should be present"
+        )
+        assert any("delegate" in tool.name.lower() for tool in used_tools), (
+            "Delegation tool should be present"
+        )
 
         # Verify the total number of tools (TestTool + CodeInterpreter + 2 delegation tools)
-        assert (
-            len(used_tools) == 4
-        ), "Should have TestTool, CodeInterpreter, and 2 delegation tools"
+        assert len(used_tools) == 4, (
+            "Should have TestTool, CodeInterpreter, and 2 delegation tools"
+        )
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
@@ -3599,9 +3239,9 @@ def test_multimodal_flag_adds_multimodal_tools():
         used_tools = kwargs["tools"]
 
         # Check that the multimodal tool was added
-        assert any(
-            isinstance(tool, AddImageTool) for tool in used_tools
-        ), "AddImageTool should be present when agent is multimodal"
+        assert any(isinstance(tool, AddImageTool) for tool in used_tools), (
+            "AddImageTool should be present when agent is multimodal"
+        )
 
         # Verify we have exactly one tool (just the AddImageTool)
         assert len(used_tools) == 1, "Should only have the AddImageTool"
@@ -3827,9 +3467,9 @@ def test_crew_guardrail_feedback_in_context():
     assert len(execution_contexts) > 1, "Task should have been executed multiple times"
 
     # Verify that the second execution included the guardrail feedback
-    assert (
-        "Output must contain the keyword 'IMPORTANT'" in execution_contexts[1]
-    ), "Guardrail feedback should be included in retry context"
+    assert "Output must contain the keyword 'IMPORTANT'" in execution_contexts[1], (
+        "Guardrail feedback should be included in retry context"
+    )
 
     # Verify final output meets guardrail requirements
     assert "IMPORTANT" in result.raw, "Final output should contain required keyword"