feat: implement file-based locking decorator for concurrent RAG client access

.github/workflows/linter.yml

@@ -15,19 +15,8 @@ jobs:
       - name: Fetch Target Branch
         run: git fetch origin $TARGET_BRANCH --depth=1
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          enable-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/uv.lock
-
-      - name: Set up Python
-        run: uv python install 3.11
-
-      - name: Install dependencies
-        run: uv sync --dev --no-install-project
+      - name: Install Ruff
+        run: pip install ruff
 
       - name: Get Changed Python Files
         id: changed-files
@@ -44,4 +33,4 @@ jobs:
           echo "${{ steps.changed-files.outputs.files }}" \
             | tr ' ' '\n' \
             | grep -v 'src/crewai/cli/templates/' \
-            | xargs -I{} uv run ruff check "{}"
+            | xargs -I{} ruff check "{}"

.github/workflows/security-checker.yml

@@ -10,20 +10,14 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          enable-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/uv.lock
-
       - name: Set up Python
-        run: uv python install 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11.9"
 
       - name: Install dependencies
-        run: uv sync --dev --no-install-project
+        run: pip install bandit
 
       - name: Run Bandit
-        run: uv run bandit -c pyproject.toml -r src/ -ll
+        run: bandit -c pyproject.toml -r src/ -ll
 

.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v3
         with:
           enable-cache: true
           cache-dependency-glob: |

.github/workflows/type-checker.yml

@@ -6,78 +6,21 @@ permissions:
   contents: write
 
 jobs:
-  type-checker-matrix:
-    name: type-checker (${{ matrix.python-version }})
+  type-checker:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
         with:
-          fetch-depth: 0 # Fetch all history for proper diff
+          python-version: "3.11.9"
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          enable-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/uv.lock
-
-      - name: Set up Python ${{ matrix.python-version }}
-        run: uv python install ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: uv sync --dev --no-install-project
-
-      - name: Get changed Python files
-        id: changed-files
+      - name: Install Requirements
         run: |
-          # Get the list of changed Python files compared to the base branch
-          echo "Fetching changed files..."
-          git diff --name-only --diff-filter=ACMRT origin/${{ github.base_ref }}...HEAD -- '*.py' > changed_files.txt
+          pip install mypy
 
-          # Filter for files in src/ and tests/ directories
-          grep -E "^(src/|tests/)" changed_files.txt > filtered_changed_files.txt || true
-
-          # Check if there are any changed files
-          if [ -s filtered_changed_files.txt ]; then
-            echo "Changed Python files in src/ and tests/:"
-            cat filtered_changed_files.txt
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-            # Convert newlines to spaces for mypy command
-            echo "files=$(cat filtered_changed_files.txt | tr '\n' ' ')" >> $GITHUB_OUTPUT
-          else
-            echo "No Python files changed in src/ or tests/"
-            echo "has_changes=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Run type checks on changed files
-        if: steps.changed-files.outputs.has_changes == 'true'
-        run: |
-          echo "Running mypy on changed files with Python ${{ matrix.python-version }}..."
-          uv run mypy ${{ steps.changed-files.outputs.files }}
-
-      - name: No files to check
-        if: steps.changed-files.outputs.has_changes == 'false'
-        run: echo "No Python files in src/ or tests/ were modified - skipping type checks"
-
-  # Summary job to provide single status for branch protection
-  type-checker:
-    name: type-checker
-    runs-on: ubuntu-latest
-    needs: type-checker-matrix
-    if: always()
-    steps:
-      - name: Check matrix results
-        run: |
-          if [ "${{ needs.type-checker-matrix.result }}" == "success" ] || [ "${{ needs.type-checker-matrix.result }}" == "skipped" ]; then
-            echo "✅ All type checks passed"
-          else
-            echo "❌ Type checks failed"
-            exit 1
-          fi
+      - name: Run type checks
+        run: mypy src

.pre-commit-config.yaml

@@ -1,14 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.11
+    rev: v0.8.2
     hooks:
       - id: ruff
-        args: ["--config", "pyproject.toml"]
+        args: ["--fix"]
       - id: ruff-format
-        args: ["--config", "pyproject.toml"]
-  
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.17.1
-    hooks:
-      - id: mypy
-        args: ["--config-file", "pyproject.toml"]

.ruff.toml

@@ -0,0 +1,4 @@
+exclude = [
+    "templates",
+    "__init__.py",
+]

README.md

@@ -418,10 +418,10 @@ Choose CrewAI to easily build powerful, adaptable, and production-ready AI autom
 
 You can test different real life examples of AI crews in the [CrewAI-examples repo](https://github.com/crewAIInc/crewAI-examples?tab=readme-ov-file):
 
-- [Landing Page Generator](https://github.com/crewAIInc/crewAI-examples/tree/main/crews/landing_page_generator)
+- [Landing Page Generator](https://github.com/crewAIInc/crewAI-examples/tree/main/landing_page_generator)
 - [Having Human input on the execution](https://docs.crewai.com/how-to/Human-Input-on-Execution)
-- [Trip Planner](https://github.com/crewAIInc/crewAI-examples/tree/main/crews/trip_planner)
-- [Stock Analysis](https://github.com/crewAIInc/crewAI-examples/tree/main/crews/stock_analysis)
+- [Trip Planner](https://github.com/crewAIInc/crewAI-examples/tree/main/trip_planner)
+- [Stock Analysis](https://github.com/crewAIInc/crewAI-examples/tree/main/stock_analysis)
 
 ### Quick Tutorial
 
@@ -429,19 +429,19 @@ You can test different real life examples of AI crews in the [CrewAI-examples re
 
 ### Write Job Descriptions
 
-[Check out code for this example](https://github.com/crewAIInc/crewAI-examples/tree/main/crews/job-posting) or watch a video below:
+[Check out code for this example](https://github.com/crewAIInc/crewAI-examples/tree/main/job-posting) or watch a video below:
 
 [![Jobs postings](https://img.youtube.com/vi/u98wEMz-9to/maxresdefault.jpg)](https://www.youtube.com/watch?v=u98wEMz-9to "Jobs postings")
 
 ### Trip Planner
 
-[Check out code for this example](https://github.com/crewAIInc/crewAI-examples/tree/main/crews/trip_planner) or watch a video below:
+[Check out code for this example](https://github.com/crewAIInc/crewAI-examples/tree/main/trip_planner) or watch a video below:
 
 [![Trip Planner](https://img.youtube.com/vi/xis7rWp-hjs/maxresdefault.jpg)](https://www.youtube.com/watch?v=xis7rWp-hjs "Trip Planner")
 
 ### Stock Analysis
 
-[Check out code for this example](https://github.com/crewAIInc/crewAI-examples/tree/main/crews/stock_analysis) or watch a video below:
+[Check out code for this example](https://github.com/crewAIInc/crewAI-examples/tree/main/stock_analysis) or watch a video below:
 
 [![Stock Analysis](https://img.youtube.com/vi/e0Uj4yWdaAg/maxresdefault.jpg)](https://www.youtube.com/watch?v=e0Uj4yWdaAg "Stock Analysis")
 

docs/en/concepts/cli.mdx

@@ -282,25 +282,7 @@ Watch this video tutorial for a step-by-step demonstration of deploying your cre
   allowfullscreen
 ></iframe>
 
-### 12. Login
-
-Authenticate with CrewAI Enterprise using a secure device code flow (no email entry required).
-
-```shell Terminal
-crewai login
-```
-
-What happens:
-- A verification URL and short code are displayed in your terminal
-- Your browser opens to the verification URL
-- Enter/confirm the code to complete authentication
-
-Notes:
-- The OAuth2 provider and domain are configured via `crewai config` (defaults use `login.crewai.com`)
-- After successful login, the CLI also attempts to authenticate to the Tool Repository automatically
-- If you reset your configuration, run `crewai login` again to re-authenticate
-
-### 13. API Keys
+### 11. API Keys
 
 When running ```crewai create crew``` command, the CLI will show you a list of available LLM providers to choose from, followed by model selection for your chosen provider.
 
@@ -328,7 +310,7 @@ See the following link for each provider's key name:
 
 * [LiteLLM Providers](https://docs.litellm.ai/docs/providers)
 
-### 14. Configuration Management
+### 12. Configuration Management
 
 Manage CLI configuration settings for CrewAI.
 
@@ -403,10 +385,6 @@ Reset all configuration to defaults:
 crewai config reset
 ```
 
-<Tip>
-After resetting configuration, re-run `crewai login` to authenticate again.
-</Tip>
-
 <Note>
 Configuration settings are stored in `~/.config/crewai/settings.json`. Some settings like organization name and UUID are read-only and managed through authentication and organization commands. Tool repository related settings are hidden and cannot be set directly by users.
 </Note>

docs/en/concepts/event-listener.mdx

@@ -44,12 +44,12 @@ To create a custom event listener, you need to:
 Here's a simple example of a custom event listener class:
 
 ```python
-from crewai.events import (
+from crewai.utilities.events import (
     CrewKickoffStartedEvent,
     CrewKickoffCompletedEvent,
     AgentExecutionCompletedEvent,
 )
-from crewai.events import BaseEventListener
+from crewai.utilities.events.base_event_listener import BaseEventListener
 
 class MyCustomListener(BaseEventListener):
     def __init__(self):
@@ -146,7 +146,7 @@ my_project/
 
 ```python
 # my_custom_listener.py
-from crewai.events import BaseEventListener
+from crewai.utilities.events.base_event_listener import BaseEventListener
 # ... import events ...
 
 class MyCustomListener(BaseEventListener):
@@ -279,7 +279,7 @@ Additional fields vary by event type. For example, `CrewKickoffCompletedEvent` i
 For temporary event handling (useful for testing or specific operations), you can use the `scoped_handlers` context manager:
 
 ```python
-from crewai.events import crewai_event_bus, CrewKickoffStartedEvent
+from crewai.utilities.events import crewai_event_bus, CrewKickoffStartedEvent
 
 with crewai_event_bus.scoped_handlers():
     @crewai_event_bus.on(CrewKickoffStartedEvent)

docs/en/concepts/flows.mdx

@@ -97,13 +97,7 @@ The state's unique ID and stored data can be useful for tracking flow executions
 
 ### @start()
 
-The `@start()` decorator marks entry points for a Flow. You can:
-
-- Declare multiple unconditional starts: `@start()`
-- Gate a start on a prior method or router label: `@start("method_or_label")`
-- Provide a callable condition to control when a start should fire
-
-All satisfied `@start()` methods will execute (often in parallel) when the Flow begins or resumes.
+The `@start()` decorator is used to mark a method as the starting point of a Flow. When a Flow is started, all the methods decorated with `@start()` are executed in parallel. You can have multiple start methods in a Flow, and they will all be executed when the Flow is started.
 
 ### @listen()
 

docs/en/concepts/knowledge.mdx

@@ -24,41 +24,6 @@ For file-based Knowledge Sources, make sure to place your files in a `knowledge`
 Also, use relative paths from the `knowledge` directory when creating the source.
 </Tip>
 
-### Vector store (RAG) client configuration
-
-CrewAI exposes a provider-neutral RAG client abstraction for vector stores. The default provider is ChromaDB, and Qdrant is supported as well. You can switch providers using configuration utilities.
-
-Supported today:
-- ChromaDB (default)
-- Qdrant
-
-```python Code
-from crewai.rag.config.utils import set_rag_config, get_rag_client, clear_rag_config
-
-# ChromaDB (default)
-from crewai.rag.chromadb.config import ChromaDBConfig
-set_rag_config(ChromaDBConfig())
-chromadb_client = get_rag_client()
-
-# Qdrant
-from crewai.rag.qdrant.config import QdrantConfig
-set_rag_config(QdrantConfig())
-qdrant_client = get_rag_client()
-
-# Example operations (same API for any provider)
-client = qdrant_client  # or chromadb_client
-client.create_collection(collection_name="docs")
-client.add_documents(
-    collection_name="docs",
-    documents=[{"id": "1", "content": "CrewAI enables collaborative AI agents."}],
-)
-results = client.search(collection_name="docs", query="collaborative agents", limit=3)
-
-clear_rag_config()  # optional reset
-```
-
-This RAG client is separate from Knowledge’s built-in storage. Use it when you need direct vector-store control or custom retrieval pipelines.
-
 ### Basic String Knowledge Example
 
 ```python Code
@@ -716,11 +681,11 @@ CrewAI emits events during the knowledge retrieval process that you can listen f
 #### Example: Monitoring Knowledge Retrieval
 
 ```python
-from crewai.events import (
+from crewai.utilities.events import (
     KnowledgeRetrievalStartedEvent,
     KnowledgeRetrievalCompletedEvent,
-    BaseEventListener,
 )
+from crewai.utilities.events.base_event_listener import BaseEventListener
 
 class KnowledgeMonitorListener(BaseEventListener):
     def setup_listeners(self, crewai_event_bus):

docs/en/concepts/llms.mdx

@@ -733,10 +733,10 @@ CrewAI supports streaming responses from LLMs, allowing your application to rece
     CrewAI emits events for each chunk received during streaming:
 
     ```python
-    from crewai.events import (
+    from crewai.utilities.events import (
       LLMStreamChunkEvent
     )
-    from crewai.events import BaseEventListener
+    from crewai.utilities.events.base_event_listener import BaseEventListener
 
     class MyCustomListener(BaseEventListener):
         def setup_listeners(self, crewai_event_bus):
@@ -758,8 +758,8 @@ CrewAI supports streaming responses from LLMs, allowing your application to rece
 
     ```python
     from crewai import LLM, Agent, Task, Crew
-    from crewai.events import LLMStreamChunkEvent
-    from crewai.events import BaseEventListener
+    from crewai.utilities.events import LLMStreamChunkEvent
+    from crewai.utilities.events.base_event_listener import BaseEventListener
 
     class MyCustomListener(BaseEventListener):
         def setup_listeners(self, crewai_event_bus):

docs/en/concepts/memory.mdx

@@ -738,17 +738,6 @@ print(f"OpenAI: {openai_time:.2f}s")
 print(f"Ollama: {ollama_time:.2f}s")
 ```
 
-### Entity Memory batching behavior
-
-Entity Memory supports batching when saving multiple entities at once. When you pass a list of `EntityMemoryItem`, the system:
-
-- Emits a single MemorySaveStartedEvent with `entity_count`
-- Saves each entity internally, collecting any partial errors
-- Emits MemorySaveCompletedEvent with aggregate metadata (saved count, errors)
-- Raises a partial-save exception if some entities failed (includes counts)
-
-This improves performance and observability when writing many entities in one operation.
-
 ## 2. External Memory 
 External Memory provides a standalone memory system that operates independently from the crew's built-in memory. This is ideal for specialized memory providers or cross-application memory sharing.
 
@@ -1052,8 +1041,8 @@ CrewAI emits the following memory-related events:
 Track memory operation timing to optimize your application:
 
 ```python
-from crewai.events import (
-    BaseEventListener,
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events import (
     MemoryQueryCompletedEvent,
     MemorySaveCompletedEvent
 )
@@ -1087,8 +1076,8 @@ memory_monitor = MemoryPerformanceMonitor()
 Log memory operations for debugging and insights:
 
 ```python
-from crewai.events import (
-    BaseEventListener,
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events import (
     MemorySaveStartedEvent,
     MemoryQueryStartedEvent,
     MemoryRetrievalCompletedEvent
@@ -1128,8 +1117,8 @@ memory_logger = MemoryLogger()
 Capture and respond to memory errors:
 
 ```python
-from crewai.events import (
-    BaseEventListener,
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events import (
     MemorySaveFailedEvent,
     MemoryQueryFailedEvent
 )
@@ -1178,8 +1167,8 @@ error_tracker = MemoryErrorTracker(notify_email="admin@example.com")
 Memory events can be forwarded to analytics and monitoring platforms to track performance metrics, detect anomalies, and visualize memory usage patterns:
 
 ```python
-from crewai.events import (
-    BaseEventListener,
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events import (
     MemoryQueryCompletedEvent,
     MemorySaveCompletedEvent
 )

docs/en/concepts/tasks.mdx

@@ -61,11 +61,6 @@ crew = Crew(
 | **Guardrail** _(optional)_       | `guardrail`       | `Optional[Callable]`             | Function to validate task output before proceeding to next task.                                                  |
 | **Guardrail Max Retries** _(optional)_ | `guardrail_max_retries` | `Optional[int]`     | Maximum number of retries when guardrail validation fails. Defaults to 3.                                         |
 
-<Note type="warning" title="Deprecated: max_retries">
-  The task attribute `max_retries` is deprecated and will be removed in v1.0.0.
-  Use `guardrail_max_retries` instead to control retry attempts when a guardrail fails.
-</Note>
-
 ## Creating Tasks
 
 There are two ways to create tasks in CrewAI: using **YAML configuration (recommended)** or defining them **directly in code**.
@@ -437,7 +432,7 @@ When a guardrail returns `(False, error)`:
 2. The agent attempts to fix the issue
 3. The process repeats until:
    - The guardrail returns `(True, result)`
-   - Maximum retries are reached (`guardrail_max_retries`)
+   - Maximum retries are reached
 
 Example with retry handling:
 ```python Code

docs/en/enterprise/features/integrations.mdx

@@ -59,7 +59,7 @@ Before using Authentication Integrations, ensure you have:
 3. Click **Connect** on your desired service from the Authentication Integrations section
 4. Complete the OAuth authentication flow
 5. Grant necessary permissions for your use case
-6. All set! Get your Enterprise Token from your [CrewAI Enterprise](https://app.crewai.com) in **Integration** tab
+6. Get your Enterprise Token from your [CrewAI Enterprise](https://app.crewai.com) account page - https://app.crewai.com/crewai_plus/settings/account
 
 <Frame>
   ![Integrations](/images/enterprise/enterprise_action_auth_token.png)

docs/en/enterprise/features/traces.mdx

@@ -141,16 +141,6 @@ Traces are invaluable for troubleshooting issues with your crews:
   </Step>
 </Steps>
 
-## Performance and batching
-
-CrewAI batches trace uploads to reduce overhead on high-volume runs:
-
-- A TraceBatchManager buffers events and sends them in batches via the Plus API client
-- Reduces network chatter and improves reliability on flaky connections
-- Automatically enabled in the default trace listener; no configuration needed
-
-This yields more stable tracing under load while preserving detailed task/agent telemetry.
-
 <Card title="Need Help?" icon="headset" href="mailto:support@crewai.com">
   Contact our support team for assistance with trace analysis or any other CrewAI Enterprise features.
 </Card>

docs/en/enterprise/guides/automation-triggers.mdx

@@ -96,13 +96,6 @@ class MyAutomatedCrew:
 
 The crew will automatically receive and can access the trigger payload through the standard CrewAI context mechanisms.
 
-<Note>
-  Crew and Flow inputs can include `crewai_trigger_payload`. CrewAI automatically injects this payload:
-  - Tasks: appended to the first task's description by default ("Trigger Payload: {crewai_trigger_payload}")
-  - Control via `allow_crewai_trigger_context`: set `True` to always inject, `False` to never inject
-  - Flows: any `@start()` method that accepts a `crewai_trigger_payload` parameter will receive it
-</Note>
-
 ### Integration with Flows
 
 For flows, you have more control over how trigger data is handled:

docs/en/guides/flows/mastering-flow-state.mdx

@@ -348,31 +348,6 @@ class SelectivePersistFlow(Flow):
 
 ## Advanced State Patterns
 
-### Conditional starts and resumable execution
-
-Flows support conditional `@start()` and resumable execution for HITL/cyclic scenarios:
-
-```python
-from crewai.flow.flow import Flow, start, listen, and_, or_
-
-class ResumableFlow(Flow):
-    @start()  # unconditional start
-    def init(self):
-        ...
-
-    # Conditional start: run after "init" or external trigger name
-    @start("init")
-    def maybe_begin(self):
-        ...
-
-    @listen(and_(init, maybe_begin))
-    def proceed(self):
-        ...
-```
-
-- Conditional `@start()` accepts a method name, a router label, or a callable condition.
-- During resume, listeners continue from prior checkpoints; cycle/router branches honor resumption flags.
-
 ### State-Based Conditional Logic
 
 You can use state to implement complex conditional logic in your flows:

docs/en/installation.mdx

@@ -30,12 +30,6 @@ Watch this video tutorial for a step-by-step demonstration of the installation p
   If you need to update Python, visit [python.org/downloads](https://python.org/downloads)
 </Note>
 
-<Note>
-  **OpenAI SDK Requirement**
-
-  CrewAI 0.175.0 requires `openai >= 1.13.3`. If you manage dependencies yourself, ensure your environment satisfies this constraint to avoid import/runtime issues.
-</Note>
-
 CrewAI uses the `uv` as its dependency management and package handling tool. It simplifies project setup and execution, offering a seamless experience.
 
 If you haven't installed `uv` yet, follow **step 1** to quickly get it set up on your system, else you can skip to **step 2**.

docs/ko/concepts/event-listener.mdx

@@ -44,12 +44,12 @@ Prompt Tracing을 통해 다음과 같은 작업이 가능합니다:
 아래는 커스텀 이벤트 리스너 클래스의 간단한 예시입니다:
 
 ```python
-from crewai.events import (
+from crewai.utilities.events import (
     CrewKickoffStartedEvent,
     CrewKickoffCompletedEvent,
     AgentExecutionCompletedEvent,
 )
-from crewai.events import BaseEventListener
+from crewai.utilities.events.base_event_listener import BaseEventListener
 
 class MyCustomListener(BaseEventListener):
     def __init__(self):
@@ -146,7 +146,7 @@ my_project/
 
 ```python
 # my_custom_listener.py
-from crewai.events import BaseEventListener
+from crewai.utilities.events.base_event_listener import BaseEventListener
 # ... import events ...
 
 class MyCustomListener(BaseEventListener):
@@ -279,7 +279,7 @@ CrewAI는 여러분이 청취할 수 있는 다양한 이벤트를 제공합니
 임시 이벤트 처리가 필요한 경우(테스트 또는 특정 작업에 유용함), `scoped_handlers` 컨텍스트 관리자를 사용할 수 있습니다:
 
 ```python
-from crewai.events import crewai_event_bus, CrewKickoffStartedEvent
+from crewai.utilities.events import crewai_event_bus, CrewKickoffStartedEvent
 
 with crewai_event_bus.scoped_handlers():
     @crewai_event_bus.on(CrewKickoffStartedEvent)

docs/ko/concepts/knowledge.mdx

@@ -683,11 +683,11 @@ CrewAI는 knowledge 검색 과정에서 이벤트를 발생시키며, 이벤트
 #### 예시: Knowledge Retrieval 모니터링
 
 ```python
-from crewai.events import (
+from crewai.utilities.events import (
     KnowledgeRetrievalStartedEvent,
     KnowledgeRetrievalCompletedEvent,
-    BaseEventListener,
 )
+from crewai.utilities.events.base_event_listener import BaseEventListener
 
 class KnowledgeMonitorListener(BaseEventListener):
     def setup_listeners(self, crewai_event_bus):

docs/ko/concepts/llms.mdx

@@ -731,10 +731,10 @@ CrewAI는 LLM의 스트리밍 응답을 지원하여, 애플리케이션이 출
     CrewAI는 스트리밍 중 수신되는 각 청크에 대해 이벤트를 발생시킵니다:
 
     ```python
-    from crewai.events import (
+    from crewai.utilities.events import (
       LLMStreamChunkEvent
     )
-    from crewai.events import BaseEventListener
+    from crewai.utilities.events.base_event_listener import BaseEventListener
 
     class MyCustomListener(BaseEventListener):
         def setup_listeners(self, crewai_event_bus):
@@ -756,8 +756,8 @@ CrewAI는 LLM의 스트리밍 응답을 지원하여, 애플리케이션이 출
 
     ```python
     from crewai import LLM, Agent, Task, Crew
-    from crewai.events import LLMStreamChunkEvent
-    from crewai.events import BaseEventListener
+    from crewai.utilities.events import LLMStreamChunkEvent
+    from crewai.utilities.events.base_event_listener import BaseEventListener
 
     class MyCustomListener(BaseEventListener):
         def setup_listeners(self, crewai_event_bus):

docs/ko/concepts/memory.mdx

@@ -985,8 +985,8 @@ CrewAI는 다음과 같은 메모리 관련 이벤트를 발생시킵니다:
 애플리케이션을 최적화하기 위해 메모리 작업 타이밍을 추적하세요:
 
 ```python
-from crewai.events import (
-    BaseEventListener,
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events import (
     MemoryQueryCompletedEvent,
     MemorySaveCompletedEvent
 )
@@ -1020,8 +1020,8 @@ memory_monitor = MemoryPerformanceMonitor()
 디버깅 및 인사이트를 위해 메모리 작업을 로깅합니다:
 
 ```python
-from crewai.events import (
-    BaseEventListener,
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events import (
     MemorySaveStartedEvent,
     MemoryQueryStartedEvent,
     MemoryRetrievalCompletedEvent
@@ -1061,8 +1061,8 @@ memory_logger = MemoryLogger()
 메모리 오류를 캡처하고 대응합니다:
 
 ```python
-from crewai.events import (
-    BaseEventListener,
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events import (
     MemorySaveFailedEvent,
     MemoryQueryFailedEvent
 )
@@ -1111,8 +1111,8 @@ error_tracker = MemoryErrorTracker(notify_email="admin@example.com")
 메모리 이벤트는 분석 및 모니터링 플랫폼으로 전달되어 성능 지표를 추적하고, 이상 징후를 감지하며, 메모리 사용 패턴을 시각화할 수 있습니다:
 
 ```python
-from crewai.events import (
-    BaseEventListener,
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events import (
     MemoryQueryCompletedEvent,
     MemorySaveCompletedEvent
 )

docs/ko/enterprise/features/integrations.mdx

@@ -58,7 +58,7 @@ Authentication Integrations를 사용하기 전에 다음이 준비되어 있는
 3. Authentication Integrations 섹션에서 원하는 서비스의 **Connect** 버튼을 클릭합니다.
 4. OAuth 인증 과정을 완료합니다.
 5. 사용 사례에 필요한 권한을 부여합니다.
-6. 완료! [CrewAI Enterprise](https://app.crewai.com)의 **Integration** 탭에서 Enterprise Token을 받습니다.
+6. [CrewAI Enterprise](https://app.crewai.com) 계정 페이지 - https://app.crewai.com/crewai_plus/settings/account 에서 Enterprise Token을 받습니다.
 
 <Frame>
   ![Integrations](/images/enterprise/enterprise_action_auth_token.png)
@@ -176,4 +176,4 @@ crew를 배포하고 각 통합을 특정 사용자에게 범위 지정할 수
 
 <Card title="도움이 필요하신가요?" icon="headset" href="mailto:support@crewai.com">
   통합 설정이나 문제 해결에 대한 지원이 필요하시면 저희 지원팀에 문의하세요.
-</Card>
+</Card>

docs/pt-BR/concepts/event-listener.mdx

@@ -44,12 +44,12 @@ Para criar um listener de evento personalizado, você precisa:
 Veja um exemplo simples de uma classe de listener de evento personalizado:
 
 ```python
-from crewai.events import (
+from crewai.utilities.events import (
     CrewKickoffStartedEvent,
     CrewKickoffCompletedEvent,
     AgentExecutionCompletedEvent,
 )
-from crewai.events import BaseEventListener
+from crewai.utilities.events.base_event_listener import BaseEventListener
 
 class MeuListenerPersonalizado(BaseEventListener):
     def __init__(self):
@@ -146,7 +146,7 @@ my_project/
 
 ```python
 # my_custom_listener.py
-from crewai.events import BaseEventListener
+from crewai.utilities.events.base_event_listener import BaseEventListener
 # ... importe events ...
 
 class MyCustomListener(BaseEventListener):
@@ -268,7 +268,7 @@ Campos adicionais variam pelo tipo de evento. Por exemplo, `CrewKickoffCompleted
 Para lidar temporariamente com eventos (útil para testes ou operações específicas), você pode usar o context manager `scoped_handlers`:
 
 ```python
-from crewai.events import crewai_event_bus, CrewKickoffStartedEvent
+from crewai.utilities.events import crewai_event_bus, CrewKickoffStartedEvent
 
 with crewai_event_bus.scoped_handlers():
     @crewai_event_bus.on(CrewKickoffStartedEvent)

docs/pt-BR/concepts/knowledge.mdx

@@ -681,11 +681,11 @@ O CrewAI emite eventos durante o processo de recuperação de knowledge que voc
 #### Exemplo: Monitorando Recuperação de Knowledge
 
 ```python
-from crewai.events import (
+from crewai.utilities.events import (
     KnowledgeRetrievalStartedEvent,
     KnowledgeRetrievalCompletedEvent,
-    BaseEventListener,
 )
+from crewai.utilities.events.base_event_listener import BaseEventListener
 
 class KnowledgeMonitorListener(BaseEventListener):
     def setup_listeners(self, crewai_event_bus):

docs/pt-BR/concepts/llms.mdx

@@ -708,10 +708,10 @@ O CrewAI suporta respostas em streaming de LLMs, permitindo que sua aplicação
     O CrewAI emite eventos para cada chunk recebido durante o streaming:
 
     ```python
-    from crewai.events import (
+    from crewai.utilities.events import (
       LLMStreamChunkEvent
     )
-    from crewai.events import BaseEventListener
+    from crewai.utilities.events.base_event_listener import BaseEventListener
 
     class MyCustomListener(BaseEventListener):
         def setup_listeners(self, crewai_event_bus):

docs/pt-BR/enterprise/features/integrations.mdx

@@ -58,7 +58,7 @@ Antes de usar as Integrações de Autenticação, certifique-se de que você pos
 3. Clique em **Conectar** no serviço desejado na seção Integrações de Autenticação
 4. Complete o fluxo de autenticação OAuth
 5. Conceda as permissões necessárias para seu caso de uso
-6. Pronto! Obtenha seu Token Enterprise do [CrewAI Enterprise](https://app.crewai.com) na aba **Integration**
+6. Obtenha seu Token Enterprise na sua página de conta do [CrewAI Enterprise](https://app.crewai.com) - https://app.crewai.com/crewai_plus/settings/account
 
 <Frame>
   ![Integrações](/images/enterprise/enterprise_action_auth_token.png)
@@ -176,4 +176,4 @@ Use o `user_bearer_token` para direcionar a integração a um usuário específi
 
 <Card title="Precisa de ajuda?" icon="headset" href="mailto:support@crewai.com">
   Entre em contato com nosso time de suporte para assistência com a configuração de integrações ou solução de problemas.
-</Card>
+</Card>

pyproject.toml

@@ -48,7 +48,7 @@ Documentation = "https://docs.crewai.com"
 Repository = "https://github.com/crewAIInc/crewAI"
 
 [project.optional-dependencies]
-tools = ["crewai-tools~=0.69.0"]
+tools = ["crewai-tools~=0.62.1"]
 embeddings = [
     "tiktoken~=0.8.0"
 ]
@@ -74,10 +74,9 @@ qdrant = [
 
 [tool.uv]
 dev-dependencies = [
-    "ruff>=0.12.11",
-    "mypy>=1.17.1",
-    "pre-commit>=4.3.0",
-    "bandit>=1.8.6",
+    "ruff>=0.8.2",
+    "mypy>=1.10.0",
+    "pre-commit>=3.6.0",
     "pillow>=10.2.0",
     "cairosvg>=2.7.1",
     "pytest>=8.0.0",
@@ -89,41 +88,15 @@ dev-dependencies = [
     "pytest-timeout>=2.3.1",
     "pytest-xdist>=3.6.1",
     "pytest-split>=0.9.0",
-    "types-requests==2.32.*",
-    "types-pyyaml==6.0.*",
-    "types-regex==2024.11.6.*",
-    "types-appdirs==1.4.*",
 ]
 
 [project.scripts]
 crewai = "crewai.cli.cli:crewai"
 
-[tool.ruff]
-exclude = [
-    "src/crewai/cli/templates",
-]
-fix = true
-
-[tool.ruff.lint]
-select = [
-    "B006",
-    "UP006",
-    "UP007",
-    "UP035",
-    "UP037",
-    "UP004",
-    "UP008",
-    "UP010",
-    "UP018",
-    "UP031",
-    "UP032",
-    "I001",
-    "I002",
-]
-
 [tool.mypy]
-strict = true
-exclude = ["src/crewai/cli/templates"]
+ignore_missing_imports = true
+disable_error_code = 'import-untyped'
+exclude = ["cli/templates"]
 
 [tool.bandit]
 exclude_dirs = ["src/crewai/cli/templates"]

src/crewai/__init__.py

@@ -1,30 +1,4 @@
 import warnings
-from typing import Any
-
-
-def _suppress_pydantic_deprecation_warnings() -> None:
-    """Suppress Pydantic deprecation warnings using targeted monkey patch."""
-    original_warn = warnings.warn
-
-    def filtered_warn(
-        message: Any,
-        category: type | None = None,
-        stacklevel: int = 1,
-        source: Any = None,
-    ) -> Any:
-        if (
-            category
-            and hasattr(category, "__module__")
-            and category.__module__ == "pydantic.warnings"
-        ):
-            return None
-        return original_warn(message, category, stacklevel + 1, source)
-
-    setattr(warnings, "warn", filtered_warn)
-
-
-_suppress_pydantic_deprecation_warnings()
-
 import threading
 import urllib.request
 
@@ -41,10 +15,17 @@ from crewai.tasks.llm_guardrail import LLMGuardrail
 from crewai.tasks.task_output import TaskOutput
 from crewai.telemetry.telemetry import Telemetry
 
+warnings.filterwarnings(
+    "ignore",
+    message="Pydantic serializer warnings:",
+    category=UserWarning,
+    module="pydantic.main",
+)
+
 _telemetry_submitted = False
 
 
-def _track_install() -> None:
+def _track_install():
     """Track package installation/first-use via Scarf analytics."""
     global _telemetry_submitted
 
@@ -55,7 +36,7 @@ def _track_install() -> None:
         pixel_url = "https://api.scarf.sh/v2/packages/CrewAI/crewai/docs/00f2dad1-8334-4a39-934e-003b2e1146db"
 
         req = urllib.request.Request(pixel_url)
-        req.add_header("User-Agent", f"CrewAI-Python/{__version__}")
+        req.add_header('User-Agent', f'CrewAI-Python/{__version__}')
 
         with urllib.request.urlopen(req, timeout=2):  # nosec B310
             _telemetry_submitted = True
@@ -64,7 +45,7 @@ def _track_install() -> None:
         pass
 
 
-def _track_install_async() -> None:
+def _track_install_async():
     """Track installation in background thread to avoid blocking imports."""
     if not Telemetry._is_telemetry_disabled():
         thread = threading.Thread(target=_track_install, daemon=True)
@@ -73,7 +54,7 @@ def _track_install_async() -> None:
 
 _track_install_async()
 
-__version__ = "0.177.0"
+__version__ = "0.165.1"
 __all__ = [
     "Agent",
     "Crew",

src/crewai/agent.py

@@ -38,17 +38,17 @@ from crewai.utilities.agent_utils import (
 )
 from crewai.utilities.constants import TRAINED_AGENTS_DATA_FILE, TRAINING_DATA_FILE
 from crewai.utilities.converter import generate_model_description
-from crewai.events.types.agent_events import (
+from crewai.utilities.events.agent_events import (
     AgentExecutionCompletedEvent,
     AgentExecutionErrorEvent,
     AgentExecutionStartedEvent,
 )
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.memory_events import (
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
+from crewai.utilities.events.memory_events import (
     MemoryRetrievalStartedEvent,
     MemoryRetrievalCompletedEvent,
 )
-from crewai.events.types.knowledge_events import (
+from crewai.utilities.events.knowledge_events import (
     KnowledgeQueryCompletedEvent,
     KnowledgeQueryFailedEvent,
     KnowledgeQueryStartedEvent,

src/crewai/agents/__init__.py

@@ -1,5 +1,5 @@
-from crewai.agents.cache.cache_handler import CacheHandler
-from crewai.agents.parser import parse, AgentAction, AgentFinish, OutputParserException
-from crewai.agents.tools_handler import ToolsHandler
+from .cache.cache_handler import CacheHandler
+from .parser import CrewAgentParser
+from .tools_handler import ToolsHandler
 
-__all__ = ["CacheHandler", "parse", "AgentAction", "AgentFinish", "OutputParserException", "ToolsHandler"]
+__all__ = ["CacheHandler", "CrewAgentParser", "ToolsHandler"]

src/crewai/agents/agent_adapters/langgraph/langgraph_adapter.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional
+from typing import Any, AsyncIterable, Dict, List, Optional
 
 from pydantic import Field, PrivateAttr
 
@@ -14,14 +14,15 @@ from crewai.tools.agent_tools.agent_tools import AgentTools
 from crewai.tools.base_tool import BaseTool
 from crewai.utilities import Logger
 from crewai.utilities.converter import Converter
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.agent_events import (
+from crewai.utilities.events import crewai_event_bus
+from crewai.utilities.events.agent_events import (
     AgentExecutionCompletedEvent,
     AgentExecutionErrorEvent,
     AgentExecutionStartedEvent,
 )
 
 try:
+    from langchain_core.messages import ToolMessage
     from langgraph.checkpoint.memory import MemorySaver
     from langgraph.prebuilt import create_react_agent
 

src/crewai/agents/agent_adapters/openai_agents/openai_adapter.py

@@ -10,8 +10,8 @@ from crewai.agents.agent_builder.base_agent import BaseAgent
 from crewai.tools import BaseTool
 from crewai.tools.agent_tools.agent_tools import AgentTools
 from crewai.utilities import Logger
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.agent_events import (
+from crewai.utilities.events import crewai_event_bus
+from crewai.utilities.events.agent_events import (
     AgentExecutionCompletedEvent,
     AgentExecutionErrorEvent,
     AgentExecutionStartedEvent,

src/crewai/agents/agent_builder/base_agent_executor_mixin.py

@@ -7,7 +7,7 @@ from crewai.utilities import I18N
 from crewai.utilities.converter import ConverterError
 from crewai.utilities.evaluators.task_evaluator import TaskEvaluator
 from crewai.utilities.printer import Printer
-from crewai.events.event_listener import event_listener
+from crewai.utilities.events.event_listener import event_listener
 
 if TYPE_CHECKING:
     from crewai.agents.agent_builder.base_agent import BaseAgent

src/crewai/agents/constants.py

@@ -1,27 +0,0 @@
-"""Constants for agent-related modules."""
-
-import re
-from typing import Final
-
-# crewai.agents.parser constants
-
-FINAL_ANSWER_ACTION: Final[str] = "Final Answer:"
-MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE: Final[str] = (
-    "I did it wrong. Invalid Format: I missed the 'Action:' after 'Thought:'. I will do right next, and don't use a tool I have already used.\n"
-)
-MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE: Final[str] = (
-    "I did it wrong. Invalid Format: I missed the 'Action Input:' after 'Action:'. I will do right next, and don't use a tool I have already used.\n"
-)
-FINAL_ANSWER_AND_PARSABLE_ACTION_ERROR_MESSAGE: Final[str] = (
-    "I did it wrong. Tried to both perform Action and give a Final Answer at the same time, I must do one or the other"
-)
-UNABLE_TO_REPAIR_JSON_RESULTS: Final[list[str]] = ['""', "{}"]
-ACTION_INPUT_REGEX: Final[re.Pattern[str]] = re.compile(
-    r"Action\s*\d*\s*:\s*(.*?)\s*Action\s*\d*\s*Input\s*\d*\s*:\s*(.*)", re.DOTALL
-)
-ACTION_REGEX: Final[re.Pattern[str]] = re.compile(
-    r"Action\s*\d*\s*:\s*(.*?)", re.DOTALL
-)
-ACTION_INPUT_ONLY_REGEX: Final[re.Pattern[str]] = re.compile(
-    r"\s*Action\s*\d*\s*Input\s*\d*\s*:\s*(.*)", re.DOTALL
-)

src/crewai/agents/crew_agent_executor.py

@@ -30,11 +30,11 @@ from crewai.utilities.constants import MAX_LLM_RETRY, TRAINING_DATA_FILE
 from crewai.utilities.logger import Logger
 from crewai.utilities.tool_utils import execute_tool_and_check_finality
 from crewai.utilities.training_handler import CrewTrainingHandler
-from crewai.events.types.logging_events import (
+from crewai.utilities.events.agent_events import (
     AgentLogsStartedEvent,
     AgentLogsExecutionEvent,
 )
-from crewai.events.event_bus import crewai_event_bus
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
 
 
 class CrewAgentExecutor(CrewAgentExecutorMixin):
@@ -54,11 +54,11 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
         tools_description: str,
         tools_handler: ToolsHandler,
         step_callback: Any = None,
-        original_tools: List[Any] | None = None,
+        original_tools: List[Any] = [],
         function_calling_llm: Any = None,
         respect_context_window: bool = False,
         request_within_rpm_limit: Optional[Callable[[], bool]] = None,
-        callbacks: List[Any] | None = None,
+        callbacks: List[Any] = [],
     ):
         self._i18n: I18N = I18N()
         self.llm: BaseLLM = llm
@@ -70,10 +70,10 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
         self.tools_names = tools_names
         self.stop = stop_words
         self.max_iter = max_iter
-        self.callbacks = callbacks or []
+        self.callbacks = callbacks
         self._printer: Printer = Printer()
         self.tools_handler = tools_handler
-        self.original_tools = original_tools or []
+        self.original_tools = original_tools
         self.step_callback = step_callback
         self.use_stop_words = self.llm.supports_stop_words()
         self.tools_description = tools_description
@@ -122,6 +122,7 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
             handle_unknown_error(self._printer, e)
             raise
 
+
         if self.ask_for_human_input:
             formatted_answer = self._handle_human_feedback(formatted_answer)
 
@@ -155,7 +156,7 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
                     messages=self.messages,
                     callbacks=self.callbacks,
                     printer=self._printer,
-                    from_task=self.task,
+                    from_task=self.task
                 )
                 formatted_answer = process_llm_response(answer, self.use_stop_words)
 

src/crewai/agents/parser.py

@@ -1,67 +1,50 @@
-"""Agent output parsing module for ReAct-style LLM responses.
-
-This module provides parsing functionality for agent outputs that follow
-the ReAct (Reasoning and Acting) format, converting them into structured
-AgentAction or AgentFinish objects.
-"""
-
-from dataclasses import dataclass
+import re
+from typing import Any, Optional, Union
 
 from json_repair import repair_json
 
-from crewai.agents.constants import (
-    ACTION_INPUT_REGEX,
-    ACTION_REGEX,
-    ACTION_INPUT_ONLY_REGEX,
-    FINAL_ANSWER_ACTION,
-    MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE,
-    MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE,
-    UNABLE_TO_REPAIR_JSON_RESULTS,
-)
 from crewai.utilities import I18N
 
-_I18N = I18N()
+FINAL_ANSWER_ACTION = "Final Answer:"
+MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE = "I did it wrong. Invalid Format: I missed the 'Action:' after 'Thought:'. I will do right next, and don't use a tool I have already used.\n"
+MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE = "I did it wrong. Invalid Format: I missed the 'Action Input:' after 'Action:'. I will do right next, and don't use a tool I have already used.\n"
+FINAL_ANSWER_AND_PARSABLE_ACTION_ERROR_MESSAGE = "I did it wrong. Tried to both perform Action and give a Final Answer at the same time, I must do one or the other"
 
 
-@dataclass
 class AgentAction:
-    """Represents an action to be taken by an agent."""
-
     thought: str
     tool: str
     tool_input: str
     text: str
-    result: str | None = None
+    result: str
+
+    def __init__(self, thought: str, tool: str, tool_input: str, text: str):
+        self.thought = thought
+        self.tool = tool
+        self.tool_input = tool_input
+        self.text = text
 
 
-@dataclass
 class AgentFinish:
-    """Represents the final answer from an agent."""
-
     thought: str
     output: str
     text: str
 
+    def __init__(self, thought: str, output: str, text: str):
+        self.thought = thought
+        self.output = output
+        self.text = text
+
 
 class OutputParserException(Exception):
-    """Exception raised when output parsing fails.
+    error: str
 
-    Attributes:
-        error: The error message.
-    """
-
-    def __init__(self, error: str) -> None:
-        """Initialize OutputParserException.
-
-        Args:
-            error: The error message.
-        """
+    def __init__(self, error: str):
         self.error = error
-        super().__init__(error)
 
 
-def parse(text: str) -> AgentAction | AgentFinish:
-    """Parse agent output text into AgentAction or AgentFinish.
+class CrewAgentParser:
+    """Parses ReAct-style LLM calls that have a single tool input.
 
     Expects output to be in one of two formats.
 
@@ -79,117 +62,108 @@ def parse(text: str) -> AgentAction | AgentFinish:
 
     Thought: agent thought here
     Final Answer: The temperature is 100 degrees
-
-    Args:
-        text: The agent output text to parse.
-
-    Returns:
-        AgentAction or AgentFinish based on the content.
-
-    Raises:
-        OutputParserException: If the text format is invalid.
     """
-    thought = _extract_thought(text)
-    includes_answer = FINAL_ANSWER_ACTION in text
-    action_match = ACTION_INPUT_REGEX.search(text)
 
-    if includes_answer:
-        final_answer = text.split(FINAL_ANSWER_ACTION)[-1].strip()
-        # Check whether the final answer ends with triple backticks.
-        if final_answer.endswith("```"):
-            # Count occurrences of triple backticks in the final answer.
-            count = final_answer.count("```")
-            # If count is odd then it's an unmatched trailing set; remove it.
-            if count % 2 != 0:
-                final_answer = final_answer[:-3].rstrip()
-        return AgentFinish(thought=thought, output=final_answer, text=text)
+    _i18n: I18N = I18N()
+    agent: Any = None
 
-    elif action_match:
-        action = action_match.group(1)
-        clean_action = _clean_action(action)
+    def __init__(self, agent: Optional[Any] = None):
+        self.agent = agent
 
-        action_input = action_match.group(2).strip()
+    @staticmethod
+    def parse_text(text: str) -> Union[AgentAction, AgentFinish]:
+        """
+        Static method to parse text into an AgentAction or AgentFinish without needing to instantiate the class.
 
-        tool_input = action_input.strip(" ").strip('"')
-        safe_tool_input = _safe_repair_json(tool_input)
+        Args:
+            text: The text to parse.
 
-        return AgentAction(
-            thought=thought, tool=clean_action, tool_input=safe_tool_input, text=text
+        Returns:
+            Either an AgentAction or AgentFinish based on the parsed content.
+        """
+        parser = CrewAgentParser()
+        return parser.parse(text)
+
+    def parse(self, text: str) -> Union[AgentAction, AgentFinish]:
+        thought = self._extract_thought(text)
+        includes_answer = FINAL_ANSWER_ACTION in text
+        regex = (
+            r"Action\s*\d*\s*:[\s]*(.*?)[\s]*Action\s*\d*\s*Input\s*\d*\s*:[\s]*(.*)"
         )
+        action_match = re.search(regex, text, re.DOTALL)
+        if includes_answer:
+            final_answer = text.split(FINAL_ANSWER_ACTION)[-1].strip()
+            # Check whether the final answer ends with triple backticks.
+            if final_answer.endswith("```"):
+                # Count occurrences of triple backticks in the final answer.
+                count = final_answer.count("```")
+                # If count is odd then it's an unmatched trailing set; remove it.
+                if count % 2 != 0:
+                    final_answer = final_answer[:-3].rstrip()
+            return AgentFinish(thought, final_answer, text)
 
-    if not ACTION_REGEX.search(text):
-        raise OutputParserException(
-            f"{MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE}\n{_I18N.slice('final_answer_format')}",
-        )
-    elif not ACTION_INPUT_ONLY_REGEX.search(text):
-        raise OutputParserException(
-            MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE,
-        )
-    else:
-        err_format = _I18N.slice("format_without_tools")
-        error = f"{err_format}"
-        raise OutputParserException(
-            error,
-        )
+        elif action_match:
+            action = action_match.group(1)
+            clean_action = self._clean_action(action)
 
+            action_input = action_match.group(2).strip()
 
-def _extract_thought(text: str) -> str:
-    """Extract the thought portion from the text.
+            tool_input = action_input.strip(" ").strip('"')
+            safe_tool_input = self._safe_repair_json(tool_input)
 
-    Args:
-        text: The full agent output text.
+            return AgentAction(thought, clean_action, safe_tool_input, text)
 
-    Returns:
-        The extracted thought string.
-    """
-    thought_index = text.find("\nAction")
-    if thought_index == -1:
-        thought_index = text.find("\nFinal Answer")
-    if thought_index == -1:
-        return ""
-    thought = text[:thought_index].strip()
-    # Remove any triple backticks from the thought string
-    thought = thought.replace("```", "").strip()
-    return thought
+        if not re.search(r"Action\s*\d*\s*:[\s]*(.*?)", text, re.DOTALL):
+            raise OutputParserException(
+                f"{MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE}\n{self._i18n.slice('final_answer_format')}",
+            )
+        elif not re.search(
+            r"[\s]*Action\s*\d*\s*Input\s*\d*\s*:[\s]*(.*)", text, re.DOTALL
+        ):
+            raise OutputParserException(
+                MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE,
+            )
+        else:
+            format = self._i18n.slice("format_without_tools")
+            error = f"{format}"
+            raise OutputParserException(
+                error,
+            )
 
+    def _extract_thought(self, text: str) -> str:
+        thought_index = text.find("\nAction")
+        if thought_index == -1:
+            thought_index = text.find("\nFinal Answer")
+        if thought_index == -1:
+            return ""
+        thought = text[:thought_index].strip()
+        # Remove any triple backticks from the thought string
+        thought = thought.replace("```", "").strip()
+        return thought
 
-def _clean_action(text: str) -> str:
-    """Clean action string by removing non-essential formatting characters.
+    def _clean_action(self, text: str) -> str:
+        """Clean action string by removing non-essential formatting characters."""
+        return text.strip().strip("*").strip()
 
-    Args:
-        text: The action text to clean.
+    def _safe_repair_json(self, tool_input: str) -> str:
+        UNABLE_TO_REPAIR_JSON_RESULTS = ['""', "{}"]
 
-    Returns:
-        The cleaned action string.
-    """
-    return text.strip().strip("*").strip()
+        # Skip repair if the input starts and ends with square brackets
+        # Explanation: The JSON parser has issues handling inputs that are enclosed in square brackets ('[]').
+        # These are typically valid JSON arrays or strings that do not require repair. Attempting to repair such inputs
+        # might lead to unintended alterations, such as wrapping the entire input in additional layers or modifying
+        # the structure in a way that changes its meaning. By skipping the repair for inputs that start and end with
+        # square brackets, we preserve the integrity of these valid JSON structures and avoid unnecessary modifications.
+        if tool_input.startswith("[") and tool_input.endswith("]"):
+            return tool_input
 
+        # Before repair, handle common LLM issues:
+        # 1. Replace """ with " to avoid JSON parser errors
 
-def _safe_repair_json(tool_input: str) -> str:
-    """Safely repair JSON input.
+        tool_input = tool_input.replace('"""', '"')
 
-    Args:
-        tool_input: The tool input string to repair.
+        result = repair_json(tool_input)
+        if result in UNABLE_TO_REPAIR_JSON_RESULTS:
+            return tool_input
 
-    Returns:
-        The repaired JSON string or original if repair fails.
-    """
-    # Skip repair if the input starts and ends with square brackets
-    # Explanation: The JSON parser has issues handling inputs that are enclosed in square brackets ('[]').
-    # These are typically valid JSON arrays or strings that do not require repair. Attempting to repair such inputs
-    # might lead to unintended alterations, such as wrapping the entire input in additional layers or modifying
-    # the structure in a way that changes its meaning. By skipping the repair for inputs that start and end with
-    # square brackets, we preserve the integrity of these valid JSON structures and avoid unnecessary modifications.
-    if tool_input.startswith("[") and tool_input.endswith("]"):
-        return tool_input
-
-    # Before repair, handle common LLM issues:
-    # 1. Replace """ with " to avoid JSON parser errors
-
-    tool_input = tool_input.replace('"""', '"')
-
-    result = repair_json(tool_input)
-    if result in UNABLE_TO_REPAIR_JSON_RESULTS:
-        return tool_input
-
-    return str(result)
+        return str(result)

src/crewai/agents/tools_handler.py

@@ -1,41 +1,29 @@
-"""Tools handler for managing tool execution and caching."""
+from typing import Any, Optional, Union
 
-from crewai.tools.cache_tools.cache_tools import CacheTools
-from crewai.tools.tool_calling import InstructorToolCalling, ToolCalling
-from crewai.agents.cache.cache_handler import CacheHandler
+from ..tools.cache_tools.cache_tools import CacheTools
+from ..tools.tool_calling import InstructorToolCalling, ToolCalling
+from .cache.cache_handler import CacheHandler
 
 
 class ToolsHandler:
-    """Callback handler for tool usage.
+    """Callback handler for tool usage."""
 
-    Attributes:
-        last_used_tool: The most recently used tool calling instance.
-        cache: Optional cache handler for storing tool outputs.
-    """
+    last_used_tool: Optional[ToolCalling] = None
+    cache: Optional[CacheHandler]
 
-    def __init__(self, cache: CacheHandler | None = None) -> None:
-        """Initialize the callback handler.
-
-        Args:
-            cache: Optional cache handler for storing tool outputs.
-        """
-        self.cache: CacheHandler | None = cache
-        self.last_used_tool: ToolCalling | InstructorToolCalling | None = None
+    def __init__(self, cache: Optional[CacheHandler] = None):
+        """Initialize the callback handler."""
+        self.cache = cache
+        self.last_used_tool = None
 
     def on_tool_use(
         self,
-        calling: ToolCalling | InstructorToolCalling,
+        calling: Union[ToolCalling, InstructorToolCalling],
         output: str,
         should_cache: bool = True,
-    ) -> None:
-        """Run when tool ends running.
-
-        Args:
-            calling: The tool calling instance.
-            output: The output from the tool execution.
-            should_cache: Whether to cache the tool output.
-        """
-        self.last_used_tool = calling
+    ) -> Any:
+        """Run when tool ends running."""
+        self.last_used_tool = calling  # type: ignore # BUG?: Incompatible types in assignment (expression has type "Union[ToolCalling, InstructorToolCalling]", variable has type "ToolCalling")
         if self.cache and should_cache and calling.tool_name != CacheTools().name:
             self.cache.add(
                 tool=calling.tool_name,

src/crewai/cli/plus_api.py

@@ -119,17 +119,12 @@ class PlusAPI:
 
     def initialize_trace_batch(self, payload) -> requests.Response:
         return self._make_request(
-            "POST",
-            f"{self.TRACING_RESOURCE}/batches",
-            json=payload,
-            timeout=30,
+            "POST", f"{self.TRACING_RESOURCE}/batches", json=payload
         )
 
     def initialize_ephemeral_trace_batch(self, payload) -> requests.Response:
         return self._make_request(
-            "POST",
-            f"{self.EPHEMERAL_TRACING_RESOURCE}/batches",
-            json=payload,
+            "POST", f"{self.EPHEMERAL_TRACING_RESOURCE}/batches", json=payload
         )
 
     def send_trace_events(self, trace_batch_id: str, payload) -> requests.Response:
@@ -155,7 +150,6 @@ class PlusAPI:
             "PATCH",
             f"{self.TRACING_RESOURCE}/batches/{trace_batch_id}/finalize",
             json=payload,
-            timeout=30,
         )
 
     def finalize_ephemeral_trace_batch(
@@ -165,5 +159,4 @@ class PlusAPI:
             "PATCH",
             f"{self.EPHEMERAL_TRACING_RESOURCE}/batches/{trace_batch_id}/finalize",
             json=payload,
-            timeout=30,
         )

src/crewai/cli/settings/main.py

@@ -10,9 +10,8 @@ console = Console()
 class SettingsCommand(BaseCommand):
     """A class to handle CLI configuration commands."""
 
-    def __init__(self, settings_kwargs: dict[str, Any] | None = None):
+    def __init__(self, settings_kwargs: dict[str, Any] = {}):
         super().__init__()
-        settings_kwargs = settings_kwargs or {}
         self.settings = Settings(**settings_kwargs)
 
     def list(self) -> None:

src/crewai/cli/shared/token_manager.py

@@ -56,8 +56,6 @@ class TokenManager:
         :return: The access token if valid and not expired, otherwise None.
         """
         encrypted_data = self.read_secure_file(self.file_path)
-        if encrypted_data is None:
-            return None
 
         decrypted_data = self.fernet.decrypt(encrypted_data)  # type: ignore
         data = json.loads(decrypted_data)

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

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

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

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

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

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

src/crewai/crew.py

@@ -59,7 +59,7 @@ from crewai.utilities import I18N, FileHandler, Logger, RPMController
 from crewai.utilities.constants import NOT_SPECIFIED, TRAINING_DATA_FILE
 from crewai.utilities.evaluators.crew_evaluator_handler import CrewEvaluator
 from crewai.utilities.evaluators.task_evaluator import TaskEvaluator
-from crewai.events.types.crew_events import (
+from crewai.utilities.events.crew_events import (
     CrewKickoffCompletedEvent,
     CrewKickoffFailedEvent,
     CrewKickoffStartedEvent,
@@ -70,14 +70,14 @@ from crewai.events.types.crew_events import (
     CrewTrainFailedEvent,
     CrewTrainStartedEvent,
 )
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.event_listener import EventListener
-from crewai.events.listeners.tracing.trace_listener import (
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
+from crewai.utilities.events.event_listener import EventListener
+from crewai.utilities.events.listeners.tracing.trace_listener import (
     TraceCollectionListener,
 )
 
 
-from crewai.events.listeners.tracing.utils import (
+from crewai.utilities.events.listeners.tracing.utils import (
     is_tracing_enabled,
 )
 from crewai.utilities.formatter import (
@@ -559,10 +559,9 @@ class Crew(FlowTrackable, BaseModel):
         CrewTrainingHandler(filename).initialize_file()
 
     def train(
-        self, n_iterations: int, filename: str, inputs: Optional[Dict[str, Any]] = None
+        self, n_iterations: int, filename: str, inputs: Optional[Dict[str, Any]] = {}
     ) -> None:
         """Trains the crew for a given number of iterations."""
-        inputs = inputs or {}
         try:
             crewai_event_bus.emit(
                 self,
@@ -703,11 +702,8 @@ class Crew(FlowTrackable, BaseModel):
         self._task_output_handler.reset()
         return results
 
-    async def kickoff_async(
-        self, inputs: Optional[Dict[str, Any]] = None
-    ) -> CrewOutput:
+    async def kickoff_async(self, inputs: Optional[Dict[str, Any]] = {}) -> CrewOutput:
         """Asynchronous kickoff method to start the crew execution."""
-        inputs = inputs or {}
         return await asyncio.to_thread(self.kickoff, inputs)
 
     async def kickoff_for_each_async(self, inputs: List[Dict]) -> List[CrewOutput]:

src/crewai/events/__init__.py

@@ -1,56 +0,0 @@
-"""CrewAI events system for monitoring and extending agent behavior.
-
-This module provides the event infrastructure that allows users to:
-- Monitor agent, task, and crew execution
-- Track memory operations and performance
-- Build custom logging and analytics
-- Extend CrewAI with custom event handlers
-"""
-
-from crewai.events.base_event_listener import BaseEventListener
-from crewai.events.event_bus import crewai_event_bus
-
-from crewai.events.types.memory_events import (
-    MemoryQueryCompletedEvent,
-    MemorySaveCompletedEvent,
-    MemorySaveStartedEvent,
-    MemoryQueryStartedEvent,
-    MemoryRetrievalCompletedEvent,
-    MemorySaveFailedEvent,
-    MemoryQueryFailedEvent,
-)
-
-from crewai.events.types.knowledge_events import (
-    KnowledgeRetrievalStartedEvent,
-    KnowledgeRetrievalCompletedEvent,
-)
-
-from crewai.events.types.crew_events import (
-    CrewKickoffStartedEvent,
-    CrewKickoffCompletedEvent,
-)
-from crewai.events.types.agent_events import (
-    AgentExecutionCompletedEvent,
-)
-
-from crewai.events.types.llm_events import (
-    LLMStreamChunkEvent,
-)
-
-__all__ = [
-    "BaseEventListener",
-    "crewai_event_bus",
-    "MemoryQueryCompletedEvent",
-    "MemorySaveCompletedEvent",
-    "MemorySaveStartedEvent",
-    "MemoryQueryStartedEvent",
-    "MemoryRetrievalCompletedEvent",
-    "MemorySaveFailedEvent",
-    "MemoryQueryFailedEvent",
-    "KnowledgeRetrievalStartedEvent",
-    "KnowledgeRetrievalCompletedEvent",
-    "CrewKickoffStartedEvent",
-    "CrewKickoffCompletedEvent",
-    "AgentExecutionCompletedEvent",
-    "LLMStreamChunkEvent",
-]

src/crewai/events/base_event_listener.py

@@ -1,15 +0,0 @@
-from abc import ABC, abstractmethod
-
-from crewai.events.event_bus import CrewAIEventsBus, crewai_event_bus
-
-
-class BaseEventListener(ABC):
-    verbose: bool = False
-
-    def __init__(self):
-        super().__init__()
-        self.setup_listeners(crewai_event_bus)
-
-    @abstractmethod
-    def setup_listeners(self, crewai_event_bus: CrewAIEventsBus):
-        pass

src/crewai/events/event_bus.py

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

src/crewai/events/listeners/__init__.py

@@ -1,5 +0,0 @@
-"""Event listener implementations for CrewAI.
-
-This module contains various event listener implementations
-for handling memory, tracing, and other event-driven functionality.
-"""

src/crewai/events/types/__init__.py

@@ -1,5 +0,0 @@
-"""Event type definitions for CrewAI.
-
-This module contains all event types used throughout the CrewAI system
-for monitoring and extending agent, crew, task, and tool execution.
-"""

src/crewai/events/types/logging_events.py

@@ -1,25 +0,0 @@
-"""Agent logging events that don't reference BaseAgent to avoid circular imports."""
-
-from typing import Any, Optional
-
-from crewai.events.base_events import BaseEvent
-
-
-class AgentLogsStartedEvent(BaseEvent):
-    """Event emitted when agent logs should be shown at start"""
-
-    agent_role: str
-    task_description: Optional[str] = None
-    verbose: bool = False
-    type: str = "agent_logs_started"
-
-
-class AgentLogsExecutionEvent(BaseEvent):
-    """Event emitted when agent logs should be shown during execution"""
-
-    agent_role: str
-    formatted_answer: Any
-    verbose: bool = False
-    type: str = "agent_logs_execution"
-
-    model_config = {"arbitrary_types_allowed": True}

src/crewai/experimental/evaluation/agent_evaluator.py

@@ -1,30 +1,18 @@
 import threading
 from typing import Any, Optional
 
-from crewai.experimental.evaluation.base_evaluator import (
-    AgentEvaluationResult,
-    AggregationStrategy,
-)
+from crewai.experimental.evaluation.base_evaluator import AgentEvaluationResult, AggregationStrategy
 from crewai.agent import Agent
 from crewai.task import Task
 from crewai.experimental.evaluation.evaluation_display import EvaluationDisplayFormatter
-from crewai.events.types.agent_events import (
-    AgentEvaluationStartedEvent,
-    AgentEvaluationCompletedEvent,
-    AgentEvaluationFailedEvent,
-)
+from crewai.utilities.events.agent_events import AgentEvaluationStartedEvent, AgentEvaluationCompletedEvent, AgentEvaluationFailedEvent
 from crewai.experimental.evaluation import BaseEvaluator, create_evaluation_callbacks
 from collections.abc import Sequence
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.utils.console_formatter import ConsoleFormatter
-from crewai.events.types.task_events import TaskCompletedEvent
-from crewai.events.types.agent_events import LiteAgentExecutionCompletedEvent
-from crewai.experimental.evaluation.base_evaluator import (
-    AgentAggregatedEvaluationResult,
-    EvaluationScore,
-    MetricCategory,
-)
-
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
+from crewai.utilities.events.utils.console_formatter import ConsoleFormatter
+from crewai.utilities.events.task_events import TaskCompletedEvent
+from crewai.utilities.events.agent_events import LiteAgentExecutionCompletedEvent
+from crewai.experimental.evaluation.base_evaluator import AgentAggregatedEvaluationResult, EvaluationScore, MetricCategory
 
 class ExecutionState:
     current_agent_id: Optional[str] = None
@@ -36,7 +24,6 @@ class ExecutionState:
         self.iterations_results = {}
         self.agent_evaluators = {}
 
-
 class AgentEvaluator:
     def __init__(
         self,
@@ -59,45 +46,27 @@ class AgentEvaluator:
 
     @property
     def _execution_state(self) -> ExecutionState:
-        if not hasattr(self._thread_local, "execution_state"):
+        if not hasattr(self._thread_local, 'execution_state'):
             self._thread_local.execution_state = ExecutionState()
         return self._thread_local.execution_state
 
     def _subscribe_to_events(self) -> None:
         from typing import cast
-
-        crewai_event_bus.register_handler(
-            TaskCompletedEvent, cast(Any, self._handle_task_completed)
-        )
-        crewai_event_bus.register_handler(
-            LiteAgentExecutionCompletedEvent,
-            cast(Any, self._handle_lite_agent_completed),
-        )
+        crewai_event_bus.register_handler(TaskCompletedEvent, cast(Any, self._handle_task_completed))
+        crewai_event_bus.register_handler(LiteAgentExecutionCompletedEvent, cast(Any, self._handle_lite_agent_completed))
 
     def _handle_task_completed(self, source: Any, event: TaskCompletedEvent) -> None:
         assert event.task is not None
         agent = event.task.agent
-        if (
-            agent
-            and str(getattr(agent, "id", "unknown"))
-            in self._execution_state.agent_evaluators
-        ):
-            self.emit_evaluation_started_event(
-                agent_role=agent.role,
-                agent_id=str(agent.id),
-                task_id=str(event.task.id),
-            )
+        if agent and str(getattr(agent, 'id', 'unknown')) in self._execution_state.agent_evaluators:
+            self.emit_evaluation_started_event(agent_role=agent.role, agent_id=str(agent.id), task_id=str(event.task.id))
 
             state = ExecutionState()
             state.current_agent_id = str(agent.id)
             state.current_task_id = str(event.task.id)
 
-            assert (
-                state.current_agent_id is not None and state.current_task_id is not None
-            )
-            trace = self.callback.get_trace(
-                state.current_agent_id, state.current_task_id
-            )
+            assert state.current_agent_id is not None and state.current_task_id is not None
+            trace = self.callback.get_trace(state.current_agent_id, state.current_task_id)
 
             if not trace:
                 return
@@ -107,28 +76,19 @@ class AgentEvaluator:
                 task=event.task,
                 execution_trace=trace,
                 final_output=event.output,
-                state=state,
+                state=state
             )
 
             current_iteration = self._execution_state.iteration
             if current_iteration not in self._execution_state.iterations_results:
                 self._execution_state.iterations_results[current_iteration] = {}
 
-            if (
-                agent.role
-                not in self._execution_state.iterations_results[current_iteration]
-            ):
-                self._execution_state.iterations_results[current_iteration][
-                    agent.role
-                ] = []
+            if agent.role not in self._execution_state.iterations_results[current_iteration]:
+                self._execution_state.iterations_results[current_iteration][agent.role] = []
 
-            self._execution_state.iterations_results[current_iteration][
-                agent.role
-            ].append(result)
+            self._execution_state.iterations_results[current_iteration][agent.role].append(result)
 
-    def _handle_lite_agent_completed(
-        self, source: object, event: LiteAgentExecutionCompletedEvent
-    ) -> None:
+    def _handle_lite_agent_completed(self, source: object, event: LiteAgentExecutionCompletedEvent) -> None:
         agent_info = event.agent_info
         agent_id = str(agent_info["id"])
 
@@ -146,12 +106,8 @@ class AgentEvaluator:
             if not target_agent:
                 return
 
-            assert (
-                state.current_agent_id is not None and state.current_task_id is not None
-            )
-            trace = self.callback.get_trace(
-                state.current_agent_id, state.current_task_id
-            )
+            assert state.current_agent_id is not None and state.current_task_id is not None
+            trace = self.callback.get_trace(state.current_agent_id, state.current_task_id)
 
             if not trace:
                 return
@@ -160,7 +116,7 @@ class AgentEvaluator:
                 agent=target_agent,
                 execution_trace=trace,
                 final_output=event.output,
-                state=state,
+                state=state
             )
 
             current_iteration = self._execution_state.iteration
@@ -168,17 +124,10 @@ class AgentEvaluator:
                 self._execution_state.iterations_results[current_iteration] = {}
 
             agent_role = target_agent.role
-            if (
-                agent_role
-                not in self._execution_state.iterations_results[current_iteration]
-            ):
-                self._execution_state.iterations_results[current_iteration][
-                    agent_role
-                ] = []
+            if agent_role not in self._execution_state.iterations_results[current_iteration]:
+                self._execution_state.iterations_results[current_iteration][agent_role] = []
 
-            self._execution_state.iterations_results[current_iteration][
-                agent_role
-            ].append(result)
+            self._execution_state.iterations_results[current_iteration][agent_role].append(result)
 
     def set_iteration(self, iteration: int) -> None:
         self._execution_state.iteration = iteration
@@ -187,26 +136,14 @@ class AgentEvaluator:
         self._execution_state.iterations_results = {}
 
     def get_evaluation_results(self) -> dict[str, list[AgentEvaluationResult]]:
-        if (
-            self._execution_state.iterations_results
-            and self._execution_state.iteration
-            in self._execution_state.iterations_results
-        ):
-            return self._execution_state.iterations_results[
-                self._execution_state.iteration
-            ]
+        if self._execution_state.iterations_results and self._execution_state.iteration in self._execution_state.iterations_results:
+            return self._execution_state.iterations_results[self._execution_state.iteration]
         return {}
 
     def display_results_with_iterations(self) -> None:
-        self.display_formatter.display_summary_results(
-            self._execution_state.iterations_results
-        )
+        self.display_formatter.display_summary_results(self._execution_state.iterations_results)
 
-    def get_agent_evaluation(
-        self,
-        strategy: AggregationStrategy = AggregationStrategy.SIMPLE_AVERAGE,
-        include_evaluation_feedback: bool = True,
-    ) -> dict[str, AgentAggregatedEvaluationResult]:
+    def get_agent_evaluation(self, strategy: AggregationStrategy = AggregationStrategy.SIMPLE_AVERAGE, include_evaluation_feedback: bool = True) -> dict[str, AgentAggregatedEvaluationResult]:
         agent_results = {}
         with crewai_event_bus.scoped_handlers():
             task_results = self.get_evaluation_results()
@@ -220,16 +157,13 @@ class AgentEvaluator:
                     agent_id=agent_id,
                     agent_role=agent_role,
                     results=results,
-                    strategy=strategy,
+                    strategy=strategy
                 )
 
                 agent_results[agent_role] = aggregated_result
 
-            if (
-                self._execution_state.iterations_results
-                and self._execution_state.iteration
-                == max(self._execution_state.iterations_results.keys(), default=0)
-            ):
+
+            if self._execution_state.iterations_results and self._execution_state.iteration == max(self._execution_state.iterations_results.keys(), default=0):
                 self.display_results_with_iterations()
 
             if include_evaluation_feedback:
@@ -238,9 +172,7 @@ class AgentEvaluator:
         return agent_results
 
     def display_evaluation_with_feedback(self) -> None:
-        self.display_formatter.display_evaluation_with_feedback(
-            self._execution_state.iterations_results
-        )
+        self.display_formatter.display_evaluation_with_feedback(self._execution_state.iterations_results)
 
     def evaluate(
         self,
@@ -252,91 +184,46 @@ class AgentEvaluator:
     ) -> AgentEvaluationResult:
         result = AgentEvaluationResult(
             agent_id=state.current_agent_id or str(agent.id),
-            task_id=state.current_task_id or (str(task.id) if task else "unknown_task"),
+            task_id=state.current_task_id or (str(task.id) if task else "unknown_task")
         )
 
         assert self.evaluators is not None
         task_id = str(task.id) if task else None
         for evaluator in self.evaluators:
             try:
-                self.emit_evaluation_started_event(
-                    agent_role=agent.role, agent_id=str(agent.id), task_id=task_id
-                )
+                self.emit_evaluation_started_event(agent_role=agent.role, agent_id=str(agent.id), task_id=task_id)
                 score = evaluator.evaluate(
                     agent=agent,
                     task=task,
                     execution_trace=execution_trace,
-                    final_output=final_output,
+                    final_output=final_output
                 )
                 result.metrics[evaluator.metric_category] = score
-                self.emit_evaluation_completed_event(
-                    agent_role=agent.role,
-                    agent_id=str(agent.id),
-                    task_id=task_id,
-                    metric_category=evaluator.metric_category,
-                    score=score,
-                )
+                self.emit_evaluation_completed_event(agent_role=agent.role, agent_id=str(agent.id), task_id=task_id, metric_category=evaluator.metric_category, score=score)
             except Exception as e:
-                self.emit_evaluation_failed_event(
-                    agent_role=agent.role,
-                    agent_id=str(agent.id),
-                    task_id=task_id,
-                    error=str(e),
-                )
-                self.console_formatter.print(
-                    f"Error in {evaluator.metric_category.value} evaluator: {str(e)}"
-                )
+                self.emit_evaluation_failed_event(agent_role=agent.role, agent_id=str(agent.id), task_id=task_id, error=str(e))
+                self.console_formatter.print(f"Error in {evaluator.metric_category.value} evaluator: {str(e)}")
 
         return result
 
-    def emit_evaluation_started_event(
-        self, agent_role: str, agent_id: str, task_id: str | None = None
-    ):
+    def emit_evaluation_started_event(self, agent_role: str, agent_id: str, task_id: str | None = None):
         crewai_event_bus.emit(
             self,
-            AgentEvaluationStartedEvent(
-                agent_role=agent_role,
-                agent_id=agent_id,
-                task_id=task_id,
-                iteration=self._execution_state.iteration,
-            ),
+            AgentEvaluationStartedEvent(agent_role=agent_role, agent_id=agent_id, task_id=task_id, iteration=self._execution_state.iteration)
         )
 
-    def emit_evaluation_completed_event(
-        self,
-        agent_role: str,
-        agent_id: str,
-        task_id: str | None = None,
-        metric_category: MetricCategory | None = None,
-        score: EvaluationScore | None = None,
-    ):
+    def emit_evaluation_completed_event(self, agent_role: str, agent_id: str, task_id: str | None = None, metric_category: MetricCategory | None = None, score: EvaluationScore | None = None):
         crewai_event_bus.emit(
             self,
-            AgentEvaluationCompletedEvent(
-                agent_role=agent_role,
-                agent_id=agent_id,
-                task_id=task_id,
-                iteration=self._execution_state.iteration,
-                metric_category=metric_category,
-                score=score,
-            ),
+            AgentEvaluationCompletedEvent(agent_role=agent_role, agent_id=agent_id, task_id=task_id, iteration=self._execution_state.iteration, metric_category=metric_category, score=score)
         )
 
-    def emit_evaluation_failed_event(
-        self, agent_role: str, agent_id: str, error: str, task_id: str | None = None
-    ):
+    def emit_evaluation_failed_event(self, agent_role: str, agent_id: str, error: str, task_id: str | None = None):
         crewai_event_bus.emit(
             self,
-            AgentEvaluationFailedEvent(
-                agent_role=agent_role,
-                agent_id=agent_id,
-                task_id=task_id,
-                iteration=self._execution_state.iteration,
-                error=error,
-            ),
+            AgentEvaluationFailedEvent(agent_role=agent_role, agent_id=agent_id, task_id=task_id, iteration=self._execution_state.iteration, error=error)
         )
 
-
 def create_default_evaluator(agents: list[Agent], llm: None = None):
     from crewai.experimental.evaluation import (
         GoalAlignmentEvaluator,
@@ -344,7 +231,7 @@ def create_default_evaluator(agents: list[Agent], llm: None = None):
         ToolSelectionEvaluator,
         ParameterExtractionEvaluator,
         ToolInvocationEvaluator,
-        ReasoningEfficiencyEvaluator,
+        ReasoningEfficiencyEvaluator
     )
 
     evaluators = [

src/crewai/experimental/evaluation/evaluation_display.py

@@ -3,28 +3,18 @@ from typing import Dict, Any, List
 from rich.table import Table
 from rich.box import HEAVY_EDGE, ROUNDED
 from collections.abc import Sequence
-from crewai.experimental.evaluation.base_evaluator import (
-    AgentAggregatedEvaluationResult,
-    AggregationStrategy,
-    AgentEvaluationResult,
-    MetricCategory,
-)
+from crewai.experimental.evaluation.base_evaluator import AgentAggregatedEvaluationResult, AggregationStrategy, AgentEvaluationResult, MetricCategory
 from crewai.experimental.evaluation import EvaluationScore
-from crewai.events.utils.console_formatter import ConsoleFormatter
+from crewai.utilities.events.utils.console_formatter import ConsoleFormatter
 from crewai.utilities.llm_utils import create_llm
 
-
 class EvaluationDisplayFormatter:
     def __init__(self):
         self.console_formatter = ConsoleFormatter()
 
-    def display_evaluation_with_feedback(
-        self, iterations_results: Dict[int, Dict[str, List[Any]]]
-    ):
+    def display_evaluation_with_feedback(self, iterations_results: Dict[int, Dict[str, List[Any]]]):
         if not iterations_results:
-            self.console_formatter.print(
-                "[yellow]No evaluation results to display[/yellow]"
-            )
+            self.console_formatter.print("[yellow]No evaluation results to display[/yellow]")
             return
 
         all_agent_roles: set[str] = set()
@@ -32,9 +22,7 @@ class EvaluationDisplayFormatter:
             all_agent_roles.update(iter_results.keys())
 
         for agent_role in sorted(all_agent_roles):
-            self.console_formatter.print(
-                f"\n[bold cyan]Agent: {agent_role}[/bold cyan]"
-            )
+            self.console_formatter.print(f"\n[bold cyan]Agent: {agent_role}[/bold cyan]")
 
             for iter_num, results in sorted(iterations_results.items()):
                 if agent_role not in results or not results[agent_role]:
@@ -74,7 +62,9 @@ class EvaluationDisplayFormatter:
 
                         table.add_section()
                         table.add_row(
-                            metric.title(), score_text, evaluation_score.feedback or ""
+                            metric.title(),
+                            score_text,
+                            evaluation_score.feedback or ""
                         )
 
                 if aggregated_result.overall_score is not None:
@@ -92,26 +82,19 @@ class EvaluationDisplayFormatter:
                     table.add_row(
                         "Overall Score",
                         f"[{overall_color}]{overall_score:.1f}[/]",
-                        "Overall agent evaluation score",
+                        "Overall agent evaluation score"
                     )
 
                 self.console_formatter.print(table)
 
-    def display_summary_results(
-        self,
-        iterations_results: Dict[int, Dict[str, List[AgentAggregatedEvaluationResult]]],
-    ):
+    def display_summary_results(self, iterations_results: Dict[int, Dict[str, List[AgentAggregatedEvaluationResult]]]):
         if not iterations_results:
-            self.console_formatter.print(
-                "[yellow]No evaluation results to display[/yellow]"
-            )
+            self.console_formatter.print("[yellow]No evaluation results to display[/yellow]")
             return
 
         self.console_formatter.print("\n")
 
-        table = Table(
-            title="Agent Performance Scores \n (1-10 Higher is better)", box=HEAVY_EDGE
-        )
+        table = Table(title="Agent Performance Scores \n (1-10 Higher is better)", box=HEAVY_EDGE)
 
         table.add_column("Agent/Metric", style="cyan")
 
@@ -140,14 +123,11 @@ class EvaluationDisplayFormatter:
                     agent_id=agent_id,
                     agent_role=agent_role,
                     results=agent_results,
-                    strategy=AggregationStrategy.SIMPLE_AVERAGE,
+                    strategy=AggregationStrategy.SIMPLE_AVERAGE
                 )
 
-                valid_scores = [
-                    score.score
-                    for score in aggregated_result.metrics.values()
-                    if score.score is not None
-                ]
+                valid_scores = [score.score for score in aggregated_result.metrics.values()
+                               if score.score is not None]
                 if valid_scores:
                     avg_score = sum(valid_scores) / len(valid_scores)
                     agent_scores_by_iteration[iter_num] = avg_score
@@ -157,9 +137,7 @@ class EvaluationDisplayFormatter:
             if not agent_scores_by_iteration:
                 continue
 
-            avg_across_iterations = sum(agent_scores_by_iteration.values()) / len(
-                agent_scores_by_iteration
-            )
+            avg_across_iterations = sum(agent_scores_by_iteration.values()) / len(agent_scores_by_iteration)
 
             row = [f"[bold]{agent_role}[/bold]"]
 
@@ -200,13 +178,9 @@ class EvaluationDisplayFormatter:
                 row = [f"  - {metric.title()}"]
 
                 for iter_num in sorted(iterations_results.keys()):
-                    if (
-                        iter_num in agent_metrics_by_iteration
-                        and metric in agent_metrics_by_iteration[iter_num]
-                    ):
-                        metric_score = agent_metrics_by_iteration[iter_num][
-                            metric
-                        ].score
+                    if (iter_num in agent_metrics_by_iteration and
+                            metric in agent_metrics_by_iteration[iter_num]):
+                        metric_score = agent_metrics_by_iteration[iter_num][metric].score
                         if metric_score is not None:
                             metric_scores.append(metric_score)
                             if metric_score >= 8.0:
@@ -251,9 +225,7 @@ class EvaluationDisplayFormatter:
         results: Sequence[AgentEvaluationResult],
         strategy: AggregationStrategy = AggregationStrategy.SIMPLE_AVERAGE,
     ) -> AgentAggregatedEvaluationResult:
-        metrics_by_category: dict[MetricCategory, list[EvaluationScore]] = defaultdict(
-            list
-        )
+        metrics_by_category: dict[MetricCategory, list[EvaluationScore]] = defaultdict(list)
 
         for result in results:
             for metric_name, evaluation_score in result.metrics.items():
@@ -274,20 +246,19 @@ class EvaluationDisplayFormatter:
                         metric=category.title(),
                         feedbacks=feedbacks,
                         scores=[s.score for s in scores],
-                        strategy=strategy,
+                        strategy=strategy
                     )
                 else:
                     feedback_summary = feedbacks[0]
 
             aggregated_metrics[category] = EvaluationScore(
-                score=avg_score, feedback=feedback_summary
+                score=avg_score,
+                feedback=feedback_summary
             )
 
         overall_score = None
         if aggregated_metrics:
-            valid_scores = [
-                m.score for m in aggregated_metrics.values() if m.score is not None
-            ]
+            valid_scores = [m.score for m in aggregated_metrics.values() if m.score is not None]
             if valid_scores:
                 overall_score = sum(valid_scores) / len(valid_scores)
 
@@ -297,7 +268,7 @@ class EvaluationDisplayFormatter:
             metrics=aggregated_metrics,
             overall_score=overall_score,
             task_count=len(results),
-            aggregation_strategy=strategy,
+            aggregation_strategy=strategy
         )
 
     def _summarize_feedbacks(
@@ -306,12 +277,10 @@ class EvaluationDisplayFormatter:
         metric: str,
         feedbacks: List[str],
         scores: List[float | None],
-        strategy: AggregationStrategy,
+        strategy: AggregationStrategy
     ) -> str:
         if len(feedbacks) <= 2 and all(len(fb) < 200 for fb in feedbacks):
-            return "\n\n".join(
-                [f"Feedback {i+1}: {fb}" for i, fb in enumerate(feedbacks)]
-            )
+            return "\n\n".join([f"Feedback {i+1}: {fb}" for i, fb in enumerate(feedbacks)])
 
         try:
             llm = create_llm()
@@ -321,26 +290,20 @@ class EvaluationDisplayFormatter:
                 if len(feedback) > 500:
                     feedback = feedback[:500] + "..."
                 score_text = f"{score:.1f}" if score is not None else "N/A"
-                formatted_feedbacks.append(
-                    f"Feedback #{i+1} (Score: {score_text}):\n{feedback}"
-                )
+                formatted_feedbacks.append(f"Feedback #{i+1} (Score: {score_text}):\n{feedback}")
 
             all_feedbacks = "\n\n" + "\n\n---\n\n".join(formatted_feedbacks)
 
             strategy_guidance = ""
             if strategy == AggregationStrategy.BEST_PERFORMANCE:
-                strategy_guidance = (
-                    "Focus on the highest-scoring aspects and strengths demonstrated."
-                )
+                strategy_guidance = "Focus on the highest-scoring aspects and strengths demonstrated."
             elif strategy == AggregationStrategy.WORST_PERFORMANCE:
                 strategy_guidance = "Focus on areas that need improvement and common issues across tasks."
             else:
                 strategy_guidance = "Provide a balanced analysis of strengths and weaknesses across all tasks."
 
             prompt = [
-                {
-                    "role": "system",
-                    "content": f"""You are an expert evaluator creating a comprehensive summary of agent performance feedback.
+                {"role": "system", "content": f"""You are an expert evaluator creating a comprehensive summary of agent performance feedback.
                 Your job is to synthesize multiple feedback points about the same metric across different tasks.
 
                 Create a concise, insightful summary that captures the key patterns and themes from all feedback.
@@ -352,18 +315,14 @@ class EvaluationDisplayFormatter:
                 3. Highlighting patterns across tasks
                 4. 150-250 words in length
 
-                The summary should be directly usable as final feedback for the agent's performance on this metric.""",
-                },
-                {
-                    "role": "user",
-                    "content": f"""I need a synthesized summary of the following feedback for:
+                The summary should be directly usable as final feedback for the agent's performance on this metric."""},
+                {"role": "user", "content": f"""I need a synthesized summary of the following feedback for:
 
                 Agent Role: {agent_role}
                 Metric: {metric.title()}
 
                 {all_feedbacks}
-                """,
-                },
+                """}
             ]
             assert llm is not None
             response = llm.call(prompt)
@@ -371,6 +330,4 @@ class EvaluationDisplayFormatter:
             return response
 
         except Exception:
-            return "Synthesized from multiple tasks: " + "\n\n".join(
-                [f"- {fb[:500]}..." for fb in feedbacks]
-            )
+            return "Synthesized from multiple tasks: " + "\n\n".join([f"- {fb[:500]}..." for fb in feedbacks])

src/crewai/experimental/evaluation/evaluation_listener.py

@@ -5,23 +5,25 @@ from collections.abc import Sequence
 
 from crewai.agent import Agent
 from crewai.task import Task
-from crewai.events.base_event_listener import BaseEventListener
-from crewai.events.event_bus import CrewAIEventsBus
-from crewai.events.types.agent_events import (
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events.crewai_event_bus import CrewAIEventsBus
+from crewai.utilities.events.agent_events import (
     AgentExecutionStartedEvent,
     AgentExecutionCompletedEvent,
     LiteAgentExecutionStartedEvent,
-    LiteAgentExecutionCompletedEvent,
+    LiteAgentExecutionCompletedEvent
 )
-from crewai.events.types.tool_usage_events import (
+from crewai.utilities.events.tool_usage_events import (
     ToolUsageFinishedEvent,
     ToolUsageErrorEvent,
     ToolExecutionErrorEvent,
     ToolSelectionErrorEvent,
-    ToolValidateInputErrorEvent,
+    ToolValidateInputErrorEvent
+)
+from crewai.utilities.events.llm_events import (
+    LLMCallStartedEvent,
+    LLMCallCompletedEvent
 )
-from crewai.events.types.llm_events import LLMCallStartedEvent, LLMCallCompletedEvent
-
 
 class EvaluationTraceCallback(BaseEventListener):
     """Event listener for collecting execution traces for evaluation.
@@ -66,49 +68,27 @@ class EvaluationTraceCallback(BaseEventListener):
 
         @event_bus.on(ToolUsageFinishedEvent)
         def on_tool_completed(source, event: ToolUsageFinishedEvent):
-            self.on_tool_use(
-                event.tool_name, event.tool_args, event.output, success=True
-            )
+            self.on_tool_use(event.tool_name, event.tool_args, event.output, success=True)
 
         @event_bus.on(ToolUsageErrorEvent)
         def on_tool_usage_error(source, event: ToolUsageErrorEvent):
-            self.on_tool_use(
-                event.tool_name,
-                event.tool_args,
-                event.error,
-                success=False,
-                error_type="usage_error",
-            )
+            self.on_tool_use(event.tool_name, event.tool_args, event.error,
+                           success=False, error_type="usage_error")
 
         @event_bus.on(ToolExecutionErrorEvent)
         def on_tool_execution_error(source, event: ToolExecutionErrorEvent):
-            self.on_tool_use(
-                event.tool_name,
-                event.tool_args,
-                event.error,
-                success=False,
-                error_type="execution_error",
-            )
+            self.on_tool_use(event.tool_name, event.tool_args, event.error,
+                           success=False, error_type="execution_error")
 
         @event_bus.on(ToolSelectionErrorEvent)
         def on_tool_selection_error(source, event: ToolSelectionErrorEvent):
-            self.on_tool_use(
-                event.tool_name,
-                event.tool_args,
-                event.error,
-                success=False,
-                error_type="selection_error",
-            )
+            self.on_tool_use(event.tool_name, event.tool_args, event.error,
+                           success=False, error_type="selection_error")
 
         @event_bus.on(ToolValidateInputErrorEvent)
         def on_tool_validate_input_error(source, event: ToolValidateInputErrorEvent):
-            self.on_tool_use(
-                event.tool_name,
-                event.tool_args,
-                event.error,
-                success=False,
-                error_type="validation_error",
-            )
+            self.on_tool_use(event.tool_name, event.tool_args, event.error,
+                           success=False, error_type="validation_error")
 
         @event_bus.on(LLMCallStartedEvent)
         def on_llm_call_started(source, event: LLMCallStartedEvent):
@@ -119,7 +99,7 @@ class EvaluationTraceCallback(BaseEventListener):
             self.on_llm_call_end(event.messages, event.response)
 
     def on_lite_agent_start(self, agent_info: dict[str, Any]):
-        self.current_agent_id = agent_info["id"]
+        self.current_agent_id = agent_info['id']
         self.current_task_id = "lite_task"
 
         trace_key = f"{self.current_agent_id}_{self.current_task_id}"
@@ -130,7 +110,7 @@ class EvaluationTraceCallback(BaseEventListener):
             tool_uses=[],
             llm_calls=[],
             start_time=datetime.now(),
-            final_output=None,
+            final_output=None
         )
 
     def _init_trace(self, trace_key: str, **kwargs: Any):
@@ -148,7 +128,7 @@ class EvaluationTraceCallback(BaseEventListener):
             tool_uses=[],
             llm_calls=[],
             start_time=datetime.now(),
-            final_output=None,
+            final_output=None
         )
 
     def on_agent_finish(self, agent: Agent, task: Task, output: Any):
@@ -171,14 +151,8 @@ class EvaluationTraceCallback(BaseEventListener):
 
         self._reset_current()
 
-    def on_tool_use(
-        self,
-        tool_name: str,
-        tool_args: dict[str, Any] | str,
-        result: Any,
-        success: bool = True,
-        error_type: str | None = None,
-    ):
+    def on_tool_use(self, tool_name: str, tool_args: dict[str, Any] | str, result: Any,
+                   success: bool = True, error_type: str | None = None):
         if not self.current_agent_id or not self.current_task_id:
             return
 
@@ -189,7 +163,7 @@ class EvaluationTraceCallback(BaseEventListener):
                 "args": tool_args,
                 "result": result,
                 "success": success,
-                "timestamp": datetime.now(),
+                "timestamp": datetime.now()
             }
 
             # Add error information if applicable
@@ -199,11 +173,7 @@ class EvaluationTraceCallback(BaseEventListener):
 
             self.traces[trace_key]["tool_uses"].append(tool_use)
 
-    def on_llm_call_start(
-        self,
-        messages: str | Sequence[dict[str, Any]] | None,
-        tools: Sequence[dict[str, Any]] | None = None,
-    ):
+    def on_llm_call_start(self, messages: str | Sequence[dict[str, Any]] | None, tools: Sequence[dict[str, Any]] | None = None):
         if not self.current_agent_id or not self.current_task_id:
             return
 
@@ -216,12 +186,10 @@ class EvaluationTraceCallback(BaseEventListener):
             "tools": tools,
             "start_time": datetime.now(),
             "response": None,
-            "end_time": None,
+            "end_time": None
         }
 
-    def on_llm_call_end(
-        self, messages: str | list[dict[str, Any]] | None, response: Any
-    ):
+    def on_llm_call_end(self, messages: str | list[dict[str, Any]] | None, response: Any):
         if not self.current_agent_id or not self.current_task_id:
             return
 
@@ -245,7 +213,7 @@ class EvaluationTraceCallback(BaseEventListener):
             "response": response,
             "start_time": start_time,
             "end_time": current_time,
-            "total_tokens": total_tokens,
+            "total_tokens": total_tokens
         }
 
         self.traces[trace_key]["llm_calls"].append(llm_call)
@@ -259,7 +227,7 @@ class EvaluationTraceCallback(BaseEventListener):
 
 
 def create_evaluation_callbacks() -> EvaluationTraceCallback:
-    from crewai.events.event_bus import crewai_event_bus
+    from crewai.utilities.events.crewai_event_bus import crewai_event_bus
 
     callback = EvaluationTraceCallback()
     callback.setup_listeners(crewai_event_bus)

src/crewai/flow/flow.py

@@ -25,8 +25,8 @@ from crewai.flow.flow_visualizer import plot_flow
 from crewai.flow.persistence.base import FlowPersistence
 from crewai.flow.types import FlowExecutionData
 from crewai.flow.utils import get_possible_return_constants
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.flow_events import (
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
+from crewai.utilities.events.flow_events import (
     FlowCreatedEvent,
     FlowFinishedEvent,
     FlowPlotEvent,
@@ -35,10 +35,10 @@ from crewai.events.types.flow_events import (
     MethodExecutionFinishedEvent,
     MethodExecutionStartedEvent,
 )
-from crewai.events.listeners.tracing.trace_listener import (
+from crewai.utilities.events.listeners.tracing.trace_listener import (
     TraceCollectionListener,
 )
-from crewai.events.listeners.tracing.utils import (
+from crewai.utilities.events.listeners.tracing.utils import (
     is_tracing_enabled,
 )
 from crewai.utilities.printer import Printer
@@ -934,12 +934,12 @@ class Flow(Generic[T], metaclass=FlowMeta):
         method = self._methods[start_method_name]
         enhanced_method = self._inject_trigger_payload_for_start_method(method)
 
-        result = await self._execute_method(start_method_name, enhanced_method)
+        result = await self._execute_method(
+            start_method_name, enhanced_method
+        )
         await self._execute_listeners(start_method_name, result)
 
-    def _inject_trigger_payload_for_start_method(
-        self, original_method: Callable
-    ) -> Callable:
+    def _inject_trigger_payload_for_start_method(self, original_method: Callable) -> Callable:
         def prepare_kwargs(*args, **kwargs):
             inputs = baggage.get_baggage("flow_inputs") or {}
             trigger_payload = inputs.get("crewai_trigger_payload")
@@ -952,17 +952,15 @@ class Flow(Generic[T], metaclass=FlowMeta):
             elif trigger_payload is not None:
                 self._log_flow_event(
                     f"Trigger payload available but {original_method.__name__} doesn't accept crewai_trigger_payload parameter",
-                    color="yellow",
+                    color="yellow"
                 )
             return args, kwargs
 
         if asyncio.iscoroutinefunction(original_method):
-
             async def enhanced_method(*args, **kwargs):
                 args, kwargs = prepare_kwargs(*args, **kwargs)
                 return await original_method(*args, **kwargs)
         else:
-
             def enhanced_method(*args, **kwargs):
                 args, kwargs = prepare_kwargs(*args, **kwargs)
                 return original_method(*args, **kwargs)

src/crewai/knowledge/storage/knowledge_storage.py

@@ -1,4 +1,6 @@
+import contextlib
 import hashlib
+import io
 import logging
 import os
 import shutil
@@ -18,7 +20,23 @@ from crewai.utilities.constants import KNOWLEDGE_DIRECTORY
 from crewai.utilities.logger import Logger
 from crewai.utilities.paths import db_storage_path
 from crewai.utilities.chromadb import create_persistent_client
-from crewai.utilities.logger_utils import suppress_logging
+
+
+@contextlib.contextmanager
+def suppress_logging(
+    logger_name="chromadb.segment.impl.vector.local_persistent_hnsw",
+    level=logging.ERROR,
+):
+    logger = logging.getLogger(logger_name)
+    original_level = logger.getEffectiveLevel()
+    logger.setLevel(level)
+    with (
+        contextlib.redirect_stdout(io.StringIO()),
+        contextlib.redirect_stderr(io.StringIO()),
+        contextlib.suppress(UserWarning),
+    ):
+        yield
+    logger.setLevel(original_level)
 
 
 class KnowledgeStorage(BaseKnowledgeStorage):
@@ -46,9 +64,7 @@ class KnowledgeStorage(BaseKnowledgeStorage):
         filter: Optional[dict] = None,
         score_threshold: float = 0.35,
     ) -> List[Dict[str, Any]]:
-        with suppress_logging(
-            "chromadb.segment.impl.vector.local_persistent_hnsw", logging.ERROR
-        ):
+        with suppress_logging():
             if self.collection:
                 fetched = self.collection.query(
                     query_texts=query,

src/crewai/lite_agent.py

@@ -62,13 +62,13 @@ from crewai.utilities.agent_utils import (
     render_text_description_and_args,
 )
 from crewai.utilities.converter import generate_model_description
-from crewai.events.types.logging_events import AgentLogsExecutionEvent
-from crewai.events.types.agent_events import (
+from crewai.utilities.events.agent_events import (
+    AgentLogsExecutionEvent,
     LiteAgentExecutionCompletedEvent,
     LiteAgentExecutionErrorEvent,
     LiteAgentExecutionStartedEvent,
 )
-from crewai.events.event_bus import crewai_event_bus
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
 
 from crewai.utilities.llm_utils import create_llm
 from crewai.utilities.printer import Printer

src/crewai/llm.py

@@ -23,14 +23,14 @@ from dotenv import load_dotenv
 from litellm.types.utils import ChatCompletionDeltaToolCall
 from pydantic import BaseModel, Field
 
-from crewai.events.types.llm_events import (
+from crewai.utilities.events.llm_events import (
     LLMCallCompletedEvent,
     LLMCallFailedEvent,
     LLMCallStartedEvent,
     LLMCallType,
     LLMStreamChunkEvent,
 )
-from crewai.events.types.tool_usage_events import (
+from crewai.utilities.events.tool_usage_events import (
     ToolUsageStartedEvent,
     ToolUsageFinishedEvent,
     ToolUsageErrorEvent,
@@ -52,7 +52,7 @@ import io
 from typing import TextIO
 
 from crewai.llms.base_llm import BaseLLM
-from crewai.events.event_bus import crewai_event_bus
+from crewai.utilities.events import crewai_event_bus
 from crewai.utilities.exceptions.context_window_exceeding_exception import (
     LLMContextLengthExceededException,
 )
@@ -311,7 +311,7 @@ class LLM(BaseLLM):
         api_base: Optional[str] = None,
         api_version: Optional[str] = None,
         api_key: Optional[str] = None,
-        callbacks: List[Any] | None = None,
+        callbacks: List[Any] = [],
         reasoning_effort: Optional[Literal["none", "low", "medium", "high"]] = None,
         stream: bool = False,
         **kwargs,
@@ -351,7 +351,7 @@ class LLM(BaseLLM):
         else:
             self.stop = stop
 
-        self.set_callbacks(callbacks or [])
+        self.set_callbacks(callbacks)
         self.set_env_callbacks()
 
     def _is_anthropic_model(self, model: str) -> bool:
@@ -950,8 +950,6 @@ class LLM(BaseLLM):
                         tool_name=function_name,
                         tool_args=function_args,
                         error=f"Tool execution error: {str(e)}",
-                        from_task=from_task,
-                        from_agent=from_agent,
                     ),
                 )
         return None

src/crewai/memory/entity/entity_memory.py

@@ -6,8 +6,8 @@ from pydantic import PrivateAttr
 from crewai.memory.entity.entity_memory_item import EntityMemoryItem
 from crewai.memory.memory import Memory
 from crewai.memory.storage.rag_storage import RAGStorage
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.memory_events import (
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
+from crewai.utilities.events.memory_events import (
     MemoryQueryStartedEvent,
     MemoryQueryCompletedEvent,
     MemoryQueryFailedEvent,

src/crewai/memory/external/external_memory.py

@@ -4,8 +4,8 @@ import time
 from crewai.memory.external.external_memory_item import ExternalMemoryItem
 from crewai.memory.memory import Memory
 from crewai.memory.storage.interface import Storage
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.memory_events import (
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
+from crewai.utilities.events.memory_events import (
     MemoryQueryStartedEvent,
     MemoryQueryCompletedEvent,
     MemoryQueryFailedEvent,

src/crewai/memory/long_term/long_term_memory.py

@@ -3,8 +3,8 @@ import time
 
 from crewai.memory.long_term.long_term_memory_item import LongTermMemoryItem
 from crewai.memory.memory import Memory
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.memory_events import (
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
+from crewai.utilities.events.memory_events import (
     MemoryQueryStartedEvent,
     MemoryQueryCompletedEvent,
     MemoryQueryFailedEvent,

src/crewai/memory/short_term/short_term_memory.py

@@ -6,8 +6,8 @@ from pydantic import PrivateAttr
 from crewai.memory.memory import Memory
 from crewai.memory.short_term.short_term_memory_item import ShortTermMemoryItem
 from crewai.memory.storage.rag_storage import RAGStorage
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.memory_events import (
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
+from crewai.utilities.events.memory_events import (
     MemoryQueryStartedEvent,
     MemoryQueryCompletedEvent,
     MemoryQueryFailedEvent,

src/crewai/memory/storage/kickoff_task_outputs_storage.py

@@ -18,7 +18,9 @@ class KickoffTaskOutputsSQLiteStorage:
     An updated SQLite storage class for kickoff task outputs storage.
     """
 
-    def __init__(self, db_path: Optional[str] = None) -> None:
+    def __init__(
+        self, db_path: Optional[str] = None
+    ) -> None:
         if db_path is None:
             # Get the parent directory of the default db path and create our db file there
             db_path = str(Path(db_storage_path()) / "latest_kickoff_task_outputs.db")
@@ -65,7 +67,7 @@ class KickoffTaskOutputsSQLiteStorage:
         output: Dict[str, Any],
         task_index: int,
         was_replayed: bool = False,
-        inputs: Dict[str, Any] | None = None,
+        inputs: Dict[str, Any] = {},
     ) -> None:
         """Add a new task output record to the database.
 
@@ -79,7 +81,6 @@ class KickoffTaskOutputsSQLiteStorage:
         Raises:
             DatabaseOperationError: If saving the task output fails due to SQLite errors.
         """
-        inputs = inputs or {}
         try:
             with sqlite3.connect(self.db_path) as conn:
                 conn.execute("BEGIN TRANSACTION")
@@ -145,9 +146,7 @@ class KickoffTaskOutputsSQLiteStorage:
                 conn.commit()
 
                 if cursor.rowcount == 0:
-                    logger.warning(
-                        f"No row found with task_index {task_index}. No update performed."
-                    )
+                    logger.warning(f"No row found with task_index {task_index}. No update performed.")
         except sqlite3.Error as e:
             error_msg = DatabaseError.format_error(DatabaseError.UPDATE_ERROR, e)
             logger.error(error_msg)

src/crewai/memory/storage/rag_storage.py

@@ -1,3 +1,5 @@
+import contextlib
+import io
 import logging
 import os
 import shutil
@@ -10,10 +12,26 @@ from crewai.rag.embeddings.configurator import EmbeddingConfigurator
 from crewai.utilities.chromadb import create_persistent_client
 from crewai.utilities.constants import MAX_FILE_NAME_LENGTH
 from crewai.utilities.paths import db_storage_path
-from crewai.utilities.logger_utils import suppress_logging
 import warnings
 
 
+@contextlib.contextmanager
+def suppress_logging(
+    logger_name="chromadb.segment.impl.vector.local_persistent_hnsw",
+    level=logging.ERROR,
+):
+    logger = logging.getLogger(logger_name)
+    original_level = logger.getEffectiveLevel()
+    logger.setLevel(level)
+    with (
+        contextlib.redirect_stdout(io.StringIO()),
+        contextlib.redirect_stderr(io.StringIO()),
+        contextlib.suppress(UserWarning),
+    ):
+        yield
+    logger.setLevel(original_level)
+
+
 class RAGStorage(BaseRAGStorage):
     """
     Extends Storage to handle embeddings for memory entries, improving
@@ -104,9 +122,7 @@ class RAGStorage(BaseRAGStorage):
             self._initialize_app()
 
         try:
-            with suppress_logging(
-                "chromadb.segment.impl.vector.local_persistent_hnsw", logging.ERROR
-            ):
+            with suppress_logging():
                 response = self.collection.query(query_texts=query, n_results=limit)
 
             results = []

src/crewai/rag/chromadb/client.py

@@ -1,6 +1,5 @@
 """ChromaDB client implementation."""
 
-import logging
 from typing import Any
 
 from chromadb.api.types import (
@@ -21,9 +20,7 @@ from crewai.rag.chromadb.utils import (
     _is_sync_client,
     _prepare_documents_for_chromadb,
     _process_query_results,
-    _sanitize_collection_name,
 )
-from crewai.utilities.logger_utils import suppress_logging
 from crewai.rag.core.base_client import (
     BaseClient,
     BaseCollectionParams,
@@ -100,7 +97,7 @@ class ChromaDBClient(BaseClient):
             metadata["hnsw:space"] = "cosine"
 
         self.client.create_collection(
-            name=_sanitize_collection_name(kwargs["collection_name"]),
+            name=kwargs["collection_name"],
             configuration=kwargs.get("configuration"),
             metadata=metadata,
             embedding_function=kwargs.get(
@@ -157,7 +154,7 @@ class ChromaDBClient(BaseClient):
             metadata["hnsw:space"] = "cosine"
 
         await self.client.create_collection(
-            name=_sanitize_collection_name(kwargs["collection_name"]),
+            name=kwargs["collection_name"],
             configuration=kwargs.get("configuration"),
             metadata=metadata,
             embedding_function=kwargs.get(
@@ -208,7 +205,7 @@ class ChromaDBClient(BaseClient):
             metadata["hnsw:space"] = "cosine"
 
         return self.client.get_or_create_collection(
-            name=_sanitize_collection_name(kwargs["collection_name"]),
+            name=kwargs["collection_name"],
             configuration=kwargs.get("configuration"),
             metadata=metadata,
             embedding_function=kwargs.get(
@@ -261,7 +258,7 @@ class ChromaDBClient(BaseClient):
             metadata["hnsw:space"] = "cosine"
 
         return await self.client.get_or_create_collection(
-            name=_sanitize_collection_name(kwargs["collection_name"]),
+            name=kwargs["collection_name"],
             configuration=kwargs.get("configuration"),
             metadata=metadata,
             embedding_function=kwargs.get(
@@ -301,12 +298,12 @@ class ChromaDBClient(BaseClient):
             raise ValueError("Documents list cannot be empty")
 
         collection = self.client.get_collection(
-            name=_sanitize_collection_name(collection_name),
+            name=collection_name,
             embedding_function=self.embedding_function,
         )
 
         prepared = _prepare_documents_for_chromadb(documents)
-        collection.upsert(
+        collection.add(
             ids=prepared.ids,
             documents=prepared.texts,
             metadatas=prepared.metadatas,
@@ -343,11 +340,11 @@ class ChromaDBClient(BaseClient):
             raise ValueError("Documents list cannot be empty")
 
         collection = await self.client.get_collection(
-            name=_sanitize_collection_name(collection_name),
+            name=collection_name,
             embedding_function=self.embedding_function,
         )
         prepared = _prepare_documents_for_chromadb(documents)
-        await collection.upsert(
+        await collection.add(
             ids=prepared.ids,
             documents=prepared.texts,
             metadatas=prepared.metadatas,
@@ -388,22 +385,19 @@ class ChromaDBClient(BaseClient):
         params = _extract_search_params(kwargs)
 
         collection = self.client.get_collection(
-            name=_sanitize_collection_name(params.collection_name),
+            name=params.collection_name,
             embedding_function=self.embedding_function,
         )
 
         where = params.where if params.where is not None else params.metadata_filter
 
-        with suppress_logging(
-            "chromadb.segment.impl.vector.local_persistent_hnsw", logging.ERROR
-        ):
-            results: QueryResult = collection.query(
-                query_texts=[params.query],
-                n_results=params.limit,
-                where=where,
-                where_document=params.where_document,
-                include=params.include,
-            )
+        results: QueryResult = collection.query(
+            query_texts=[params.query],
+            n_results=params.limit,
+            where=where,
+            where_document=params.where_document,
+            include=params.include,
+        )
 
         return _process_query_results(
             collection=collection,
@@ -446,22 +440,19 @@ class ChromaDBClient(BaseClient):
         params = _extract_search_params(kwargs)
 
         collection = await self.client.get_collection(
-            name=_sanitize_collection_name(params.collection_name),
+            name=params.collection_name,
             embedding_function=self.embedding_function,
         )
 
         where = params.where if params.where is not None else params.metadata_filter
 
-        with suppress_logging(
-            "chromadb.segment.impl.vector.local_persistent_hnsw", logging.ERROR
-        ):
-            results: QueryResult = await collection.query(
-                query_texts=[params.query],
-                n_results=params.limit,
-                where=where,
-                where_document=params.where_document,
-                include=params.include,
-            )
+        results: QueryResult = await collection.query(
+            query_texts=[params.query],
+            n_results=params.limit,
+            where=where,
+            where_document=params.where_document,
+            include=params.include,
+        )
 
         return _process_query_results(
             collection=collection,
@@ -494,7 +485,7 @@ class ChromaDBClient(BaseClient):
             )
 
         collection_name = kwargs["collection_name"]
-        self.client.delete_collection(name=_sanitize_collection_name(collection_name))
+        self.client.delete_collection(name=collection_name)
 
     async def adelete_collection(self, **kwargs: Unpack[BaseCollectionParams]) -> None:
         """Delete a collection and all its data asynchronously.
@@ -524,9 +515,7 @@ class ChromaDBClient(BaseClient):
             )
 
         collection_name = kwargs["collection_name"]
-        await self.client.delete_collection(
-            name=_sanitize_collection_name(collection_name)
-        )
+        await self.client.delete_collection(name=collection_name)
 
     def reset(self) -> None:
         """Reset the vector database by deleting all collections and data.

src/crewai/rag/chromadb/config.py

@@ -23,12 +23,6 @@ warnings.filterwarnings(
     module="pydantic._internal._generate_schema",
 )
 
-warnings.filterwarnings(
-    "ignore",
-    message=r".*'model_fields'.*is deprecated.*",
-    module=r"^chromadb(\.|$)",
-)
-
 
 def _default_settings() -> Settings:
     """Create default ChromaDB settings.

src/crewai/rag/chromadb/constants.py

@@ -1,17 +1,10 @@
 """Constants for ChromaDB configuration."""
 
-import re
+import os
 from typing import Final
 
 from crewai.utilities.paths import db_storage_path
 
 DEFAULT_TENANT: Final[str] = "default_tenant"
 DEFAULT_DATABASE: Final[str] = "default_database"
-DEFAULT_STORAGE_PATH: Final[str] = db_storage_path()
-
-MIN_COLLECTION_LENGTH: Final[int] = 3
-MAX_COLLECTION_LENGTH: Final[int] = 63
-DEFAULT_COLLECTION: Final[str] = "default_collection"
-
-INVALID_CHARS_PATTERN: Final[re.Pattern[str]] = re.compile(r"[^a-zA-Z0-9_-]")
-IPV4_PATTERN: Final[re.Pattern[str]] = re.compile(r"^(\d{1,3}\.){3}\d{1,3}$")
+DEFAULT_STORAGE_PATH: Final[str] = os.path.join(db_storage_path(), "chromadb")

src/crewai/rag/chromadb/factory.py

@@ -1,9 +1,6 @@
 """Factory functions for creating ChromaDB clients."""
 
-import os
-from hashlib import md5
-import portalocker
-from chromadb import PersistentClient
+from chromadb import Client
 
 from crewai.rag.chromadb.config import ChromaDBConfig
 from crewai.rag.chromadb.client import ChromaDBClient
@@ -17,24 +14,11 @@ def create_client(config: ChromaDBConfig) -> ChromaDBClient:
 
     Returns:
         Configured ChromaDBClient instance.
-
-    Notes:
-        Need to update to use chromadb.Client to support more client types in the near future.
     """
 
-    persist_dir = config.settings.persist_directory
-    lock_id = md5(persist_dir.encode(), usedforsecurity=False).hexdigest()
-    lockfile = os.path.join(persist_dir, f"chromadb-{lock_id}.lock")
-
-    with portalocker.Lock(lockfile):
-        client = PersistentClient(
-            path=persist_dir,
-            settings=config.settings,
-            tenant=config.tenant,
-            database=config.database,
-        )
-
     return ChromaDBClient(
-        client=client,
+        client=Client(
+            settings=config.settings, tenant=config.tenant, database=config.database
+        ),
         embedding_function=config.embedding_function,
     )

src/crewai/rag/chromadb/utils.py

@@ -12,13 +12,6 @@ from chromadb.api.types import (
 )
 from chromadb.api.models.AsyncCollection import AsyncCollection
 from chromadb.api.models.Collection import Collection
-from crewai.rag.chromadb.constants import (
-    DEFAULT_COLLECTION,
-    INVALID_CHARS_PATTERN,
-    IPV4_PATTERN,
-    MAX_COLLECTION_LENGTH,
-    MIN_COLLECTION_LENGTH,
-)
 from crewai.rag.chromadb.types import (
     ChromaDBClientType,
     ChromaDBCollectionSearchParams,
@@ -223,58 +216,3 @@ def _process_query_results(
         distance_metric=distance_metric,
         score_threshold=params.score_threshold,
     )
-
-
-def _is_ipv4_pattern(name: str) -> bool:
-    """Check if a string matches an IPv4 address pattern.
-
-    Args:
-        name: The string to check
-
-    Returns:
-        True if the string matches an IPv4 pattern, False otherwise
-    """
-    return bool(IPV4_PATTERN.match(name))
-
-
-def _sanitize_collection_name(
-    name: str | None, max_collection_length: int = MAX_COLLECTION_LENGTH
-) -> str:
-    """Sanitize a collection name to meet ChromaDB requirements.
-
-    Requirements:
-    1. 3-63 characters long
-    2. Starts and ends with alphanumeric character
-    3. Contains only alphanumeric characters, underscores, or hyphens
-    4. No consecutive periods
-    5. Not a valid IPv4 address
-
-    Args:
-        name: The original collection name to sanitize
-        max_collection_length: Maximum allowed length for the collection name
-
-    Returns:
-        A sanitized collection name that meets ChromaDB requirements
-    """
-    if not name:
-        return DEFAULT_COLLECTION
-
-    if _is_ipv4_pattern(name):
-        name = f"ip_{name}"
-
-    sanitized = INVALID_CHARS_PATTERN.sub("_", name)
-
-    if not sanitized[0].isalnum():
-        sanitized = "a" + sanitized
-
-    if not sanitized[-1].isalnum():
-        sanitized = sanitized[:-1] + "z"
-
-    if len(sanitized) < MIN_COLLECTION_LENGTH:
-        sanitized = sanitized + "x" * (MIN_COLLECTION_LENGTH - len(sanitized))
-    if len(sanitized) > max_collection_length:
-        sanitized = sanitized[:max_collection_length]
-        if not sanitized[-1].isalnum():
-            sanitized = sanitized[:-1] + "z"
-
-    return sanitized

src/crewai/rag/utils/synchronized.py

@@ -0,0 +1,622 @@
+from __future__ import annotations
+
+import asyncio
+import contextvars
+import functools
+import hashlib
+import inspect
+import os
+import re
+import sys
+import threading
+import time
+import weakref
+from pathlib import Path
+from collections.abc import Callable, Coroutine
+from typing import Any, TypeVar, ParamSpec, Concatenate, TypedDict
+
+import portalocker
+from portalocker import constants
+from typing_extensions import NotRequired, Self
+
+P = ParamSpec("P")
+R = TypeVar("R")
+T = TypeVar("T")
+
+_STATE: dict[str, int] = {"pid": os.getpid()}
+
+
+def _reset_after_fork() -> None:
+    """Reset in-process state in the child after a fork.
+
+    Resets all locks and thread-local storage after a process fork
+    to prevent lock contamination across processes.
+    """
+    global _sync_rlocks, _async_locks_by_loop, _tls, _task_depths_var, _STATE
+    _sync_rlocks = {}
+    _async_locks_by_loop = weakref.WeakKeyDictionary()
+    _tls = threading.local()
+    # Reset task-local depths for async
+    _task_depths_var = contextvars.ContextVar("locked_task_depths", default=None)
+    _STATE["pid"] = os.getpid()
+
+
+def _ensure_same_process() -> None:
+    """Ensure we're in the same process, reset if forked.
+
+    Checks if the current PID matches the stored PID and resets
+    state if a fork has occurred.
+    """
+    if _STATE["pid"] != os.getpid():
+        _reset_after_fork()
+
+
+# Automatically reset in a forked child on POSIX
+_register_at_fork = getattr(os, "register_at_fork", None)
+if _register_at_fork is not None:
+    _register_at_fork(after_in_child=_reset_after_fork)
+
+
+class LockConfig(TypedDict):
+    """Configuration for portalocker locks.
+
+    Attributes:
+        mode: File open mode.
+        timeout: Optional lock timeout.
+        check_interval: Optional check interval.
+        fail_when_locked: Whether to fail if already locked.
+        flags: Portalocker lock flags.
+    """
+
+    mode: str
+    timeout: NotRequired[float]
+    check_interval: NotRequired[float]
+    fail_when_locked: bool
+    flags: portalocker.LockFlags
+
+
+def _get_platform_lock_flags() -> portalocker.LockFlags:
+    """Get platform-appropriate lock flags.
+
+    Returns:
+        LockFlags.EXCLUSIVE for exclusive file locking.
+    """
+    # Use EXCLUSIVE flag only - let portalocker handle blocking/non-blocking internally
+    return constants.LockFlags.EXCLUSIVE
+
+
+def _get_lock_config() -> LockConfig:
+    """Get lock configuration appropriate for the platform.
+
+    Returns:
+        LockConfig dict with mode, flags, and fail_when_locked settings.
+    """
+    config: LockConfig = {
+        "mode": "a+",
+        "fail_when_locked": False,
+        "flags": _get_platform_lock_flags(),
+    }
+    return config
+
+
+LOCK_CONFIG: LockConfig = _get_lock_config()
+LOCK_STALE_SECONDS = 120
+
+
+def _default_lock_dir() -> Path:
+    """Get or create the default lock directory.
+
+    Returns:
+        Path to ~/.crewai/locks directory, created if necessary.
+    """
+    lock_dir = Path.home() / ".crewai" / "locks"
+    lock_dir.mkdir(parents=True, exist_ok=True)
+    # Best-effort: restrict perms on POSIX
+    try:
+        if os.name == "posix":
+            lock_dir.chmod(0o700)
+    except Exception:
+        pass
+
+    # Clean up old lock files
+    _cleanup_stale_locks(lock_dir)
+    return lock_dir
+
+
+def _cleanup_stale_locks(lock_dir: Path, max_age_seconds: int = 86400) -> None:
+    """Remove lock files older than max_age_seconds.
+
+    Args:
+        lock_dir: Directory containing lock files.
+        max_age_seconds: Maximum age before considering a lock stale (default 24 hours).
+    """
+    try:
+        current_time = time.time()
+        for lock_file in lock_dir.glob("*.lock"):
+            try:
+                # Check if file is old and not currently locked
+                file_age = current_time - lock_file.stat().st_mtime
+                if file_age > max_age_seconds:
+                    # Try to acquire exclusive lock - if successful, file is not in use
+                    try:
+                        with portalocker.Lock(
+                            str(lock_file),
+                            mode="a+",
+                            timeout=0.01,  # Very short timeout
+                            fail_when_locked=True,
+                            flags=constants.LockFlags.EXCLUSIVE,
+                        ):
+                            pass  # We got the lock, file is not in use
+                        # Safe to remove
+                        lock_file.unlink(missing_ok=True)
+                    except (portalocker.LockException, OSError):
+                        # File is locked or can't be accessed, skip it
+                        pass
+            except (OSError, IOError):
+                # Skip files we can't stat or process
+                pass
+    except Exception:
+        # Cleanup is best-effort, don't fail on errors
+        pass
+
+
+def _hash_str(value: str) -> str:
+    """Generate a short hash of a string.
+
+    Args:
+        value: String to hash.
+
+    Returns:
+        First 10 characters of SHA256 hash.
+    """
+    return hashlib.sha256(value.encode()).hexdigest()[:10]
+
+
+def _qualname_for(func: Callable[..., Any], owner: object | None = None) -> str:
+    """Get qualified name for a function.
+
+    Args:
+        func: Function to get qualified name for.
+        owner: Optional owner object for the function.
+
+    Returns:
+        Fully qualified name including module and class.
+    """
+    target = inspect.unwrap(func)
+
+    if inspect.ismethod(func) and getattr(func, "__self__", None) is not None:
+        owner_obj = func.__self__
+        cls = owner_obj if inspect.isclass(owner_obj) else owner_obj.__class__
+        return f"{target.__module__}.{cls.__qualname__}.{getattr(target, '__name__', '<?>')}"
+
+    if owner is not None:
+        cls = owner if inspect.isclass(owner) else owner.__class__
+        return f"{target.__module__}.{cls.__qualname__}.{getattr(target, '__name__', '<?>')}"
+
+    qn = getattr(target, "__qualname__", None)
+    if qn is not None:
+        return f"{getattr(target, '__module__', target.__class__.__module__)}.{qn}"
+
+    if isinstance(target, functools.partial):
+        f = inspect.unwrap(target.func)
+        return f"{getattr(f, '__module__', 'builtins')}.{getattr(f, '__qualname__', getattr(f, '__name__', '<?>'))}"
+
+    cls = target.__class__
+    return f"{cls.__module__}.{cls.__qualname__}.__call__"
+
+
+def _get_lock_context(
+    instance: Any | None,
+    func: Callable[..., Any],
+    kwargs: dict[str, Any],
+) -> tuple[Path, str | None]:
+    """Extract lock context from function call.
+
+    Args:
+        instance: Instance the function is called on.
+        func: Function being called.
+        kwargs: Keyword arguments passed to function.
+
+    Returns:
+        Tuple of (lock_file_path, collection_name).
+    """
+    collection_name = (
+        str(kwargs.get("collection_name")) if "collection_name" in kwargs else None
+    )
+    lock_dir = _default_lock_dir()
+    base = _qualname_for(func, owner=instance)
+    safe_base = re.sub(r"[^\w.\-]+", "_", base)
+    suffix = f"_{_hash_str(collection_name)}" if collection_name else ""
+    path = lock_dir / f"{safe_base}{suffix}.lock"
+    return path, collection_name
+
+
+def _write_lock_metadata(lock_file_path: Path) -> None:
+    """Write metadata to lock file for staleness detection.
+
+    Args:
+        lock_file_path: Path to the lock file.
+    """
+    try:
+        with open(lock_file_path, "w") as f:
+            f.write(f"{os.getpid()}\n{time.time()}\n")
+            f.flush()
+            os.fsync(f.fileno())  # Ensure data is written to disk
+
+        # Set restrictive permissions on lock file (Unix only)
+        if sys.platform not in ("win32", "cygwin"):
+            try:
+                lock_file_path.chmod(0o600)
+            except Exception:
+                pass
+    except Exception:
+        # Best effort - don't fail if we can't write metadata
+        pass
+
+
+def _check_lock_staleness(lock_file_path: Path) -> bool:
+    """Check if a lock file is stale.
+
+    Args:
+        lock_file_path: Path to the lock file.
+
+    Returns:
+        True if lock is stale, False otherwise.
+    """
+    try:
+        if not lock_file_path.exists():
+            return False
+
+        with open(lock_file_path) as f:
+            lines = f.readlines()
+        if len(lines) < 2:
+            return True  # unreadable metadata
+
+        pid = int(lines[0].strip())
+        ts = float(lines[1].strip())
+
+        # If the process is alive, do NOT treat as stale based on time alone.
+        if sys.platform not in ("win32", "cygwin"):
+            try:
+                os.kill(pid, 0)
+                return False  # alive → not stale
+            except (OSError, ProcessLookupError):
+                pass  # dead process → proceed to time check
+
+        # Process dead: time window can be small; consider stale now
+        return (time.time() - ts) > 1.0  # essentially “dead means stale”
+
+    except Exception:
+        return True
+
+
+_sync_rlocks: dict[Path, threading.RLock] = {}
+_sync_rlocks_guard = threading.Lock()
+_tls = threading.local()
+
+
+def _get_sync_rlock(path: Path) -> threading.RLock:
+    """Get or create a reentrant lock for a path.
+
+    Args:
+        path: Path to get lock for.
+
+    Returns:
+        Threading RLock for the given path.
+    """
+    with _sync_rlocks_guard:
+        lk = _sync_rlocks.get(path)
+        if lk is None:
+            lk = threading.RLock()
+            _sync_rlocks[path] = lk
+        return lk
+
+
+class _SyncDepthManager:
+    """Context manager for sync depth tracking.
+
+    Tracks reentrancy depth for synchronous locks to determine
+    when to acquire/release file locks.
+    """
+
+    def __init__(self, path: Path):
+        """Initialize depth manager.
+
+        Args:
+            path: Path to track depth for.
+        """
+        self.path = path
+        self.depth = 0
+
+    def __enter__(self) -> int:
+        """Enter context and increment depth.
+
+        Returns:
+            Current depth after increment.
+        """
+        depths = getattr(_tls, "depths", None)
+        if depths is None:
+            depths = {}
+            _tls.depths = depths
+        self.depth = depths.get(self.path, 0) + 1
+        depths[self.path] = self.depth
+        return self.depth
+
+    def __exit__(self, *args: Any) -> None:
+        """Exit context and decrement depth.
+
+        Args:
+            *args: Exception information if any.
+        """
+        depths = getattr(_tls, "depths", {})
+        v = depths.get(self.path, 1) - 1
+        if v <= 0:
+            depths.pop(self.path, None)
+        else:
+            depths[self.path] = v
+
+
+def _safe_to_delete(path: Path) -> bool:
+    """Check if a lock file can be safely deleted.
+
+    Args:
+        path: Path to the lock file.
+
+    Returns:
+        True if file can be deleted safely, False otherwise.
+    """
+    try:
+        with portalocker.Lock(
+            str(path),
+            mode="a+",
+            timeout=0.01,  # very short, non-blocking-ish
+            fail_when_locked=True,  # fail if someone holds it
+            flags=constants.LockFlags.EXCLUSIVE,
+        ):
+            return True
+    except Exception:
+        return False
+
+
+def with_lock(func: Callable[Concatenate[T, P], R]) -> Callable[Concatenate[T, P], R]:
+    """Decorator for file-based cross-process locking.
+
+    Args:
+        func: Function to wrap with locking.
+
+    Returns:
+        Wrapped function with locking behavior.
+    """
+
+    @functools.wraps(func)
+    def wrapper(self, *args, **kwargs):
+        _ensure_same_process()
+
+        path, _ = _get_lock_context(self, func, kwargs)
+        local_lock = _get_sync_rlock(path)
+
+        prune_after = False
+        with local_lock:
+            with _SyncDepthManager(path) as depth:
+                if depth == 1:
+                    # stale handling
+                    if _check_lock_staleness(path) and _safe_to_delete(path):
+                        try:
+                            path.unlink(missing_ok=True)
+                        except Exception:
+                            pass
+
+                    # acquire file lock
+                    lock_config = LockConfig(
+                        mode=LOCK_CONFIG["mode"],
+                        fail_when_locked=LOCK_CONFIG["fail_when_locked"],
+                        flags=LOCK_CONFIG["flags"],
+                    )
+                    with portalocker.Lock(str(path), **lock_config) as _fh:
+                        _write_lock_metadata(path)
+                        result = func(self, *args, **kwargs)
+                    try:
+                        path.unlink(missing_ok=True)
+                    except Exception:
+                        pass
+
+                    prune_after = True
+                else:
+                    result = func(self, *args, **kwargs)
+
+        # <-- NOW it’s safe to remove the entry
+        if prune_after:
+            with _sync_rlocks_guard:
+                _sync_rlocks.pop(path, None)
+
+        return result
+
+    return wrapper
+
+
+# Use weak references to avoid keeping event loops alive
+_async_locks_by_loop: weakref.WeakKeyDictionary[
+    asyncio.AbstractEventLoop, dict[Path, asyncio.Lock]
+] = weakref.WeakKeyDictionary()
+_async_locks_guard = threading.Lock()
+_task_depths_var: contextvars.ContextVar[dict[Path, int] | None] = (
+    contextvars.ContextVar("locked_task_depths", default=None)
+)
+
+
+def _get_async_lock(path: Path) -> asyncio.Lock:
+    """Get or create an async lock for the current event loop.
+
+    Args:
+        path: Path to get lock for.
+
+    Returns:
+        Asyncio Lock for the given path in current event loop.
+    """
+    loop = asyncio.get_running_loop()
+
+    with _async_locks_guard:
+        # Get locks dict for this event loop
+        loop_locks = _async_locks_by_loop.get(loop)
+        if loop_locks is None:
+            loop_locks = {}
+            _async_locks_by_loop[loop] = loop_locks
+
+        # Get or create lock for this path
+        lk = loop_locks.get(path)
+        if lk is None:
+            # Create lock in the context of the running loop
+            lk = asyncio.Lock()
+            loop_locks[path] = lk
+        return lk
+
+
+class _AsyncDepthManager:
+    """Context manager for async task-local depth tracking.
+
+    Tracks reentrancy depth for async locks to determine
+    when to acquire/release file locks.
+    """
+
+    def __init__(self, path: Path):
+        """Initialize async depth manager.
+
+        Args:
+            path: Path to track depth for.
+        """
+        self.path = path
+        self.depths: dict[Path, int] | None = None
+        self.is_reentrant = False
+
+    def __enter__(self) -> Self:
+        """Enter context and track async task depth.
+
+        Returns:
+            Self for context management.
+        """
+        d = _task_depths_var.get()
+        if d is None:
+            d = {}
+            _task_depths_var.set(d)
+        self.depths = d
+
+        cur_depth = self.depths.get(self.path, 0)
+        if cur_depth > 0:
+            self.is_reentrant = True
+            self.depths[self.path] = cur_depth + 1
+        else:
+            self.depths[self.path] = 1
+        return self
+
+    def __exit__(self, *args: Any) -> None:
+        """Exit context and update task depth.
+
+        Args:
+            *args: Exception information if any.
+        """
+        if self.depths is not None:
+            new_depth = self.depths.get(self.path, 1) - 1
+            if new_depth <= 0:
+                self.depths.pop(self.path, None)
+            else:
+                self.depths[self.path] = new_depth
+
+
+async def _safe_to_delete_async(path: Path) -> bool:
+    """Check if a lock file can be safely deleted (async).
+
+    Args:
+        path: Path to the lock file.
+
+    Returns:
+        True if file can be deleted safely, False otherwise.
+    """
+
+    def _try_lock() -> bool:
+        try:
+            with portalocker.Lock(
+                str(path),
+                mode="a+",
+                timeout=0.01,  # very short, effectively non-blocking
+                fail_when_locked=True,  # fail if another process holds it
+                flags=constants.LockFlags.EXCLUSIVE,
+            ):
+                return True
+        except Exception:
+            return False
+
+    return await asyncio.to_thread(_try_lock)
+
+
+def async_with_lock(
+    func: Callable[Concatenate[T, P], Coroutine[Any, Any, R]],
+) -> Callable[Concatenate[T, P], Coroutine[Any, Any, R]]:
+    """Async decorator for file-based cross-process locking.
+
+    Args:
+        func: Async function to wrap with locking.
+
+    Returns:
+        Wrapped async function with locking behavior.
+    """
+
+    @functools.wraps(func)
+    async def wrapper(self: T, *args: P.args, **kwargs: P.kwargs) -> R:
+        _ensure_same_process()
+
+        path, _ = _get_lock_context(self, func, kwargs)
+
+        with _AsyncDepthManager(path) as depth_mgr:
+            if depth_mgr.is_reentrant:
+                # Re-entrant within the same task: skip file lock
+                return await func(self, *args, **kwargs)
+
+            # Safer stale handling: only unlink if we can lock it first
+            if _check_lock_staleness(path) and await _safe_to_delete_async(path):
+                try:
+                    await asyncio.to_thread(lambda: path.unlink(missing_ok=True))
+                except Exception:
+                    pass
+
+            # Acquire per-loop async lock to serialize within this loop
+            async_lock = _get_async_lock(path)
+            await async_lock.acquire()
+            try:
+                # Acquire cross-process file lock in a thread
+                lock_config = LockConfig(
+                    mode=LOCK_CONFIG["mode"],
+                    fail_when_locked=LOCK_CONFIG["fail_when_locked"],
+                    flags=LOCK_CONFIG["flags"],
+                )
+                file_lock = portalocker.Lock(str(path), **lock_config)
+
+                await asyncio.to_thread(file_lock.acquire)
+                try:
+                    # Write/refresh metadata while lock is held
+                    await asyncio.to_thread(lambda: _write_lock_metadata(path))
+
+                    result = await func(self, *args, **kwargs)
+                finally:
+                    # Release file lock before unlink to avoid inode race
+                    try:
+                        await asyncio.to_thread(file_lock.release)
+                    finally:
+                        # Now it's safe to unlink the path
+                        try:
+                            await asyncio.to_thread(
+                                lambda: path.unlink(missing_ok=True)
+                            )
+                        except Exception:
+                            pass
+
+                return result
+            finally:
+                async_lock.release()
+
+                with _async_locks_guard:
+                    loop = asyncio.get_running_loop()
+                    loop_locks = _async_locks_by_loop.get(loop)
+                    if loop_locks is not None:
+                        loop_locks.pop(path, None)
+
+    return wrapper

src/crewai/task.py

@@ -43,12 +43,12 @@ from crewai.utilities.config import process_config
 from crewai.utilities.constants import NOT_SPECIFIED, _NotSpecified
 from crewai.utilities.guardrail import process_guardrail, GuardrailResult
 from crewai.utilities.converter import Converter, convert_to_model
-from crewai.events.event_types import (
+from crewai.utilities.events import (
     TaskCompletedEvent,
     TaskFailedEvent,
     TaskStartedEvent,
 )
-from crewai.events.event_bus import crewai_event_bus
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
 from crewai.utilities.i18n import I18N
 from crewai.utilities.printer import Printer
 from crewai.utilities.string_utils import interpolate_only
@@ -160,10 +160,11 @@ class Task(BaseModel):
     )
     max_retries: Optional[int] = Field(
         default=None,
-        description="[DEPRECATED] Maximum number of retries when guardrail fails. Use guardrail_max_retries instead. Will be removed in v1.0.0",
+        description="[DEPRECATED] Maximum number of retries when guardrail fails. Use guardrail_max_retries instead. Will be removed in v1.0.0"
     )
     guardrail_max_retries: int = Field(
-        default=3, description="Maximum number of retries when guardrail fails"
+        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(
@@ -366,7 +367,7 @@ class Task(BaseModel):
                 "The 'max_retries' parameter is deprecated and will be removed in CrewAI v1.0.0. "
                 "Please use 'guardrail_max_retries' instead.",
                 DeprecationWarning,
-                stacklevel=2,
+                stacklevel=2
             )
             self.guardrail_max_retries = self.max_retries
         return self
@@ -531,11 +532,11 @@ class Task(BaseModel):
     def _process_guardrail(self, task_output: TaskOutput) -> GuardrailResult:
         assert self._guardrail is not None
 
-        from crewai.events.event_types import (
+        from crewai.utilities.events import (
             LLMGuardrailCompletedEvent,
             LLMGuardrailStartedEvent,
         )
-        from crewai.events.event_bus import crewai_event_bus
+        from crewai.utilities.events.crewai_event_bus import crewai_event_bus
 
         crewai_event_bus.emit(
             self,

src/crewai/tools/tool_usage.py

@@ -20,8 +20,8 @@ from crewai.utilities.agent_utils import (
     get_tool_names,
     render_text_description_and_args,
 )
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.tool_usage_events import (
+from crewai.utilities.events.crewai_event_bus import crewai_event_bus
+from crewai.utilities.events.tool_usage_events import (
     ToolSelectionErrorEvent,
     ToolUsageErrorEvent,
     ToolUsageFinishedEvent,

src/crewai/utilities/agent_utils.py

@@ -2,12 +2,12 @@ import json
 import re
 from typing import Any, Callable, Dict, List, Optional, Sequence, Union
 
-from crewai.agents.constants import FINAL_ANSWER_AND_PARSABLE_ACTION_ERROR_MESSAGE
 from crewai.agents.parser import (
+    FINAL_ANSWER_AND_PARSABLE_ACTION_ERROR_MESSAGE,
     AgentAction,
     AgentFinish,
+    CrewAgentParser,
     OutputParserException,
-    parse,
 )
 from crewai.llm import LLM
 from crewai.llms.base_llm import BaseLLM
@@ -25,7 +25,6 @@ from crewai.cli.config import Settings
 
 console = Console()
 
-
 def parse_tools(tools: List[BaseTool]) -> List[CrewStructuredTool]:
     """Parse tools to be used for the task."""
     tools_list = []
@@ -123,7 +122,7 @@ def format_message_for_llm(prompt: str, role: str = "user") -> Dict[str, str]:
 def format_answer(answer: str) -> Union[AgentAction, AgentFinish]:
     """Format a response from the LLM into an AgentAction or AgentFinish."""
     try:
-        return parse(answer)
+        return CrewAgentParser.parse_text(answer)
     except Exception:
         # If parsing fails, return a default AgentFinish
         return AgentFinish(
@@ -447,16 +446,9 @@ def show_agent_logs(
 def _print_current_organization():
     settings = Settings()
     if settings.org_uuid:
-        console.print(
-            f"Fetching agent from organization: {settings.org_name} ({settings.org_uuid})",
-            style="bold blue",
-        )
+        console.print(f"Fetching agent from organization: {settings.org_name} ({settings.org_uuid})", style="bold blue")
     else:
-        console.print(
-            "No organization currently set. We recommend setting one before using: `crewai org switch <org_id>` command.",
-            style="yellow",
-        )
-
+        console.print("No organization currently set. We recommend setting one before using: `crewai org switch <org_id>` command.", style="yellow")
 
 def load_agent_from_repository(from_repository: str) -> Dict[str, Any]:
     attributes: Dict[str, Any] = {}

src/crewai/utilities/constants.py

@@ -16,4 +16,4 @@ class _NotSpecified:
 # Unlike `None`, which might be a valid value from the user, `NOT_SPECIFIED` allows
 # us to distinguish between "not passed at all" and "explicitly passed None" or "[]".
 NOT_SPECIFIED = _NotSpecified()
-CREWAI_BASE_URL = "https://app.crewai.com"
+CREWAI_BASE_URL = "https://app.crewai.com/"

src/crewai/utilities/evaluators/crew_evaluator_handler.py

@@ -9,8 +9,8 @@ from crewai.agent import Agent
 from crewai.llm import BaseLLM
 from crewai.task import Task
 from crewai.tasks.task_output import TaskOutput
-from crewai.events.event_bus import crewai_event_bus
-from crewai.events.types.crew_events import CrewTestResultEvent
+from crewai.utilities.events import crewai_event_bus
+from crewai.utilities.events.crew_events import CrewTestResultEvent
 
 
 class TaskEvaluationPydanticOutput(BaseModel):

src/crewai/utilities/evaluators/task_evaluator.py

@@ -3,8 +3,7 @@ from typing import List
 from pydantic import BaseModel, Field
 
 from crewai.utilities import Converter
-from crewai.events.types.task_events import TaskEvaluationEvent
-from crewai.events.event_bus import crewai_event_bus
+from crewai.utilities.events import TaskEvaluationEvent, crewai_event_bus
 from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser
 from crewai.utilities.training_converter import TrainingConverter
 

src/crewai/utilities/events/__init__.py

@@ -1,140 +1,124 @@
-"""Backwards compatibility - this module has moved to crewai.events."""
-
-import warnings
-from abc import ABC
-from collections.abc import Callable
-from typing import Any, Type, TypeVar
-
-from typing_extensions import deprecated
-import crewai.events as new_events
-from crewai.events.base_events import BaseEvent
-from crewai.events.event_types import EventTypes
-
-EventT = TypeVar("EventT", bound=BaseEvent)
-
-
-warnings.warn(
-    "Importing from 'crewai.utilities.events' is deprecated and will be removed in v1.0.0. "
-    "Please use 'crewai.events' instead.",
-    DeprecationWarning,
-    stacklevel=2
+from .crew_events import (
+    CrewKickoffStartedEvent,
+    CrewKickoffCompletedEvent,
+    CrewKickoffFailedEvent,
+    CrewTrainStartedEvent,
+    CrewTrainCompletedEvent,
+    CrewTrainFailedEvent,
+    CrewTestStartedEvent,
+    CrewTestCompletedEvent,
+    CrewTestFailedEvent,
+)
+from .llm_guardrail_events import (
+    LLMGuardrailCompletedEvent,
+    LLMGuardrailStartedEvent,
+)
+from .agent_events import (
+    AgentExecutionStartedEvent,
+    AgentExecutionCompletedEvent,
+    AgentExecutionErrorEvent,
+    AgentEvaluationStartedEvent,
+    AgentEvaluationCompletedEvent,
+    AgentEvaluationFailedEvent,
+)
+from .task_events import (
+    TaskStartedEvent,
+    TaskCompletedEvent,
+    TaskFailedEvent,
+    TaskEvaluationEvent,
+)
+from .flow_events import (
+    FlowCreatedEvent,
+    FlowStartedEvent,
+    FlowFinishedEvent,
+    FlowPlotEvent,
+    MethodExecutionStartedEvent,
+    MethodExecutionFinishedEvent,
+    MethodExecutionFailedEvent,
+)
+from .crewai_event_bus import CrewAIEventsBus, crewai_event_bus
+from .tool_usage_events import (
+    ToolUsageFinishedEvent,
+    ToolUsageErrorEvent,
+    ToolUsageStartedEvent,
+    ToolExecutionErrorEvent,
+    ToolSelectionErrorEvent,
+    ToolUsageEvent,
+    ToolValidateInputErrorEvent,
+)
+from .llm_events import (
+    LLMCallCompletedEvent,
+    LLMCallFailedEvent,
+    LLMCallStartedEvent,
+    LLMCallType,
+    LLMStreamChunkEvent,
 )
 
+from .memory_events import (
+    MemorySaveStartedEvent,
+    MemorySaveCompletedEvent,
+    MemorySaveFailedEvent,
+    MemoryQueryStartedEvent,
+    MemoryQueryCompletedEvent,
+    MemoryQueryFailedEvent,
+    MemoryRetrievalStartedEvent,
+    MemoryRetrievalCompletedEvent,
+)
 
-@deprecated("Use 'from crewai.events import BaseEventListener' instead")
-class BaseEventListener(new_events.BaseEventListener, ABC):
-    """Deprecated: Use crewai.events.BaseEventListener instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import crewai_event_bus' instead")
-class crewai_event_bus:  # noqa: N801
-    """Deprecated: Use crewai.events.crewai_event_bus instead."""
-
-    @classmethod
-    def on(
-        cls, event_type: Type[EventT]
-    ) -> Callable[[Callable[[Any, EventT], None]], Callable[[Any, EventT], None]]:
-        """Delegate to the actual event bus instance."""
-        return new_events.crewai_event_bus.on(event_type)
-
-    @classmethod
-    def emit(cls, source: Any, event: BaseEvent) -> None:
-        """Delegate to the actual event bus instance."""
-        return new_events.crewai_event_bus.emit(source, event)
-
-    @classmethod
-    def register_handler(
-        cls, event_type: Type[EventTypes], handler: Callable[[Any, EventTypes], None]
-    ) -> None:
-        """Delegate to the actual event bus instance."""
-        return new_events.crewai_event_bus.register_handler(event_type, handler)
-
-    @classmethod
-    def scoped_handlers(cls) -> Any:
-        """Delegate to the actual event bus instance."""
-        return new_events.crewai_event_bus.scoped_handlers()
-
-@deprecated("Use 'from crewai.events import CrewKickoffStartedEvent' instead")
-class CrewKickoffStartedEvent(new_events.CrewKickoffStartedEvent):
-    """Deprecated: Use crewai.events.CrewKickoffStartedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import CrewKickoffCompletedEvent' instead")
-class CrewKickoffCompletedEvent(new_events.CrewKickoffCompletedEvent):
-    """Deprecated: Use crewai.events.CrewKickoffCompletedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import AgentExecutionCompletedEvent' instead")
-class AgentExecutionCompletedEvent(new_events.AgentExecutionCompletedEvent):
-    """Deprecated: Use crewai.events.AgentExecutionCompletedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import MemoryQueryCompletedEvent' instead")
-class MemoryQueryCompletedEvent(new_events.MemoryQueryCompletedEvent):
-    """Deprecated: Use crewai.events.MemoryQueryCompletedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import MemorySaveCompletedEvent' instead")
-class MemorySaveCompletedEvent(new_events.MemorySaveCompletedEvent):
-    """Deprecated: Use crewai.events.MemorySaveCompletedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import MemorySaveStartedEvent' instead")
-class MemorySaveStartedEvent(new_events.MemorySaveStartedEvent):
-    """Deprecated: Use crewai.events.MemorySaveStartedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import MemoryQueryStartedEvent' instead")
-class MemoryQueryStartedEvent(new_events.MemoryQueryStartedEvent):
-    """Deprecated: Use crewai.events.MemoryQueryStartedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import MemoryRetrievalCompletedEvent' instead")
-class MemoryRetrievalCompletedEvent(new_events.MemoryRetrievalCompletedEvent):
-    """Deprecated: Use crewai.events.MemoryRetrievalCompletedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import MemorySaveFailedEvent' instead")
-class MemorySaveFailedEvent(new_events.MemorySaveFailedEvent):
-    """Deprecated: Use crewai.events.MemorySaveFailedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import MemoryQueryFailedEvent' instead")
-class MemoryQueryFailedEvent(new_events.MemoryQueryFailedEvent):
-    """Deprecated: Use crewai.events.MemoryQueryFailedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import KnowledgeRetrievalStartedEvent' instead")
-class KnowledgeRetrievalStartedEvent(new_events.KnowledgeRetrievalStartedEvent):
-    """Deprecated: Use crewai.events.KnowledgeRetrievalStartedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import KnowledgeRetrievalCompletedEvent' instead")
-class KnowledgeRetrievalCompletedEvent(new_events.KnowledgeRetrievalCompletedEvent):
-    """Deprecated: Use crewai.events.KnowledgeRetrievalCompletedEvent instead."""
-    pass
-
-@deprecated("Use 'from crewai.events import LLMStreamChunkEvent' instead")
-class LLMStreamChunkEvent(new_events.LLMStreamChunkEvent):
-    """Deprecated: Use crewai.events.LLMStreamChunkEvent instead."""
-    pass
+# events
+from .event_listener import EventListener
 
 __all__ = [
-    'BaseEventListener',
-    'crewai_event_bus',
-    'CrewKickoffStartedEvent',
-    'CrewKickoffCompletedEvent',
-    'AgentExecutionCompletedEvent',
-    'MemoryQueryCompletedEvent',
-    'MemorySaveCompletedEvent',
-    'MemorySaveStartedEvent',
-    'MemoryQueryStartedEvent',
-    'MemoryRetrievalCompletedEvent',
-    'MemorySaveFailedEvent',
-    'MemoryQueryFailedEvent',
-    'KnowledgeRetrievalStartedEvent',
-    'KnowledgeRetrievalCompletedEvent',
-    'LLMStreamChunkEvent',
+    "EventListener",
+    "CrewAIEventsBus",
+    "crewai_event_bus",
+    "AgentExecutionStartedEvent",
+    "AgentExecutionCompletedEvent",
+    "AgentExecutionErrorEvent",
+    "AgentEvaluationStartedEvent",
+    "AgentEvaluationCompletedEvent",
+    "AgentEvaluationFailedEvent",
+    "TaskStartedEvent",
+    "TaskCompletedEvent",
+    "TaskFailedEvent",
+    "TaskEvaluationEvent",
+    "FlowCreatedEvent",
+    "FlowStartedEvent",
+    "FlowFinishedEvent",
+    "FlowPlotEvent",
+    "MethodExecutionStartedEvent",
+    "MethodExecutionFinishedEvent",
+    "MethodExecutionFailedEvent",
+    "LLMCallCompletedEvent",
+    "LLMCallFailedEvent",
+    "LLMCallStartedEvent",
+    "LLMCallType",
+    "LLMStreamChunkEvent",
+    "MemorySaveStartedEvent",
+    "MemorySaveCompletedEvent",
+    "MemorySaveFailedEvent",
+    "MemoryQueryStartedEvent",
+    "MemoryQueryCompletedEvent",
+    "MemoryQueryFailedEvent",
+    "MemoryRetrievalStartedEvent",
+    "MemoryRetrievalCompletedEvent",
+    "EventListener",
+    "CrewKickoffStartedEvent",
+    "CrewKickoffCompletedEvent",
+    "CrewKickoffFailedEvent",
+    "CrewTrainStartedEvent",
+    "CrewTrainCompletedEvent",
+    "CrewTrainFailedEvent",
+    "CrewTestStartedEvent",
+    "CrewTestCompletedEvent",
+    "CrewTestFailedEvent",
+    "LLMGuardrailCompletedEvent",
+    "LLMGuardrailStartedEvent",
+    "ToolUsageFinishedEvent",
+    "ToolUsageErrorEvent",
+    "ToolUsageStartedEvent",
+    "ToolExecutionErrorEvent",
+    "ToolSelectionErrorEvent",
+    "ToolUsageEvent",
+    "ToolValidateInputErrorEvent",
 ]
-
-__deprecated__ = "Use 'crewai.events' instead of 'crewai.utilities.events'"

src/crewai/utilities/events/agent_events.py

@@ -1,15 +1,13 @@
-"""Agent-related events moved to break circular dependencies."""
-
-from __future__ import annotations
-
-from typing import Any, Dict, List, Optional, Sequence, Union
-
-from pydantic import model_validator
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Sequence, Union
 
 from crewai.agents.agent_builder.base_agent import BaseAgent
 from crewai.tools.base_tool import BaseTool
 from crewai.tools.structured_tool import CrewStructuredTool
-from crewai.events.base_events import BaseEvent
+
+from .base_events import BaseEvent
+
+if TYPE_CHECKING:
+    from crewai.agents.agent_builder.base_agent import BaseAgent
 
 
 class AgentExecutionStartedEvent(BaseEvent):
@@ -23,9 +21,9 @@ class AgentExecutionStartedEvent(BaseEvent):
 
     model_config = {"arbitrary_types_allowed": True}
 
-    @model_validator(mode="after")
-    def set_fingerprint_data(self):
-        """Set fingerprint data from the agent if available."""
+    def __init__(self, **data):
+        super().__init__(**data)
+        # Set fingerprint data from the agent
         if hasattr(self.agent, "fingerprint") and self.agent.fingerprint:
             self.source_fingerprint = self.agent.fingerprint.uuid_str
             self.source_type = "agent"
@@ -34,7 +32,6 @@ class AgentExecutionStartedEvent(BaseEvent):
                 and self.agent.fingerprint.metadata
             ):
                 self.fingerprint_metadata = self.agent.fingerprint.metadata
-        return self
 
 
 class AgentExecutionCompletedEvent(BaseEvent):
@@ -45,11 +42,9 @@ class AgentExecutionCompletedEvent(BaseEvent):
     output: str
     type: str = "agent_execution_completed"
 
-    model_config = {"arbitrary_types_allowed": True}
-
-    @model_validator(mode="after")
-    def set_fingerprint_data(self):
-        """Set fingerprint data from the agent if available."""
+    def __init__(self, **data):
+        super().__init__(**data)
+        # Set fingerprint data from the agent
         if hasattr(self.agent, "fingerprint") and self.agent.fingerprint:
             self.source_fingerprint = self.agent.fingerprint.uuid_str
             self.source_type = "agent"
@@ -58,7 +53,6 @@ class AgentExecutionCompletedEvent(BaseEvent):
                 and self.agent.fingerprint.metadata
             ):
                 self.fingerprint_metadata = self.agent.fingerprint.metadata
-        return self
 
 
 class AgentExecutionErrorEvent(BaseEvent):
@@ -69,11 +63,9 @@ class AgentExecutionErrorEvent(BaseEvent):
     error: str
     type: str = "agent_execution_error"
 
-    model_config = {"arbitrary_types_allowed": True}
-
-    @model_validator(mode="after")
-    def set_fingerprint_data(self):
-        """Set fingerprint data from the agent if available."""
+    def __init__(self, **data):
+        super().__init__(**data)
+        # Set fingerprint data from the agent
         if hasattr(self.agent, "fingerprint") and self.agent.fingerprint:
             self.source_fingerprint = self.agent.fingerprint.uuid_str
             self.source_type = "agent"
@@ -82,7 +74,6 @@ class AgentExecutionErrorEvent(BaseEvent):
                 and self.agent.fingerprint.metadata
             ):
                 self.fingerprint_metadata = self.agent.fingerprint.metadata
-        return self
 
 
 # New event classes for LiteAgent
@@ -113,6 +104,26 @@ class LiteAgentExecutionErrorEvent(BaseEvent):
     type: str = "lite_agent_execution_error"
 
 
+# New logging events
+class AgentLogsStartedEvent(BaseEvent):
+    """Event emitted when agent logs should be shown at start"""
+
+    agent_role: str
+    task_description: Optional[str] = None
+    verbose: bool = False
+    type: str = "agent_logs_started"
+
+
+class AgentLogsExecutionEvent(BaseEvent):
+    """Event emitted when agent logs should be shown during execution"""
+
+    agent_role: str
+    formatted_answer: Any
+    verbose: bool = False
+    type: str = "agent_logs_execution"
+
+    model_config = {"arbitrary_types_allowed": True}
+
 # Agent Eval events
 class AgentEvaluationStartedEvent(BaseEvent):
     agent_id: str
@@ -121,7 +132,6 @@ class AgentEvaluationStartedEvent(BaseEvent):
     iteration: int
     type: str = "agent_evaluation_started"
 
-
 class AgentEvaluationCompletedEvent(BaseEvent):
     agent_id: str
     agent_role: str
@@ -131,7 +141,6 @@ class AgentEvaluationCompletedEvent(BaseEvent):
     score: Any
     type: str = "agent_evaluation_completed"
 
-
 class AgentEvaluationFailedEvent(BaseEvent):
     agent_id: str
     agent_role: str

src/crewai/utilities/events/base_event_listener.py

@@ -1,13 +1,16 @@
-"""Backwards compatibility stub for crewai.utilities.events.base_event_listener."""
+from abc import ABC, abstractmethod
+from logging import Logger
 
-import warnings
-from crewai.events import BaseEventListener
+from crewai.utilities.events.crewai_event_bus import CrewAIEventsBus, crewai_event_bus
 
-warnings.warn(
-    "Importing from 'crewai.utilities.events.base_event_listener' is deprecated and will be removed in v1.0.0. "
-    "Please use 'from crewai.events import BaseEventListener' instead.",
-    DeprecationWarning,
-    stacklevel=2,
-)
 
-__all__ = ["BaseEventListener"]
+class BaseEventListener(ABC):
+    verbose: bool = False
+
+    def __init__(self):
+        super().__init__()
+        self.setup_listeners(crewai_event_bus)
+
+    @abstractmethod
+    def setup_listeners(self, crewai_event_bus: CrewAIEventsBus):
+        pass

src/crewai/utilities/events/crew_events.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
-from crewai.events.base_events import BaseEvent
+from crewai.utilities.events.base_events import BaseEvent
 
 if TYPE_CHECKING:
     from crewai.crew import Crew

src/crewai/utilities/events/crewai_event_bus.py

@@ -1,13 +1,115 @@
-"""Backwards compatibility stub for crewai.utilities.events.crewai_event_bus."""
+import threading
+from contextlib import contextmanager
+from typing import Any, Callable, Dict, List, Type, TypeVar, cast
 
-import warnings
-from crewai.events import crewai_event_bus
+from blinker import Signal
 
-warnings.warn(
-    "Importing from 'crewai.utilities.events.crewai_event_bus' is deprecated and will be removed in v1.0.0. "
-    "Please use 'from crewai.events import crewai_event_bus' instead.",
-    DeprecationWarning,
-    stacklevel=2,
-)
+from crewai.utilities.events.base_events import BaseEvent
+from crewai.utilities.events.event_types import EventTypes
 
-__all__ = ["crewai_event_bus"]
+EventT = TypeVar("EventT", bound=BaseEvent)
+
+
+class CrewAIEventsBus:
+    """
+    A singleton event bus that uses blinker signals for event handling.
+    Allows both internal (Flow/Crew) and external event handling.
+    """
+
+    _instance = None
+    _lock = threading.Lock()
+
+    def __new__(cls):
+        if cls._instance is None:
+            with cls._lock:
+                if cls._instance is None:  # prevent race condition
+                    cls._instance = super(CrewAIEventsBus, cls).__new__(cls)
+                    cls._instance._initialize()
+        return cls._instance
+
+    def _initialize(self) -> None:
+        """Initialize the event bus internal state"""
+        self._signal = Signal("crewai_event_bus")
+        self._handlers: Dict[Type[BaseEvent], List[Callable]] = {}
+
+    def on(
+        self, event_type: Type[EventT]
+    ) -> Callable[[Callable[[Any, EventT], None]], Callable[[Any, EventT], None]]:
+        """
+        Decorator to register an event handler for a specific event type.
+
+        Usage:
+            @crewai_event_bus.on(AgentExecutionCompletedEvent)
+            def on_agent_execution_completed(
+                source: Any, event: AgentExecutionCompletedEvent
+            ):
+                print(f"👍 Agent '{event.agent}' completed task")
+                print(f"   Output: {event.output}")
+        """
+
+        def decorator(
+            handler: Callable[[Any, EventT], None],
+        ) -> Callable[[Any, EventT], None]:
+            if event_type not in self._handlers:
+                self._handlers[event_type] = []
+            self._handlers[event_type].append(
+                cast(Callable[[Any, EventT], None], handler)
+            )
+            return handler
+
+        return decorator
+
+    def emit(self, source: Any, event: BaseEvent) -> None:
+        """
+        Emit an event to all registered handlers
+
+        Args:
+            source: The object emitting the event
+            event: The event instance to emit
+        """
+        for event_type, handlers in self._handlers.items():
+            if isinstance(event, event_type):
+                for handler in handlers:
+                    try:
+                        handler(source, event)
+                    except Exception as e:
+                        print(
+                            f"[EventBus Error] Handler '{handler.__name__}' failed for event '{event_type.__name__}': {e}"
+                        )
+
+        self._signal.send(source, event=event)
+
+    def register_handler(
+        self, event_type: Type[EventTypes], handler: Callable[[Any, EventTypes], None]
+    ) -> None:
+        """Register an event handler for a specific event type"""
+        if event_type not in self._handlers:
+            self._handlers[event_type] = []
+        self._handlers[event_type].append(
+            cast(Callable[[Any, EventTypes], None], handler)
+        )
+
+    @contextmanager
+    def scoped_handlers(self):
+        """
+        Context manager for temporary event handling scope.
+        Useful for testing or temporary event handling.
+
+        Usage:
+            with crewai_event_bus.scoped_handlers():
+                @crewai_event_bus.on(CrewKickoffStarted)
+                def temp_handler(source, event):
+                    print("Temporary handler")
+                # Do stuff...
+            # Handlers are cleared after the context
+        """
+        previous_handlers = self._handlers.copy()
+        self._handlers.clear()
+        try:
+            yield
+        finally:
+            self._handlers = previous_handlers
+
+
+# Global instance
+crewai_event_bus = CrewAIEventsBus()

src/crewai/utilities/events/event_listener.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from io import StringIO
 from typing import Any, Dict
 
@@ -9,8 +7,8 @@ from crewai.task import Task
 from crewai.telemetry.telemetry import Telemetry
 from crewai.utilities import Logger
 from crewai.utilities.constants import EMITTER_COLOR
-from crewai.events.base_event_listener import BaseEventListener
-from crewai.events.types.knowledge_events import (
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events.knowledge_events import (
     KnowledgeQueryCompletedEvent,
     KnowledgeQueryFailedEvent,
     KnowledgeQueryStartedEvent,
@@ -18,30 +16,28 @@ from crewai.events.types.knowledge_events import (
     KnowledgeRetrievalStartedEvent,
     KnowledgeSearchQueryFailedEvent,
 )
-from crewai.events.types.llm_events import (
+from crewai.utilities.events.llm_events import (
     LLMCallCompletedEvent,
     LLMCallFailedEvent,
     LLMCallStartedEvent,
     LLMStreamChunkEvent,
 )
-from crewai.events.types.llm_guardrail_events import (
+from crewai.utilities.events.llm_guardrail_events import (
     LLMGuardrailStartedEvent,
     LLMGuardrailCompletedEvent,
 )
-from crewai.events.utils.console_formatter import ConsoleFormatter
+from crewai.utilities.events.utils.console_formatter import ConsoleFormatter
 
-from crewai.events.types.agent_events import (
+from .agent_events import (
     AgentExecutionCompletedEvent,
     AgentExecutionStartedEvent,
+    AgentLogsStartedEvent,
+    AgentLogsExecutionEvent,
     LiteAgentExecutionCompletedEvent,
     LiteAgentExecutionErrorEvent,
     LiteAgentExecutionStartedEvent,
 )
-from crewai.events.types.logging_events import (
-    AgentLogsStartedEvent,
-    AgentLogsExecutionEvent,
-)
-from crewai.events.types.crew_events import (
+from .crew_events import (
     CrewKickoffCompletedEvent,
     CrewKickoffFailedEvent,
     CrewKickoffStartedEvent,
@@ -53,7 +49,7 @@ from crewai.events.types.crew_events import (
     CrewTrainFailedEvent,
     CrewTrainStartedEvent,
 )
-from .types.flow_events import (
+from .flow_events import (
     FlowCreatedEvent,
     FlowFinishedEvent,
     FlowStartedEvent,
@@ -61,13 +57,13 @@ from .types.flow_events import (
     MethodExecutionFinishedEvent,
     MethodExecutionStartedEvent,
 )
-from .types.task_events import TaskCompletedEvent, TaskFailedEvent, TaskStartedEvent
-from .types.tool_usage_events import (
+from .task_events import TaskCompletedEvent, TaskFailedEvent, TaskStartedEvent
+from .tool_usage_events import (
     ToolUsageErrorEvent,
     ToolUsageFinishedEvent,
     ToolUsageStartedEvent,
 )
-from .types.reasoning_events import (
+from .reasoning_events import (
     AgentReasoningStartedEvent,
     AgentReasoningCompletedEvent,
     AgentReasoningFailedEvent,
@@ -166,7 +162,7 @@ class EventListener(BaseEventListener):
             span = self._telemetry.task_started(crew=source.agent.crew, task=source)
             self.execution_spans[source] = span
             # Pass both task ID and task name (if set)
-            task_name = source.name if hasattr(source, "name") and source.name else None
+            task_name = source.name if hasattr(source, 'name') and source.name else None
             self.formatter.create_task_branch(
                 self.formatter.current_crew_tree, source.id, task_name
             )
@@ -180,13 +176,13 @@ class EventListener(BaseEventListener):
             self.execution_spans[source] = None
 
             # Pass task name if it exists
-            task_name = source.name if hasattr(source, "name") and source.name else None
+            task_name = source.name if hasattr(source, 'name') and source.name else None
             self.formatter.update_task_status(
                 self.formatter.current_crew_tree,
                 source.id,
                 source.agent.role,
                 "completed",
-                task_name,
+                task_name
             )
 
         @crewai_event_bus.on(TaskFailedEvent)
@@ -198,13 +194,13 @@ class EventListener(BaseEventListener):
                 self.execution_spans[source] = None
 
             # Pass task name if it exists
-            task_name = source.name if hasattr(source, "name") and source.name else None
+            task_name = source.name if hasattr(source, 'name') and source.name else None
             self.formatter.update_task_status(
                 self.formatter.current_crew_tree,
                 source.id,
                 source.agent.role,
                 "failed",
-                task_name,
+                task_name
             )
 
         # ----------- AGENT EVENTS -----------

src/crewai/utilities/events/event_types.py

@@ -1,12 +1,12 @@
 from typing import Union
 
-from crewai.events.types.agent_events import (
+from .agent_events import (
     AgentExecutionCompletedEvent,
     AgentExecutionErrorEvent,
     AgentExecutionStartedEvent,
     LiteAgentExecutionCompletedEvent,
 )
-from .types.crew_events import (
+from .crew_events import (
     CrewKickoffCompletedEvent,
     CrewKickoffFailedEvent,
     CrewKickoffStartedEvent,
@@ -17,39 +17,39 @@ from .types.crew_events import (
     CrewTrainFailedEvent,
     CrewTrainStartedEvent,
 )
-from .types.flow_events import (
+from .flow_events import (
     FlowFinishedEvent,
     FlowStartedEvent,
     MethodExecutionFailedEvent,
     MethodExecutionFinishedEvent,
     MethodExecutionStartedEvent,
 )
-from .types.llm_events import (
+from .llm_events import (
     LLMCallCompletedEvent,
     LLMCallFailedEvent,
     LLMCallStartedEvent,
     LLMStreamChunkEvent,
 )
-from .types.llm_guardrail_events import (
+from .llm_guardrail_events import (
     LLMGuardrailCompletedEvent,
     LLMGuardrailStartedEvent,
 )
-from .types.task_events import (
+from .task_events import (
     TaskCompletedEvent,
     TaskFailedEvent,
     TaskStartedEvent,
 )
-from .types.tool_usage_events import (
+from .tool_usage_events import (
     ToolUsageErrorEvent,
     ToolUsageFinishedEvent,
     ToolUsageStartedEvent,
 )
-from .types.reasoning_events import (
+from .reasoning_events import (
     AgentReasoningStartedEvent,
     AgentReasoningCompletedEvent,
     AgentReasoningFailedEvent,
 )
-from .types.knowledge_events import (
+from .knowledge_events import (
     KnowledgeRetrievalStartedEvent,
     KnowledgeRetrievalCompletedEvent,
     KnowledgeQueryStartedEvent,
@@ -58,7 +58,7 @@ from .types.knowledge_events import (
     KnowledgeSearchQueryFailedEvent,
 )
 
-from .types.memory_events import (
+from .memory_events import (
     MemorySaveStartedEvent,
     MemorySaveCompletedEvent,
     MemorySaveFailedEvent,

src/crewai/utilities/events/flow_events.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, Optional, Union
 
 from pydantic import BaseModel, ConfigDict
 
-from crewai.events.base_events import BaseEvent
+from .base_events import BaseEvent
 
 
 class FlowEvent(BaseEvent):

src/crewai/utilities/events/knowledge_events.py

@@ -1,6 +1,10 @@
-from crewai.events.base_events import BaseEvent
+from typing import TYPE_CHECKING, Any
 
 from crewai.agents.agent_builder.base_agent import BaseAgent
+from crewai.utilities.events.base_events import BaseEvent
+
+if TYPE_CHECKING:
+    from crewai.agents.agent_builder.base_agent import BaseAgent
 
 
 class KnowledgeRetrievalStartedEvent(BaseEvent):
@@ -16,7 +20,7 @@ class KnowledgeRetrievalCompletedEvent(BaseEvent):
     query: str
     type: str = "knowledge_search_query_completed"
     agent: BaseAgent
-    retrieved_knowledge: str
+    retrieved_knowledge: Any
 
 
 class KnowledgeQueryStartedEvent(BaseEvent):

src/crewai/utilities/events/listeners/memory_listener.py

@@ -1,5 +1,5 @@
-from crewai.events.base_event_listener import BaseEventListener
-from crewai.events.types.memory_events import (
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events.memory_events import (
     MemoryRetrievalCompletedEvent,
     MemoryRetrievalStartedEvent,
     MemoryQueryFailedEvent,
@@ -9,8 +9,8 @@ from crewai.events.types.memory_events import (
     MemorySaveFailedEvent,
 )
 
-
 class MemoryListener(BaseEventListener):
+
     def __init__(self, formatter):
         super().__init__()
         self.formatter = formatter
@@ -19,7 +19,9 @@ class MemoryListener(BaseEventListener):
 
     def setup_listeners(self, crewai_event_bus):
         @crewai_event_bus.on(MemoryRetrievalStartedEvent)
-        def on_memory_retrieval_started(source, event: MemoryRetrievalStartedEvent):
+        def on_memory_retrieval_started(
+            source, event: MemoryRetrievalStartedEvent
+        ):
             if self.memory_retrieval_in_progress:
                 return
 
@@ -31,7 +33,9 @@ class MemoryListener(BaseEventListener):
             )
 
         @crewai_event_bus.on(MemoryRetrievalCompletedEvent)
-        def on_memory_retrieval_completed(source, event: MemoryRetrievalCompletedEvent):
+        def on_memory_retrieval_completed(
+            source, event: MemoryRetrievalCompletedEvent
+        ):
             if not self.memory_retrieval_in_progress:
                 return
 
@@ -40,7 +44,7 @@ class MemoryListener(BaseEventListener):
                 self.formatter.current_agent_branch,
                 self.formatter.current_crew_tree,
                 event.memory_content,
-                event.retrieval_time_ms,
+                event.retrieval_time_ms
             )
 
         @crewai_event_bus.on(MemoryQueryCompletedEvent)
@@ -103,4 +107,4 @@ class MemoryListener(BaseEventListener):
                 event.error,
                 event.source_type,
                 self.formatter.current_crew_tree,
-            )
+            )

src/crewai/utilities/events/listeners/tracing/trace_batch_manager.py

@@ -11,7 +11,7 @@ from crewai.cli.plus_api import PlusAPI
 from rich.console import Console
 from rich.panel import Panel
 
-from crewai.events.listeners.tracing.types import TraceEvent
+from crewai.utilities.events.listeners.tracing.types import TraceEvent
 from logging import getLogger
 
 logger = getLogger(__name__)
@@ -50,9 +50,7 @@ class TraceBatchManager:
 
     def __init__(self):
         try:
-            self.plus_api = PlusAPI(
-                api_key=get_auth_token(),
-            )
+            self.plus_api = PlusAPI(api_key=get_auth_token())
         except AuthError:
             self.plus_api = PlusAPI(api_key="")
 
@@ -116,13 +114,7 @@ class TraceBatchManager:
                 else self.plus_api.initialize_trace_batch(payload)
             )
 
-            if response is None:
-                logger.warning(
-                    "Trace batch initialization failed gracefully. Continuing without tracing."
-                )
-                return
-
-            if response.status_code in [201, 200]:
+            if response.status_code == 201 or response.status_code == 200:
                 response_data = response.json()
                 self.trace_batch_id = (
                     response_data["trace_id"]
@@ -137,23 +129,21 @@ class TraceBatchManager:
                 )
                 console.print(panel)
             else:
-                logger.warning(
-                    f"Trace batch initialization returned status {response.status_code}. Continuing without tracing."
+                logger.error(
+                    f"❌ Failed to initialize trace batch: {response.status_code} - {response.text}"
                 )
 
         except Exception as e:
-            logger.warning(
-                f"Error initializing trace batch: {str(e)}. Continuing without tracing."
-            )
+            logger.error(f"❌ Error initializing trace batch: {str(e)}")
 
     def add_event(self, trace_event: TraceEvent):
         """Add event to buffer"""
         self.event_buffer.append(trace_event)
 
-    def _send_events_to_backend(self) -> int:
-        """Send buffered events to backend with graceful failure handling"""
+    def _send_events_to_backend(self):
+        """Send buffered events to backend"""
         if not self.plus_api or not self.trace_batch_id or not self.event_buffer:
-            return 500
+            return
 
         try:
             payload = {
@@ -165,30 +155,24 @@ class TraceBatchManager:
                 },
             }
 
+            if not self.trace_batch_id:
+                raise Exception("❌ Trace batch ID not found")
+
             response = (
                 self.plus_api.send_ephemeral_trace_events(self.trace_batch_id, payload)
                 if self.is_current_batch_ephemeral
                 else self.plus_api.send_trace_events(self.trace_batch_id, payload)
             )
 
-            if response is None:
-                logger.warning("Failed to send trace events. Events will be lost.")
-                return 500
-
-            if response.status_code in [200, 201]:
+            if response.status_code == 200 or response.status_code == 201:
                 self.event_buffer.clear()
-                return 200
             else:
-                logger.warning(
-                    f"Failed to send events: {response.status_code}. Events will be lost."
+                logger.error(
+                    f"❌ Failed to send events: {response.status_code} - {response.text}"
                 )
-                return 500
 
         except Exception as e:
-            logger.warning(
-                f"Error sending events to backend: {str(e)}. Events will be lost."
-            )
-            return 500
+            logger.error(f"❌ Error sending events to backend: {str(e)}")
 
     def finalize_batch(self) -> Optional[TraceBatch]:
         """Finalize batch and return it for sending"""
@@ -197,9 +181,7 @@ class TraceBatchManager:
 
         self.current_batch.events = self.event_buffer.copy()
         if self.event_buffer:
-            events_sent_to_backend_status = self._send_events_to_backend()
-            if events_sent_to_backend_status == 500:
-                return None
+            self._send_events_to_backend()
         self._finalize_backend_batch()
 
         finalized_batch = self.current_batch

src/crewai/utilities/events/listeners/tracing/trace_listener.py

@@ -3,8 +3,8 @@ import uuid
 
 from typing import Dict, Any, Optional
 
-from crewai.events.base_event_listener import BaseEventListener
-from crewai.events.types.agent_events import (
+from crewai.utilities.events.base_event_listener import BaseEventListener
+from crewai.utilities.events.agent_events import (
     AgentExecutionCompletedEvent,
     AgentExecutionStartedEvent,
     LiteAgentExecutionStartedEvent,
@@ -12,34 +12,34 @@ from crewai.events.types.agent_events import (
     LiteAgentExecutionErrorEvent,
     AgentExecutionErrorEvent,
 )
-from crewai.events.listeners.tracing.types import TraceEvent
-from crewai.events.types.reasoning_events import (
+from crewai.utilities.events.listeners.tracing.types import TraceEvent
+from crewai.utilities.events.reasoning_events import (
     AgentReasoningStartedEvent,
     AgentReasoningCompletedEvent,
     AgentReasoningFailedEvent,
 )
-from crewai.events.types.crew_events import (
+from crewai.utilities.events.crew_events import (
     CrewKickoffCompletedEvent,
     CrewKickoffFailedEvent,
     CrewKickoffStartedEvent,
 )
-from crewai.events.types.task_events import (
+from crewai.utilities.events.task_events import (
     TaskCompletedEvent,
     TaskFailedEvent,
     TaskStartedEvent,
 )
-from crewai.events.types.tool_usage_events import (
+from crewai.utilities.events.tool_usage_events import (
     ToolUsageErrorEvent,
     ToolUsageFinishedEvent,
     ToolUsageStartedEvent,
 )
-from crewai.events.types.llm_events import (
+from crewai.utilities.events.llm_events import (
     LLMCallCompletedEvent,
     LLMCallFailedEvent,
     LLMCallStartedEvent,
 )
 
-from crewai.events.types.flow_events import (
+from crewai.utilities.events.flow_events import (
     FlowCreatedEvent,
     FlowStartedEvent,
     FlowFinishedEvent,
@@ -48,7 +48,7 @@ from crewai.events.types.flow_events import (
     MethodExecutionFailedEvent,
     FlowPlotEvent,
 )
-from crewai.events.types.llm_guardrail_events import (
+from crewai.utilities.events.llm_guardrail_events import (
     LLMGuardrailStartedEvent,
     LLMGuardrailCompletedEvent,
 )
@@ -57,7 +57,7 @@ from crewai.utilities.serialization import to_serializable
 
 from .trace_batch_manager import TraceBatchManager
 
-from crewai.events.types.memory_events import (
+from crewai.utilities.events.memory_events import (
     MemoryQueryStartedEvent,
     MemoryQueryCompletedEvent,
     MemoryQueryFailedEvent,

src/crewai/utilities/events/llm_events.py

@@ -3,7 +3,7 @@ from typing import Any, Dict, List, Optional, Union
 
 from pydantic import BaseModel
 
-from crewai.events.base_events import BaseEvent
+from crewai.utilities.events.base_events import BaseEvent
 
 
 class LLMEventBase(BaseEvent):

src/crewai/utilities/events/llm_guardrail_events.py

@@ -1,7 +1,7 @@
 from inspect import getsource
 from typing import Any, Callable, Optional, Union
 
-from crewai.events.base_events import BaseEvent
+from crewai.utilities.events.base_events import BaseEvent
 
 
 class LLMGuardrailStartedEvent(BaseEvent):

src/crewai/utilities/events/memory_events.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, Optional
 
-from crewai.events.base_events import BaseEvent
+from crewai.utilities.events.base_events import BaseEvent
 
 
 class MemoryBaseEvent(BaseEvent):

src/crewai/utilities/events/reasoning_events.py

@@ -1,4 +1,4 @@
-from crewai.events.base_events import BaseEvent
+from crewai.utilities.events.base_events import BaseEvent
 from typing import Any, Optional
 
 

src/crewai/utilities/events/task_events.py

@@ -1,7 +1,7 @@
 from typing import Any, Optional
 
 from crewai.tasks.task_output import TaskOutput
-from crewai.events.base_events import BaseEvent
+from crewai.utilities.events.base_events import BaseEvent
 
 
 class TaskStartedEvent(BaseEvent):