feat: update tasks config main template typos

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -65,6 +65,7 @@ body:
         - '3.10'
         - '3.11'
         - '3.12'
+        - '3.13'
     validations:
       required: true
   - type: input

.github/workflows/linter.yml

@@ -13,4 +13,4 @@ jobs:
           pip install ruff
 
       - name: Run Ruff Linter
-        run: ruff check
+        run: ruff check --exclude "templates","__init__.py"

.github/workflows/stale.yml

@@ -1,10 +1,5 @@
 name: Mark stale issues and pull requests
 
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
-
 on:
   schedule:
     - cron: '10 12 * * *'
@@ -13,6 +8,9 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
     - uses: actions/stale@v9
       with:

.github/workflows/tests.yml

@@ -23,7 +23,7 @@ jobs:
 
 
       - name: Set up Python
-        run: uv python install 3.12.8
+        run: uv python install 3.11.9
 
       - name: Install the project
         run: uv sync --dev --all-extras

.gitignore

@@ -21,4 +21,3 @@ crew_tasks_output.json
 .mypy_cache
 .ruff_cache
 .venv
-agentops.log

.pre-commit-config.yaml

@@ -1,7 +1,9 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.2
+    rev: v0.4.4
     hooks:
       - id: ruff
         args: ["--fix"]
+        exclude: "templates"
       - id: ruff-format
+        exclude: "templates"

.ruff.toml

@@ -1,9 +0,0 @@
-exclude = [
-    "templates",
-    "__init__.py",
-]
-
-[lint]
-select = [
-    "I", # isort rules
-]

README.md

@@ -4,7 +4,7 @@
 
 # **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**: Cutting-edge framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks.
 
 <h3>
 
@@ -22,17 +22,13 @@
 - [Why CrewAI?](#why-crewai)
 - [Getting Started](#getting-started)
 - [Key Features](#key-features)
-- [Understanding Flows and Crews](#understanding-flows-and-crews)
-- [CrewAI vs LangGraph](#how-crewai-compares)
 - [Examples](#examples)
   - [Quick Tutorial](#quick-tutorial)
   - [Write Job Descriptions](#write-job-descriptions)
   - [Trip Planner](#trip-planner)
   - [Stock Analysis](#stock-analysis)
-  - [Using Crews and Flows Together](#using-crews-and-flows-together)
 - [Connecting Your Crew to a Model](#connecting-your-crew-to-a-model)
 - [How CrewAI Compares](#how-crewai-compares)
-- [Frequently Asked Questions (FAQ)](#frequently-asked-questions-faq)
 - [Contribution](#contribution)
 - [Telemetry](#telemetry)
 - [License](#license)
@@ -40,51 +36,22 @@
 ## Why CrewAI?
 
 The power of AI collaboration has too much to offer.
-CrewAI is a standalone framework, built from the ground up without dependencies on Langchain or other agent frameworks. It's designed to enable AI agents to assume roles, share goals, and operate in a cohesive unit - much like a well-oiled crew. Whether you're building a smart assistant platform, an automated customer service ensemble, or a multi-agent research team, CrewAI provides the backbone for sophisticated multi-agent interactions.
+CrewAI is designed to enable AI agents to assume roles, share goals, and operate in a cohesive unit - much like a well-oiled crew. Whether you're building a smart assistant platform, an automated customer service ensemble, or a multi-agent research team, CrewAI provides the backbone for sophisticated multi-agent interactions.
 
 ## Getting Started
 
-### Learning Resources
-
-Learn CrewAI through our comprehensive courses:
-- [Multi AI Agent Systems with CrewAI](https://www.deeplearning.ai/short-courses/multi-ai-agent-systems-with-crewai/) - Master the fundamentals of multi-agent systems
-- [Practical Multi AI Agents and Advanced Use Cases](https://www.deeplearning.ai/short-courses/practical-multi-ai-agents-and-advanced-use-cases-with-crewai/) - Deep dive into advanced implementations
-
-### Understanding Flows and Crews
-
-CrewAI offers two powerful, complementary approaches that work seamlessly together to build sophisticated AI applications:
-
-1. **Crews**: Teams of AI agents with true autonomy and agency, working together to accomplish complex tasks through role-based collaboration. Crews enable:
-   - Natural, autonomous decision-making between agents
-   - Dynamic task delegation and collaboration
-   - Specialized roles with defined goals and expertise
-   - Flexible problem-solving approaches
-
-2. **Flows**: Production-ready, event-driven workflows that deliver precise control over complex automations. Flows provide:
-   - Fine-grained control over execution paths for real-world scenarios
-   - Secure, consistent state management between tasks
-   - Clean integration of AI agents with production Python code
-   - Conditional branching for complex business logic
-
-The true power of CrewAI emerges when combining Crews and Flows. This synergy allows you to:
-- Build complex, production-grade applications
-- Balance autonomy with precise control
-- Handle sophisticated real-world scenarios
-- Maintain clean, maintainable code structure
-
-### Getting Started with Installation
-
 To get started with CrewAI, follow these simple steps:
 
 ### 1. Installation
 
-Ensure you have Python >=3.10 <3.13 installed on your system. CrewAI uses [UV](https://docs.astral.sh/uv/) for dependency management and package handling, offering a seamless setup and execution experience.
+Ensure you have Python >=3.10 <=3.13 installed on your system. CrewAI uses [UV](https://docs.astral.sh/uv/) for dependency management and package handling, offering a seamless setup and execution experience.
 
 First, install CrewAI:
 
 ```shell
 pip install crewai
 ```
+
 If you want to install the 'crewai' package along with its optional features that include additional tools for agents, you can do so by using the following command:
 
 ```shell
@@ -92,22 +59,6 @@ pip install 'crewai[tools]'
 ```
 The command above installs the basic package and also adds extra components which require more dependencies to function.
 
-### Troubleshooting Dependencies
-
-If you encounter issues during installation or usage, here are some common solutions:
-
-#### Common Issues
-
-1. **ModuleNotFoundError: No module named 'tiktoken'**
-   - Install tiktoken explicitly: `pip install 'crewai[embeddings]'`
-   - If using embedchain or other tools: `pip install 'crewai[tools]'`
-
-2. **Failed building wheel for tiktoken**
-   - Ensure Rust compiler is installed (see installation steps above)
-   - For Windows: Verify Visual C++ Build Tools are installed
-   - Try upgrading pip: `pip install --upgrade pip`
-   - If issues persist, use a pre-built wheel: `pip install tiktoken --prefer-binary`
-
 ### 2. Setting Up Your Crew with the YAML Configuration
 
 To create a new CrewAI project, run the following CLI (Command Line Interface) command:
@@ -313,16 +264,13 @@ In addition to the sequential process, you can use the hierarchical process, whi
 
 ## Key Features
 
-**Note**: CrewAI is a standalone framework built from the ground up, without dependencies on Langchain or other agent frameworks.
-
-- **Deep Customization**: Build sophisticated agents with full control over the system - from overriding inner prompts to accessing low-level APIs. Customize roles, goals, tools, and behaviors while maintaining clean abstractions.
-- **Autonomous Inter-Agent Delegation**: Agents can autonomously delegate tasks and inquire amongst themselves, enabling complex problem-solving in real-world scenarios.
-- **Flexible Task Management**: Define and customize tasks with granular control, from simple operations to complex multi-step processes.
-- **Production-Grade Architecture**: Support for both high-level abstractions and low-level customization, with robust error handling and state management.
-- **Predictable Results**: Ensure consistent, accurate outputs through programmatic guardrails, agent training capabilities, and flow-based execution control. See our [documentation on guardrails](https://docs.crewai.com/how-to/guardrails/) for implementation details.
-- **Model Flexibility**: Run your crew using OpenAI or open source models with production-ready integrations. See [Connect CrewAI to LLMs](https://docs.crewai.com/how-to/LLM-Connections/) for detailed configuration options.
-- **Event-Driven Flows**: Build complex, real-world workflows with precise control over execution paths, state management, and conditional logic.
-- **Process Orchestration**: Achieve any workflow pattern through flows - from simple sequential and hierarchical processes to complex, custom orchestration patterns with conditional branching and parallel execution.
+- **Role-Based Agent Design**: Customize agents with specific roles, goals, and tools.
+- **Autonomous Inter-Agent Delegation**: Agents can autonomously delegate tasks and inquire amongst themselves, enhancing problem-solving efficiency.
+- **Flexible Task Management**: Define tasks with customizable tools and assign them to agents dynamically.
+- **Processes Driven**: Currently only supports `sequential` task execution and `hierarchical` processes, but more complex processes like consensual and autonomous are being worked on.
+- **Save output as file**: Save the output of individual tasks as a file, so you can use it later.
+- **Parse output as Pydantic or Json**: Parse the output of individual tasks as a Pydantic model or as a Json if you want to.
+- **Works with Open Source Models**: Run your crew using Open AI or open source models refer to the [Connect CrewAI to LLMs](https://docs.crewai.com/how-to/LLM-Connections/) page for details on configuring your agents' connections to models, even ones running locally!
 
 ![CrewAI Mind Map](./docs/crewAI-mindmap.png "CrewAI Mind Map")
 
@@ -357,98 +305,6 @@ You can test different real life examples of AI crews in the [CrewAI-examples re
 
 [![Stock Analysis](https://img.youtube.com/vi/e0Uj4yWdaAg/maxresdefault.jpg)](https://www.youtube.com/watch?v=e0Uj4yWdaAg "Stock Analysis")
 
-### Using Crews and Flows Together
-
-CrewAI's power truly shines when combining Crews with Flows to create sophisticated automation pipelines. Here's how you can orchestrate multiple Crews within a Flow:
-
-```python
-from crewai.flow.flow import Flow, listen, start, router
-from crewai import Crew, Agent, Task
-from pydantic import BaseModel
-
-# Define structured state for precise control
-class MarketState(BaseModel):
-    sentiment: str = "neutral"
-    confidence: float = 0.0
-    recommendations: list = []
-
-class AdvancedAnalysisFlow(Flow[MarketState]):
-    @start()
-    def fetch_market_data(self):
-        # Demonstrate low-level control with structured state
-        self.state.sentiment = "analyzing"
-        return {"sector": "tech", "timeframe": "1W"}  # These parameters match the task description template
-
-    @listen(fetch_market_data)
-    def analyze_with_crew(self, market_data):
-        # Show crew agency through specialized roles
-        analyst = Agent(
-            role="Senior Market Analyst",
-            goal="Conduct deep market analysis with expert insight",
-            backstory="You're a veteran analyst known for identifying subtle market patterns"
-        )
-        researcher = Agent(
-            role="Data Researcher",
-            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",
-            agent=analyst
-        )
-        research_task = Task(
-            description="Find supporting data to validate the analysis",
-            expected_output="Corroborating evidence and potential contradictions",
-            agent=researcher
-        )
-        
-        # Demonstrate crew autonomy
-        analysis_crew = Crew(
-            agents=[analyst, researcher],
-            tasks=[analysis_task, research_task],
-            process=Process.sequential,
-            verbose=True
-        )
-        return analysis_crew.kickoff(inputs=market_data)  # Pass market_data as named inputs
-
-    @router(analyze_with_crew)
-    def determine_next_steps(self):
-        # Show flow control with conditional routing
-        if self.state.confidence > 0.8:
-            return "high_confidence"
-        elif self.state.confidence > 0.5:
-            return "medium_confidence"
-        return "low_confidence"
-
-    @listen("high_confidence")
-    def execute_strategy(self):
-        # Demonstrate complex decision making
-        strategy_crew = Crew(
-            agents=[
-                Agent(role="Strategy Expert",
-                      goal="Develop optimal market strategy")
-            ],
-            tasks=[
-                Task(description="Create detailed strategy based on analysis",
-                     expected_output="Step-by-step action plan")
-            ]
-        )
-        return strategy_crew.kickoff()
-
-    @listen("medium_confidence", "low_confidence")
-    def request_additional_analysis(self):
-        self.state.recommendations.append("Gather more data")
-        return "Additional analysis required"
-```
-
-This example demonstrates how to:
-1. Use Python code for basic data operations
-2. Create and execute Crews as steps in your workflow
-3. Use Flow decorators to manage the sequence of operations
-4. Implement conditional branching based on Crew results
-
 ## Connecting Your Crew to a Model
 
 CrewAI supports using various LLMs through a variety of connection options. By default your agents will use the OpenAI API when querying the model. However, there are several other ways to allow your agents to connect to models. For example, you can configure your agents to use a local model via the Ollama tool.
@@ -457,13 +313,9 @@ Please refer to the [Connect CrewAI to LLMs](https://docs.crewai.com/how-to/LLM-
 
 ## How CrewAI Compares
 
-**CrewAI's Advantage**: CrewAI combines autonomous agent intelligence with precise workflow control through its unique Crews and Flows architecture. The framework excels at both high-level orchestration and low-level customization, enabling complex, production-grade systems with granular control.
+**CrewAI's Advantage**: CrewAI is built with production in mind. It offers the flexibility of Autogen's conversational agents and the structured process approach of ChatDev, but without the rigidity. CrewAI's processes are designed to be dynamic and adaptable, fitting seamlessly into both development and production workflows.
 
-- **LangGraph**: While LangGraph provides a foundation for building agent workflows, its approach requires significant boilerplate code and complex state management patterns. The framework's tight coupling with LangChain can limit flexibility when implementing custom agent behaviors or integrating with external systems.
-
-*P.S. CrewAI demonstrates significant performance advantages over LangGraph, executing 5.76x faster in certain cases like this QA task example ([see comparison](https://github.com/crewAIInc/crewAI-examples/tree/main/Notebooks/CrewAI%20Flows%20%26%20Langgraph/QA%20Agent)) while achieving higher evaluation scores with faster completion times in certain coding tasks, like in this example ([detailed analysis](https://github.com/crewAIInc/crewAI-examples/blob/main/Notebooks/CrewAI%20Flows%20%26%20Langgraph/Coding%20Assistant/coding_assistant_eval.ipynb)).*
-
-- **Autogen**: While Autogen excels at creating conversational agents capable of working together, it lacks an inherent concept of process. In Autogen, orchestrating agents' interactions requires additional programming, which can become complex and cumbersome as the scale of tasks grows.
+- **Autogen**: While Autogen does good in creating conversational agents capable of working together, it lacks an inherent concept of process. In Autogen, orchestrating agents' interactions requires additional programming, which can become complex and cumbersome as the scale of tasks grows.
 
 - **ChatDev**: ChatDev introduced the idea of processes into the realm of AI agents, but its implementation is quite rigid. Customizations in ChatDev are limited and not geared towards production environments, which can hinder scalability and flexibility in real-world applications.
 
@@ -588,8 +440,5 @@ A: CrewAI uses anonymous telemetry to collect usage data for improvement purpose
 ### Q: Where can I find examples of CrewAI in action?
 A: You can find various real-life examples in the [CrewAI-examples repository](https://github.com/crewAIInc/crewAI-examples), including trip planners, stock analysis tools, and more.
 
-### Q: What is the difference between Crews and Flows?
-A: Crews and Flows serve different but complementary purposes in CrewAI. Crews are teams of AI agents working together to accomplish specific tasks through role-based collaboration, delivering accurate and predictable results. Flows, on the other hand, are event-driven workflows that can orchestrate both Crews and regular Python code, allowing you to build complex automation pipelines with secure state management and conditional execution paths.
-
 ### Q: How can I contribute to CrewAI?
 A: Contributions are welcome! You can fork the repository, create a new branch for your feature, add your improvement, and send a pull request. Check the Contribution section in the README for more details.

docs/concepts/crews.mdx

@@ -32,6 +32,7 @@ A crew in crewAI represents a collaborative group of agents working together to
 | **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`      | 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.                                                                                                                                                                                             |
+| **Manager Callbacks** _(optional)_    | `manager_callbacks`    | `manager_callbacks` takes a list of callback handlers to be executed by the manager agent when a hierarchical process is used.                                                                                                                            |
 | **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.                                                     |
 | **Planning LLM** *(optional)*         | `planning_llm`         | The language model used by the AgentPlanner in a planning process.                                                                                                                                                                                        |

docs/concepts/flows.mdx

@@ -138,7 +138,7 @@ print("---- Final Output ----")
 print(final_output)
 ````
 
-```text Output
+``` text Output
 ---- Final Output ----
 Second method received: Output from first_method
 ````

docs/concepts/knowledge.mdx

@@ -4,6 +4,8 @@ description: What is knowledge in CrewAI and how to use it.
 icon: book
 ---
 
+# Using Knowledge in CrewAI
+
 ## What is Knowledge?
 
 Knowledge in CrewAI is a powerful system that allows AI agents to access and utilize external information sources during their tasks. 
@@ -34,20 +36,7 @@ CrewAI supports various types of knowledge sources out of the box:
   </Card>
 </CardGroup>
 
-## Supported Knowledge Parameters
-
-| Parameter                    | Type                                | Required | Description                                                                                                                                           |
-| :--------------------------- | :---------------------------------- | :------- | :---------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `sources`                  | **List[BaseKnowledgeSource]**        | Yes      | List of knowledge sources that provide content to be stored and queried. Can include PDF, CSV, Excel, JSON, text files, or string content.           |
-| `collection_name`          | **str**                              | No       | Name of the collection where the knowledge will be stored. Used to identify different sets of knowledge. Defaults to "knowledge" if not provided.     |
-| `storage`                  | **Optional[KnowledgeStorage]**       | No       | Custom storage configuration for managing how the knowledge is stored and retrieved. If not provided, a default storage will be created.              |
-
-## Quickstart Example
-
-<Tip>
-For file-Based Knowledge Sources, make sure to place your files in a `knowledge` directory at the root of your project. 
-Also, use relative paths from the `knowledge` directory when creating the source.
-</Tip>
+## Quick Start
 
 Here's an example using string-based knowledge:
 
@@ -90,267 +79,39 @@ crew = Crew(
 result = crew.kickoff(inputs={"question": "What city does John live in and how old is he?"})
 ```
 
-
-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. 
-
-```python Code
-from crewai import LLM, Agent, Crew, Process, Task
-from crewai.knowledge.source.crew_docling_source import CrewDoclingSource
-
-# Create a knowledge source
-content_source = CrewDoclingSource(
-    file_paths=[
-        "https://lilianweng.github.io/posts/2024-11-28-reward-hacking",
-        "https://lilianweng.github.io/posts/2024-07-07-hallucination",
-    ],
-)
-
-# Create an LLM with a temperature of 0 to ensure deterministic outputs
-llm = LLM(model="gpt-4o-mini", temperature=0)
-
-# Create an agent with the knowledge store
-agent = Agent(
-    role="About papers",
-    goal="You know everything about the papers.",
-    backstory="""You are a master at understanding papers and their content.""",
-    verbose=True,
-    allow_delegation=False,
-    llm=llm,
-)
-task = Task(
-    description="Answer the following questions about the papers: {question}",
-    expected_output="An answer to the question.",
-    agent=agent,
-)
-
-crew = Crew(
-    agents=[agent],
-    tasks=[task],
-    verbose=True,
-    process=Process.sequential,
-    knowledge_sources=[
-        content_source
-    ],  # Enable knowledge by adding the sources here. You can also add more sources to the sources list.
-)
-
-result = crew.kickoff(
-    inputs={
-        "question": "What is the reward hacking paper about? Be sure to provide sources."
-    }
-)
-```
-
-## More Examples
-
-Here are examples of how to use different types of knowledge sources:
-
-### Text File Knowledge Source
-```python
-from crewai.knowledge.source.crew_docling_source import CrewDoclingSource
-
-# Create a text file knowledge source
-text_source = CrewDoclingSource(
-    file_paths=["document.txt", "another.txt"]
-)
-
-# Create crew with text file source on agents or crew level
-agent = Agent(
-    ...
-    knowledge_sources=[text_source]
-)
-
-crew = Crew(
-    ...
-    knowledge_sources=[text_source]
-)
-```
-
-### PDF Knowledge Source
-```python
-from crewai.knowledge.source.pdf_knowledge_source import PDFKnowledgeSource
-
-# Create a PDF knowledge source
-pdf_source = PDFKnowledgeSource(
-    file_paths=["document.pdf", "another.pdf"]
-)
-
-# Create crew with PDF knowledge source on agents or crew level
-agent = Agent(
-    ...
-    knowledge_sources=[pdf_source]
-)
-
-crew = Crew(
-    ...
-    knowledge_sources=[pdf_source]
-)
-```
-
-### CSV Knowledge Source
-```python
-from crewai.knowledge.source.csv_knowledge_source import CSVKnowledgeSource
-
-# Create a CSV knowledge source
-csv_source = CSVKnowledgeSource(
-    file_paths=["data.csv"]
-)
-
-# Create crew with CSV knowledge source or on agent level
-agent = Agent(
-    ...
-    knowledge_sources=[csv_source]
-)
-
-crew = Crew(
-    ...
-    knowledge_sources=[csv_source]
-)
-```
-
-### Excel Knowledge Source
-```python
-from crewai.knowledge.source.excel_knowledge_source import ExcelKnowledgeSource
-
-# Create an Excel knowledge source
-excel_source = ExcelKnowledgeSource(
-    file_paths=["spreadsheet.xlsx"]
-)
-
-# Create crew with Excel knowledge source on agents or crew level
-agent = Agent(
-    ...
-    knowledge_sources=[excel_source]
-)
-
-crew = Crew(
-    ...
-    knowledge_sources=[excel_source]
-)
-```
-
-### JSON Knowledge Source
-```python
-from crewai.knowledge.source.json_knowledge_source import JSONKnowledgeSource
-
-# Create a JSON knowledge source
-json_source = JSONKnowledgeSource(
-    file_paths=["data.json"]
-)
-
-# Create crew with JSON knowledge source on agents or crew level
-agent = Agent(
-    ...
-    knowledge_sources=[json_source]
-)
-
-crew = Crew(
-    ...
-    knowledge_sources=[json_source]
-)
-```
-
 ## Knowledge Configuration
 
 ### Chunking Configuration
 
-Knowledge sources automatically chunk content for better processing. 
-You can configure chunking behavior in your knowledge sources:
+Control how content is split for processing by setting the chunk size and overlap.
 
-```python
-from crewai.knowledge.source.string_knowledge_source import StringKnowledgeSource
-
-source = StringKnowledgeSource(
-    content="Your content here",
-    chunk_size=4000,      # Maximum size of each chunk (default: 4000)
-    chunk_overlap=200     # Overlap between chunks (default: 200)
+```python Code
+knowledge_source = StringKnowledgeSource(
+    content="Long content...",
+    chunk_size=4000,     # Characters per chunk (default)
+    chunk_overlap=200    # Overlap between chunks (default)
 )
 ```
 
-The chunking configuration helps in:
-- Breaking down large documents into manageable pieces
-- Maintaining context through chunk overlap
-- Optimizing retrieval accuracy
+## Embedder Configuration
 
-### Embeddings Configuration
+You can also configure the embedder for the knowledge store. This is useful if you want to use a different embedder for the knowledge store than the one used for the agents.
 
-You can also configure the embedder for the knowledge store. 
-This is useful if you want to use a different embedder for the knowledge store than the one used for the agents.
-The `embedder` parameter supports various embedding model providers that include:
-- `openai`: OpenAI's embedding models
-- `google`: Google's text embedding models
-- `azure`: Azure OpenAI embeddings
-- `ollama`: Local embeddings with Ollama
-- `vertexai`: Google Cloud VertexAI embeddings
-- `cohere`: Cohere's embedding models
-- `bedrock`: AWS Bedrock embeddings
-- `huggingface`: Hugging Face models
-- `watson`: IBM Watson embeddings
-
-Here's an example of how to configure the embedder for the knowledge store using Google's `text-embedding-004` model:
-<CodeGroup>
-```python Example
-from crewai import Agent, Task, Crew, Process, LLM
-from crewai.knowledge.source.string_knowledge_source import StringKnowledgeSource
-import os
-
-# Get the GEMINI API key
-GEMINI_API_KEY = os.environ.get("GEMINI_API_KEY")
-
-# Create a knowledge source
-content = "Users name is John. He is 30 years old and lives in San Francisco."
+```python Code
+...
 string_source = StringKnowledgeSource(
-    content=content,
+    content="Users name is John. He is 30 years old and lives in San Francisco.",
 )
-
-# Create an LLM with a temperature of 0 to ensure deterministic outputs
-gemini_llm = LLM(
-    model="gemini/gemini-1.5-pro-002",
-    api_key=GEMINI_API_KEY,
-    temperature=0,
-)
-
-# Create an agent with the knowledge store
-agent = Agent(
-    role="About User",
-    goal="You know everything about the user.",
-    backstory="""You are a master at understanding people and their preferences.""",
-    verbose=True,
-    allow_delegation=False,
-    llm=gemini_llm,
-)
-
-task = Task(
-    description="Answer the following questions about the user: {question}",
-    expected_output="An answer to the question.",
-    agent=agent,
-)
-
 crew = Crew(
-    agents=[agent],
-    tasks=[task],
-    verbose=True,
-    process=Process.sequential,
+    ...
     knowledge_sources=[string_source],
     embedder={
-        "provider": "google",
-        "config": {
-            "model": "models/text-embedding-004",
-            "api_key": GEMINI_API_KEY,
-        }
-    }
+        "provider": "openai",
+        "config": {"model": "text-embedding-3-small"},
+    },
 )
-
-result = crew.kickoff(inputs={"question": "What city does John live in and how old is he?"})
 ```
-```text Output
-# Agent: About User
-## Task: Answer the following questions about the user: What city does John live in and how old is he?
 
-# Agent: About User
-## Final Answer: 
-John is 30 years old and lives in San Francisco.
-```
-</CodeGroup>
 ## Clearing Knowledge
 
 If you need to clear the knowledge stored in CrewAI, you can use the `crewai reset-memories` command with the `--knowledge` option.
@@ -361,57 +122,6 @@ crewai reset-memories --knowledge
 
 This is useful when you've updated your knowledge sources and want to ensure that the agents are using the most recent information.
 
-## Agent-Specific Knowledge
-
-While knowledge can be provided at the crew level using `crew.knowledge_sources`, individual agents can also have their own knowledge sources using the `knowledge_sources` parameter:
-
-```python Code
-from crewai import Agent, Task, Crew
-from crewai.knowledge.source.string_knowledge_source import StringKnowledgeSource
-
-# Create agent-specific knowledge about a product
-product_specs = StringKnowledgeSource(
-    content="""The XPS 13 laptop features:
-    - 13.4-inch 4K display
-    - Intel Core i7 processor
-    - 16GB RAM
-    - 512GB SSD storage
-    - 12-hour battery life""",
-    metadata={"category": "product_specs"}
-)
-
-# Create a support agent with product knowledge
-support_agent = Agent(
-    role="Technical Support Specialist",
-    goal="Provide accurate product information and support.",
-    backstory="You are an expert on our laptop products and specifications.",
-    knowledge_sources=[product_specs]  # Agent-specific knowledge
-)
-
-# Create a task that requires product knowledge
-support_task = Task(
-    description="Answer this customer question: {question}",
-    agent=support_agent
-)
-
-# Create and run the crew
-crew = Crew(
-    agents=[support_agent],
-    tasks=[support_task]
-)
-
-# Get answer about the laptop's specifications
-result = crew.kickoff(
-    inputs={"question": "What is the storage capacity of the XPS 13?"}
-)
-```
-
-<Info>
-  Benefits of agent-specific knowledge:
-  - Give agents specialized information for their roles
-  - Maintain separation of concerns between agents
-  - Combine with crew-level knowledge for layered information access
-</Info>
 
 ## Custom Knowledge Sources
 
@@ -510,7 +220,6 @@ result = crew.kickoff(
     inputs={"user_question": "What are the latest developments in space exploration?"}
 )
 ```
-
 ```output Output
 # Agent: Space News Analyst
 ## Task: Answer this question about space news: What are the latest developments in space exploration?
@@ -534,12 +243,10 @@ The latest developments in space exploration, based on recent space news article
 
 7. The Center for AEroSpace Autonomy Research (CAESAR) at Stanford University is focusing on spacecraft autonomy. The center held a kickoff event on May 22, 2024, to highlight the industry, academia, and government collaboration it seeks to foster. This could lead to significant advancements in autonomous spacecraft technology. [Source: SpaceNews](https://spacenews.com/stanford-center-focuses-on-spacecraft-autonomy/)
 ``` 
-
 </CodeGroup>
 #### Key Components Explained
 
 1. **Custom Knowledge Source (`SpaceNewsKnowledgeSource`)**:
-
    - Extends `BaseKnowledgeSource` for integration with CrewAI
    - Configurable API endpoint and article limit
    - Implements three key methods:
@@ -548,12 +255,10 @@ The latest developments in space exploration, based on recent space news article
      - `add()`: Processes and stores the content
 
 2. **Agent Configuration**:
-
    - Specialized role as a Space News Analyst
    - Uses the knowledge source to access space news
 
 3. **Task Setup**:
-
    - Takes a user question as input through `{user_question}`
    - Designed to provide detailed answers based on the knowledge source
 
@@ -562,7 +267,6 @@ The latest developments in space exploration, based on recent space news article
    - Handles input/output through the kickoff method
 
 This example demonstrates how to:
-
 - Create a custom knowledge source that fetches real-time data
 - Process and format external data for AI consumption
 - Use the knowledge source to answer specific user questions
@@ -570,15 +274,13 @@ This example demonstrates how to:
 
 #### About the Spaceflight News API
 
-The example uses the [Spaceflight News API](https://api.spaceflightnewsapi.net/v4/docs/), which:
-
+The example uses the [Spaceflight News API](https://api.spaceflightnewsapi.net/v4/documentation), which:
 - Provides free access to space-related news articles
 - Requires no authentication
 - Returns structured data about space news
 - Supports pagination and filtering
 
 You can customize the API query by modifying the endpoint URL:
-
 ```python
 # Fetch more articles
 recent_news = SpaceNewsKnowledgeSource(

docs/concepts/llms.mdx

@@ -29,7 +29,7 @@ Large Language Models (LLMs) are the core intelligence behind CrewAI agents. The
 
 ## Available Models and Their Capabilities
 
-Here's a detailed breakdown of supported models and their capabilities, you can compare performance at [lmarena.ai](https://lmarena.ai/?leaderboard) and [artificialanalysis.ai](https://artificialanalysis.ai/):
+Here's a detailed breakdown of supported models and their capabilities:
 
 <Tabs>
   <Tab title="OpenAI">
@@ -43,104 +43,13 @@ Here's a detailed breakdown of supported models and their capabilities, you can
       1 token ≈ 4 characters in English. For example, 8,192 tokens ≈ 32,768 characters or about 6,000 words.
     </Note>
   </Tab>
-  <Tab title="Nvidia NIM">
-    | Model | Context Window | Best For |
-    |-------|---------------|-----------|
-    | nvidia/mistral-nemo-minitron-8b-8k-instruct | 8,192 tokens | State-of-the-art small language model delivering superior accuracy for chatbot, virtual assistants, and content generation. |
-    | nvidia/nemotron-4-mini-hindi-4b-instruct| 4,096 tokens | A bilingual Hindi-English SLM for on-device inference, tailored specifically for Hindi Language. |
-    | "nvidia/llama-3.1-nemotron-70b-instruct | 128k tokens | Llama-3.1-Nemotron-70B-Instruct is a large language model customized by NVIDIA in order to improve the helpfulness of LLM generated responses. |
-    | nvidia/llama3-chatqa-1.5-8b | 128k tokens | Advanced LLM to generate high-quality, context-aware responses for chatbots and search engines. |
-    | nvidia/llama3-chatqa-1.5-70b | 128k tokens | Advanced LLM to generate high-quality, context-aware responses for chatbots and search engines. |
-    | nvidia/vila | 128k tokens | Multi-modal vision-language model that understands text/img/video and creates informative responses |
-    | nvidia/neva-22| 4,096 tokens | Multi-modal vision-language model that understands text/images and generates informative responses |
-    | nvidia/nemotron-mini-4b-instruct | 8,192 tokens | General-purpose tasks |
-    | nvidia/usdcode-llama3-70b-instruct | 128k tokens | State-of-the-art LLM that answers OpenUSD knowledge queries and generates USD-Python code. |
-    | nvidia/nemotron-4-340b-instruct | 4,096 tokens | Creates diverse synthetic data that mimics the characteristics of real-world data. |
-    | meta/codellama-70b | 100k tokens | LLM capable of generating code from natural language and vice versa. |
-    | meta/llama2-70b | 4,096 tokens | Cutting-edge large language AI model capable of generating text and code in response to prompts. |
-    | meta/llama3-8b-instruct | 8,192 tokens | Advanced state-of-the-art LLM with language understanding, superior reasoning, and text generation. |
-    | meta/llama3-70b-instruct | 8,192 tokens | Powers complex conversations with superior contextual understanding, reasoning and text generation. |
-    | meta/llama-3.1-8b-instruct | 128k tokens | Advanced state-of-the-art model with language understanding, superior reasoning, and text generation. |
-    | meta/llama-3.1-70b-instruct | 128k tokens | Powers complex conversations with superior contextual understanding, reasoning and text generation. |
-    | meta/llama-3.1-405b-instruct | 128k tokens | Advanced LLM for synthetic data generation, distillation, and inference for chatbots, coding, and domain-specific tasks. |
-    | meta/llama-3.2-1b-instruct | 128k tokens | Advanced state-of-the-art small language model with language understanding, superior reasoning, and text generation. |
-    | meta/llama-3.2-3b-instruct | 128k tokens | Advanced state-of-the-art small language model with language understanding, superior reasoning, and text generation. |
-    | meta/llama-3.2-11b-vision-instruct | 128k tokens | Advanced state-of-the-art small language model with language understanding, superior reasoning, and text generation. |
-    | meta/llama-3.2-90b-vision-instruct | 128k tokens | Advanced state-of-the-art small language model with language understanding, superior reasoning, and text generation. |
-    | meta/llama-3.1-70b-instruct | 128k tokens | Powers complex conversations with superior contextual understanding, reasoning and text generation. |
-    | google/gemma-7b | 8,192 tokens | Cutting-edge text generation model text understanding, transformation, and code generation. |
-    | google/gemma-2b | 8,192 tokens | Cutting-edge text generation model text understanding, transformation, and code generation. |
-    | google/codegemma-7b | 8,192 tokens | Cutting-edge model built on Google's Gemma-7B specialized for code generation and code completion. |
-    | google/codegemma-1.1-7b | 8,192 tokens | Advanced programming model for code generation, completion, reasoning, and instruction following. |
-    | google/recurrentgemma-2b | 8,192 tokens | Novel recurrent architecture based language model for faster inference when generating long sequences. |
-    | google/gemma-2-9b-it | 8,192 tokens | Cutting-edge text generation model text understanding, transformation, and code generation. |
-    | google/gemma-2-27b-it | 8,192 tokens | Cutting-edge text generation model text understanding, transformation, and code generation. |
-    | google/gemma-2-2b-it | 8,192 tokens | Cutting-edge text generation model text understanding, transformation, and code generation. |
-    | google/deplot | 512 tokens | One-shot visual language understanding model that translates images of plots into tables. |
-    | google/paligemma | 8,192 tokens | Vision language model adept at comprehending text and visual inputs to produce informative responses. |
-    | mistralai/mistral-7b-instruct-v0.2 | 32k tokens | This LLM follows instructions, completes requests, and generates creative text. |
-    | mistralai/mixtral-8x7b-instruct-v0.1 | 8,192 tokens | An MOE LLM that follows instructions, completes requests, and generates creative text. |
-    | mistralai/mistral-large | 4,096 tokens | Creates diverse synthetic data that mimics the characteristics of real-world data. |
-    | mistralai/mixtral-8x22b-instruct-v0.1 | 8,192 tokens | Creates diverse synthetic data that mimics the characteristics of real-world data. |
-    | mistralai/mistral-7b-instruct-v0.3 | 32k tokens | This LLM follows instructions, completes requests, and generates creative text. |
-    | nv-mistralai/mistral-nemo-12b-instruct | 128k tokens | Most advanced language model for reasoning, code, multilingual tasks; runs on a single GPU. |
-    | mistralai/mamba-codestral-7b-v0.1 | 256k tokens | Model for writing and interacting with code across a wide range of programming languages and tasks. |
-    | microsoft/phi-3-mini-128k-instruct | 128K tokens | Lightweight, state-of-the-art open LLM with strong math and logical reasoning skills. |
-    | microsoft/phi-3-mini-4k-instruct | 4,096 tokens | Lightweight, state-of-the-art open LLM with strong math and logical reasoning skills. |
-    | microsoft/phi-3-small-8k-instruct | 8,192 tokens | Lightweight, state-of-the-art open LLM with strong math and logical reasoning skills. |
-    | microsoft/phi-3-small-128k-instruct | 128K tokens | Lightweight, state-of-the-art open LLM with strong math and logical reasoning skills. |
-    | microsoft/phi-3-medium-4k-instruct | 4,096 tokens | Lightweight, state-of-the-art open LLM with strong math and logical reasoning skills. |
-    | microsoft/phi-3-medium-128k-instruct | 128K tokens | Lightweight, state-of-the-art open LLM with strong math and logical reasoning skills. |
-    | microsoft/phi-3.5-mini-instruct | 128K tokens | Lightweight multilingual LLM powering AI applications in latency bound, memory/compute constrained environments |
-    | microsoft/phi-3.5-moe-instruct | 128K tokens | Advanced LLM based on Mixture of Experts architecure to deliver compute efficient content generation |
-    | microsoft/kosmos-2 | 1,024 tokens | Groundbreaking multimodal model designed to understand and reason about visual elements in images. |
-    | microsoft/phi-3-vision-128k-instruct | 128k tokens | Cutting-edge open multimodal model exceling in high-quality reasoning from images. |
-    | microsoft/phi-3.5-vision-instruct | 128k tokens | Cutting-edge open multimodal model exceling in high-quality reasoning from images. |
-    | databricks/dbrx-instruct | 12k tokens | A general-purpose LLM with state-of-the-art performance in language understanding, coding, and RAG. |
-    | snowflake/arctic | 1,024 tokens | Delivers high efficiency inference for enterprise applications focused on SQL generation and coding. |
-    | aisingapore/sea-lion-7b-instruct | 4,096 tokens | LLM to represent and serve the linguistic and cultural diversity of Southeast Asia |
-    | ibm/granite-8b-code-instruct | 4,096 tokens | Software programming LLM for code generation, completion, explanation, and multi-turn conversion. |
-    | ibm/granite-34b-code-instruct | 8,192 tokens | Software programming LLM for code generation, completion, explanation, and multi-turn conversion. |
-    | ibm/granite-3.0-8b-instruct | 4,096 tokens | Advanced Small Language Model supporting RAG, summarization, classification, code, and agentic AI |
-    | ibm/granite-3.0-3b-a800m-instruct | 4,096 tokens | Highly efficient Mixture of Experts model for RAG, summarization, entity extraction, and classification |
-    | mediatek/breeze-7b-instruct | 4,096 tokens | Creates diverse synthetic data that mimics the characteristics of real-world data. |
-    | upstage/solar-10.7b-instruct | 4,096 tokens | Excels in NLP tasks, particularly in instruction-following, reasoning, and mathematics. |
-    | writer/palmyra-med-70b-32k | 32k tokens | Leading LLM for accurate, contextually relevant responses in the medical domain. |
-    | writer/palmyra-med-70b | 32k tokens | Leading LLM for accurate, contextually relevant responses in the medical domain. |
-    | writer/palmyra-fin-70b-32k | 32k tokens | Specialized LLM for financial analysis, reporting, and data processing |
-    | 01-ai/yi-large | 32k tokens | Powerful model trained on English and Chinese for diverse tasks including chatbot and creative writing. |
-    | deepseek-ai/deepseek-coder-6.7b-instruct | 2k tokens | Powerful coding model offering advanced capabilities in code generation, completion, and infilling |
-    | rakuten/rakutenai-7b-instruct | 1,024 tokens | Advanced state-of-the-art LLM with language understanding, superior reasoning, and text generation. |
-    | rakuten/rakutenai-7b-chat | 1,024 tokens | Advanced state-of-the-art LLM with language understanding, superior reasoning, and text generation. |
-    | baichuan-inc/baichuan2-13b-chat | 4,096 tokens | Support Chinese and English chat, coding, math, instruction following, solving quizzes |
-
-    <Note>
-      NVIDIA's NIM support for models is expanding continuously! For the most up-to-date list of available models, please visit build.nvidia.com.
-    </Note>
-  </Tab>
-  <Tab title="Gemini">
-    | Model | Context Window | Best For |
-    |-------|---------------|-----------|
-    | gemini-2.0-flash-exp | 1M tokens | Higher quality at faster speed, multimodal model, good for most tasks |
-    | gemini-1.5-flash | 1M tokens | Balanced multimodal model, good for most tasks |
-    | gemini-1.5-flash-8B | 1M tokens | Fastest, most cost-efficient, good for high-frequency tasks |
-    | gemini-1.5-pro | 2M tokens | Best performing, wide variety of reasoning tasks including logical reasoning, coding, and creative collaboration |
-
-    <Tip>
-      Google's Gemini models are all multimodal, supporting audio, images, video and text, supporting context caching, json schema, function calling, etc.
-
-      These models are available via API_KEY from 
-      [The Gemini API](https://ai.google.dev/gemini-api/docs) and also from 
-      [Google Cloud Vertex](https://cloud.google.com/vertex-ai/generative-ai/docs/migrate/migrate-google-ai) as part of the
-      [Model Garden](https://cloud.google.com/vertex-ai/generative-ai/docs/model-garden/explore-models).
-    </Tip>
-  </Tab>
   <Tab title="Groq">
     | Model | Context Window | Best For |
     |-------|---------------|-----------|
     | Llama 3.1 70B/8B | 131,072 tokens | High-performance, large context tasks |
     | Llama 3.2 Series | 8,192 tokens | General-purpose tasks |
     | Mixtral 8x7B | 32,768 tokens | Balanced performance and context |
+    | Gemma Series | 8,192 tokens | Efficient, smaller-scale tasks |
 
     <Tip>
       Groq is known for its fast inference speeds, making it suitable for real-time applications.
@@ -151,7 +60,7 @@ Here's a detailed breakdown of supported models and their capabilities, you can
     |----------|---------------|--------------|
     | Deepseek Chat | 128,000 tokens | Specialized in technical discussions |
     | Claude 3 | Up to 200K tokens | Strong reasoning, code understanding |
-    | Gemma Series | 8,192 tokens | Efficient, smaller-scale tasks |
+    | Gemini | Varies by model | Multimodal capabilities |
 
     <Info>
       Provider selection should consider factors like:
@@ -219,10 +128,10 @@ There are three ways to configure LLMs in CrewAI. Choose the method that best fi
         # llm: anthropic/claude-2.1
         # llm: anthropic/claude-2.0
 
-        # Google Models - Strong reasoning, large cachable context window, multimodal
+        # Google Models - Good for general tasks
+        # llm: gemini/gemini-pro
         # llm: gemini/gemini-1.5-pro-latest
-        # llm: gemini/gemini-1.5-flash-latest
-        # llm: gemini/gemini-1.5-flash-8b-latest
+        # llm: gemini/gemini-1.0-pro-latest
 
         # AWS Bedrock Models - Enterprise-grade
         # llm: bedrock/anthropic.claude-3-sonnet-20240229-v1:0
@@ -441,18 +350,13 @@ Learn how to get the most out of your LLM configuration:
 
   <Accordion title="Google">
     ```python Code
-    # Option 1. Gemini accessed with an API key.
-    # https://ai.google.dev/gemini-api/docs/api-key
     GEMINI_API_KEY=<your-api-key>
-
-    # Option 2. Vertex AI IAM credentials for Gemini, Anthropic, and anything in the Model Garden.
-    # https://cloud.google.com/vertex-ai/generative-ai/docs/overview
     ```
 
     Example usage:
     ```python Code
     llm = LLM(
-        model="gemini/gemini-1.5-pro-latest",
+        model="gemini/gemini-pro",
         temperature=0.7
     )
     ```
@@ -508,20 +412,6 @@ Learn how to get the most out of your LLM configuration:
     ```
   </Accordion>
 
-  <Accordion title="Nvidia NIM">
-    ```python Code
-    NVIDIA_API_KEY=<your-api-key>
-    ```
-
-    Example usage:
-    ```python Code
-    llm = LLM(
-        model="nvidia_nim/meta/llama3-70b-instruct",
-        temperature=0.7
-    )
-    ```
-  </Accordion>
-
   <Accordion title="Groq">
     ```python Code
     GROQ_API_KEY=<your-api-key>
@@ -612,6 +502,20 @@ Learn how to get the most out of your LLM configuration:
     ```
   </Accordion>
 
+  <Accordion title="Nvidia NIM">
+    ```python Code
+    NVIDIA_API_KEY=<your-api-key>
+    ```
+
+    Example usage:
+    ```python Code
+    llm = LLM(
+        model="nvidia_nim/meta/llama3-70b-instruct",
+        temperature=0.7
+    )
+    ```
+  </Accordion>
+
   <Accordion title="SambaNova">
     ```python Code
     SAMBANOVA_API_KEY=<your-api-key>

docs/concepts/tasks.mdx

@@ -263,148 +263,8 @@ analysis_task = Task(
 )
 ```
 
-## Task Guardrails
-
-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
-efeedback to agents when their output doesn't meet specific criteria.
-
-### Using Task Guardrails
-
-To add a guardrail to a task, provide a validation function through the `guardrail` parameter:
-
-```python Code
-from typing import Tuple, Union, Dict, Any
-
-def validate_blog_content(result: str) -> Tuple[bool, Union[Dict[str, Any], str]]:
-    """Validate blog content meets requirements."""
-    try:
-        # Check word count
-        word_count = len(result.split())
-        if word_count > 200:
-            return (False, {
-                "error": "Blog content exceeds 200 words",
-                "code": "WORD_COUNT_ERROR",
-                "context": {"word_count": word_count}
-            })
-
-        # Additional validation logic here
-        return (True, result.strip())
-    except Exception as e:
-        return (False, {
-            "error": "Unexpected error during validation",
-            "code": "SYSTEM_ERROR"
-        })
-
-blog_task = Task(
-    description="Write a blog post about AI",
-    expected_output="A blog post under 200 words",
-    agent=blog_agent,
-    guardrail=validate_blog_content  # Add the guardrail function
-)
-```
-
-### Guardrail Function Requirements
-
-1. **Function Signature**:
-   - Must accept exactly one parameter (the task output)
-   - Should return a tuple of `(bool, Any)`
-   - Type hints are recommended but optional
-
-2. **Return Values**:
-   - Success: Return `(True, validated_result)`
-   - Failure: Return `(False, error_details)`
-
-### Error Handling Best Practices
-
-1. **Structured Error Responses**:
-```python Code
-def validate_with_context(result: str) -> Tuple[bool, Union[Dict[str, Any], str]]:
-    try:
-        # Main validation logic
-        validated_data = perform_validation(result)
-        return (True, validated_data)
-    except ValidationError as e:
-        return (False, {
-            "error": str(e),
-            "code": "VALIDATION_ERROR",
-            "context": {"input": result}
-        })
-    except Exception as e:
-        return (False, {
-            "error": "Unexpected error",
-            "code": "SYSTEM_ERROR"
-        })
-```
-
-2. **Error Categories**:
-   - Use specific error codes
-   - Include relevant context
-   - Provide actionable feedback
-
-3. **Validation Chain**:
-```python Code
-from typing import Any, Dict, List, Tuple, Union
-
-def complex_validation(result: str) -> Tuple[bool, Union[str, Dict[str, Any]]]:
-    """Chain multiple validation steps."""
-    # Step 1: Basic validation
-    if not result:
-        return (False, {"error": "Empty result", "code": "EMPTY_INPUT"})
-
-    # Step 2: Content validation
-    try:
-        validated = validate_content(result)
-        if not validated:
-            return (False, {"error": "Invalid content", "code": "CONTENT_ERROR"})
-
-        # Step 3: Format validation
-        formatted = format_output(validated)
-        return (True, formatted)
-    except Exception as e:
-        return (False, {
-            "error": str(e),
-            "code": "VALIDATION_ERROR",
-            "context": {"step": "content_validation"}
-        })
-```
-
-### Handling Guardrail Results
-
-When a guardrail returns `(False, error)`:
-1. The error is sent back to the agent
-2. The agent attempts to fix the issue
-3. The process repeats until:
-   - The guardrail returns `(True, result)`
-   - Maximum retries are reached
-
-Example with retry handling:
-```python Code
-from typing import Optional, Tuple, Union
-
-def validate_json_output(result: str) -> Tuple[bool, Union[Dict[str, Any], str]]:
-    """Validate and parse JSON output."""
-    try:
-        # Try to parse as JSON
-        data = json.loads(result)
-        return (True, data)
-    except json.JSONDecodeError as e:
-        return (False, {
-            "error": "Invalid JSON format",
-            "code": "JSON_ERROR",
-            "context": {"line": e.lineno, "column": e.colno}
-        })
-
-task = Task(
-    description="Generate a JSON report",
-    expected_output="A valid JSON object",
-    agent=analyst,
-    guardrail=validate_json_output,
-    max_retries=3  # Limit retry attempts
-)
-```
-
 ## Getting Structured Consistent Outputs from Tasks
+When you need to ensure that a task outputs a structured and consistent format, you can use the `output_pydantic` or `output_json` properties on a task. These properties allow you to define the expected output structure, making it easier to parse and utilize the results in your application. 
 
 <Note>
 It's also important to note that the output of the final task of a crew becomes the final output of the actual crew itself.
@@ -748,114 +608,6 @@ While creating and executing tasks, certain validation mechanisms are in place t
 
 These validations help in maintaining the consistency and reliability of task executions within the crewAI framework.
 
-## Task Guardrails
-
-Task guardrails provide a powerful way to validate, transform, or filter task outputs before they are passed to the next task. Guardrails are optional functions that execute before the next task starts, allowing you to ensure that task outputs meet specific requirements or formats.
-
-### Basic Usage
-
-```python Code
-from typing import Tuple, Union
-from crewai import Task
-
-def validate_json_output(result: str) -> Tuple[bool, Union[dict, str]]:
-    """Validate that the output is valid JSON."""
-    try:
-        json_data = json.loads(result)
-        return (True, json_data)
-    except json.JSONDecodeError:
-        return (False, "Output must be valid JSON")
-
-task = Task(
-    description="Generate JSON data",
-    expected_output="Valid JSON object",
-    guardrail=validate_json_output
-)
-```
-
-### How Guardrails Work
-
-1. **Optional Attribute**: Guardrails are an optional attribute at the task level, allowing you to add validation only where needed.
-2. **Execution Timing**: The guardrail function is executed before the next task starts, ensuring valid data flow between tasks.
-3. **Return Format**: Guardrails must return a tuple of `(success, data)`:
-   - If `success` is `True`, `data` is the validated/transformed result
-   - If `success` is `False`, `data` is the error message
-4. **Result Routing**:
-   - On success (`True`), the result is automatically passed to the next task
-   - On failure (`False`), the error is sent back to the agent to generate a new answer
-
-### Common Use Cases
-
-#### Data Format Validation
-```python Code
-def validate_email_format(result: str) -> Tuple[bool, Union[str, str]]:
-    """Ensure the output contains a valid email address."""
-    import re
-    email_pattern = r'^[\w\.-]+@[\w\.-]+\.\w+$'
-    if re.match(email_pattern, result.strip()):
-        return (True, result.strip())
-    return (False, "Output must be a valid email address")
-```
-
-#### Content Filtering
-```python Code
-def filter_sensitive_info(result: str) -> Tuple[bool, Union[str, str]]:
-    """Remove or validate sensitive information."""
-    sensitive_patterns = ['SSN:', 'password:', 'secret:']
-    for pattern in sensitive_patterns:
-        if pattern.lower() in result.lower():
-            return (False, f"Output contains sensitive information ({pattern})")
-    return (True, result)
-```
-
-#### Data Transformation
-```python Code
-def normalize_phone_number(result: str) -> Tuple[bool, Union[str, str]]:
-    """Ensure phone numbers are in a consistent format."""
-    import re
-    digits = re.sub(r'\D', '', result)
-    if len(digits) == 10:
-        formatted = f"({digits[:3]}) {digits[3:6]}-{digits[6:]}"
-        return (True, formatted)
-    return (False, "Output must be a 10-digit phone number")
-```
-
-### Advanced Features
-
-#### Chaining Multiple Validations
-```python Code
-def chain_validations(*validators):
-    """Chain multiple validators together."""
-    def combined_validator(result):
-        for validator in validators:
-            success, data = validator(result)
-            if not success:
-                return (False, data)
-            result = data
-        return (True, result)
-    return combined_validator
-
-# Usage
-task = Task(
-    description="Get user contact info",
-    expected_output="Email and phone",
-    guardrail=chain_validations(
-        validate_email_format,
-        filter_sensitive_info
-    )
-)
-```
-
-#### Custom Retry Logic
-```python Code
-task = Task(
-    description="Generate data",
-    expected_output="Valid data",
-    guardrail=validate_data,
-    max_retries=5  # Override default retry limit
-)
-```
-
 ## Creating Directories when Saving Files
 
 You can now specify if a task should create directories when saving its output to a file. This is particularly useful for organizing outputs and ensuring that file paths are correctly structured.

docs/concepts/tools.mdx

@@ -172,48 +172,6 @@ def my_tool(question: str) -> str:
     return "Result from your custom tool"
 ```
 
-### Structured Tools
-
-The `StructuredTool` class wraps functions as tools, providing flexibility and validation while reducing boilerplate. It supports custom schemas and dynamic logic for seamless integration of complex functionalities.
-
-#### Example:
-Using `StructuredTool.from_function`, you can wrap a function that interacts with an external API or system, providing a structured interface. This enables robust validation and consistent execution, making it easier to integrate complex functionalities into your applications as demonstrated in the following example:
-
-```python
-from crewai.tools.structured_tool import CrewStructuredTool
-from pydantic import BaseModel
-
-# Define the schema for the tool's input using Pydantic
-class APICallInput(BaseModel):
-    endpoint: str
-    parameters: dict
-
-# Wrapper function to execute the API call
-def tool_wrapper(*args, **kwargs):
-    # Here, you would typically call the API using the parameters
-    # For demonstration, we'll return a placeholder string
-    return f"Call the API at {kwargs['endpoint']} with parameters {kwargs['parameters']}"
-
-# Create and return the structured tool
-def create_structured_tool():
-    return CrewStructuredTool.from_function(
-        name='Wrapper API',
-        description="A tool to wrap API calls with structured input.",
-        args_schema=APICallInput,
-        func=tool_wrapper,
-    )
-
-# Example usage
-structured_tool = create_structured_tool()
-
-# Execute the tool with structured input
-result = structured_tool._run(**{
-    "endpoint": "https://example.com/api",
-    "parameters": {"key1": "value1", "key2": "value2"}
-})
-print(result)  # Output: Call the API at https://example.com/api with parameters {'key1': 'value1', 'key2': 'value2'}
-```
-
 ### Custom Caching Mechanism
 
 <Tip>

docs/how-to/multimodal-agents.mdx

@@ -1,138 +0,0 @@
----
-title: Using Multimodal Agents
-description: Learn how to enable and use multimodal capabilities in your agents for processing images and other non-text content within the CrewAI framework.
-icon: image
----
-
-# Using Multimodal Agents
-
-CrewAI supports multimodal agents that can process both text and non-text content like images. This guide will show you how to enable and use multimodal capabilities in your agents.
-
-## Enabling Multimodal Capabilities
-
-To create a multimodal agent, simply set the `multimodal` parameter to `True` when initializing your agent:
-
-```python
-from crewai import Agent
-
-agent = Agent(
-    role="Image Analyst",
-    goal="Analyze and extract insights from images",
-    backstory="An expert in visual content interpretation with years of experience in image analysis",
-    multimodal=True  # This enables multimodal capabilities
-)
-```
-
-When you set `multimodal=True`, the agent is automatically configured with the necessary tools for handling non-text content, including the `AddImageTool`.
-
-## Working with Images
-
-The multimodal agent comes pre-configured with the `AddImageTool`, which allows it to process images. You don't need to manually add this tool - it's automatically included when you enable multimodal capabilities.
-
-Here's a complete example showing how to use a multimodal agent to analyze an image:
-
-```python
-from crewai import Agent, Task, Crew
-
-# Create a multimodal agent
-image_analyst = Agent(
-    role="Product Analyst",
-    goal="Analyze product images and provide detailed descriptions",
-    backstory="Expert in visual product analysis with deep knowledge of design and features",
-    multimodal=True
-)
-
-# Create a task for image analysis
-task = Task(
-    description="Analyze the product image at https://example.com/product.jpg and provide a detailed description",
-    agent=image_analyst
-)
-
-# Create and run the crew
-crew = Crew(
-    agents=[image_analyst],
-    tasks=[task]
-)
-
-result = crew.kickoff()
-```
-
-### Advanced Usage with Context
-
-You can provide additional context or specific questions about the image when creating tasks for multimodal agents. The task description can include specific aspects you want the agent to focus on:
-
-```python
-from crewai import Agent, Task, Crew
-
-# Create a multimodal agent for detailed analysis
-expert_analyst = Agent(
-    role="Visual Quality Inspector",
-    goal="Perform detailed quality analysis of product images",
-    backstory="Senior quality control expert with expertise in visual inspection",
-    multimodal=True  # AddImageTool is automatically included
-)
-
-# Create a task with specific analysis requirements
-inspection_task = Task(
-    description="""
-    Analyze the product image at https://example.com/product.jpg with focus on:
-    1. Quality of materials
-    2. Manufacturing defects
-    3. Compliance with standards
-    Provide a detailed report highlighting any issues found.
-    """,
-    agent=expert_analyst
-)
-
-# Create and run the crew
-crew = Crew(
-    agents=[expert_analyst],
-    tasks=[inspection_task]
-)
-
-result = crew.kickoff()
-```
-
-### Tool Details
-
-When working with multimodal agents, the `AddImageTool` is automatically configured with the following schema:
-
-```python
-class AddImageToolSchema:
-    image_url: str  # Required: The URL or path of the image to process
-    action: Optional[str] = None  # Optional: Additional context or specific questions about the image
-```
-
-The multimodal agent will automatically handle the image processing through its built-in tools, allowing it to:
-- Access images via URLs or local file paths
-- Process image content with optional context or specific questions
-- Provide analysis and insights based on the visual information and task requirements
-
-## Best Practices
-
-When working with multimodal agents, keep these best practices in mind:
-
-1. **Image Access**
-   - Ensure your images are accessible via URLs that the agent can reach
-   - For local images, consider hosting them temporarily or using absolute file paths
-   - Verify that image URLs are valid and accessible before running tasks
-
-2. **Task Description**
-   - Be specific about what aspects of the image you want the agent to analyze
-   - Include clear questions or requirements in the task description
-   - Consider using the optional `action` parameter for focused analysis
-
-3. **Resource Management**
-   - Image processing may require more computational resources than text-only tasks
-   - Some language models may require base64 encoding for image data
-   - Consider batch processing for multiple images to optimize performance
-
-4. **Environment Setup**
-   - Verify that your environment has the necessary dependencies for image processing
-   - Ensure your language model supports multimodal capabilities
-   - Test with small images first to validate your setup
-
-5. **Error Handling**
-   - Implement proper error handling for image loading failures
-   - Have fallback strategies for when image processing fails
-   - Monitor and log image processing operations for debugging

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

@@ -1,211 +0,0 @@
-# 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,202 +0,0 @@
----
-title: Portkey Observability and Guardrails
-description: How to use Portkey with CrewAI
-icon: key
----
-
-<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
-
-<Steps>
-    <Step title="Install CrewAI and Portkey">
-    ```bash
-    pip install -qU crewai portkey-ai
-    ```
-    </Step>
-    <Step title="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
-        )
-    )
-    ```
-    </Step>
-    <Step title="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)
-    ```
-    </Step>
-</Steps>
-
-## 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/installation.mdx

@@ -7,7 +7,7 @@ icon: wrench
 <Note>
   **Python Version Requirements**
   
-  CrewAI requires `Python >=3.10 and <3.13`. Here's how to check your version:
+  CrewAI requires `Python >=3.10 and <=3.13`. Here's how to check your version:
   ```bash
   python3 --version
   ```

docs/mint.json

@@ -100,8 +100,7 @@
         "how-to/conditional-tasks",
         "how-to/agentops-observability",
         "how-to/langtrace-observability",
-        "how-to/openlit-observability",
-        "how-to/portkey-observability"
+        "how-to/openlit-observability"
       ]
     },
     {

pyproject.toml

@@ -3,44 +3,33 @@ name = "crewai"
 version = "0.86.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"
+requires-python = ">=3.10,<=3.13"
 authors = [
     { name = "Joao Moura", email = "joao@crewai.com" }
 ]
 dependencies = [
-    # Core Dependencies
     "pydantic>=2.4.2",
     "openai>=1.13.3",
-    "litellm>=1.44.22",
-    "instructor>=1.3.3",
-
-    # Text Processing
-    "pdfplumber>=0.11.4",
-    "regex>=2024.9.11",
-
-    # Telemetry and Monitoring
     "opentelemetry-api>=1.22.0",
     "opentelemetry-sdk>=1.22.0",
     "opentelemetry-exporter-otlp-proto-http>=1.22.0",
-
-    # Data Handling
-    "chromadb>=0.5.23",
-    "openpyxl>=3.1.5",
-    "pyvis>=0.3.2",
-
-    # Authentication and Security
-    "auth0-python>=4.7.1",
-    "python-dotenv>=1.0.0",
-
-    # Configuration and Utils
+    "instructor>=1.3.3",
+    "regex>=2024.9.11",
+    "crewai-tools>=0.17.0",
     "click>=8.1.7",
+    "python-dotenv>=1.0.0",
     "appdirs>=1.4.4",
     "jsonref>=1.1.0",
     "json-repair>=0.25.2",
+    "auth0-python>=4.7.1",
+    "litellm>=1.44.22",
+    "pyvis>=0.3.2",
     "uv>=0.4.25",
     "tomli-w>=1.1.0",
     "tomli>=2.0.2",
-    "blinker>=1.9.0"
+    "chromadb>=0.5.18",
+    "pdfplumber>=0.11.4",
+    "openpyxl>=3.1.5",
 ]
 
 [project.urls]
@@ -49,10 +38,7 @@ Documentation = "https://docs.crewai.com"
 Repository = "https://github.com/crewAIInc/crewAI"
 
 [project.optional-dependencies]
-tools = ["crewai-tools>=0.25.5"]
-embeddings = [
-    "tiktoken~=0.7.0"
-]
+tools = ["crewai-tools>=0.14.0"]
 agentops = ["agentops>=0.3.0"]
 fastembed = ["fastembed>=0.4.1"]
 pdfplumber = [
@@ -65,13 +51,10 @@ openpyxl = [
     "openpyxl>=3.1.5",
 ]
 mem0 = ["mem0ai>=0.1.29"]
-docling = [
-    "docling>=2.12.0",
-]
 
 [tool.uv]
 dev-dependencies = [
-    "ruff>=0.8.2",
+    "ruff>=0.4.10",
     "mypy>=1.10.0",
     "pre-commit>=3.6.0",
     "mkdocs>=1.4.3",
@@ -81,6 +64,7 @@ dev-dependencies = [
     "mkdocs-material-extensions>=1.3.1",
     "pillow>=10.2.0",
     "cairosvg>=2.7.1",
+    "crewai-tools>=0.14.0",
     "pytest>=8.0.0",
     "pytest-vcr>=1.0.2",
     "python-dotenv>=1.0.0",

src/crewai/agent.py

@@ -17,26 +17,33 @@ 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.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 mock_agent_ops_provider():
+    def track_agent(*args, **kwargs):
         def noop(f):
             return f
 
         return noop
 
+    return track_agent
+
+
+agentops = None
+
+if os.environ.get("AGENTOPS_API_KEY"):
+    try:
+        from agentops import track_agent
+    except ImportError:
+        track_agent = mock_agent_ops_provider()
+else:
+    track_agent = mock_agent_ops_provider()
+
 
 @track_agent()
 class Agent(BaseAgent):
@@ -115,10 +122,6 @@ class Agent(BaseAgent):
         default=2,
         description="Maximum number of retries for an agent to execute a task when an error occurs.",
     )
-    multimodal: bool = Field(
-        default=False,
-        description="Whether the agent is multimodal.",
-    )
     code_execution_mode: Literal["safe", "unsafe"] = Field(
         default="safe",
         description="Mode for code execution: 'safe' (using Docker) or 'unsafe' (direct execution).",
@@ -411,10 +414,6 @@ class Agent(BaseAgent):
         tools = agent_tools.tools()
         return tools
 
-    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

src/crewai/agents/crew_agent_executor.py

@@ -143,20 +143,7 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
                         tool_result = self._execute_tool_and_check_finality(
                             formatted_answer
                         )
-
-                        # Directly append the result to the messages if the
-                        # tool is "Add image to content" in case of multimodal
-                        # agents
-                        if formatted_answer.tool == self._i18n.tools("add_image")["name"]:
-                            self.messages.append(tool_result.result)
-                            continue
-
-                        else:
-                            if self.step_callback:
-                                self.step_callback(tool_result)
-
                         formatted_answer.text += f"\nObservation: {tool_result.result}"
-
                         formatted_answer.result = tool_result.result
                         if tool_result.result_as_answer:
                             return AgentFinish(
@@ -312,7 +299,7 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
                         self._i18n.slice("summarizer_system_message"), role="system"
                     ),
                     self._format_msg(
-                        self._i18n.slice("summarize_instruction").format(group=group),
+                        self._i18n.slice("sumamrize_instruction").format(group=group),
                     ),
                 ],
                 callbacks=self.callbacks,
@@ -423,6 +410,7 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
         """
         while self.ask_for_human_input:
             human_feedback = self._ask_human_input(formatted_answer.output)
+            print("Human feedback: ", human_feedback)
 
             if self.crew and self.crew._train:
                 self._handle_crew_training_output(formatted_answer, human_feedback)

src/crewai/agents/parser.py

@@ -1,6 +1,5 @@
 import re
 from typing import Any, Union
-
 from json_repair import repair_json
 
 from crewai.utilities import I18N

src/crewai/cli/authentication/main.py

@@ -5,10 +5,9 @@ from typing import Any, Dict
 import requests
 from rich.console import Console
 
-from crewai.cli.tools.main import ToolCommand
-
 from .constants import AUTH0_AUDIENCE, AUTH0_CLIENT_ID, AUTH0_DOMAIN
 from .utils import TokenManager, validate_token
+from crewai.cli.tools.main import ToolCommand
 
 console = Console()
 
@@ -80,9 +79,7 @@ class AuthenticationCommand:
                         style="yellow",
                     )
 
-                console.print(
-                    "\n[bold green]Welcome to CrewAI Enterprise![/bold green]\n"
-                )
+                console.print("\n[bold green]Welcome to CrewAI Enterprise![/bold green]\n")
                 return
 
             if token_data["error"] not in ("authorization_pending", "slow_down"):

src/crewai/cli/authentication/token.py

@@ -1,9 +1,10 @@
 from .utils import TokenManager
 
-
 def get_auth_token() -> str:
     """Get the authentication token."""
     access_token = TokenManager().get_token()
     if not access_token:
         raise Exception()
     return access_token
+
+

src/crewai/cli/cli.py

@@ -1,7 +1,7 @@
-from importlib.metadata import version as get_version
 from typing import Optional
 
 import click
+import pkg_resources
 
 from crewai.cli.add_crew_to_flow import add_crew_to_flow
 from crewai.cli.create_crew import create_crew
@@ -25,7 +25,7 @@ from .update_crew import update_crew
 
 
 @click.group()
-@click.version_option(get_version("crewai"))
+@click.version_option(pkg_resources.get_distribution("crewai").version)
 def crewai():
     """Top-level command group for crewai."""
 
@@ -52,16 +52,16 @@ def create(type, name, provider, skip_provider=False):
 def version(tools):
     """Show the installed version of crewai."""
     try:
-        crewai_version = get_version("crewai")
+        crewai_version = pkg_resources.get_distribution("crewai").version
     except Exception:
         crewai_version = "unknown version"
     click.echo(f"crewai version: {crewai_version}")
 
     if tools:
         try:
-            tools_version = get_version("crewai")
+            tools_version = pkg_resources.get_distribution("crewai-tools").version
             click.echo(f"crewai tools version: {tools_version}")
-        except Exception:
+        except pkg_resources.DistributionNotFound:
             click.echo("crewai tools not installed")
 
 

src/crewai/cli/command.py

@@ -1,9 +1,8 @@
 import requests
 from requests.exceptions import JSONDecodeError
 from rich.console import Console
-
-from crewai.cli.authentication.token import get_auth_token
 from crewai.cli.plus_api import PlusAPI
+from crewai.cli.authentication.token import get_auth_token
 from crewai.telemetry.telemetry import Telemetry
 
 console = Console()

src/crewai/cli/config.py

@@ -1,19 +1,13 @@
 import json
 from pathlib import Path
-from typing import Optional
-
 from pydantic import BaseModel, Field
+from typing import Optional
 
 DEFAULT_CONFIG_PATH = Path.home() / ".config" / "crewai" / "settings.json"
 
-
 class Settings(BaseModel):
-    tool_repository_username: Optional[str] = Field(
-        None, description="Username for interacting with the Tool Repository"
-    )
-    tool_repository_password: Optional[str] = Field(
-        None, description="Password for interacting with the Tool Repository"
-    )
+    tool_repository_username: Optional[str] = Field(None, description="Username for interacting with the Tool Repository")
+    tool_repository_password: Optional[str] = Field(None, description="Password for interacting with the Tool Repository")
     config_path: Path = Field(default=DEFAULT_CONFIG_PATH, exclude=True)
 
     def __init__(self, config_path: Path = DEFAULT_CONFIG_PATH, **data):

src/crewai/cli/plus_api.py

@@ -1,10 +1,8 @@
-from os import getenv
 from typing import Optional
-from urllib.parse import urljoin
-
 import requests
-
+from os import getenv
 from crewai.cli.version import get_crewai_version
+from urllib.parse import urljoin
 
 
 class PlusAPI:

src/crewai/cli/reset_memories_command.py

@@ -1,12 +1,11 @@
 import subprocess
-
 import click
 
-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
+from crewai.knowledge.storage.knowledge_storage import KnowledgeStorage
 
 
 def reset_memories_command(

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

@@ -4,7 +4,7 @@ Welcome to the {{crew_name}} Crew project, powered by [crewAI](https://crewai.co
 
 ## Installation
 
-Ensure you have Python >=3.10 <3.13 installed on your system. This project uses [UV](https://docs.astral.sh/uv/) for dependency management and package handling, offering a seamless setup and execution experience.
+Ensure you have Python >=3.10 <=3.13 installed on your system. This project uses [UV](https://docs.astral.sh/uv/) for dependency management and package handling, offering a seamless setup and execution experience.
 
 First, if you haven't already, install uv:
 

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

@@ -3,7 +3,7 @@ name = "{{folder_name}}"
 version = "0.1.0"
 description = "{{name}} using crewAI"
 authors = [{ name = "Your Name", email = "you@example.com" }]
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<=3.13"
 dependencies = [
     "crewai[tools]>=0.86.0,<1.0.0"
 ]
@@ -18,6 +18,3 @@ test = "{{folder_name}}.main:test"
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
-
-[tool.crewai]
-type = "crew"

src/crewai/cli/templates/crew/tools/custom_tool.py

@@ -10,7 +10,7 @@ class MyCustomToolInput(BaseModel):
 class MyCustomTool(BaseTool):
     name: str = "Name of my tool"
     description: str = (
-        "Clear description for what this tool is useful for, your agent will need this information to use it."
+        "Clear description for what this tool is useful for, you agent will need this information to use it."
     )
     args_schema: Type[BaseModel] = MyCustomToolInput
 

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

@@ -4,7 +4,7 @@ Welcome to the {{crew_name}} Crew project, powered by [crewAI](https://crewai.co
 
 ## Installation
 
-Ensure you have Python >=3.10 <3.13 installed on your system. This project uses [UV](https://docs.astral.sh/uv/) for dependency management and package handling, offering a seamless setup and execution experience.
+Ensure you have Python >=3.10 <=3.13 installed on your system. This project uses [UV](https://docs.astral.sh/uv/) for dependency management and package handling, offering a seamless setup and execution experience.
 
 First, if you haven't already, install uv:
 

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

@@ -5,7 +5,7 @@ from pydantic import BaseModel
 
 from crewai.flow.flow import Flow, listen, start
 
-from {{folder_name}}.crews.poem_crew.poem_crew import PoemCrew
+from .crews.poem_crew.poem_crew import PoemCrew
 
 
 class PoemState(BaseModel):

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

@@ -3,7 +3,7 @@ name = "{{folder_name}}"
 version = "0.1.0"
 description = "{{name}} using crewAI"
 authors = [{ name = "Your Name", email = "you@example.com" }]
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<=3.13"
 dependencies = [
     "crewai[tools]>=0.86.0,<1.0.0",
 ]
@@ -15,6 +15,3 @@ plot = "{{folder_name}}.main:plot"
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
-
-[tool.crewai]
-type = "flow"

src/crewai/cli/templates/flow/tools/custom_tool.py

@@ -13,7 +13,7 @@ class MyCustomToolInput(BaseModel):
 class MyCustomTool(BaseTool):
     name: str = "Name of my tool"
     description: str = (
-        "Clear description for what this tool is useful for, your agent will need this information to use it."
+        "Clear description for what this tool is useful for, you agent will need this information to use it."
     )
     args_schema: Type[BaseModel] = MyCustomToolInput
 

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

@@ -0,0 +1,17 @@
+[tool.poetry]
+name = "{{folder_name}}"
+version = "0.1.0"
+description = "{{name}} using crewAI"
+authors = ["Your Name <you@example.com>"]
+
+[tool.poetry.dependencies]
+python = ">=3.10,<=3.13"
+crewai = { extras = ["tools"], version = ">=0.86.0,<1.0.0" }
+asyncio = "*"
+
+[tool.poetry.scripts]
+{{folder_name}} = "{{folder_name}}.main:main"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

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

@@ -5,7 +5,7 @@ custom tools to power up your crews.
 
 ## Installing
 
-Ensure you have Python >=3.10 <3.13 installed on your system. This project
+Ensure you have Python >=3.10 <=3.13 installed on your system. This project
 uses [UV](https://docs.astral.sh/uv/) for dependency management and package
 handling, offering a seamless setup and execution experience.
 

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

@@ -3,10 +3,8 @@ name = "{{folder_name}}"
 version = "0.1.0"
 description = "Power up your crews with {{folder_name}}"
 readme = "README.md"
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<=3.13"
 dependencies = [
     "crewai[tools]>=0.86.0"
 ]
 
-[tool.crewai]
-type = "tool"

src/crewai/cli/tools/main.py

@@ -117,7 +117,7 @@ class ToolCommand(BaseCommand, PlusAPIMixin):
 
         published_handle = publish_response.json()["handle"]
         console.print(
-            f"Successfully published {published_handle} ({project_version}).\nInstall it in other projects with crewai tool install {published_handle}",
+            f"Succesfully published {published_handle} ({project_version}).\nInstall it in other projects with crewai tool install {published_handle}",
             style="bold green",
         )
 
@@ -138,7 +138,7 @@ class ToolCommand(BaseCommand, PlusAPIMixin):
 
         self._add_package(get_response.json())
 
-        console.print(f"Successfully installed {handle}", style="bold green")
+        console.print(f"Succesfully installed {handle}", style="bold green")
 
     def login(self):
         login_response = self.plus_api_client.login_to_tool_repository()

src/crewai/cli/utils.py

@@ -33,6 +33,26 @@ def copy_template(src, dst, name, class_name, folder_name):
     click.secho(f"  - Created {dst}", fg="green")
 
 
+# Drop the simple_toml_parser when we move to python3.11
+def simple_toml_parser(content):
+    result = {}
+    current_section = result
+    for line in content.split("\n"):
+        line = line.strip()
+        if line.startswith("[") and line.endswith("]"):
+            # New section
+            section = line[1:-1].split(".")
+            current_section = result
+            for key in section:
+                current_section = current_section.setdefault(key, {})
+        elif "=" in line:
+            key, value = line.split("=", 1)
+            key = key.strip()
+            value = value.strip().strip('"')
+            current_section[key] = value
+    return result
+
+
 def read_toml(file_path: str = "pyproject.toml"):
     """Read the content of a TOML file and return it as a dictionary."""
     with open(file_path, "rb") as f:
@@ -43,7 +63,7 @@ def read_toml(file_path: str = "pyproject.toml"):
 def parse_toml(content):
     if sys.version_info >= (3, 11):
         return tomllib.loads(content)
-    return tomli.loads(content)
+    return simple_toml_parser(content)
 
 
 def get_project_name(

src/crewai/cli/version.py

@@ -1,6 +1,6 @@
 import importlib.metadata
 
-
 def get_crewai_version() -> str:
     """Get the version number of CrewAI running the CLI"""
     return importlib.metadata.version("crewai")
+

src/crewai/crew.py

@@ -1,5 +1,6 @@
 import asyncio
 import json
+import os
 import uuid
 import warnings
 from concurrent.futures import Future
@@ -35,7 +36,6 @@ 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
 from crewai.utilities import I18N, FileHandler, Logger, RPMController
 from crewai.utilities.constants import TRAINING_DATA_FILE
@@ -49,10 +49,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:
+agentops = None
+if os.environ.get("AGENTOPS_API_KEY"):
+    try:
         import agentops  # type: ignore
-except ImportError:
-    agentops = None
+    except ImportError:
+        pass
 
 
 warnings.filterwarnings("ignore", category=SyntaxWarning, module="pysbd")
@@ -534,6 +536,9 @@ class Crew(BaseModel):
             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 agent.allow_code_execution:  # type: ignore # BaseAgent" has no attribute "allow_code_execution"
+                agent.tools += agent.get_code_execution_tools()  # type: ignore # "BaseAgent" has no attribute "get_code_execution_tools"; maybe "get_delegation_tools"?
+
             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"
 
@@ -670,6 +675,7 @@ class Crew(BaseModel):
                 )
                 manager.tools = []
                 raise Exception("Manager agent should not have tools")
+            manager.tools = self.manager_agent.get_delegation_tools(self.agents)
         else:
             self.manager_llm = (
                 getattr(self.manager_llm, "model_name", None)
@@ -681,7 +687,6 @@ class Crew(BaseModel):
                 goal=i18n.retrieve("hierarchical_manager_agent", "goal"),
                 backstory=i18n.retrieve("hierarchical_manager_agent", "backstory"),
                 tools=AgentTools(agents=self.agents).tools(),
-                allow_delegation=True,
                 llm=self.manager_llm,
                 verbose=self.verbose,
             )
@@ -724,10 +729,7 @@ class Crew(BaseModel):
                     f"No agent available for task: {task.description}. Ensure that either the task has an assigned agent or a manager agent is provided."
                 )
 
-            # Determine which tools to use - task tools take precedence over agent tools
-            tools_for_task = task.tools or agent_to_use.tools or []
-            tools_for_task = self._prepare_tools(agent_to_use, task, tools_for_task)
-
+            self._prepare_agent_tools(task)
             self._log_task_start(task, agent_to_use.role)
 
             if isinstance(task, ConditionalTask):
@@ -744,7 +746,7 @@ class Crew(BaseModel):
                 future = task.execute_async(
                     agent=agent_to_use,
                     context=context,
-                    tools=tools_for_task,
+                    tools=agent_to_use.tools,
                 )
                 futures.append((task, future, task_index))
             else:
@@ -756,7 +758,7 @@ class Crew(BaseModel):
                 task_output = task.execute_sync(
                     agent=agent_to_use,
                     context=context,
-                    tools=tools_for_task,
+                    tools=agent_to_use.tools,
                 )
                 task_outputs = [task_output]
                 self._process_task_result(task, task_output)
@@ -793,77 +795,45 @@ class Crew(BaseModel):
             return skipped_task_output
         return None
 
-    def _prepare_tools(
-        self, agent: BaseAgent, task: Task, tools: List[Tool]
-    ) -> List[Tool]:
-        # Add delegation tools if agent allows delegation
-        if agent.allow_delegation:
+    def _prepare_agent_tools(self, task: Task):
         if self.process == Process.hierarchical:
             if self.manager_agent:
-                    tools = self._update_manager_tools(task, tools)
+                self._update_manager_tools(task)
             else:
-                    raise ValueError(
-                        "Manager agent is required for hierarchical process."
-                    )
-
-            elif agent and agent.allow_delegation:
-                tools = self._add_delegation_tools(task, tools)
-
-        # Add code execution tools if agent allows code execution
-        if agent.allow_code_execution:
-            tools = self._add_code_execution_tools(agent, tools)
-
-        if agent and agent.multimodal:
-            tools = self._add_multimodal_tools(agent, tools)
-
-        return tools
+                raise ValueError("Manager agent is required for hierarchical process.")
+        elif task.agent and task.agent.allow_delegation:
+            self._add_delegation_tools(task)
 
     def _get_agent_to_use(self, task: Task) -> Optional[BaseAgent]:
         if self.process == Process.hierarchical:
             return self.manager_agent
         return task.agent
 
-    def _merge_tools(
-        self, existing_tools: List[Tool], new_tools: List[Tool]
-    ) -> List[Tool]:
-        """Merge new tools into existing tools list, avoiding duplicates by tool name."""
-        if not new_tools:
-            return existing_tools
-
-        # Create mapping of tool names to new tools
-        new_tool_map = {tool.name: tool for tool in new_tools}
-
-        # Remove any existing tools that will be replaced
-        tools = [tool for tool in existing_tools if tool.name not in new_tool_map]
-
-        # Add all new tools
-        tools.extend(new_tools)
-
-        return tools
-
-    def _inject_delegation_tools(
-        self, tools: List[Tool], task_agent: BaseAgent, agents: List[BaseAgent]
-    ):
-        delegation_tools = task_agent.get_delegation_tools(agents)
-        return self._merge_tools(tools, delegation_tools)
-
-    def _add_multimodal_tools(self, agent: BaseAgent, tools: List[Tool]):
-        multimodal_tools = agent.get_multimodal_tools()
-        return self._merge_tools(tools, multimodal_tools)
-
-    def _add_code_execution_tools(self, agent: BaseAgent, tools: List[Tool]):
-        code_tools = agent.get_code_execution_tools()
-        return self._merge_tools(tools, code_tools)
-
-    def _add_delegation_tools(self, task: Task, tools: List[Tool]):
+    def _add_delegation_tools(self, task: Task):
         agents_for_delegation = [agent for agent in self.agents if agent != task.agent]
         if len(self.agents) > 1 and len(agents_for_delegation) > 0 and task.agent:
-            if not tools:
-                tools = []
-            tools = self._inject_delegation_tools(
-                tools, task.agent, agents_for_delegation
+            delegation_tools = task.agent.get_delegation_tools(agents_for_delegation)
+
+            # Add tools if they are not already in task.tools
+            for new_tool in delegation_tools:
+                # Find the index of the tool with the same name
+                existing_tool_index = next(
+                    (
+                        index
+                        for index, tool in enumerate(task.tools or [])
+                        if tool.name == new_tool.name
+                    ),
+                    None,
                 )
-        return tools
+                if not task.tools:
+                    task.tools = []
+
+                if existing_tool_index is not None:
+                    # Replace the existing tool
+                    task.tools[existing_tool_index] = new_tool
+                else:
+                    # Add the new tool
+                    task.tools.append(new_tool)
 
     def _log_task_start(self, task: Task, role: str = "None"):
         if self.output_log_file:
@@ -871,15 +841,14 @@ class Crew(BaseModel):
                 task_name=task.name, task=task.description, agent=role, status="started"
             )
 
-    def _update_manager_tools(self, task: Task, tools: List[Tool]):
+    def _update_manager_tools(self, task: Task):
         if self.manager_agent:
             if task.agent:
-                tools = self._inject_delegation_tools(tools, task.agent, [task.agent])
+                self.manager_agent.tools = task.agent.get_delegation_tools([task.agent])
             else:
-                tools = self._inject_delegation_tools(
-                    tools, self.manager_agent, self.agents
+                self.manager_agent.tools = self.manager_agent.get_delegation_tools(
+                    self.agents
                 )
-        return tools
 
     def _get_context(self, task: Task, task_outputs: List[TaskOutput]):
         context = (
@@ -1063,7 +1032,6 @@ class Crew(BaseModel):
             agentops.end_session(
                 end_state="Success",
                 end_state_reason="Finished Execution",
-                is_auto_end=True,
             )
         self._telemetry.end_crew(self, final_string_output)
 

src/crewai/flow/flow.py

@@ -14,15 +14,8 @@ from typing import (
     cast,
 )
 
-from blinker import Signal
 from pydantic import BaseModel, ValidationError
 
-from crewai.flow.flow_events import (
-    FlowFinishedEvent,
-    FlowStartedEvent,
-    MethodExecutionFinishedEvent,
-    MethodExecutionStartedEvent,
-)
 from crewai.flow.flow_visualizer import plot_flow
 from crewai.flow.utils import get_possible_return_constants
 from crewai.telemetry import Telemetry
@@ -30,47 +23,7 @@ from crewai.telemetry import Telemetry
 T = TypeVar("T", bound=Union[BaseModel, Dict[str, Any]])
 
 
-def start(condition: Optional[Union[str, dict, Callable]] = None) -> Callable:
-    """
-    Marks a method as a flow's starting point.
-
-    This decorator designates a method as an entry point for the flow execution.
-    It can optionally specify conditions that trigger the start based on other
-    method executions.
-
-    Parameters
-    ----------
-    condition : Optional[Union[str, dict, Callable]], optional
-        Defines when the start method should execute. Can be:
-        - str: Name of a method that triggers this start
-        - dict: Contains "type" ("AND"/"OR") and "methods" (list of triggers)
-        - Callable: A method reference that triggers this start
-        Default is None, meaning unconditional start.
-
-    Returns
-    -------
-    Callable
-        A decorator function that marks the method as a flow start point.
-
-    Raises
-    ------
-    ValueError
-        If the condition format is invalid.
-
-    Examples
-    --------
-    >>> @start()  # Unconditional start
-    >>> def begin_flow(self):
-    ...     pass
-
-    >>> @start("method_name")  # Start after specific method
-    >>> def conditional_start(self):
-    ...     pass
-
-    >>> @start(and_("method1", "method2"))  # Start after multiple methods
-    >>> def complex_start(self):
-    ...     pass
-    """
+def start(condition=None):
     def decorator(func):
         func.__is_start_method__ = True
         if condition is not None:
@@ -95,42 +48,8 @@ def start(condition: Optional[Union[str, dict, Callable]] = None) -> Callable:
 
     return decorator
 
-def listen(condition: Union[str, dict, Callable]) -> Callable:
-    """
-    Creates a listener that executes when specified conditions are met.
 
-    This decorator sets up a method to execute in response to other method
-    executions in the flow. It supports both simple and complex triggering
-    conditions.
-
-    Parameters
-    ----------
-    condition : Union[str, dict, Callable]
-        Specifies when the listener should execute. Can be:
-        - str: Name of a method that triggers this listener
-        - dict: Contains "type" ("AND"/"OR") and "methods" (list of triggers)
-        - Callable: A method reference that triggers this listener
-
-    Returns
-    -------
-    Callable
-        A decorator function that sets up the method as a listener.
-
-    Raises
-    ------
-    ValueError
-        If the condition format is invalid.
-
-    Examples
-    --------
-    >>> @listen("process_data")  # Listen to single method
-    >>> def handle_processed_data(self):
-    ...     pass
-
-    >>> @listen(or_("success", "failure"))  # Listen to multiple methods
-    >>> def handle_completion(self):
-    ...     pass
-    """
+def listen(condition):
     def decorator(func):
         if isinstance(condition, str):
             func.__trigger_methods__ = [condition]
@@ -154,103 +73,16 @@ def listen(condition: Union[str, dict, Callable]) -> Callable:
     return decorator
 
 
-def router(condition: Union[str, dict, Callable]) -> Callable:
-    """
-    Creates a routing method that directs flow execution based on conditions.
-
-    This decorator marks a method as a router, which can dynamically determine
-    the next steps in the flow based on its return value. Routers are triggered
-    by specified conditions and can return constants that determine which path
-    the flow should take.
-
-    Parameters
-    ----------
-    condition : Union[str, dict, Callable]
-        Specifies when the router should execute. Can be:
-        - str: Name of a method that triggers this router
-        - dict: Contains "type" ("AND"/"OR") and "methods" (list of triggers)
-        - Callable: A method reference that triggers this router
-
-    Returns
-    -------
-    Callable
-        A decorator function that sets up the method as a router.
-
-    Raises
-    ------
-    ValueError
-        If the condition format is invalid.
-
-    Examples
-    --------
-    >>> @router("check_status")
-    >>> def route_based_on_status(self):
-    ...     if self.state.status == "success":
-    ...         return SUCCESS
-    ...     return FAILURE
-
-    >>> @router(and_("validate", "process"))
-    >>> def complex_routing(self):
-    ...     if all([self.state.valid, self.state.processed]):
-    ...         return CONTINUE
-    ...     return STOP
-    """
+def router(method):
     def decorator(func):
         func.__is_router__ = True
-        if isinstance(condition, str):
-            func.__trigger_methods__ = [condition]
-            func.__condition_type__ = "OR"
-        elif (
-            isinstance(condition, dict)
-            and "type" in condition
-            and "methods" in condition
-        ):
-            func.__trigger_methods__ = condition["methods"]
-            func.__condition_type__ = condition["type"]
-        elif callable(condition) and hasattr(condition, "__name__"):
-            func.__trigger_methods__ = [condition.__name__]
-            func.__condition_type__ = "OR"
-        else:
-            raise ValueError(
-                "Condition must be a method, string, or a result of or_() or and_()"
-            )
+        func.__router_for__ = method.__name__
         return func
 
     return decorator
 
-def or_(*conditions: Union[str, dict, Callable]) -> dict:
-    """
-    Combines multiple conditions with OR logic for flow control.
 
-    Creates a condition that is satisfied when any of the specified conditions
-    are met. This is used with @start, @listen, or @router decorators to create
-    complex triggering conditions.
-
-    Parameters
-    ----------
-    *conditions : Union[str, dict, Callable]
-        Variable number of conditions that can be:
-        - str: Method names
-        - dict: Existing condition dictionaries
-        - Callable: Method references
-
-    Returns
-    -------
-    dict
-        A condition dictionary with format:
-        {"type": "OR", "methods": list_of_method_names}
-
-    Raises
-    ------
-    ValueError
-        If any condition is invalid.
-
-    Examples
-    --------
-    >>> @listen(or_("success", "timeout"))
-    >>> def handle_completion(self):
-    ...     pass
-    """
+def or_(*conditions):
     methods = []
     for condition in conditions:
         if isinstance(condition, dict) and "methods" in condition:
@@ -264,39 +96,7 @@ def or_(*conditions: Union[str, dict, Callable]) -> dict:
     return {"type": "OR", "methods": methods}
 
 
-def and_(*conditions: Union[str, dict, Callable]) -> dict:
-    """
-    Combines multiple conditions with AND logic for flow control.
-
-    Creates a condition that is satisfied only when all specified conditions
-    are met. This is used with @start, @listen, or @router decorators to create
-    complex triggering conditions.
-
-    Parameters
-    ----------
-    *conditions : Union[str, dict, Callable]
-        Variable number of conditions that can be:
-        - str: Method names
-        - dict: Existing condition dictionaries
-        - Callable: Method references
-
-    Returns
-    -------
-    dict
-        A condition dictionary with format:
-        {"type": "AND", "methods": list_of_method_names}
-
-    Raises
-    ------
-    ValueError
-        If any condition is invalid.
-
-    Examples
-    --------
-    >>> @listen(and_("validated", "processed"))
-    >>> def handle_complete_data(self):
-    ...     pass
-    """
+def and_(*conditions):
     methods = []
     for condition in conditions:
         if isinstance(condition, dict) and "methods" in condition:
@@ -316,8 +116,8 @@ class FlowMeta(type):
 
         start_methods = []
         listeners = {}
+        routers = {}
         router_paths = {}
-        routers = set()
 
         for attr_name, attr_value in dct.items():
             if hasattr(attr_value, "__is_start_method__"):
@@ -330,12 +130,19 @@ class FlowMeta(type):
                 methods = attr_value.__trigger_methods__
                 condition_type = getattr(attr_value, "__condition_type__", "OR")
                 listeners[attr_name] = (condition_type, methods)
-                if hasattr(attr_value, "__is_router__") and attr_value.__is_router__:
-                    routers.add(attr_name)
+
+            elif hasattr(attr_value, "__is_router__"):
+                routers[attr_value.__router_for__] = attr_name
                 possible_returns = get_possible_return_constants(attr_value)
                 if possible_returns:
                     router_paths[attr_name] = possible_returns
 
+                # Register router as a listener to its triggering method
+                trigger_method_name = attr_value.__router_for__
+                methods = [trigger_method_name]
+                condition_type = "OR"
+                listeners[attr_name] = (condition_type, methods)
+
         setattr(cls, "_start_methods", start_methods)
         setattr(cls, "_listeners", listeners)
         setattr(cls, "_routers", routers)
@@ -349,10 +156,9 @@ class Flow(Generic[T], metaclass=FlowMeta):
 
     _start_methods: List[str] = []
     _listeners: Dict[str, tuple[str, List[str]]] = {}
-    _routers: Set[str] = set()
+    _routers: Dict[str, str] = {}
     _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
@@ -396,10 +202,20 @@ class Flow(Generic[T], metaclass=FlowMeta):
         return self._method_outputs
 
     def _initialize_state(self, inputs: Dict[str, Any]) -> None:
-        if isinstance(self._state, BaseModel):
-            # Structured state
-            try:
+        """
+        Initializes or updates the state with the provided inputs.
 
+        Args:
+            inputs: Dictionary of inputs to initialize or update the state.
+
+        Raises:
+            ValueError: If inputs do not match the structured state model.
+            TypeError: If state is neither a BaseModel instance nor a dictionary.
+        """
+        if isinstance(self._state, BaseModel):
+            # Structured state management
+            try:
+                # Define a function to create the dynamic class
                 def create_model_with_extra_forbid(
                     base_model: Type[BaseModel],
                 ) -> Type[BaseModel]:
@@ -409,33 +225,50 @@ class Flow(Generic[T], metaclass=FlowMeta):
 
                     return ModelWithExtraForbid
 
+                # Create the dynamic class
                 ModelWithExtraForbid = create_model_with_extra_forbid(
                     self._state.__class__
                 )
+
+                # Create a new instance using the combined state and inputs
                 self._state = cast(
                     T, ModelWithExtraForbid(**{**self._state.model_dump(), **inputs})
                 )
+
             except ValidationError as e:
                 raise ValueError(f"Invalid inputs for structured state: {e}") from e
         elif isinstance(self._state, dict):
+            # Unstructured state management
             self._state.update(inputs)
         else:
             raise TypeError("State must be a BaseModel instance or a dictionary.")
 
     def kickoff(self, inputs: Optional[Dict[str, Any]] = None) -> Any:
-        self.event_emitter.send(
-            self,
-            event=FlowStartedEvent(
-                type="flow_started",
-                flow_name=self.__class__.__name__,
-            ),
-        )
+        """
+        Starts the execution of the flow synchronously.
 
+        Args:
+            inputs: Optional dictionary of inputs to initialize or update the state.
+
+        Returns:
+            The final output from the flow execution.
+        """
         if inputs is not None:
             self._initialize_state(inputs)
         return asyncio.run(self.kickoff_async())
 
     async def kickoff_async(self, inputs: Optional[Dict[str, Any]] = None) -> Any:
+        """
+        Starts the execution of the flow asynchronously.
+
+        Args:
+            inputs: Optional dictionary of inputs to initialize or update the state.
+
+        Returns:
+            The final output from the flow execution.
+        """
+        if inputs is not None:
+            self._initialize_state(inputs)
         if not self._start_methods:
             raise ValueError("No start method defined")
 
@@ -443,42 +276,22 @@ class Flow(Generic[T], metaclass=FlowMeta):
             self.__class__.__name__, list(self._methods.keys())
         )
 
+        # Create tasks for all start methods
         tasks = [
             self._execute_start_method(start_method)
             for start_method in self._start_methods
         ]
+
+        # Run all start methods concurrently
         await asyncio.gather(*tasks)
 
-        final_output = self._method_outputs[-1] if self._method_outputs else None
-
-        self.event_emitter.send(
-            self,
-            event=FlowFinishedEvent(
-                type="flow_finished",
-                flow_name=self.__class__.__name__,
-                result=final_output,
-            ),
-        )
-        return final_output
+        # Return the final output (from the last executed method)
+        if self._method_outputs:
+            return self._method_outputs[-1]
+        else:
+            return None  # Or raise an exception if no methods were executed
 
     async def _execute_start_method(self, start_method_name: str) -> None:
-        """
-        Executes a flow's start method and its triggered listeners.
-
-        This internal method handles the execution of methods marked with @start
-        decorator and manages the subsequent chain of listener executions.
-
-        Parameters
-        ----------
-        start_method_name : str
-            The name of the start method to execute.
-
-        Notes
-        -----
-        - Executes the start method and captures its result
-        - Triggers execution of any listeners waiting on this start method
-        - Part of the flow's initialization sequence
-        """
         result = await self._execute_method(
             start_method_name, self._methods[start_method_name]
         )
@@ -492,181 +305,70 @@ class Flow(Generic[T], metaclass=FlowMeta):
             if asyncio.iscoroutinefunction(method)
             else method(*args, **kwargs)
         )
-        self._method_outputs.append(result)
+        self._method_outputs.append(result)  # Store the output
+
+        # Track method execution counts
         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:
-        """
-        Executes all listeners and routers triggered by a method completion.
+        listener_tasks = []
 
-        This internal method manages the execution flow by:
-        1. First executing all triggered routers sequentially
-        2. Then executing all triggered listeners in parallel
-
-        Parameters
-        ----------
-        trigger_method : str
-            The name of the method that triggered these listeners.
-        result : Any
-            The result from the triggering method, passed to listeners
-            that accept parameters.
-
-        Notes
-        -----
-        - Routers are executed sequentially to maintain flow control
-        - 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
-        while True:
-            routers_triggered = self._find_triggered_methods(
-                trigger_method, router_only=True
+        if trigger_method in self._routers:
+            router_method = self._methods[self._routers[trigger_method]]
+            path = await self._execute_method(
+                self._routers[trigger_method], router_method
             )
-            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
-                # 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]
+            trigger_method = path
 
-        # 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
-    ) -> List[str]:
-        """
-        Finds all methods that should be triggered based on conditions.
-
-        This internal method evaluates both OR and AND conditions to determine
-        which methods should be executed next in the flow.
-
-        Parameters
-        ----------
-        trigger_method : str
-            The name of the method that just completed execution.
-        router_only : bool
-            If True, only consider router methods.
-            If False, only consider non-router methods.
-
-        Returns
-        -------
-        List[str]
-            Names of methods that should be triggered.
-
-        Notes
-        -----
-        - Handles both OR and AND conditions:
-          * OR: Triggers if any condition is met
-          * AND: Triggers only when all conditions are met
-        - Maintains state for AND conditions using _pending_and_listeners
-        - Separates router and normal listener evaluation
-        """
-        triggered = []
         for listener_name, (condition_type, methods) in self._listeners.items():
-            is_router = listener_name in self._routers
-
-            if router_only != is_router:
-                continue
-
             if condition_type == "OR":
-                # If the trigger_method matches any in methods, run this
                 if trigger_method in methods:
-                    triggered.append(listener_name)
+                    # Schedule the listener without preventing re-execution
+                    listener_tasks.append(
+                        self._execute_single_listener(listener_name, result)
+                    )
             elif condition_type == "AND":
                 # Initialize pending methods for this listener if not already done
                 if listener_name not in self._pending_and_listeners:
                     self._pending_and_listeners[listener_name] = set(methods)
                 # Remove the trigger method from pending methods
-                if trigger_method in self._pending_and_listeners[listener_name]:
                 self._pending_and_listeners[listener_name].discard(trigger_method)
-
                 if not self._pending_and_listeners[listener_name]:
                     # All required methods have been executed
-                    triggered.append(listener_name)
+                    listener_tasks.append(
+                        self._execute_single_listener(listener_name, result)
+                    )
                     # Reset pending methods for this listener
                     self._pending_and_listeners.pop(listener_name, None)
 
-        return triggered
+        # Run all listener tasks concurrently and wait for them to complete
+        if listener_tasks:
+            await asyncio.gather(*listener_tasks)
 
     async def _execute_single_listener(self, listener_name: str, result: Any) -> None:
-        """
-        Executes a single listener method with proper event handling.
-
-        This internal method manages the execution of an individual listener,
-        including parameter inspection, event emission, and error handling.
-
-        Parameters
-        ----------
-        listener_name : str
-            The name of the listener method to execute.
-        result : Any
-            The result from the triggering method, which may be passed
-            to the listener if it accepts parameters.
-
-        Notes
-        -----
-        - Inspects method signature to determine if it accepts the trigger result
-        - Emits events for method execution start and finish
-        - Handles errors gracefully with detailed logging
-        - Recursively triggers listeners of this listener
-        - Supports both parameterized and parameter-less listeners
-
-        Error Handling
-        -------------
-        Catches and logs any exceptions during execution, preventing
-        individual listener failures from breaking the entire flow.
-        """
         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())
+
+            # Exclude 'self' parameter
             method_params = [p for p in params if p.name != "self"]
 
             if method_params:
+                # If listener expects parameters, pass the result
                 listener_result = await self._execute_method(
                     listener_name, method, result
                 )
             else:
+                # If listener does not expect parameters, call without arguments
                 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
+            # Execute listeners of this listener
             await self._execute_listeners(listener_name, listener_result)
-
         except Exception as e:
             print(
                 f"[Flow._execute_single_listener] Error in method {listener_name}: {e}"
@@ -679,4 +381,5 @@ class Flow(Generic[T], metaclass=FlowMeta):
         self._telemetry.flow_plotting_span(
             self.__class__.__name__, list(self._methods.keys())
         )
+
         plot_flow(self, filename)

src/crewai/flow/flow_events.py

@@ -1,33 +0,0 @@
-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/flow_visualizer.py

@@ -1,14 +1,12 @@
 # flow_visualizer.py
 
 import os
-from pathlib import Path
 
 from pyvis.network import Network
 
 from crewai.flow.config import COLORS, NODE_STYLES
 from crewai.flow.html_template_handler import HTMLTemplateHandler
 from crewai.flow.legend_generator import generate_legend_items_html, get_legend_items
-from crewai.flow.path_utils import safe_path_join, validate_path_exists
 from crewai.flow.utils import calculate_node_levels
 from crewai.flow.visualization_utils import (
     add_edges,
@@ -18,56 +16,12 @@ from crewai.flow.visualization_utils import (
 
 
 class FlowPlot:
-    """Handles the creation and rendering of flow visualization diagrams."""
-
     def __init__(self, flow):
-        """
-        Initialize FlowPlot with a flow object.
-
-        Parameters
-        ----------
-        flow : Flow
-            A Flow instance to visualize.
-
-        Raises
-        ------
-        ValueError
-            If flow object is invalid or missing required attributes.
-        """
-        if not hasattr(flow, '_methods'):
-            raise ValueError("Invalid flow object: missing '_methods' attribute")
-        if not hasattr(flow, '_listeners'):
-            raise ValueError("Invalid flow object: missing '_listeners' attribute")
-        if not hasattr(flow, '_start_methods'):
-            raise ValueError("Invalid flow object: missing '_start_methods' attribute")
-            
         self.flow = flow
         self.colors = COLORS
         self.node_styles = NODE_STYLES
 
     def plot(self, filename):
-        """
-        Generate and save an HTML visualization of the flow.
-
-        Parameters
-        ----------
-        filename : str
-            Name of the output file (without extension).
-
-        Raises
-        ------
-        ValueError
-            If filename is invalid or network generation fails.
-        IOError
-            If file operations fail or visualization cannot be generated.
-        RuntimeError
-            If network visualization generation fails.
-        """
-        if not filename or not isinstance(filename, str):
-            raise ValueError("Filename must be a non-empty string")
-            
-        try:
-            # Initialize network
         net = Network(
             directed=True,
             height="750px",
@@ -93,85 +47,34 @@ class FlowPlot:
         )
 
         # Calculate levels for nodes
-            try:
         node_levels = calculate_node_levels(self.flow)
-            except Exception as e:
-                raise ValueError(f"Failed to calculate node levels: {str(e)}")
 
         # Compute positions
-            try:
         node_positions = compute_positions(self.flow, node_levels)
-            except Exception as e:
-                raise ValueError(f"Failed to compute node positions: {str(e)}")
 
         # Add nodes to the network
-            try:
         add_nodes_to_network(net, self.flow, node_positions, self.node_styles)
-            except Exception as e:
-                raise RuntimeError(f"Failed to add nodes to network: {str(e)}")
 
         # Add edges to the network
-            try:
         add_edges(net, self.flow, node_positions, self.colors)
-            except Exception as e:
-                raise RuntimeError(f"Failed to add edges to network: {str(e)}")
 
-            # Generate HTML
-            try:
         network_html = net.generate_html()
         final_html_content = self._generate_final_html(network_html)
-            except Exception as e:
-                raise RuntimeError(f"Failed to generate network visualization: {str(e)}")
 
         # Save the final HTML content to the file
-            try:
         with open(f"{filename}.html", "w", encoding="utf-8") as f:
             f.write(final_html_content)
         print(f"Plot saved as {filename}.html")
-            except IOError as e:
-                raise IOError(f"Failed to save flow visualization to {filename}.html: {str(e)}")
 
-        except (ValueError, RuntimeError, IOError) as e:
-            raise e
-        except Exception as e:
-            raise RuntimeError(f"Unexpected error during flow visualization: {str(e)}")
-        finally:
         self._cleanup_pyvis_lib()
 
     def _generate_final_html(self, network_html):
-        """
-        Generate the final HTML content with network visualization and legend.
-
-        Parameters
-        ----------
-        network_html : str
-            HTML content generated by pyvis Network.
-
-        Returns
-        -------
-        str
-            Complete HTML content with styling and legend.
-
-        Raises
-        ------
-        IOError
-            If template or logo files cannot be accessed.
-        ValueError
-            If network_html is invalid.
-        """
-        if not network_html:
-            raise ValueError("Invalid network HTML content")
-
-        try:
         # Extract just the body content from the generated HTML
         current_dir = os.path.dirname(__file__)
-            template_path = safe_path_join("assets", "crewai_flow_visual_template.html", root=current_dir)
-            logo_path = safe_path_join("assets", "crewai_logo.svg", root=current_dir)
-
-            if not os.path.exists(template_path):
-                raise IOError(f"Template file not found: {template_path}")
-            if not os.path.exists(logo_path):
-                raise IOError(f"Logo file not found: {logo_path}")
+        template_path = os.path.join(
+            current_dir, "assets", "crewai_flow_visual_template.html"
+        )
+        logo_path = os.path.join(current_dir, "assets", "crewai_logo.svg")
 
         html_handler = HTMLTemplateHandler(template_path, logo_path)
         network_body = html_handler.extract_body_content(network_html)
@@ -183,44 +86,19 @@ class FlowPlot:
             network_body, legend_items_html
         )
         return final_html_content
-        except Exception as e:
-            raise IOError(f"Failed to generate visualization HTML: {str(e)}")
 
     def _cleanup_pyvis_lib(self):
-        """
-        Clean up the generated lib folder from pyvis.
-
-        This method safely removes the temporary lib directory created by pyvis
-        during network visualization generation.
-        """
+        # Clean up the generated lib folder
+        lib_folder = os.path.join(os.getcwd(), "lib")
         try:
-            lib_folder = safe_path_join("lib", root=os.getcwd())
             if os.path.exists(lib_folder) and os.path.isdir(lib_folder):
                 import shutil
+
                 shutil.rmtree(lib_folder)
-        except ValueError as e:
-            print(f"Error validating lib folder path: {e}")
         except Exception as e:
-            print(f"Error cleaning up lib folder: {e}")
+            print(f"Error cleaning up {lib_folder}: {e}")
 
 
 def plot_flow(flow, filename="flow_plot"):
-    """
-    Convenience function to create and save a flow visualization.
-
-    Parameters
-    ----------
-    flow : Flow
-        Flow instance to visualize.
-    filename : str, optional
-        Output filename without extension, by default "flow_plot".
-
-    Raises
-    ------
-    ValueError
-        If flow object or filename is invalid.
-    IOError
-        If file operations fail.
-    """
     visualizer = FlowPlot(flow)
     visualizer.plot(filename)

src/crewai/flow/html_template_handler.py

@@ -1,53 +1,26 @@
 import base64
 import re
-from pathlib import Path
-
-from crewai.flow.path_utils import safe_path_join, validate_path_exists
 
 
 class HTMLTemplateHandler:
-    """Handles HTML template processing and generation for flow visualization diagrams."""
-
     def __init__(self, template_path, logo_path):
-        """
-        Initialize HTMLTemplateHandler with validated template and logo paths.
-
-        Parameters
-        ----------
-        template_path : str
-            Path to the HTML template file.
-        logo_path : str
-            Path to the logo image file.
-
-        Raises
-        ------
-        ValueError
-            If template or logo paths are invalid or files don't exist.
-        """
-        try:
-            self.template_path = validate_path_exists(template_path, "file")
-            self.logo_path = validate_path_exists(logo_path, "file")
-        except ValueError as e:
-            raise ValueError(f"Invalid template or logo path: {e}")
+        self.template_path = template_path
+        self.logo_path = logo_path
 
     def read_template(self):
-        """Read and return the HTML template file contents."""
         with open(self.template_path, "r", encoding="utf-8") as f:
             return f.read()
 
     def encode_logo(self):
-        """Convert the logo SVG file to base64 encoded string."""
         with open(self.logo_path, "rb") as logo_file:
             logo_svg_data = logo_file.read()
             return base64.b64encode(logo_svg_data).decode("utf-8")
 
     def extract_body_content(self, html):
-        """Extract and return content between body tags from HTML string."""
         match = re.search("<body.*?>(.*?)</body>", html, re.DOTALL)
         return match.group(1) if match else ""
 
     def generate_legend_items_html(self, legend_items):
-        """Generate HTML markup for the legend items."""
         legend_items_html = ""
         for item in legend_items:
             if "border" in item:
@@ -75,7 +48,6 @@ class HTMLTemplateHandler:
         return legend_items_html
 
     def generate_final_html(self, network_body, legend_items_html, title="Flow Plot"):
-        """Combine all components into final HTML document with network visualization."""
         html_template = self.read_template()
         logo_svg_base64 = self.encode_logo()
 

src/crewai/flow/legend_generator.py

@@ -1,4 +1,3 @@
-
 def get_legend_items(colors):
     return [
         {"label": "Start Method", "color": colors["start"]},

src/crewai/flow/path_utils.py

@@ -1,135 +0,0 @@
-"""
-Path utilities for secure file operations in CrewAI flow module.
-
-This module provides utilities for secure path handling to prevent directory
-traversal attacks and ensure paths remain within allowed boundaries.
-"""
-
-import os
-from pathlib import Path
-from typing import List, Union
-
-
-def safe_path_join(*parts: str, root: Union[str, Path, None] = None) -> str:
-    """
-    Safely join path components and ensure the result is within allowed boundaries.
-
-    Parameters
-    ----------
-    *parts : str
-        Variable number of path components to join.
-    root : Union[str, Path, None], optional
-        Root directory to use as base. If None, uses current working directory.
-
-    Returns
-    -------
-    str
-        String representation of the resolved path.
-
-    Raises
-    ------
-    ValueError
-        If the resulting path would be outside the root directory
-        or if any path component is invalid.
-    """
-    if not parts:
-        raise ValueError("No path components provided")
-
-    try:
-        # Convert all parts to strings and clean them
-        clean_parts = [str(part).strip() for part in parts if part]
-        if not clean_parts:
-            raise ValueError("No valid path components provided")
-
-        # Establish root directory
-        root_path = Path(root).resolve() if root else Path.cwd()
-        
-        # Join and resolve the full path
-        full_path = Path(root_path, *clean_parts).resolve()
-        
-        # Check if the resolved path is within root
-        if not str(full_path).startswith(str(root_path)):
-            raise ValueError(
-                f"Invalid path: Potential directory traversal. Path must be within {root_path}"
-            )
-            
-        return str(full_path)
-        
-    except Exception as e:
-        if isinstance(e, ValueError):
-            raise
-        raise ValueError(f"Invalid path components: {str(e)}")
-
-
-def validate_path_exists(path: Union[str, Path], file_type: str = "file") -> str:
-    """
-    Validate that a path exists and is of the expected type.
-
-    Parameters
-    ----------
-    path : Union[str, Path]
-        Path to validate.
-    file_type : str, optional
-        Expected type ('file' or 'directory'), by default 'file'.
-
-    Returns
-    -------
-    str
-        Validated path as string.
-
-    Raises
-    ------
-    ValueError
-        If path doesn't exist or is not of expected type.
-    """
-    try:
-        path_obj = Path(path).resolve()
-        
-        if not path_obj.exists():
-            raise ValueError(f"Path does not exist: {path}")
-            
-        if file_type == "file" and not path_obj.is_file():
-            raise ValueError(f"Path is not a file: {path}")
-        elif file_type == "directory" and not path_obj.is_dir():
-            raise ValueError(f"Path is not a directory: {path}")
-            
-        return str(path_obj)
-        
-    except Exception as e:
-        if isinstance(e, ValueError):
-            raise
-        raise ValueError(f"Invalid path: {str(e)}")
-
-
-def list_files(directory: Union[str, Path], pattern: str = "*") -> List[str]:
-    """
-    Safely list files in a directory matching a pattern.
-
-    Parameters
-    ----------
-    directory : Union[str, Path]
-        Directory to search in.
-    pattern : str, optional
-        Glob pattern to match files against, by default "*".
-
-    Returns
-    -------
-    List[str]
-        List of matching file paths.
-
-    Raises
-    ------
-    ValueError
-        If directory is invalid or inaccessible.
-    """
-    try:
-        dir_path = Path(directory).resolve()
-        if not dir_path.is_dir():
-            raise ValueError(f"Not a directory: {directory}")
-            
-        return [str(p) for p in dir_path.glob(pattern) if p.is_file()]
-        
-    except Exception as e:
-        if isinstance(e, ValueError):
-            raise
-        raise ValueError(f"Error listing files: {str(e)}")

src/crewai/flow/utils.py

@@ -1,25 +1,9 @@
-"""
-Utility functions for flow visualization and dependency analysis.
-
-This module provides core functionality for analyzing and manipulating flow structures,
-including node level calculation, ancestor tracking, and return value analysis.
-Functions in this module are primarily used by the visualization system to create
-accurate and informative flow diagrams.
-
-Example
--------
->>> flow = Flow()
->>> node_levels = calculate_node_levels(flow)
->>> ancestors = build_ancestor_dict(flow)
-"""
-
 import ast
 import inspect
 import textwrap
-from typing import Any, Dict, List, Optional, Set, Union
 
 
-def get_possible_return_constants(function: Any) -> Optional[List[str]]:
+def get_possible_return_constants(function):
     try:
         source = inspect.getsource(function)
     except OSError:
@@ -47,80 +31,23 @@ def get_possible_return_constants(function: Any) -> Optional[List[str]]:
         print(f"Source code:\n{source}")
         return None
 
-    return_values = set()
-    dict_definitions = {}
-
-    class DictionaryAssignmentVisitor(ast.NodeVisitor):
-        def visit_Assign(self, node):
-            # Check if this assignment is assigning a dictionary literal to a variable
-            if isinstance(node.value, ast.Dict) and len(node.targets) == 1:
-                target = node.targets[0]
-                if isinstance(target, ast.Name):
-                    var_name = target.id
-                    dict_values = []
-                    # Extract string values from the dictionary
-                    for val in node.value.values:
-                        if isinstance(val, ast.Constant) and isinstance(val.value, str):
-                            dict_values.append(val.value)
-                        # If non-string, skip or just ignore
-                    if dict_values:
-                        dict_definitions[var_name] = dict_values
-            self.generic_visit(node)
+    return_values = []
 
     class ReturnVisitor(ast.NodeVisitor):
         def visit_Return(self, node):
-            # Direct string return
-            if isinstance(node.value, ast.Constant) and isinstance(
-                node.value.value, str
-            ):
-                return_values.add(node.value.value)
-            # Dictionary-based return, like return paths[result]
-            elif isinstance(node.value, ast.Subscript):
-                # Check if we're subscripting a known dictionary variable
-                if isinstance(node.value.value, ast.Name):
-                    var_name = node.value.value.id
-                    if var_name in dict_definitions:
-                        # Add all possible dictionary values
-                        for v in dict_definitions[var_name]:
-                            return_values.add(v)
-            self.generic_visit(node)
+            # Check if the return value is a constant (Python 3.8+)
+            if isinstance(node.value, ast.Constant):
+                return_values.append(node.value.value)
 
-    # First pass: identify dictionary assignments
-    DictionaryAssignmentVisitor().visit(code_ast)
-    # Second pass: identify returns
     ReturnVisitor().visit(code_ast)
-
-    return list(return_values) if return_values else None
+    return return_values
 
 
-def calculate_node_levels(flow: Any) -> Dict[str, int]:
-    """
-    Calculate the hierarchical level of each node in the flow.
-
-    Performs a breadth-first traversal of the flow graph to assign levels
-    to nodes, starting with start methods at level 0.
-
-    Parameters
-    ----------
-    flow : Any
-        The flow instance containing methods, listeners, and router configurations.
-
-    Returns
-    -------
-    Dict[str, int]
-        Dictionary mapping method names to their hierarchical levels.
-
-    Notes
-    -----
-    - Start methods are assigned level 0
-    - Each subsequent connected node is assigned level = parent_level + 1
-    - Handles both OR and AND conditions for listeners
-    - Processes router paths separately
-    """
-    levels: Dict[str, int] = {}
-    queue: List[str] = []
-    visited: Set[str] = set()
-    pending_and_listeners: Dict[str, Set[str]] = {}
+def calculate_node_levels(flow):
+    levels = {}
+    queue = []
+    visited = set()
+    pending_and_listeners = {}
 
     # Make all start methods at level 0
     for method_name, method in flow._methods.items():
@@ -134,7 +61,10 @@ def calculate_node_levels(flow: Any) -> Dict[str, int]:
         current_level = levels[current]
         visited.add(current)
 
-        for listener_name, (condition_type, trigger_methods) in flow._listeners.items():
+        for listener_name, (
+            condition_type,
+            trigger_methods,
+        ) in flow._listeners.items():
             if condition_type == "OR":
                 if current in trigger_methods:
                     if (
@@ -159,7 +89,7 @@ def calculate_node_levels(flow: Any) -> Dict[str, int]:
                             queue.append(listener_name)
 
         # Handle router connections
-        if current in flow._routers:
+        if current in flow._routers.values():
             router_method_name = current
             paths = flow._router_paths.get(router_method_name, [])
             for path in paths:
@@ -175,24 +105,10 @@ def calculate_node_levels(flow: Any) -> Dict[str, int]:
                             levels[listener_name] = current_level + 1
                             if listener_name not in visited:
                                 queue.append(listener_name)
-
     return levels
 
 
-def count_outgoing_edges(flow: Any) -> Dict[str, int]:
-    """
-    Count the number of outgoing edges for each method in the flow.
-
-    Parameters
-    ----------
-    flow : Any
-        The flow instance to analyze.
-
-    Returns
-    -------
-    Dict[str, int]
-        Dictionary mapping method names to their outgoing edge count.
-    """
+def count_outgoing_edges(flow):
     counts = {}
     for method_name in flow._methods:
         counts[method_name] = 0
@@ -204,53 +120,16 @@ def count_outgoing_edges(flow: Any) -> Dict[str, int]:
     return counts
 
 
-def build_ancestor_dict(flow: Any) -> Dict[str, Set[str]]:
-    """
-    Build a dictionary mapping each node to its ancestor nodes.
-
-    Parameters
-    ----------
-    flow : Any
-        The flow instance to analyze.
-
-    Returns
-    -------
-    Dict[str, Set[str]]
-        Dictionary mapping each node to a set of its ancestor nodes.
-    """
-    ancestors: Dict[str, Set[str]] = {node: set() for node in flow._methods}
-    visited: Set[str] = set()
+def build_ancestor_dict(flow):
+    ancestors = {node: set() for node in flow._methods}
+    visited = set()
     for node in flow._methods:
         if node not in visited:
             dfs_ancestors(node, ancestors, visited, flow)
     return ancestors
 
 
-def dfs_ancestors(
-    node: str,
-    ancestors: Dict[str, Set[str]],
-    visited: Set[str],
-    flow: Any
-) -> None:
-    """
-    Perform depth-first search to build ancestor relationships.
-
-    Parameters
-    ----------
-    node : str
-        Current node being processed.
-    ancestors : Dict[str, Set[str]]
-        Dictionary tracking ancestor relationships.
-    visited : Set[str]
-        Set of already visited nodes.
-    flow : Any
-        The flow instance being analyzed.
-
-    Notes
-    -----
-    This function modifies the ancestors dictionary in-place to build
-    the complete ancestor graph.
-    """
+def dfs_ancestors(node, ancestors, visited, flow):
     if node in visited:
         return
     visited.add(node)
@@ -263,7 +142,7 @@ def dfs_ancestors(
             dfs_ancestors(listener_name, ancestors, visited, flow)
 
     # Handle router methods separately
-    if node in flow._routers:
+    if node in flow._routers.values():
         router_method_name = node
         paths = flow._router_paths.get(router_method_name, [])
         for path in paths:
@@ -274,48 +153,12 @@ def dfs_ancestors(
                     dfs_ancestors(listener_name, ancestors, visited, flow)
 
 
-def is_ancestor(node: str, ancestor_candidate: str, ancestors: Dict[str, Set[str]]) -> bool:
-    """
-    Check if one node is an ancestor of another.
-
-    Parameters
-    ----------
-    node : str
-        The node to check ancestors for.
-    ancestor_candidate : str
-        The potential ancestor node.
-    ancestors : Dict[str, Set[str]]
-        Dictionary containing ancestor relationships.
-
-    Returns
-    -------
-    bool
-        True if ancestor_candidate is an ancestor of node, False otherwise.
-    """
+def is_ancestor(node, ancestor_candidate, ancestors):
     return ancestor_candidate in ancestors.get(node, set())
 
 
-def build_parent_children_dict(flow: Any) -> Dict[str, List[str]]:
-    """
-    Build a dictionary mapping parent nodes to their children.
-
-    Parameters
-    ----------
-    flow : Any
-        The flow instance to analyze.
-
-    Returns
-    -------
-    Dict[str, List[str]]
-        Dictionary mapping parent method names to lists of their child method names.
-
-    Notes
-    -----
-    - Maps listeners to their trigger methods
-    - Maps router methods to their paths and listeners
-    - Children lists are sorted for consistent ordering
-    """
-    parent_children: Dict[str, List[str]] = {}
+def build_parent_children_dict(flow):
+    parent_children = {}
 
     # Map listeners to their trigger methods
     for listener_name, (_, trigger_methods) in flow._listeners.items():
@@ -339,24 +182,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:
-    """
-    Get the index of a child node in its parent's sorted children list.
-
-    Parameters
-    ----------
-    parent : str
-        The parent node name.
-    child : str
-        The child node name to find the index for.
-    parent_children : Dict[str, List[str]]
-        Dictionary mapping parents to their children lists.
-
-    Returns
-    -------
-    int
-        Zero-based index of the child in its parent's sorted children list.
-    """
+def get_child_index(parent, child, parent_children):
     children = parent_children.get(parent, [])
     children.sort()
     return children.index(child)

src/crewai/flow/visualization_utils.py

@@ -1,23 +1,5 @@
-"""
-Utilities for creating visual representations of flow structures.
-
-This module provides functions for generating network visualizations of flows,
-including node placement, edge creation, and visual styling. It handles the
-conversion of flow structures into visual network graphs with appropriate
-styling and layout.
-
-Example
--------
->>> flow = Flow()
->>> net = Network(directed=True)
->>> node_positions = compute_positions(flow, node_levels)
->>> add_nodes_to_network(net, flow, node_positions, node_styles)
->>> add_edges(net, flow, node_positions, colors)
-"""
-
 import ast
 import inspect
-from typing import Any, Dict, List, Optional, Tuple, Union
 
 from .utils import (
     build_ancestor_dict,
@@ -27,25 +9,8 @@ from .utils import (
 )
 
 
-def method_calls_crew(method: Any) -> bool:
-    """
-    Check if the method contains a call to `.crew()`.
-
-    Parameters
-    ----------
-    method : Any
-        The method to analyze for crew() calls.
-
-    Returns
-    -------
-    bool
-        True if the method calls .crew(), False otherwise.
-
-    Notes
-    -----
-    Uses AST analysis to detect method calls, specifically looking for
-    attribute access of 'crew'.
-    """
+def method_calls_crew(method):
+    """Check if the method calls `.crew()`."""
     try:
         source = inspect.getsource(method)
         source = inspect.cleandoc(source)
@@ -55,7 +20,6 @@ def method_calls_crew(method: Any) -> bool:
         return False
 
     class CrewCallVisitor(ast.NodeVisitor):
-        """AST visitor to detect .crew() method calls."""
         def __init__(self):
             self.found = False
 
@@ -70,34 +34,7 @@ def method_calls_crew(method: Any) -> bool:
     return visitor.found
 
 
-def add_nodes_to_network(
-    net: Any,
-    flow: Any,
-    node_positions: Dict[str, Tuple[float, float]],
-    node_styles: Dict[str, Dict[str, Any]]
-) -> None:
-    """
-    Add nodes to the network visualization with appropriate styling.
-
-    Parameters
-    ----------
-    net : Any
-        The pyvis Network instance to add nodes to.
-    flow : Any
-        The flow instance containing method information.
-    node_positions : Dict[str, Tuple[float, float]]
-        Dictionary mapping node names to their (x, y) positions.
-    node_styles : Dict[str, Dict[str, Any]]
-        Dictionary containing style configurations for different node types.
-
-    Notes
-    -----
-    Node types include:
-    - Start methods
-    - Router methods
-    - Crew methods
-    - Regular methods
-    """
+def add_nodes_to_network(net, flow, node_positions, node_styles):
     def human_friendly_label(method_name):
         return method_name.replace("_", " ").title()
 
@@ -136,33 +73,9 @@ def add_nodes_to_network(
         )
 
 
-def compute_positions(
-    flow: Any,
-    node_levels: Dict[str, int],
-    y_spacing: float = 150,
-    x_spacing: float = 150
-) -> Dict[str, Tuple[float, float]]:
-    """
-    Compute the (x, y) positions for each node in the flow graph.
-
-    Parameters
-    ----------
-    flow : Any
-        The flow instance to compute positions for.
-    node_levels : Dict[str, int]
-        Dictionary mapping node names to their hierarchical levels.
-    y_spacing : float, optional
-        Vertical spacing between levels, by default 150.
-    x_spacing : float, optional
-        Horizontal spacing between nodes, by default 150.
-
-    Returns
-    -------
-    Dict[str, Tuple[float, float]]
-        Dictionary mapping node names to their (x, y) coordinates.
-    """
-    level_nodes: Dict[int, List[str]] = {}
-    node_positions: Dict[str, Tuple[float, float]] = {}
+def compute_positions(flow, node_levels, y_spacing=150, x_spacing=150):
+    level_nodes = {}
+    node_positions = {}
 
     for method_name, level in node_levels.items():
         level_nodes.setdefault(level, []).append(method_name)
@@ -177,44 +90,16 @@ def compute_positions(
     return node_positions
 
 
-def add_edges(
-    net: Any,
-    flow: Any,
-    node_positions: Dict[str, Tuple[float, float]],
-    colors: Dict[str, str]
-) -> None:
-    edge_smooth: Dict[str, Union[str, float]] = {"type": "continuous"}  # Default value
-    """
-    Add edges to the network visualization with appropriate styling.
-
-    Parameters
-    ----------
-    net : Any
-        The pyvis Network instance to add edges to.
-    flow : Any
-        The flow instance containing edge information.
-    node_positions : Dict[str, Tuple[float, float]]
-        Dictionary mapping node names to their positions.
-    colors : Dict[str, str]
-        Dictionary mapping edge types to their colors.
-
-    Notes
-    -----
-    - Handles both normal listener edges and router edges
-    - Applies appropriate styling (color, dashes) based on edge type
-    - Adds curvature to edges when needed (cycles or multiple children)
-    """
+def add_edges(net, flow, node_positions, colors):
     ancestors = build_ancestor_dict(flow)
     parent_children = build_parent_children_dict(flow)
 
-    # Edges for normal listeners
     for method_name in flow._listeners:
         condition_type, trigger_methods = flow._listeners[method_name]
         is_and_condition = condition_type == "AND"
 
         for trigger in trigger_methods:
-            # Check if nodes exist before adding edges
-            if trigger in node_positions and method_name in node_positions:
+            if trigger in flow._methods or trigger in flow._routers.values():
                 is_router_edge = any(
                     trigger in paths for paths in flow._router_paths.values()
                 )
@@ -239,7 +124,7 @@ def add_edges(
                     else:
                         edge_smooth = {"type": "cubicBezier"}
                 else:
-                    edge_smooth.update({"type": "continuous"})
+                    edge_smooth = False
 
                 edge_style = {
                     "color": edge_color,
@@ -250,22 +135,7 @@ def add_edges(
                 }
 
                 net.add_edge(trigger, method_name, **edge_style)
-            else:
-                # Nodes not found in node_positions. Check if it's a known router outcome and a known method.
-                is_router_edge = any(
-                    trigger in paths for paths in flow._router_paths.values()
-                )
-                # Check if method_name is a known method
-                method_known = method_name in flow._methods
 
-                # If it's a known router edge and the method is known, don't warn.
-                # This means the path is legitimate, just not reflected as nodes here.
-                if not (is_router_edge and method_known):
-                    print(
-                        f"Warning: No node found for '{trigger}' or '{method_name}'. Skipping edge."
-                    )
-
-    # Edges for router return paths
     for router_method_name, paths in flow._router_paths.items():
         for path in paths:
             for listener_name, (
@@ -273,13 +143,7 @@ def add_edges(
                 trigger_methods,
             ) in flow._listeners.items():
                 if path in trigger_methods:
-                    if (
-                        router_method_name in node_positions
-                        and listener_name in node_positions
-                    ):
-                        is_cycle_edge = is_ancestor(
-                            router_method_name, listener_name, ancestors
-                        )
+                    is_cycle_edge = is_ancestor(trigger, method_name, ancestors)
                     parent_has_multiple_children = (
                         len(parent_children.get(router_method_name, [])) > 1
                     )
@@ -302,7 +166,7 @@ def add_edges(
                         else:
                             edge_smooth = {"type": "cubicBezier"}
                     else:
-                            edge_smooth.update({"type": "continuous"})
+                        edge_smooth = False
 
                     edge_style = {
                         "color": colors["router_edge"],
@@ -312,10 +176,3 @@ def add_edges(
                         "smooth": edge_smooth,
                     }
                     net.add_edge(router_method_name, listener_name, **edge_style)
-                    else:
-                        # Same check here: known router edge and known method?
-                        method_known = listener_name in flow._methods
-                        if not method_known:
-                            print(
-                                f"Warning: No node found for '{router_method_name}' or '{listener_name}'. Skipping edge."
-                            )

src/crewai/knowledge/knowledge.py

@@ -14,13 +14,13 @@ class Knowledge(BaseModel):
     Knowledge is a collection of sources and setup for the vector store to save and query relevant context.
     Args:
         sources: List[BaseKnowledgeSource] = Field(default_factory=list)
-        storage: Optional[KnowledgeStorage] = Field(default=None)
+        storage: KnowledgeStorage = Field(default_factory=KnowledgeStorage)
         embedder_config: Optional[Dict[str, Any]] = None
     """
 
     sources: List[BaseKnowledgeSource] = Field(default_factory=list)
     model_config = ConfigDict(arbitrary_types_allowed=True)
-    storage: Optional[KnowledgeStorage] = Field(default=None)
+    storage: KnowledgeStorage = Field(default_factory=KnowledgeStorage)
     embedder_config: Optional[Dict[str, Any]] = None
     collection_name: Optional[str] = None
 
@@ -49,12 +49,7 @@ class Knowledge(BaseModel):
         """
         Query across all knowledge sources to find the most relevant information.
         Returns the top_k most relevant chunks.
-        
-        Raises:
-            ValueError: If storage is not initialized.
         """
-        if self.storage is None:
-            raise ValueError("Storage is not initialized.")
 
         results = self.storage.search(
             query,

src/crewai/knowledge/source/base_file_knowledge_source.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Dict, List, Optional, Union
+from typing import Dict, List, Union
 
-from pydantic import Field, field_validator
+from pydantic import Field
 
 from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource
 from crewai.knowledge.storage.knowledge_storage import KnowledgeStorage
@@ -14,29 +14,17 @@ class BaseFileKnowledgeSource(BaseKnowledgeSource, ABC):
     """Base class for knowledge sources that load content from files."""
 
     _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"
+    file_path: Union[Path, List[Path], str, List[str]] = Field(
+        ..., description="The path to the file"
     )
     content: Dict[Path, str] = Field(init=False, default_factory=dict)
-    storage: Optional[KnowledgeStorage] = Field(default=None)
+    storage: KnowledgeStorage = Field(default_factory=KnowledgeStorage)
     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 model_post_init(self, _):
         """Post-initialization method to load content."""
         self.safe_file_paths = self._process_file_paths()
-        self.validate_content()
+        self.validate_paths()
         self.content = self.load_content()
 
     @abstractmethod
@@ -44,13 +32,13 @@ class BaseFileKnowledgeSource(BaseKnowledgeSource, ABC):
         """Load and preprocess file content. Should be overridden by subclasses. Assume that the file path is relative to the project root in the knowledge directory."""
         pass
 
-    def validate_content(self):
+    def validate_paths(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.",
+                    f"File not found: {path}. Try adding sources to the knowledge directory. If its inside the knowledge directory, use the relative path.",
                     color="red",
                 )
                 raise FileNotFoundError(f"File not found: {path}")
@@ -63,10 +51,7 @@ class BaseFileKnowledgeSource(BaseKnowledgeSource, ABC):
 
     def _save_documents(self):
         """Save the documents to the storage."""
-        if self.storage:
         self.storage.save(self.chunks)
-        else:
-            raise ValueError("No storage found to save documents.")
 
     def convert_to_path(self, path: Union[Path, str]) -> Path:
         """Convert a path to a Path object."""
@@ -74,30 +59,13 @@ class BaseFileKnowledgeSource(BaseKnowledgeSource, ABC):
 
     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 []
+        paths = (
+            [self.file_path]
+            if isinstance(self.file_path, (str, Path))
+            else self.file_path
         )
 
-        if not path_list:
-            raise ValueError(
-                "file_path/file_paths must be a Path, str, or a list of these types"
-            )
+        if not isinstance(paths, list):
+            raise ValueError("file_path must be a Path, str, or a list of these types")
 
-        return [self.convert_to_path(path) for path in path_list]
+        return [self.convert_to_path(path) for path in paths]

src/crewai/knowledge/source/base_knowledge_source.py

@@ -16,12 +16,12 @@ class BaseKnowledgeSource(BaseModel, ABC):
     chunk_embeddings: List[np.ndarray] = Field(default_factory=list)
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
-    storage: Optional[KnowledgeStorage] = Field(default=None)
+    storage: KnowledgeStorage = Field(default_factory=KnowledgeStorage)
     metadata: Dict[str, Any] = Field(default_factory=dict)  # Currently unused
     collection_name: Optional[str] = Field(default=None)
 
     @abstractmethod
-    def validate_content(self) -> Any:
+    def load_content(self) -> Dict[Any, str]:
         """Load and preprocess content from the source."""
         pass
 
@@ -46,7 +46,4 @@ class BaseKnowledgeSource(BaseModel, ABC):
         Save the documents to the storage.
         This method should be called after the chunks and embeddings are generated.
         """
-        if self.storage:
         self.storage.save(self.chunks)
-        else:
-            raise ValueError("No storage found to save documents.")

src/crewai/knowledge/source/crew_docling_source.py

@@ -1,133 +0,0 @@
-from pathlib import Path
-from typing import Iterator, List, Optional, Union
-from urllib.parse import urlparse
-
-try:
-    from docling.datamodel.base_models import InputFormat
-    from docling.document_converter import DocumentConverter
-    from docling.exceptions import ConversionError
-    from docling_core.transforms.chunker.hierarchical_chunker import HierarchicalChunker
-    from docling_core.types.doc.document import DoclingDocument
-    DOCLING_AVAILABLE = True
-except ImportError:
-    DOCLING_AVAILABLE = False
-
-from pydantic import Field
-
-from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource
-from crewai.utilities.constants import KNOWLEDGE_DIRECTORY
-from crewai.utilities.logger import Logger
-
-
-class CrewDoclingSource(BaseKnowledgeSource):
-    """Default Source class for converting documents to markdown or json
-    This will auto support PDF, DOCX, and TXT, XLSX, Images, and HTML files without any additional dependencies and follows the docling package as the source of truth.
-    """
-
-    def __init__(self, *args, **kwargs):
-        if not DOCLING_AVAILABLE:
-            raise ImportError(
-                "The docling package is required to use CrewDoclingSource. "
-                "Please install it using: uv add docling"
-            )
-        super().__init__(*args, **kwargs)
-
-    _logger: Logger = Logger(verbose=True)
-
-    file_path: Optional[List[Union[Path, str]]] = Field(default=None)
-    file_paths: List[Union[Path, str]] = Field(default_factory=list)
-    chunks: List[str] = Field(default_factory=list)
-    safe_file_paths: List[Union[Path, str]] = Field(default_factory=list)
-    content: List[DoclingDocument] = Field(default_factory=list)
-    document_converter: DocumentConverter = Field(
-        default_factory=lambda: DocumentConverter(
-            allowed_formats=[
-                InputFormat.MD,
-                InputFormat.ASCIIDOC,
-                InputFormat.PDF,
-                InputFormat.DOCX,
-                InputFormat.HTML,
-                InputFormat.IMAGE,
-                InputFormat.XLSX,
-                InputFormat.PPTX,
-            ]
-        )
-    )
-
-    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.validate_content()
-        self.content = self._load_content()
-
-    def _load_content(self) -> List[DoclingDocument]:
-        try:
-            return self._convert_source_to_docling_documents()
-        except ConversionError as e:
-            self._logger.log(
-                "error",
-                f"Error loading content: {e}. Supported formats: {self.document_converter.allowed_formats}",
-                "red",
-            )
-            raise e
-        except Exception as e:
-            self._logger.log("error", f"Error loading content: {e}")
-            raise e
-
-    def add(self) -> None:
-        if self.content is None:
-            return
-        for doc in self.content:
-            new_chunks_iterable = self._chunk_doc(doc)
-            self.chunks.extend(list(new_chunks_iterable))
-        self._save_documents()
-
-    def _convert_source_to_docling_documents(self) -> List[DoclingDocument]:
-        conv_results_iter = self.document_converter.convert_all(self.safe_file_paths)
-        return [result.document for result in conv_results_iter]
-
-    def _chunk_doc(self, doc: DoclingDocument) -> Iterator[str]:
-        chunker = HierarchicalChunker()
-        for chunk in chunker.chunk(doc):
-            yield chunk.text
-
-    def validate_content(self) -> List[Union[Path, str]]:
-        processed_paths: List[Union[Path, str]] = []
-        for path in self.file_paths:
-            if isinstance(path, str):
-                if path.startswith(("http://", "https://")):
-                    try:
-                        if self._validate_url(path):
-                            processed_paths.append(path)
-                        else:
-                            raise ValueError(f"Invalid URL format: {path}")
-                    except Exception as e:
-                        raise ValueError(f"Invalid URL: {path}. Error: {str(e)}")
-                else:
-                    local_path = Path(KNOWLEDGE_DIRECTORY + "/" + path)
-                    if local_path.exists():
-                        processed_paths.append(local_path)
-                    else:
-                        raise FileNotFoundError(f"File not found: {local_path}")
-            else:
-                # this is an instance of Path
-                processed_paths.append(path)
-        return processed_paths
-
-    def _validate_url(self, url: str) -> bool:
-        try:
-            result = urlparse(url)
-            return all(
-                [
-                    result.scheme in ("http", "https"),
-                    result.netloc,
-                    len(result.netloc.split(".")) >= 2,  # Ensure domain has TLD
-                ]
-            )
-        except Exception:
-            return False

src/crewai/knowledge/source/string_knowledge_source.py

@@ -13,9 +13,9 @@ class StringKnowledgeSource(BaseKnowledgeSource):
 
     def model_post_init(self, _):
         """Post-initialization method to validate content."""
-        self.validate_content()
+        self.load_content()
 
-    def validate_content(self):
+    def load_content(self):
         """Validate string content."""
         if not isinstance(self.content, str):
             raise ValueError("StringKnowledgeSource only accepts string content")

src/crewai/knowledge/storage/base_knowledge_storage.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Any, Dict, List, Optional
+from typing import Dict, Any, List, Optional
 
 
 class BaseKnowledgeStorage(ABC):

src/crewai/knowledge/storage/knowledge_storage.py

@@ -3,7 +3,6 @@ import hashlib
 import io
 import logging
 import os
-import shutil
 from typing import Any, Dict, List, Optional, Union, cast
 
 import chromadb
@@ -14,7 +13,6 @@ from chromadb.config import Settings
 
 from crewai.knowledge.storage.base_knowledge_storage import BaseKnowledgeStorage
 from crewai.utilities import EmbeddingConfigurator
-from crewai.utilities.constants import KNOWLEDGE_DIRECTORY
 from crewai.utilities.logger import Logger
 from crewai.utilities.paths import db_storage_path
 
@@ -107,61 +105,38 @@ class KnowledgeStorage(BaseKnowledgeStorage):
             raise Exception("Failed to create or get collection")
 
     def reset(self):
-        base_path = os.path.join(db_storage_path(), KNOWLEDGE_DIRECTORY)
-        if not self.app:
+        if self.app:
+            self.app.reset()
+        else:
+            base_path = os.path.join(db_storage_path(), "knowledge")
             self.app = chromadb.PersistentClient(
                 path=base_path,
                 settings=Settings(allow_reset=True),
             )
-
             self.app.reset()
-        shutil.rmtree(base_path)
-        self.app = None
-        self.collection = None
 
     def save(
         self,
         documents: List[str],
         metadata: Optional[Union[Dict[str, Any], List[Dict[str, Any]]]] = None,
     ):
-        if not self.collection:
-            raise Exception("Collection not initialized")
-
+        if self.collection:
             try:
-            # Create a dictionary to store unique documents
-            unique_docs = {}
-
-            # Generate IDs and create a mapping of id -> (document, metadata)
-            for idx, doc in enumerate(documents):
-                doc_id = hashlib.sha256(doc.encode("utf-8")).hexdigest()
-                doc_metadata = None
-                if metadata is not None:
-                    if isinstance(metadata, list):
-                        doc_metadata = metadata[idx]
+                if metadata is None:
+                    metadatas: Optional[OneOrMany[chromadb.Metadata]] = None
+                elif isinstance(metadata, list):
+                    metadatas = [cast(chromadb.Metadata, m) for m in metadata]
                 else:
-                        doc_metadata = metadata
-                unique_docs[doc_id] = (doc, doc_metadata)
+                    metadatas = cast(chromadb.Metadata, metadata)
 
-            # Prepare filtered lists for ChromaDB
-            filtered_docs = []
-            filtered_metadata = []
-            filtered_ids = []
-
-            # Build the filtered lists
-            for doc_id, (doc, meta) in unique_docs.items():
-                filtered_docs.append(doc)
-                filtered_metadata.append(meta)
-                filtered_ids.append(doc_id)
-
-            # If we have no metadata at all, set it to None
-            final_metadata: Optional[OneOrMany[chromadb.Metadata]] = (
-                None if all(m is None for m in filtered_metadata) else filtered_metadata
-            )
+                ids = [
+                    hashlib.sha256(doc.encode("utf-8")).hexdigest() for doc in documents
+                ]
 
                 self.collection.upsert(
-                documents=filtered_docs,
-                metadatas=final_metadata,
-                ids=filtered_ids,
+                    documents=documents,
+                    metadatas=metadatas,
+                    ids=ids,
                 )
             except chromadb.errors.InvalidDimensionException as e:
                 Logger(verbose=True).log(
@@ -175,8 +150,12 @@ class KnowledgeStorage(BaseKnowledgeStorage):
                     "Try resetting the collection using `crewai reset-memories -a`"
                 ) from e
             except Exception as e:
-            Logger(verbose=True).log("error", f"Failed to upsert documents: {e}", "red")
+                Logger(verbose=True).log(
+                    "error", f"Failed to upsert documents: {e}", "red"
+                )
                 raise
+        else:
+            raise Exception("Collection not initialized")
 
     def _create_default_embedding_function(self):
         from chromadb.utils.embedding_functions.openai_embedding_function import (

src/crewai/llm.py

@@ -6,10 +6,8 @@ import warnings
 from contextlib import contextmanager
 from typing import Any, Dict, List, Optional, Union
 
-with warnings.catch_warnings():
-    warnings.simplefilter("ignore", UserWarning)
-    import litellm
-    from litellm import get_supported_openai_params
+import litellm
+from litellm import get_supported_openai_params
 
 from crewai.utilities.exceptions.context_window_exceeding_exception import (
     LLMContextLengthExceededException,
@@ -45,11 +43,6 @@ LLM_CONTEXT_WINDOW_SIZES = {
     "gpt-4-turbo": 128000,
     "o1-preview": 128000,
     "o1-mini": 128000,
-    # gemini
-    "gemini-2.0-flash": 1048576,
-    "gemini-1.5-pro": 2097152,
-    "gemini-1.5-flash": 1048576,
-    "gemini-1.5-flash-8b": 1048576,
     # deepseek
     "deepseek-chat": 128000,
     # groq
@@ -66,13 +59,8 @@ LLM_CONTEXT_WINDOW_SIZES = {
     "llama3-70b-8192": 8192,
     "llama3-8b-8192": 8192,
     "mixtral-8x7b-32768": 32768,
-    "llama-3.3-70b-versatile": 128000,
-    "llama-3.3-70b-instruct": 128000,
 }
 
-DEFAULT_CONTEXT_WINDOW_SIZE = 8192
-CONTEXT_WINDOW_USAGE_RATIO = 0.75
-
 
 @contextmanager
 def suppress_warnings():
@@ -136,11 +124,10 @@ class LLM:
         self.api_version = api_version
         self.api_key = api_key
         self.callbacks = callbacks
-        self.context_window_size = 0
         self.kwargs = kwargs
 
         litellm.drop_params = True
-
+        litellm.set_verbose = False
         self.set_callbacks(callbacks)
         self.set_env_callbacks()
 
@@ -204,16 +191,7 @@ class LLM:
 
     def get_context_window_size(self) -> int:
         # Only using 75% of the context window size to avoid cutting the message in the middle
-        if self.context_window_size != 0:
-            return self.context_window_size
-
-        self.context_window_size = int(
-            DEFAULT_CONTEXT_WINDOW_SIZE * CONTEXT_WINDOW_USAGE_RATIO
-        )
-        for key, value in LLM_CONTEXT_WINDOW_SIZES.items():
-            if self.model.startswith(key):
-                self.context_window_size = int(value * CONTEXT_WINDOW_USAGE_RATIO)
-        return self.context_window_size
+        return int(LLM_CONTEXT_WINDOW_SIZES.get(self.model, 8192) * 0.75)
 
     def set_callbacks(self, callbacks: List[Any]):
         callback_types = [type(callback) for callback in callbacks]

src/crewai/memory/contextual/contextual_memory.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Optional, Dict, Any
 
 from crewai.memory import EntityMemory, LongTermMemory, ShortTermMemory, UserMemory
 

src/crewai/memory/memory.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, Optional, List
 
 from crewai.memory.storage.rag_storage import RAGStorage
 

src/crewai/memory/short_term/short_term_memory.py

@@ -1,5 +1,4 @@
 from typing import Any, Dict, Optional
-
 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
@@ -33,10 +32,7 @@ class ShortTermMemory(Memory):
                 storage
                 if storage
                 else RAGStorage(
-                    type="short_term",
-                    embedder_config=embedder_config,
-                    crew=crew,
-                    path=path,
+                    type="short_term", embedder_config=embedder_config, crew=crew, path=path
                 )
             )
         super().__init__(storage)

src/crewai/memory/storage/mem0_storage.py

@@ -2,7 +2,6 @@ import os
 from typing import Any, Dict, List
 
 from mem0 import MemoryClient
-
 from crewai.memory.storage.interface import Storage
 
 

src/crewai/memory/storage/rag_storage.py

@@ -150,11 +150,9 @@ class RAGStorage(BaseRAGStorage):
 
     def reset(self) -> None:
         try:
+            shutil.rmtree(f"{db_storage_path()}/{self.type}")
             if self.app:
                 self.app.reset()
-                shutil.rmtree(f"{db_storage_path()}/{self.type}")
-                self.app = None
-                self.collection = None
         except Exception as e:
             if "attempt to write a readonly database" in str(e):
                 # Ignore this specific error

src/crewai/memory/user/user_memory.py

@@ -37,7 +37,7 @@ class UserMemory(Memory):
         limit: int = 3,
         score_threshold: float = 0.35,
     ):
-        results = self.storage.search(
+        results = super().search(
             query=query,
             limit=limit,
             score_threshold=score_threshold,

src/crewai/project/annotations.py

@@ -4,23 +4,18 @@ from typing import Callable
 from crewai import Crew
 from crewai.project.utils import memoize
 
-"""Decorators for defining crew components and their behaviors."""
-
 
 def before_kickoff(func):
-    """Marks a method to execute before crew kickoff."""
     func.is_before_kickoff = True
     return func
 
 
 def after_kickoff(func):
-    """Marks a method to execute after crew kickoff."""
     func.is_after_kickoff = True
     return func
 
 
 def task(func):
-    """Marks a method as a crew task."""
     func.is_task = True
 
     @wraps(func)
@@ -34,53 +29,43 @@ def task(func):
 
 
 def agent(func):
-    """Marks a method as a crew agent."""
     func.is_agent = True
     func = memoize(func)
     return func
 
 
 def llm(func):
-    """Marks a method as an LLM provider."""
     func.is_llm = True
     func = memoize(func)
     return func
 
 
 def output_json(cls):
-    """Marks a class as JSON output format."""
     cls.is_output_json = True
     return cls
 
 
 def output_pydantic(cls):
-    """Marks a class as Pydantic output format."""
     cls.is_output_pydantic = True
     return cls
 
 
 def tool(func):
-    """Marks a method as a crew tool."""
     func.is_tool = True
     return memoize(func)
 
 
 def callback(func):
-    """Marks a method as a crew callback."""
     func.is_callback = True
     return memoize(func)
 
 
 def cache_handler(func):
-    """Marks a method as a cache handler."""
     func.is_cache_handler = True
     return memoize(func)
 
 
 def crew(func) -> Callable[..., Crew]:
-    """Marks a method as the main crew execution point."""
-
-    @wraps(func)
     def wrapper(self, *args, **kwargs) -> Crew:
         instantiated_tasks = []
         instantiated_agents = []

src/crewai/project/crew_base.py

@@ -9,10 +9,8 @@ load_dotenv()
 
 T = TypeVar("T", bound=type)
 
-"""Base decorator for creating crew classes with configuration and function management."""
 
 def CrewBase(cls: T) -> T:
-    """Wraps a class with crew functionality and configuration management."""
     class WrappedClass(cls):  # type: ignore
         is_crew_class: bool = True  # type: ignore
 
@@ -215,8 +213,4 @@ def CrewBase(cls: T) -> T:
                     callback_functions[callback]() for callback in callbacks
                 ]
 
-    # Include base class (qual)name in the wrapper class (qual)name.
-    WrappedClass.__name__ = CrewBase.__name__ + "(" + cls.__name__ + ")"
-    WrappedClass.__qualname__ = CrewBase.__qualname__ + "(" + cls.__name__ + ")"
-
     return cast(T, WrappedClass)

src/crewai/project/utils.py

@@ -1,14 +1,11 @@
-from functools import wraps
-
-
 def memoize(func):
     cache = {}
 
-    @wraps(func)
     def memoized_func(*args, **kwargs):
         key = (args, tuple(kwargs.items()))
         if key not in cache:
             cache[key] = func(*args, **kwargs)
         return cache[key]
 
+    memoized_func.__dict__.update(func.__dict__)
     return memoized_func

src/crewai/task.py

@@ -1,25 +1,12 @@
 import datetime
-import inspect
 import json
-import logging
+import os
 import threading
 import uuid
 from concurrent.futures import Future
 from copy import copy
 from hashlib import md5
-from pathlib import Path
-from typing import (
-    Any,
-    Callable,
-    ClassVar,
-    Dict,
-    List,
-    Optional,
-    Set,
-    Tuple,
-    Type,
-    Union,
-)
+from typing import Any, Dict, List, Optional, Set, Tuple, Type, Union
 
 from opentelemetry.trace import Span
 from pydantic import (
@@ -33,7 +20,6 @@ from pydantic import (
 from pydantic_core import PydanticCustomError
 
 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
@@ -63,7 +49,6 @@ class Task(BaseModel):
     """
 
     __hash__ = object.__hash__  # type: ignore
-    logger: ClassVar[logging.Logger] = logging.getLogger(__name__)
     used_tools: int = 0
     tools_errors: int = 0
     delegations: int = 0
@@ -125,70 +110,13 @@ class Task(BaseModel):
         default=None,
     )
     processed_by_agents: Set[str] = Field(default_factory=set)
-    guardrail: Optional[Callable[[TaskOutput], Tuple[bool, Any]]] = Field(
-        default=None,
-        description="Function to validate task output before proceeding to next task",
-    )
-    max_retries: int = Field(
-        default=3, description="Maximum number of retries when guardrail fails"
-    )
-    retry_count: int = Field(default=0, description="Current number of retries")
-
-    start_time: Optional[datetime.datetime] = Field(
-        default=None, description="Start time of the task execution"
-    )
-    end_time: Optional[datetime.datetime] = Field(
-        default=None, description="End time of the task execution"
-    )
-
-    @field_validator("guardrail")
-    @classmethod
-    def validate_guardrail_function(cls, v: Optional[Callable]) -> Optional[Callable]:
-        """Validate that the guardrail function has the correct signature and behavior.
-
-        While type hints provide static checking, this validator ensures runtime safety by:
-        1. Verifying the function accepts exactly one parameter (the TaskOutput)
-        2. Checking return type annotations match Tuple[bool, Any] if present
-        3. Providing clear, immediate error messages for debugging
-
-        This runtime validation is crucial because:
-        - Type hints are optional and can be ignored at runtime
-        - Function signatures need immediate validation before task execution
-        - Clear error messages help users debug guardrail implementation issues
-
-        Args:
-            v: The guardrail function to validate
-
-        Returns:
-            The validated guardrail function
-
-        Raises:
-            ValueError: If the function signature is invalid or return annotation
-                       doesn't match Tuple[bool, Any]
-        """
-        if v is not None:
-            sig = inspect.signature(v)
-            if len(sig.parameters) != 1:
-                raise ValueError("Guardrail function must accept exactly one parameter")
-
-            # Check return annotation if present, but don't require it
-            return_annotation = sig.return_annotation
-            if return_annotation != inspect.Signature.empty:
-                if not (
-                    return_annotation == Tuple[bool, Any]
-                    or str(return_annotation) == "Tuple[bool, Any]"
-                ):
-                    raise ValueError(
-                        "If return type is annotated, it must be Tuple[bool, Any]"
-                    )
-        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)
     _thread: Optional[threading.Thread] = PrivateAttr(default=None)
+    _execution_time: Optional[float] = PrivateAttr(default=None)
 
     @model_validator(mode="before")
     @classmethod
@@ -213,54 +141,16 @@ class Task(BaseModel):
                 "may_not_set_field", "This field is not to be set by the user.", {}
             )
 
+    def _set_start_execution_time(self) -> float:
+        return datetime.datetime.now().timestamp()
+
+    def _set_end_execution_time(self, start_time: float) -> None:
+        self._execution_time = datetime.datetime.now().timestamp() - start_time
+
     @field_validator("output_file")
     @classmethod
-    def output_file_validation(cls, value: Optional[str]) -> Optional[str]:
-        """Validate the output file path.
-
-        Args:
-            value: The output file path to validate. Can be None or a string.
-                  If the path contains template variables (e.g. {var}), leading slashes are preserved.
-                  For regular paths, leading slashes are stripped.
-
-        Returns:
-            The validated and potentially modified path, or None if no path was provided.
-
-        Raises:
-            ValueError: If the path contains invalid characters, path traversal attempts,
-                      or other security concerns.
-        """
-        if value is None:
-            return None
-
-        # Basic security checks
-        if ".." in value:
-            raise ValueError(
-                "Path traversal attempts are not allowed in output_file paths"
-            )
-
-        # Check for shell expansion first
-        if value.startswith("~") or value.startswith("$"):
-            raise ValueError(
-                "Shell expansion characters are not allowed in output_file paths"
-            )
-
-        # Then check other shell special characters
-        if any(char in value for char in ["|", ">", "<", "&", ";"]):
-            raise ValueError(
-                "Shell special characters are not allowed in output_file paths"
-            )
-
-        # Don't strip leading slash if it's a template path with variables
-        if "{" in value or "}" in value:
-            # Validate template variable format
-            template_vars = [part.split("}")[0] for part in value.split("{")[1:]]
-            for var in template_vars:
-                if not var.isidentifier():
-                    raise ValueError(f"Invalid template variable name: {var}")
-            return value
-
-        # Strip leading slash for regular paths
+    def output_file_validation(cls, value: str) -> str:
+        """Validate the output file path by removing the / from the beginning of the path."""
         if value.startswith("/"):
             return value[1:]
         return value
@@ -309,12 +199,6 @@ class Task(BaseModel):
 
         return md5("|".join(source).encode(), usedforsecurity=False).hexdigest()
 
-    @property
-    def execution_duration(self) -> float | None:
-        if not self.start_time or not self.end_time:
-            return None
-        return (self.end_time - self.start_time).total_seconds()
-
     def execute_async(
         self,
         agent: BaseAgent | None = None,
@@ -355,7 +239,7 @@ class Task(BaseModel):
                 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()
+        start_time = self._set_start_execution_time()
         self._execution_span = self._telemetry.task_started(crew=agent.crew, task=self)
 
         self.prompt_context = context
@@ -370,6 +254,7 @@ class Task(BaseModel):
         )
 
         pydantic_output, json_output = self._export_output(result)
+
         task_output = TaskOutput(
             name=self.name,
             description=self.description,
@@ -380,42 +265,9 @@ class Task(BaseModel):
             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(
-                        f"Task failed guardrail validation after {self.max_retries} retries. "
-                        f"Last error: {guardrail_result.error}"
-                    )
-
-                self.retry_count += 1
-                context = (
-                    f"### Previous attempt failed validation: {guardrail_result.error}\n\n\n"
-                    f"### Previous result:\n{task_output.raw}\n\n\n"
-                    "Try again, making sure to address the validation error."
-                )
-                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()
 
+        self._set_end_execution_time(start_time)
         if self.callback:
             self.callback(self.output)
 
@@ -427,9 +279,7 @@ class Task(BaseModel):
             content = (
                 json_output
                 if json_output
-                else pydantic_output.model_dump_json()
-                if pydantic_output
-                else result
+                else pydantic_output.model_dump_json() if pydantic_output else result
             )
             self._save_file(content)
 
@@ -449,101 +299,16 @@ class Task(BaseModel):
         tasks_slices = [self.description, output]
         return "\n".join(tasks_slices)
 
-    def interpolate_inputs(self, inputs: Dict[str, Union[str, int, float]]) -> None:
-        """Interpolate inputs into the task description, expected output, and output file path.
-
-        Args:
-            inputs: Dictionary mapping template variables to their values.
-                   Supported value types are strings, integers, and floats.
-
-        Raises:
-            ValueError: If a required template variable is missing from inputs.
-        """
+    def interpolate_inputs(self, inputs: Dict[str, Any]) -> None:
+        """Interpolate inputs into the task description and expected output."""
         if self._original_description is None:
             self._original_description = self.description
         if self._original_expected_output is None:
             self._original_expected_output = self.expected_output
-        if self.output_file is not None and self._original_output_file is None:
-            self._original_output_file = self.output_file
 
-        if not inputs:
-            return
-
-        try:
+        if inputs:
             self.description = self._original_description.format(**inputs)
-        except KeyError as e:
-            raise ValueError(
-                f"Missing required template variable '{e.args[0]}' in description"
-            ) from e
-        except ValueError as e:
-            raise ValueError(f"Error interpolating description: {str(e)}") from e
-
-        try:
-            self.expected_output = self.interpolate_only(
-                input_string=self._original_expected_output, inputs=inputs
-            )
-        except (KeyError, ValueError) as e:
-            raise ValueError(f"Error interpolating expected_output: {str(e)}") from e
-
-        if self.output_file is not None:
-            try:
-                self.output_file = self.interpolate_only(
-                    input_string=self._original_output_file, inputs=inputs
-                )
-            except (KeyError, ValueError) as e:
-                raise ValueError(
-                    f"Error interpolating output_file path: {str(e)}"
-                ) from e
-
-    def interpolate_only(
-        self, input_string: Optional[str], inputs: Dict[str, Union[str, int, float]]
-    ) -> str:
-        """Interpolate placeholders (e.g., {key}) in a string while leaving JSON untouched.
-
-        Args:
-            input_string: The string containing template variables to interpolate.
-                         Can be None or empty, in which case an empty string is returned.
-            inputs: Dictionary mapping template variables to their values.
-                   Supported value types are strings, integers, and floats.
-                   If input_string is empty or has no placeholders, inputs can be empty.
-
-        Returns:
-            The interpolated string with all template variables replaced with their values.
-            Empty string if input_string is None or empty.
-
-        Raises:
-            ValueError: If a required template variable is missing from inputs.
-            KeyError: If a template variable is not found in the inputs dictionary.
-        """
-        if input_string is None or not input_string:
-            return ""
-        if "{" not in input_string and "}" not in input_string:
-            return input_string
-        if not inputs:
-            raise ValueError(
-                "Inputs dictionary cannot be empty when interpolating variables"
-            )
-
-        try:
-            # Validate input types
-            for key, value in inputs.items():
-                if not isinstance(value, (str, int, float)):
-                    raise ValueError(
-                        f"Value for key '{key}' must be a string, integer, or float, got {type(value).__name__}"
-                    )
-
-            escaped_string = input_string.replace("{", "{{").replace("}", "}}")
-
-            for key in inputs.keys():
-                escaped_string = escaped_string.replace(f"{{{{{key}}}}}", f"{{{key}}}")
-
-            return escaped_string.format(**inputs)
-        except KeyError as e:
-            raise KeyError(
-                f"Template variable '{e.args[0]}' not found in inputs dictionary"
-            ) from e
-        except ValueError as e:
-            raise ValueError(f"Error during string interpolation: {str(e)}") from e
+            self.expected_output = self._original_expected_output.format(**inputs)
 
     def increment_tools_errors(self) -> None:
         """Increment the tools errors counter."""
@@ -625,34 +390,21 @@ class Task(BaseModel):
         return OutputFormat.RAW
 
     def _save_file(self, result: Any) -> None:
-        """Save task output to a file.
-
-        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
-        """
         if self.output_file is None:
             raise ValueError("output_file is not set.")
 
-        try:
-            resolved_path = Path(self.output_file).expanduser().resolve()
-            directory = resolved_path.parent
+        directory = os.path.dirname(self.output_file)  # type: ignore # Value of type variable "AnyOrLiteralStr" of "dirname" cannot be "str | None"
 
-            if not directory.exists():
-                directory.mkdir(parents=True, exist_ok=True)
+        if directory and not os.path.exists(directory):
+            os.makedirs(directory)
 
-            with resolved_path.open("w", encoding="utf-8") as file:
+        with open(self.output_file, "w", encoding="utf-8") as file:
             if isinstance(result, dict):
                 import json
 
                 json.dump(result, file, ensure_ascii=False, indent=2)
             else:
                 file.write(str(result))
-        except (OSError, IOError) as e:
-            raise RuntimeError(f"Failed to save output file: {e}")
         return None
 
     def __repr__(self):

src/crewai/tasks/guardrail_result.py

@@ -1,56 +0,0 @@
-"""
-Module for handling task guardrail validation results.
-
-This module provides the GuardrailResult class which standardizes
-the way task guardrails return their validation results.
-"""
-
-from typing import Any, Optional, Tuple, Union
-
-from pydantic import BaseModel, field_validator
-
-
-class GuardrailResult(BaseModel):
-    """Result from a task guardrail execution.
-
-    This class standardizes the return format of task guardrails,
-    converting tuple responses into a structured format that can
-    be easily handled by the task execution system.
-
-    Attributes:
-        success (bool): Whether the guardrail validation passed
-        result (Any, optional): The validated/transformed result if successful
-        error (str, optional): Error message if validation failed
-    """
-    success: bool
-    result: Optional[Any] = None
-    error: Optional[str] = None
-
-    @field_validator("result", "error")
-    @classmethod
-    def validate_result_error_exclusivity(cls, v: Any, info) -> Any:
-        values = info.data
-        if "success" in values:
-            if values["success"] and v and "error" in values and values["error"]:
-                raise ValueError("Cannot have both result and error when success is True")
-            if not values["success"] and v and "result" in values and values["result"]:
-                raise ValueError("Cannot have both result and error when success is False")
-        return v
-
-    @classmethod
-    def from_tuple(cls, result: Tuple[bool, Union[Any, str]]) -> "GuardrailResult":
-        """Create a GuardrailResult from a validation tuple.
-
-        Args:
-            result: A tuple of (success, data) where data is either
-                   the validated result or error message.
-
-        Returns:
-            GuardrailResult: A new instance with the tuple data.
-        """
-        success, data = result
-        return cls(
-            success=success,
-            result=data if success else None,
-            error=data if not success else None
-        )

src/crewai/telemetry/telemetry.py

@@ -6,7 +6,6 @@ import os
 import platform
 import warnings
 from contextlib import contextmanager
-from importlib.metadata import version
 from typing import TYPE_CHECKING, Any, Optional
 
 
@@ -17,10 +16,12 @@ def suppress_warnings():
         yield
 
 
+with suppress_warnings():
+    import pkg_resources
+
+
 from opentelemetry import trace  # noqa: E402
-from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
-    OTLPSpanExporter,  # noqa: E402
-)
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter # noqa: E402
 from opentelemetry.sdk.resources import SERVICE_NAME, Resource  # noqa: E402
 from opentelemetry.sdk.trace import TracerProvider  # noqa: E402
 from opentelemetry.sdk.trace.export import BatchSpanProcessor  # noqa: E402
@@ -103,7 +104,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "python_version", platform.python_version())
             self._add_attribute(span, "crew_key", crew.key)
@@ -305,7 +306,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "tool_name", tool_name)
             self._add_attribute(span, "attempts", attempts)
@@ -325,7 +326,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "tool_name", tool_name)
             self._add_attribute(span, "attempts", attempts)
@@ -345,7 +346,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             if llm:
                 self._add_attribute(span, "llm", llm.model)
@@ -364,7 +365,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "crew_key", crew.key)
             self._add_attribute(span, "crew_id", str(crew.id))
@@ -390,7 +391,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "crew_key", crew.key)
             self._add_attribute(span, "crew_id", str(crew.id))
@@ -471,7 +472,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "crew_key", crew.key)
             self._add_attribute(span, "crew_id", str(crew.id))
@@ -540,7 +541,7 @@ class Telemetry:
             self._add_attribute(
                 crew._execution_span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(
                 crew._execution_span, "crew_output", final_string_output

src/crewai/tools/agent_tools/add_image_tool.py

@@ -1,45 +0,0 @@
-from typing import Dict, Optional, Union
-
-from pydantic import BaseModel, Field
-
-from crewai.tools.base_tool import BaseTool
-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"
-    )
-
-
-class AddImageTool(BaseTool):
-    """Tool for adding images to the content"""
-
-    name: str = Field(default_factory=lambda: i18n.tools("add_image")["name"])  # type: ignore
-    description: str = Field(default_factory=lambda: i18n.tools("add_image")["description"])  # type: ignore
-    args_schema: type[BaseModel] = AddImageToolSchema
-
-    def _run(
-        self,
-        image_url: str,
-        action: Optional[str] = None,
-        **kwargs,
-    ) -> dict:
-        action = action or i18n.tools("add_image")["default_action"]  # type: ignore
-        content = [
-            {"type": "text", "text": action},
-            {
-                "type": "image_url",
-                "image_url": {
-                    "url": image_url,
-                },
-            }
-        ]
-
-        return {
-            "role": "user",
-            "content": content
-        }

src/crewai/tools/agent_tools/agent_tools.py

@@ -1,9 +1,9 @@
-from crewai.agents.agent_builder.base_agent import BaseAgent
 from crewai.tools.base_tool import BaseTool
+from crewai.agents.agent_builder.base_agent import BaseAgent
 from crewai.utilities import I18N
 
-from .ask_question_tool import AskQuestionTool
 from .delegate_work_tool import DelegateWorkTool
+from .ask_question_tool import AskQuestionTool
 
 
 class AgentTools:
@@ -20,13 +20,13 @@ class AgentTools:
         delegate_tool = DelegateWorkTool(
             agents=self.agents,
             i18n=self.i18n,
-            description=self.i18n.tools("delegate_work").format(coworkers=coworkers),  # type: ignore
+            description=self.i18n.tools("delegate_work").format(coworkers=coworkers),
         )
 
         ask_tool = AskQuestionTool(
             agents=self.agents,
             i18n=self.i18n,
-            description=self.i18n.tools("ask_question").format(coworkers=coworkers),  # type: ignore
+            description=self.i18n.tools("ask_question").format(coworkers=coworkers),
         )
 
         return [delegate_tool, ask_tool]

src/crewai/tools/agent_tools/ask_question_tool.py

@@ -1,8 +1,6 @@
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
 from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool
+from typing import Optional
+from pydantic import BaseModel, Field
 
 
 class AskQuestionToolSchema(BaseModel):

src/crewai/tools/agent_tools/base_agent_tools.py

@@ -1,15 +1,11 @@
-import logging
 from typing import Optional, Union
-
 from pydantic import Field
 
+from crewai.tools.base_tool import BaseTool
 from crewai.agents.agent_builder.base_agent import BaseAgent
 from crewai.task import Task
-from crewai.tools.base_tool import BaseTool
 from crewai.utilities import I18N
 
-logger = logging.getLogger(__name__)
-
 
 class BaseAgentTool(BaseTool):
     """Base class for agent-related tools"""
@@ -19,25 +15,6 @@ class BaseAgentTool(BaseTool):
         default_factory=I18N, description="Internationalization settings"
     )
 
-    def sanitize_agent_name(self, name: str) -> str:
-        """
-        Sanitize agent role name by normalizing whitespace and setting to lowercase.
-        Converts all whitespace (including newlines) to single spaces and removes quotes.
-
-        Args:
-            name (str): The agent role name to sanitize
-
-        Returns:
-            str: The sanitized agent role name, with whitespace normalized,
-                 converted to lowercase, and quotes removed
-        """
-        if not name:
-            return ""
-        # Normalize all whitespace (including newlines) to single spaces
-        normalized = " ".join(name.split())
-        # Remove quotes and convert to lowercase
-        return normalized.replace('"', "").casefold()
-
     def _get_coworker(self, coworker: Optional[str], **kwargs) -> Optional[str]:
         coworker = coworker or kwargs.get("co_worker") or kwargs.get("coworker")
         if coworker:
@@ -47,27 +24,11 @@ class BaseAgentTool(BaseTool):
         return coworker
 
     def _execute(
-        self,
-        agent_name: Optional[str],
-        task: str,
-        context: Optional[str] = None
+        self, agent_name: Union[str, None], task: str, context: Union[str, None]
     ) -> str:
-        """
-        Execute delegation to an agent with case-insensitive and whitespace-tolerant matching.
-        
-        Args:
-            agent_name: Name/role of the agent to delegate to (case-insensitive)
-            task: The specific question or task to delegate
-            context: Optional additional context for the task execution
-            
-        Returns:
-            str: The execution result from the delegated agent or an error message
-                 if the agent cannot be found
-        """
         try:
             if agent_name is None:
                 agent_name = ""
-                logger.debug("No agent name provided, using empty string")
 
             # It is important to remove the quotes from the agent name.
             # The reason we have to do this is because less-powerful LLM's
@@ -76,49 +37,31 @@ class BaseAgentTool(BaseTool):
             # {"task": "....", "coworker": "....
             # when it should look like this:
             # {"task": "....", "coworker": "...."}
-            sanitized_name = self.sanitize_agent_name(agent_name)
-            logger.debug(f"Sanitized agent name from '{agent_name}' to '{sanitized_name}'")
-
-            available_agents = [agent.role for agent in self.agents]
-            logger.debug(f"Available agents: {available_agents}")
-
+            agent_name = agent_name.casefold().replace('"', "").replace("\n", "")
             agent = [  # type: ignore # Incompatible types in assignment (expression has type "list[BaseAgent]", variable has type "str | None")
                 available_agent
                 for available_agent in self.agents
-                if self.sanitize_agent_name(available_agent.role) == sanitized_name
+                if available_agent.role.casefold().replace("\n", "") == agent_name
             ]
-            logger.debug(f"Found {len(agent)} matching agents for role '{sanitized_name}'")
-        except (AttributeError, ValueError) as e:
-            # Handle specific exceptions that might occur during role name processing
-            return self.i18n.errors("agent_tool_unexisting_coworker").format(
+        except Exception as _:
+            return self.i18n.errors("agent_tool_unexsiting_coworker").format(
                 coworkers="\n".join(
-                    [f"- {self.sanitize_agent_name(agent.role)}" for agent in self.agents]
-                ),
-                error=str(e)
+                    [f"- {agent.role.casefold()}" for agent in self.agents]
+                )
             )
 
         if not agent:
-            # No matching agent found after sanitization
-            return self.i18n.errors("agent_tool_unexisting_coworker").format(
+            return self.i18n.errors("agent_tool_unexsiting_coworker").format(
                 coworkers="\n".join(
-                    [f"- {self.sanitize_agent_name(agent.role)}" for agent in self.agents]
-                ),
-                error=f"No agent found with role '{sanitized_name}'"
+                    [f"- {agent.role.casefold()}" for agent in self.agents]
+                )
             )
 
         agent = agent[0]
-        try:
-            task_with_assigned_agent = Task(
+        task_with_assigned_agent = Task(  # type: ignore # Incompatible types in assignment (expression has type "Task", variable has type "str")
             description=task,
             agent=agent,
             expected_output=agent.i18n.slice("manager_request"),
             i18n=agent.i18n,
         )
-            logger.debug(f"Created task for agent '{self.sanitize_agent_name(agent.role)}': {task}")
         return agent.execute_task(task_with_assigned_agent, context)
-        except Exception as e:
-            # Handle task creation or execution errors
-            return self.i18n.errors("agent_tool_execution_error").format(
-                agent_role=self.sanitize_agent_name(agent.role),
-                error=str(e)
-            )

src/crewai/tools/agent_tools/delegate_work_tool.py

@@ -1,9 +1,8 @@
+from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool
 from typing import Optional
 
 from pydantic import BaseModel, Field
 
-from crewai.tools.agent_tools.base_agent_tools import BaseAgentTool
-
 
 class DelegateWorkToolSchema(BaseModel):
     task: str = Field(..., description="The task to delegate")

src/crewai/tools/tool_usage.py

@@ -1,5 +1,6 @@
 import ast
 import datetime
+import os
 import time
 from difflib import SequenceMatcher
 from textwrap import dedent
@@ -10,16 +11,18 @@ 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
 
-try:
+agentops = None
+if os.environ.get("AGENTOPS_API_KEY"):
+    try:
         import agentops  # type: ignore
-except ImportError:
-    agentops = None
-OPENAI_BIGGER_MODELS = ["gpt-4", "gpt-4o", "o1-preview", "o1-mini", "o1", "o3", "o3-mini"]
+    except ImportError:
+        pass
+
+OPENAI_BIGGER_MODELS = ["gpt-4", "gpt-4o", "o1-preview", "o1-mini"]
 
 
 class ToolUsageErrorException(Exception):
@@ -103,19 +106,6 @@ class ToolUsage:
             if self.agent.verbose:
                 self._printer.print(content=f"\n\n{error}\n", color="red")
             return error
-
-        if isinstance(tool, CrewStructuredTool) and tool.name == self._i18n.tools("add_image")["name"]:  # type: ignore
-            try:
-                result = self._use(tool_string=tool_string, tool=tool, calling=calling)
-                return result
-
-            except Exception as e:
-                error = getattr(e, "message", str(e))
-                self.task.increment_tools_errors()
-                if self.agent.verbose:
-                    self._printer.print(content=f"\n\n{error}\n", color="red")
-                return error
-
         return f"{self._use(tool_string=tool_string, tool=tool, calling=calling)}"  # type: ignore # BUG?: "_use" of "ToolUsage" does not return a value (it only ever returns None)
 
     def _use(
@@ -169,7 +159,7 @@ class ToolUsage:
 
                 if calling.arguments:
                     try:
-                        acceptable_args = tool.args_schema.model_json_schema()["properties"].keys()  # type: ignore
+                        acceptable_args = tool.args_schema.schema()["properties"].keys()  # type: ignore # Item "None" of "type[BaseModel] | None" has no attribute "schema"
                         arguments = {
                             k: v
                             for k, v in calling.arguments.items()
@@ -432,10 +422,9 @@ class ToolUsage:
                 elif value.lower() in [
                     "true",
                     "false",
+                    "null",
                 ]:  # Check for boolean and null values
-                    value = value.lower().capitalize()
-                elif value.lower() == "null":
-                    value = "None"
+                    value = value.lower()
                 else:
                     # Assume the value is a string and needs quotes
                     value = '"' + value.replace('"', '\\"') + '"'

src/crewai/tools/tool_usage_events.py

@@ -1,7 +1,6 @@
-from datetime import datetime
 from typing import Any, Dict
-
 from pydantic import BaseModel
+from datetime import datetime
 
 
 class ToolUsageEvent(BaseModel):

src/crewai/translations/en.json

@@ -12,14 +12,14 @@
     "tools": "\nYou ONLY have access to the following tools, and should NEVER make up tools that are not listed here:\n\n{tools}\n\nUse the following format:\n\nThought: you should always think about what to do\nAction: the action to take, only one name of [{tool_names}], just the name, exactly as it's written.\nAction Input: the input to the action, just a simple python dictionary, enclosed in curly braces, using \" to wrap keys and values.\nObservation: the result of the action\n\nOnce all necessary information is gathered:\n\nThought: I now know the final answer\nFinal Answer: the final answer to the original input question\n",
     "no_tools": "\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!",
     "format": "I MUST either use a tool (use one at time) OR give my best final answer not both at the same time. To Use the following format:\n\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, dictionary enclosed in curly braces\nObservation: the result of the action\n... (this Thought/Action/Action Input/Result can repeat N times)\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",
-    "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\nThought: I now can give a great answer\nFinal Answer: my best complete final answer to the task.\n\n",
+    "final_answer_format": "If you don't need to use any more tools, you must give your best complete final answer, make sure it satisfy the expect criteria, use the EXACT format below:\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.\nI just remembered the expected format I must follow:\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... (this Thought/Action/Action Input/Result can repeat N times)\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 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.",
-    "summarize_instruction": "Summarize the following text, make sure to include all the important information: {group}",
+    "sumamrize_instruction": "Summarize the following text, make sure to include all the important information: {group}",
     "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.",
@@ -28,21 +28,15 @@
   "errors": {
     "force_final_answer_error": "You can't keep going, this was the best you could do.\n {formatted_answer.text}",
     "force_final_answer": "Now it's time you MUST give your absolute best final answer. You'll ignore all previous instructions, stop using any tools, and just return your absolute BEST Final answer.",
-    "agent_tool_unexisting_coworker": "\nError executing tool. coworker mentioned not found, it must be one of the following options:\n{coworkers}\n",
+    "agent_tool_unexsiting_coworker": "\nError executing tool. coworker mentioned not found, it must be one of the following options:\n{coworkers}\n",
     "task_repeated_usage": "I tried reusing the same input, I must stop using this action input. I'll try something else instead.\n\n",
     "tool_usage_error": "I encountered an error: {error}",
     "tool_arguments_error": "Error: the Action Input is not a valid key, value dictionary.",
     "wrong_tool_name": "You tried to use the tool {tool}, but it doesn't exist. You must use one of the following tools, use one at time: {tools}.",
-    "tool_usage_exception": "I encountered an error while trying to use the tool. This was the error: {error}.\n Tool {tool} accepts these inputs: {tool_inputs}",
-    "agent_tool_execution_error": "Error executing task with agent '{agent_role}'. Error: {error}"
+    "tool_usage_exception": "I encountered an error while trying to use the tool. This was the error: {error}.\n Tool {tool} accepts these inputs: {tool_inputs}"
   },
   "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 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 it's content, you can optionally ask a question about the image",
-      "default_action": "Please provide a detailed description of this image, including all visual elements, context, and any notable details you can observe."
-    }
+    "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."
   }
 }

src/crewai/utilities/crew_json_encoder.py

@@ -1,20 +1,15 @@
-"""JSON encoder for handling CrewAI specific types."""
-
+from datetime import datetime, date
 import json
-from datetime import date, datetime
-from decimal import Decimal
-from enum import Enum
 from uuid import UUID
-
 from pydantic import BaseModel
+from decimal import Decimal
 
 
 class CrewJSONEncoder(json.JSONEncoder):
-    """Custom JSON encoder for CrewAI objects and special types."""
     def default(self, obj):
         if isinstance(obj, BaseModel):
             return self._handle_pydantic_model(obj)
-        elif isinstance(obj, UUID) or isinstance(obj, Decimal) or isinstance(obj, Enum):
+        elif isinstance(obj, UUID) or isinstance(obj, Decimal):
             return str(obj)
 
         elif isinstance(obj, datetime) or isinstance(obj, date):

src/crewai/utilities/crew_pydantic_output_parser.py

@@ -1,15 +1,13 @@
 import json
+import regex
 from typing import Any, Type
 
-import regex
+from crewai.agents.parser import OutputParserException
 from pydantic import BaseModel, ValidationError
 
-from crewai.agents.parser import OutputParserException
-
-"""Parser for converting text outputs into Pydantic models."""
 
 class CrewPydanticOutputParser:
-    """Parses text outputs into specified Pydantic models."""
+    """Parses the text into pydantic models"""
 
     pydantic_object: Type[BaseModel]
 

src/crewai/utilities/embedding_configurator.py

@@ -1,7 +1,6 @@
 import os
 from typing import Any, Dict, cast
-
-from chromadb import Documents, EmbeddingFunction, Embeddings
+from chromadb import EmbeddingFunction, Documents, Embeddings
 from chromadb.api.types import validate_embedding_function
 
 

src/crewai/utilities/evaluators/crew_evaluator_handler.py

@@ -1,14 +1,13 @@
 from collections import defaultdict
 
-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.task import Task
 from crewai.tasks.task_output import TaskOutput
 from crewai.telemetry import Telemetry
+from pydantic import BaseModel, Field
+from rich.box import HEAVY_EDGE
+from rich.console import Console
+from rich.table import Table
 
 
 class TaskEvaluationPydanticOutput(BaseModel):
@@ -180,12 +179,12 @@ class CrewEvaluator:
             self._test_result_span = self._telemetry.individual_test_result_span(
                 self.crew,
                 evaluation_result.pydantic.quality,
-                current_task.execution_duration,
+                current_task._execution_time,
                 self.openai_model_name,
             )
             self.tasks_scores[self.iteration].append(evaluation_result.pydantic.quality)
             self.run_execution_times[self.iteration].append(
-                current_task.execution_duration
+                current_task._execution_time
             )
         else:
             raise ValueError("Evaluation result is not in the expected format")

src/crewai/utilities/evaluators/task_evaluator.py

@@ -1,3 +1,4 @@
+import os
 from typing import List
 
 from pydantic import BaseModel, Field
@@ -5,17 +6,27 @@ from pydantic import BaseModel, Field
 from crewai.utilities import Converter
 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 mock_agent_ops_provider():
+    def track_agent(*args, **kwargs):
         def noop(f):
             return f
 
         return noop
 
+    return track_agent
+
+
+agentops = None
+
+if os.environ.get("AGENTOPS_API_KEY"):
+    try:
+        from agentops import track_agent
+    except ImportError:
+        track_agent = mock_agent_ops_provider()
+else:
+    track_agent = mock_agent_ops_provider()
+
 
 class Entity(BaseModel):
     name: str = Field(description="The name of the entity.")

src/crewai/utilities/events.py

@@ -1,8 +1,8 @@
+from typing import Any, Callable, Generic, List, Dict, Type, TypeVar
 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)
 

src/crewai/utilities/i18n.py

@@ -1,13 +1,11 @@
 import json
 import os
-from typing import Dict, Optional, Union
+from typing import Dict, Optional
 
 from pydantic import BaseModel, Field, PrivateAttr, model_validator
 
-"""Internationalization support for CrewAI prompts and messages."""
 
 class I18N(BaseModel):
-    """Handles loading and retrieving internationalized prompts."""
     _prompts: Dict[str, Dict[str, str]] = PrivateAttr()
     prompt_file: Optional[str] = Field(
         default=None,
@@ -43,8 +41,8 @@ class I18N(BaseModel):
     def errors(self, error: str) -> str:
         return self.retrieve("errors", error)
 
-    def tools(self, tool: str) -> Union[str, Dict[str, str]]:
-        return self.retrieve("tools", tool)
+    def tools(self, error: str) -> str:
+        return self.retrieve("tools", error)
 
     def retrieve(self, kind, key) -> str:
         try:

src/crewai/utilities/internal_instructor.py

@@ -1,4 +1,3 @@
-import warnings
 from typing import Any, Optional, Type
 
 
@@ -26,8 +25,7 @@ class InternalInstructor:
         if self.agent and not self.llm:
             self.llm = self.agent.function_calling_llm or self.agent.llm
 
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", UserWarning)
+        # Lazy import
         import instructor
         from litellm import completion
 

src/crewai/utilities/paths.py

@@ -3,10 +3,8 @@ from pathlib import Path
 
 import appdirs
 
-"""Path management utilities for CrewAI storage and configuration."""
 
 def db_storage_path():
-    """Returns the path for database storage."""
     app_name = get_project_directory_name()
     app_author = "CrewAI"
 
@@ -16,7 +14,6 @@ def db_storage_path():
 
 
 def get_project_directory_name():
-    """Returns the current project directory name."""
     project_directory_name = os.environ.get("CREWAI_STORAGE_DIR")
 
     if project_directory_name:

src/crewai/utilities/planning_handler.py

@@ -1,17 +1,11 @@
-import json
-import logging
 from typing import Any, List, Optional
-
 from pydantic import BaseModel, Field
 
 from crewai.agent import Agent
 from crewai.task import Task
 
-"""Handles planning and coordination of crew tasks."""
-logger = logging.getLogger(__name__)
 
 class PlanPerTask(BaseModel):
-    """Represents a plan for a specific task."""
     task: str = Field(..., description="The task for which the plan is created")
     plan: str = Field(
         ...,
@@ -20,7 +14,6 @@ class PlanPerTask(BaseModel):
 
 
 class PlannerTaskPydanticOutput(BaseModel):
-    """Output format for task planning results."""
     list_of_plans_per_task: List[PlanPerTask] = Field(
         ...,
         description="Step by step plan on how the agents can execute their tasks using the available tools with mastery",
@@ -28,7 +21,6 @@ class PlannerTaskPydanticOutput(BaseModel):
 
 
 class CrewPlanner:
-    """Plans and coordinates the execution of crew tasks."""
     def __init__(self, tasks: List[Task], planning_agent_llm: Optional[Any] = None):
         self.tasks = tasks
 
@@ -75,39 +67,19 @@ class CrewPlanner:
             output_pydantic=PlannerTaskPydanticOutput,
         )
 
-    def _get_agent_knowledge(self, task: Task) -> List[str]:
-        """
-        Safely retrieve knowledge source content from the task's agent.
-        
-        Args:
-            task: The task containing an agent with potential knowledge sources
-            
-        Returns:
-            List[str]: A list of knowledge source strings
-        """
-        try:
-            if task.agent and task.agent.knowledge_sources:
-                return [source.content for source in task.agent.knowledge_sources]
-        except AttributeError:
-            logger.warning("Error accessing agent knowledge sources")
-        return []
-
     def _create_tasks_summary(self) -> str:
         """Creates a summary of all tasks."""
         tasks_summary = []
         for idx, task in enumerate(self.tasks):
-            knowledge_list = self._get_agent_knowledge(task)
-            task_summary = f"""
+            tasks_summary.append(
+                f"""
                 Task Number {idx + 1} - {task.description}
                 "task_description": {task.description}
                 "task_expected_output": {task.expected_output}
                 "agent": {task.agent.role if task.agent else "None"}
                 "agent_goal": {task.agent.goal if task.agent else "None"}
                 "task_tools": {task.tools}
-                "agent_tools": %s%s""" % (
-                    f"[{', '.join(str(tool) for tool in task.agent.tools)}]" if task.agent and task.agent.tools else '"agent has no tools"',
-                    f',\n                "agent_knowledge": "[\\"{knowledge_list[0]}\\"]"' if knowledge_list and str(knowledge_list) != "None" else ""
+                "agent_tools": {task.agent.tools if task.agent else "None"}
+                """
             )
-            
-            tasks_summary.append(task_summary)
         return " ".join(tasks_summary)

src/crewai/utilities/printer.py

@@ -1,11 +1,7 @@
-"""Utility for colored console output."""
-
 from typing import Optional
 
 
 class Printer:
-    """Handles colored console output formatting."""
-
     def print(self, content: str, color: Optional[str] = None):
         if color == "purple":
             self._print_purple(content)

src/crewai/utilities/prompts.py

@@ -1,7 +1,5 @@
-from typing import Any, Optional
-
 from pydantic import BaseModel, Field
-
+from typing import Any, Optional
 from crewai.utilities import I18N
 
 

src/crewai/utilities/pydantic_schema_parser.py

@@ -1,4 +1,4 @@
-from typing import Type, Union, get_args, get_origin
+from typing import Type, get_args, get_origin, Union
 
 from pydantic import BaseModel
 

src/crewai/utilities/rpm_controller.py

@@ -6,10 +6,8 @@ from pydantic import BaseModel, Field, PrivateAttr, model_validator
 
 from crewai.utilities.logger import Logger
 
-"""Controls request rate limiting for API calls."""
 
 class RPMController(BaseModel):
-    """Manages requests per minute limiting."""
     max_rpm: Optional[int] = Field(default=None)
     logger: Logger = Field(default_factory=lambda: Logger(verbose=False))
     _current_rpm: int = PrivateAttr(default=0)

src/crewai/utilities/task_output_storage_handler.py

@@ -1,17 +1,13 @@
-from datetime import datetime
-from typing import Any, Dict, List, Optional
-
 from pydantic import BaseModel, Field
-
+from datetime import datetime
+from typing import Dict, Any, Optional, List
 from crewai.memory.storage.kickoff_task_outputs_storage import (
     KickoffTaskOutputsSQLiteStorage,
 )
 from crewai.task import Task
 
-"""Handles storage and retrieval of task execution outputs."""
 
 class ExecutionLog(BaseModel):
-    """Represents a log entry for task execution."""
     task_id: str
     expected_output: Optional[str] = None
     output: Dict[str, Any]
@@ -24,8 +20,6 @@ class ExecutionLog(BaseModel):
         return getattr(self, key)
 
 
-"""Manages storage and retrieval of task outputs."""
-
 class TaskOutputStorageHandler:
     def __init__(self) -> None:
         self.storage = KickoffTaskOutputsSQLiteStorage()

src/crewai/utilities/token_counter_callback.py

@@ -1,8 +1,5 @@
-import warnings
-
 from litellm.integrations.custom_logger import CustomLogger
 from litellm.types.utils import Usage
-
 from crewai.agents.agent_builder.utilities.base_token_process import TokenProcess
 
 
@@ -14,9 +11,7 @@ class TokenCalcHandler(CustomLogger):
         if self.token_cost_process is None:
             return
 
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", UserWarning)
-            usage: Usage = response_obj["usage"]
+        usage : Usage = response_obj["usage"]
         self.token_cost_process.sum_successful_requests(1)
         self.token_cost_process.sum_prompt_tokens(usage.prompt_tokens)
         self.token_cost_process.sum_completion_tokens(usage.completion_tokens)

tests/agent_test.py

@@ -1445,43 +1445,44 @@ def test_llm_call_with_all_attributes():
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
-def test_agent_with_ollama_llama3():
+def test_agent_with_ollama_gemma():
     agent = Agent(
         role="test role",
         goal="test goal",
         backstory="test backstory",
-        llm=LLM(model="ollama/llama3.2:3b", base_url="http://localhost:11434"),
+        llm=LLM(
+            model="ollama/gemma2:latest",
+            base_url="http://localhost:8080",
+        ),
     )
 
     assert isinstance(agent.llm, LLM)
-    assert agent.llm.model == "ollama/llama3.2:3b"
-    assert agent.llm.base_url == "http://localhost:11434"
+    assert agent.llm.model == "ollama/gemma2:latest"
+    assert agent.llm.base_url == "http://localhost:8080"
 
-    task = "Respond in 20 words. Which model are you?"
+    task = "Respond in 20 words. Who are you?"
     response = agent.llm.call([{"role": "user", "content": task}])
 
     assert response
     assert len(response.split()) <= 25  # Allow a little flexibility in word count
-    assert "Llama3" in response or "AI" in response or "language model" in response
+    assert "Gemma" in response or "AI" in response or "language model" in response
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
-def test_llm_call_with_ollama_llama3():
+def test_llm_call_with_ollama_gemma():
     llm = LLM(
-        model="ollama/llama3.2:3b",
-        base_url="http://localhost:11434",
+        model="ollama/gemma2:latest",
+        base_url="http://localhost:8080",
         temperature=0.7,
         max_tokens=30,
     )
-    messages = [
-        {"role": "user", "content": "Respond in 20 words. Which model are you?"}
-    ]
+    messages = [{"role": "user", "content": "Respond in 20 words. Who are you?"}]
 
     response = llm.call(messages)
 
     assert response
     assert len(response.split()) <= 25  # Allow a little flexibility in word count
-    assert "Llama3" in response or "AI" in response or "language model" in response
+    assert "Gemma" in response or "AI" in response or "language model" in response
 
 
 @pytest.mark.vcr(filter_headers=["authorization"])
@@ -1577,7 +1578,7 @@ def test_agent_execute_task_with_ollama():
         role="test role",
         goal="test goal",
         backstory="test backstory",
-        llm=LLM(model="ollama/llama3.2:3b", base_url="http://localhost:11434"),
+        llm=LLM(model="ollama/gemma2:latest", base_url="http://localhost:8080"),
     )
 
     task = Task(
@@ -1594,15 +1595,19 @@ def test_agent_execute_task_with_ollama():
 @pytest.mark.vcr(filter_headers=["authorization"])
 def test_agent_with_knowledge_sources():
     # Create a knowledge source with some content
-    content = "Brandon's favorite color is red and he likes Mexican food."
-    string_source = StringKnowledgeSource(content=content)
+    content = "Brandon's favorite color is blue and he likes Mexican food."
+    string_source = StringKnowledgeSource(
+        content=content, metadata={"preference": "personal"}
+    )
 
     with patch(
         "crewai.knowledge.storage.knowledge_storage.KnowledgeStorage"
     ) as MockKnowledge:
         mock_knowledge_instance = MockKnowledge.return_value
         mock_knowledge_instance.sources = [string_source]
-        mock_knowledge_instance.query.return_value = [{"content": content}]
+        mock_knowledge_instance.query.return_value = [
+            {"content": content, "metadata": {"preference": "personal"}}
+        ]
 
         agent = Agent(
             role="Information Agent",
@@ -1623,4 +1628,4 @@ def test_agent_with_knowledge_sources():
         result = crew.kickoff()
 
         # Assert that the agent provides the correct information
-        assert "red" in result.raw.lower()
+        assert "blue" in result.raw.lower()

tests/agents/agent_builder/base_agent_test.py

@@ -1,10 +1,9 @@
 import hashlib
 from typing import Any, List, Optional
 
-from pydantic import BaseModel
-
 from crewai.agents.agent_builder.base_agent import BaseAgent
 from crewai.tools.base_tool import BaseTool
+from pydantic import BaseModel
 
 
 class TestAgent(BaseAgent):

tests/agents/test_crew_agent_parser.py

@@ -1,11 +1,10 @@
 import pytest
-
+from crewai.agents.parser import CrewAgentParser
 from crewai.agents.crew_agent_executor import (
     AgentAction,
     AgentFinish,
     OutputParserException,
 )
-from crewai.agents.parser import CrewAgentParser
 
 
 @pytest.fixture

tests/cassettes/test_agent_execute_task_with_ollama.yaml

@@ -1,6 +1,42 @@
 interactions:
 - request:
-    body: '{"model": "llama3.2:3b", "prompt": "### System:\nYou are test role. test
+    body: !!binary |
+      CrcCCiQKIgoMc2VydmljZS5uYW1lEhIKEGNyZXdBSS10ZWxlbWV0cnkSjgIKEgoQY3Jld2FpLnRl
+      bGVtZXRyeRJoChA/Q8UW5bidCRtKvri5fOaNEgh5qLzvLvZJkioQVG9vbCBVc2FnZSBFcnJvcjAB
+      OYjFVQr1TPgXQXCXhwr1TPgXShoKDmNyZXdhaV92ZXJzaW9uEggKBjAuNjEuMHoCGAGFAQABAAAS
+      jQEKEChQTWQ07t26ELkZmP5RresSCHEivRGBpsP7KgpUb29sIFVzYWdlMAE5sKkbC/VM+BdB8MIc
+      C/VM+BdKGgoOY3Jld2FpX3ZlcnNpb24SCAoGMC42MS4wShkKCXRvb2xfbmFtZRIMCgpkdW1teV90
+      b29sSg4KCGF0dGVtcHRzEgIYAXoCGAGFAQABAAA=
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '314'
+      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:
+      - Tue, 24 Sep 2024 21:57:54 GMT
+    status:
+      code: 200
+      message: OK
+- request:
+    body: '{"model": "gemma2:latest", "prompt": "### System:\nYou 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
@@ -10,7 +46,7 @@ interactions:
       explanation of AI\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:\n\n",
-      "options": {"stop": ["\nObservation:"]}, "stream": false}'
+      "options": {}, "stream": false}'
     headers:
       Accept:
       - '*/*'
@@ -19,26 +55,26 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '839'
+      - '815'
       Content-Type:
       - application/json
       User-Agent:
-      - python-requests/2.32.3
+      - python-requests/2.31.0
     method: POST
-    uri: http://localhost:11434/api/generate
+    uri: http://localhost:8080/api/generate
   response:
     body:
-      string: '{"model":"llama3.2:3b","created_at":"2025-01-02T20:05:52.24992Z","response":"Final
-        Answer: Artificial Intelligence (AI) refers to the development of computer
-        systems capable of performing tasks that typically require human intelligence,
-        such as learning, problem-solving, decision-making, and perception.","done":true,"done_reason":"stop","context":[128006,9125,128007,271,38766,1303,33025,2696,25,6790,220,2366,18,271,128009,128006,882,128007,271,14711,744,512,2675,527,1296,3560,13,1296,93371,198,7927,4443,5915,374,25,1296,5915,198,1271,3041,856,1888,4686,1620,4320,311,279,3465,1005,279,4839,2768,3645,1473,85269,25,358,1457,649,3041,264,2294,4320,198,19918,22559,25,4718,1620,4320,2011,387,279,2294,323,279,1455,4686,439,3284,11,433,2011,387,15632,7633,382,40,28832,1005,1521,20447,11,856,2683,14117,389,433,2268,14711,2724,1473,5520,5546,25,83017,1148,15592,374,304,832,11914,271,2028,374,279,1755,13186,369,701,1620,4320,25,362,832,1355,18886,16540,315,15592,198,9514,28832,471,279,5150,4686,2262,439,279,1620,4320,11,539,264,12399,382,11382,0,1115,374,48174,3062,311,499,11,1005,279,7526,2561,323,3041,701,1888,13321,22559,11,701,2683,14117,389,433,2268,85269,1473,128009,128006,78191,128007,271,19918,22559,25,59294,22107,320,15836,8,19813,311,279,4500,315,6500,6067,13171,315,16785,9256,430,11383,1397,3823,11478,11,1778,439,6975,11,3575,99246,11,5597,28846,11,323,21063,13],"total_duration":1461909875,"load_duration":39886208,"prompt_eval_count":181,"prompt_eval_duration":701000000,"eval_count":39,"eval_duration":719000000}'
+      string: '{"model":"gemma2:latest","created_at":"2024-09-24T21:57:55.835715Z","response":"Thought:
+        I can explain AI in one sentence. \n\nFinal Answer: Artificial intelligence
+        (AI) is the ability of computer systems to perform tasks that typically require
+        human intelligence, such as learning, problem-solving, and decision-making.  \n","done":true,"done_reason":"stop","context":[106,1645,108,6176,1479,235292,108,2045,708,2121,4731,235265,2121,135147,108,6922,3749,6789,603,235292,2121,6789,108,1469,2734,970,1963,3407,2048,3448,577,573,6911,1281,573,5463,2412,5920,235292,109,65366,235292,590,1490,798,2734,476,1775,3448,108,11263,10358,235292,3883,2048,3448,2004,614,573,1775,578,573,1546,3407,685,3077,235269,665,2004,614,17526,6547,235265,109,235285,44472,1281,1450,32808,235269,970,3356,12014,611,665,235341,109,6176,4926,235292,109,6846,12297,235292,36576,1212,16481,603,575,974,13060,109,1596,603,573,5246,12830,604,861,2048,3448,235292,586,974,235290,47366,15844,576,16481,108,4747,44472,2203,573,5579,3407,3381,685,573,2048,3448,235269,780,476,13367,235265,109,12694,235341,1417,603,50471,2845,577,692,235269,1281,573,8112,2506,578,2734,861,1963,14124,10358,235269,861,3356,12014,611,665,235341,109,65366,235292,109,107,108,106,2516,108,65366,235292,590,798,10200,16481,575,974,13060,235265,235248,109,11263,10358,235292,42456,17273,591,11716,235275,603,573,7374,576,6875,5188,577,3114,13333,674,15976,2817,3515,17273,235269,1582,685,6044,235269,3210,235290,60495,235269,578,4530,235290,14577,235265,139,108],"total_duration":3370959792,"load_duration":20611750,"prompt_eval_count":173,"prompt_eval_duration":688036000,"eval_count":51,"eval_duration":2660291000}'
     headers:
       Content-Length:
-      - '1537'
+      - '1662'
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Thu, 02 Jan 2025 20:05:52 GMT
+      - Tue, 24 Sep 2024 21:57:55 GMT
     status:
       code: 200
       message: OK