add in 2 small improvements based on joao feedback

README.md

@@ -73,7 +73,6 @@ os.environ["SERPER_API_KEY"] = "Your Key" # serper.dev API key
 # You can pass an optional llm attribute specifying what model you wanna use.
 # It can be a local model through Ollama / LM Studio or a remote
 # model like OpenAI, Mistral, Antrophic or others (https://docs.crewai.com/how-to/LLM-Connections/)
-# If you don't specify a model, the default is OpenAI gpt-4o
 #
 # import os
 # os.environ['OPENAI_MODEL_NAME'] = 'gpt-3.5-turbo'

docs/core-concepts/Pipeline.md

@@ -32,8 +32,8 @@ Each input creates its own run, flowing through all stages of the pipeline. Mult
 
 ## Pipeline Attributes
 
-| Attribute  | Parameters | Description                                                                           |
-| :--------- | :--------- | :------------------------------------------------------------------------------------ |
+| Attribute  | Parameters | Description                                                                                     |
+| :--------- | :--------- | :---------------------------------------------------------------------------------------------- |
 | **Stages** | `stages`   | A list of crews, lists of crews, or routers representing the stages to be executed in sequence. |
 
 ## Creating a Pipeline
@@ -239,7 +239,7 @@ email_router = Router(
             pipeline=normal_pipeline
         )
     },
-    default=Pipeline(stages=[normal_pipeline])  # Default to just classification if no urgency score
+    default=Pipeline(stages=[normal_pipeline])  # Default to just normal if no urgency score
 )
 
 # Use the router in a main pipeline

docs/how-to/Kickoff-async.md

@@ -4,11 +4,9 @@ description: Kickoff a Crew Asynchronously
 ---
 
 ## Introduction
-
 CrewAI provides the ability to kickoff a crew asynchronously, allowing you to start the crew execution in a non-blocking manner. This feature is particularly useful when you want to run multiple crews concurrently or when you need to perform other tasks while the crew is executing.
 
 ## Asynchronous Crew Execution
-
 To kickoff a crew asynchronously, use the `kickoff_async()` method. This method initiates the crew execution in a separate thread, allowing the main thread to continue executing other tasks.
 
 ### Method Signature
@@ -25,20 +23,10 @@ def kickoff_async(self, inputs: dict) -> CrewOutput:
 
 - `CrewOutput`: An object representing the result of the crew execution.
 
-## Potential Use Cases
-
-- **Parallel Content Generation**: Kickoff multiple independent crews asynchronously, each responsible for generating content on different topics. For example, one crew might research and draft an article on AI trends, while another crew generates social media posts about a new product launch. Each crew operates independently, allowing content production to scale efficiently.
-
-- **Concurrent Market Research Tasks**: Launch multiple crews asynchronously to conduct market research in parallel. One crew might analyze industry trends, while another examines competitor strategies, and yet another evaluates consumer sentiment. Each crew independently completes its task, enabling faster and more comprehensive insights.
-
-- **Independent Travel Planning Modules**: Execute separate crews to independently plan different aspects of a trip. One crew might handle flight options, another handles accommodation, and a third plans activities. Each crew works asynchronously, allowing various components of the trip to be planned simultaneously and independently for faster results.
-
-## Example: Single Asynchronous Crew Execution
-
-Here's an example of how to kickoff a crew asynchronously using asyncio and awaiting the result:
+## Example
+Here's an example of how to kickoff a crew asynchronously:
 
 ```python
-import asyncio
 from crewai import Crew, Agent, Task
 
 # Create an agent with code execution enabled
@@ -61,57 +49,6 @@ analysis_crew = Crew(
     tasks=[data_analysis_task]
 )
 
-# Async function to kickoff the crew asynchronously
-async def async_crew_execution():
-    result = await analysis_crew.kickoff_async(inputs={"ages": [25, 30, 35, 40, 45]})
-    print("Crew Result:", result)
-
-# Run the async function
-asyncio.run(async_crew_execution())
-```
-
-## Example: Multiple Asynchronous Crew Executions
-
-In this example, we'll show how to kickoff multiple crews asynchronously and wait for all of them to complete using asyncio.gather():
-
-```python
-import asyncio
-from crewai import Crew, Agent, Task
-
-# Create an agent with code execution enabled
-coding_agent = Agent(
-    role="Python Data Analyst",
-    goal="Analyze data and provide insights using Python",
-    backstory="You are an experienced data analyst with strong Python skills.",
-    allow_code_execution=True
-)
-
-# Create tasks that require code execution
-task_1 = Task(
-    description="Analyze the first dataset and calculate the average age of participants. Ages: {ages}",
-    agent=coding_agent
-)
-
-task_2 = Task(
-    description="Analyze the second dataset and calculate the average age of participants. Ages: {ages}",
-    agent=coding_agent
-)
-
-# Create two crews and add tasks
-crew_1 = Crew(agents=[coding_agent], tasks=[task_1])
-crew_2 = Crew(agents=[coding_agent], tasks=[task_2])
-
-# Async function to kickoff multiple crews asynchronously and wait for all to finish
-async def async_multiple_crews():
-    result_1 = crew_1.kickoff_async(inputs={"ages": [25, 30, 35, 40, 45]})
-    result_2 = crew_2.kickoff_async(inputs={"ages": [20, 22, 24, 28, 30]})
-
-    # Wait for both crews to finish
-    results = await asyncio.gather(result_1, result_2)
-
-    for i, result in enumerate(results, 1):
-        print(f"Crew {i} Result:", result)
-
-# Run the async function
-asyncio.run(async_multiple_crews())
-```
+# Execute the crew asynchronously
+result = analysis_crew.kickoff_async(inputs={"ages": [25, 30, 35, 40, 45]})
+```

docs/telemetry/Telemetry.md

@@ -5,39 +5,24 @@ description: Understanding the telemetry data collected by CrewAI and how it con
 
 ## Telemetry
 
-!!! note "Personal Information"
-    By default, we collect no data that would be considered personal information under GDPR and other privacy regulations.
-    We do collect Tool's names and Agent's roles, so be advised not to include any personal information in the tool's names or the Agent's roles.
-		Because no personal information is collected, it's not necessary to worry about data residency.
-		When `share_crew` is enabled, additional data is collected which may contain personal information if included by the user. Users should exercise caution when enabling this feature to ensure compliance with privacy regulations.
+CrewAI utilizes anonymous telemetry to gather usage statistics with the primary goal of enhancing the library. Our focus is on improving and developing the features, integrations, and tools most utilized by our users. We don't offer a way to disable it now, but we will in the future.
 
-CrewAI utilizes anonymous telemetry to gather usage statistics with the primary goal of enhancing the library. Our focus is on improving and developing the features, integrations, and tools most utilized by our users.
+It's pivotal to understand that **NO data is collected** concerning prompts, task descriptions, agents' backstories or goals, usage of tools, API calls, responses, any data processed by the agents, or secrets and environment variables, with the exception of the conditions mentioned. When the `share_crew` feature is enabled, detailed data including task descriptions, agents' backstories or goals, and other specific attributes are collected to provide deeper insights while respecting user privacy.
 
-It's pivotal to understand that by default, **NO personal data is collected** concerning prompts, task descriptions, agents' backstories or goals, usage of tools, API calls, responses, any data processed by the agents, or secrets and environment variables.
-When the `share_crew` feature is enabled, detailed data including task descriptions, agents' backstories or goals, and other specific attributes are collected to provide deeper insights. This expanded data collection may include personal information if users have incorporated it into their crews or tasks. Users should carefully consider the content of their crews and tasks before enabling `share_crew`. Users can disable telemetry by setting the environment variable OTEL_SDK_DISABLED to true.
-
-### Data Explanation:
-| Defaulted | Data                                      | Reason and Specifics                                                                                                       |
-|-----------|-------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
-| Yes       | CrewAI and Python Version                 | Tracks software versions. Example: CrewAI v1.2.3, Python 3.8.10. No personal data. |
-| Yes       | Crew Metadata | Includes: randomly generated key and ID, process type (e.g., 'sequential', 'parallel'), boolean flag for memory usage (true/false), count of tasks, count of agents. All non-personal. |
-| Yes       | Agent Data | Includes: randomly generated key and ID, role name (should not include personal info), boolean settings (verbose, delegation enabled, code execution allowed), max iterations, max RPM, max retry limit, LLM info (see LLM Attributes), list of tool names (should not include personal info). No personal data. |
-| Yes       | Task Metadata | Includes: randomly generated key and ID, boolean execution settings (async_execution, human_input), associated agent's role and key, list of tool names. All non-personal. |
-| Yes       | Tool Usage Statistics | Includes: tool name (should not include personal info), number of usage attempts (integer), LLM attributes used. No personal data. |
-| Yes       | Test Execution Data | Includes: crew's randomly generated key and ID, number of iterations, model name used, quality score (float), execution time (in seconds). All non-personal. |
-| Yes       | Task Lifecycle Data | Includes: creation and execution start/end times, crew and task identifiers. Stored as spans with timestamps. No personal data. |
-| Yes       | LLM Attributes | Includes: name, model_name, model, top_k, temperature, and class name of the LLM. All technical, non-personal data. |
-| Yes       | Crew Deployment attempt using crewAI CLI | Includes: The fact a deploy is being made and crew id, and if it's trying to pull logs, no other data. |
-| No        | Agent's Expanded Data | Includes: goal description, backstory text, i18n prompt file identifier. Users should ensure no personal info is included in text fields. |
-| No        | Detailed Task Information | Includes: task description, expected output description, context references. Users should ensure no personal info is included in these fields. |
-| No        | Environment Information | Includes: platform, release, system, version, and CPU count. Example: 'Windows 10', 'x86_64'. No personal data. |
-| No        | Crew and Task Inputs and Outputs | Includes: input parameters and output results as non-identifiable data. Users should ensure no personal info is included. |
-| No        | Comprehensive Crew Execution Data | Includes: detailed logs of crew operations, all agents and tasks data, final output. All non-personal and technical in nature. |
-
-Note: "No" in the "Defaulted" column indicates that this data is only collected when `share_crew` is set to `true`.
+### Data Collected Includes:
+- **Version of CrewAI**: Assessing the adoption rate of our latest version helps us understand user needs and guide our updates.
+- **Python Version**: Identifying the Python versions our users operate with assists in prioritizing our support efforts for these versions.
+- **General OS Information**: Details like the number of CPUs and the operating system type (macOS, Windows, Linux) enable us to focus our development on the most used operating systems and explore the potential for OS-specific features.
+- **Number of Agents and Tasks in a Crew**: Ensures our internal testing mirrors real-world scenarios, helping us guide users towards best practices.
+- **Crew Process Utilization**: Understanding how crews are utilized aids in directing our development focus.
+- **Memory and Delegation Use by Agents**: Insights into how these features are used help evaluate their effectiveness and future.
+- **Task Execution Mode**: Knowing whether tasks are executed in parallel or sequentially influences our emphasis on enhancing parallel execution capabilities.
+- **Language Model Utilization**: Supports our goal to improve support for the most popular languages among our users.
+- **Roles of Agents within a Crew**: Understanding the various roles agents play aids in crafting better tools, integrations, and examples.
+- **Tool Usage**: Identifying which tools are most frequently used allows us to prioritize improvements in those areas.
 
 ### Opt-In Further Telemetry Sharing
-Users can choose to share their complete telemetry data by enabling the `share_crew` attribute to `True` in their crew configurations. Enabling `share_crew` results in the collection of detailed crew and task execution data, including `goal`, `backstory`, `context`, and `output` of tasks. This enables a deeper insight into usage patterns.
+Users can choose to share their complete telemetry data by enabling the `share_crew` attribute to `True` in their crew configurations. Enabling `share_crew` results in the collection of detailed crew and task execution data, including `goal`, `backstory`, `context`, and `output` of tasks. This enables a deeper insight into usage patterns while respecting the user's choice to share.
 
-!!! warning "Potential Personal Information"
-    If you enable `share_crew`, the collected data may include personal information if it has been incorporated into crew configurations, task descriptions, or outputs. Users should carefully review their data and ensure compliance with GDPR and other applicable privacy regulations before enabling this feature.
+### Updates and Revisions
+We are committed to maintaining the accuracy and transparency of our documentation. Regular reviews and updates are performed to ensure our documentation accurately reflects the latest developments of our codebase and telemetry practices. Users are encouraged to review this section for the most current information on our data collection practices and how they contribute to the improvement of CrewAI.

mkdocs.yml

@@ -2,8 +2,8 @@ site_name: crewAI
 site_author: crewAI, Inc
 site_description: Cutting-edge framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks.
 repo_name: crewAI
-repo_url: https://github.com/crewAIInc/crewAI
-site_url: https://docs.crewai.com
+repo_url: https://github.com/joaomdmoura/crewai/
+site_url: https://crewai.com
 edit_uri: edit/main/docs/
 copyright: Copyright © 2024 crewAI, Inc
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "crewai"
-version = "0.54.0"
+version = "0.51.1"
 description = "Cutting-edge framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks."
 authors = ["Joao Moura <joao@crewai.com>"]
 readme = "README.md"
@@ -20,7 +20,7 @@ opentelemetry-api = "^1.22.0"
 opentelemetry-sdk = "^1.22.0"
 opentelemetry-exporter-otlp-proto-http = "^1.22.0"
 instructor = "1.3.3"
-regex = "^2024.7.24"
+regex = "^2023.12.25"
 crewai-tools = { version = "^0.8.3", optional = true }
 click = "^8.1.7"
 python-dotenv = "^1.0.0"

src/crewai/__init__.py

@@ -2,6 +2,7 @@ from crewai.agent import Agent
 from crewai.crew import Crew
 from crewai.pipeline import Pipeline
 from crewai.process import Process
+from crewai.routers import Router
 from crewai.task import Task
 
-__all__ = ["Agent", "Crew", "Process", "Task", "Pipeline"]
+__all__ = ["Agent", "Crew", "Process", "Task", "Pipeline", "Router"]

src/crewai/agent.py

@@ -117,21 +117,16 @@ class Agent(BaseAgent):
     def post_init_setup(self):
         self.agent_ops_agent_name = self.role
 
-        # Different llms store the model name in different attributes
-        model_name = getattr(self.llm, "model_name", None) or getattr(
-            self.llm, "deployment_name", None
-        )
-
-        if model_name:
-            self._setup_llm_callbacks(model_name)
+        if hasattr(self.llm, "model_name"):
+            self._setup_llm_callbacks()
 
         if not self.agent_executor:
             self._setup_agent_executor()
 
         return self
 
-    def _setup_llm_callbacks(self, model_name: str):
-        token_handler = TokenCalcHandler(model_name, self._token_process)
+    def _setup_llm_callbacks(self):
+        token_handler = TokenCalcHandler(self.llm.model_name, self._token_process)
 
         if not isinstance(self.llm.callbacks, list):
             self.llm.callbacks = []

src/crewai/cli/deploy/api.py

@@ -2,8 +2,6 @@ from os import getenv
 
 import requests
 
-from crewai.cli.deploy.utils import get_crewai_version
-
 
 class CrewAPI:
     """
@@ -15,7 +13,6 @@ class CrewAPI:
         self.headers = {
             "Authorization": f"Bearer {api_key}",
             "Content-Type": "application/json",
-            "User-Agent": f"CrewAI-CLI/{get_crewai_version()}",
         }
         self.base_url = getenv(
             "CREWAI_BASE_URL", "https://dev.crewai.com/crewai_plus/api/v1/crews"

src/crewai/cli/deploy/main.py

@@ -2,7 +2,6 @@ from typing import Any, Dict, List, Optional
 
 from rich.console import Console
 
-from crewai.telemetry import Telemetry
 from .api import CrewAPI
 from .utils import (
     fetch_and_json_env_file,
@@ -24,13 +23,8 @@ class DeployCommand:
         Initialize the DeployCommand with project name and API client.
         """
         try:
-            self._telemetry = Telemetry()
-            self._telemetry.set_tracer()
             access_token = get_auth_token()
         except Exception:
-            self._deploy_signup_error_span = self._telemetry.deploy_signup_error_span(
-                self
-            )
             console.print(
                 "Please sign up/login to CrewAI+ before using the CLI.",
                 style="bold red",
@@ -39,10 +33,6 @@ class DeployCommand:
             raise SystemExit
 
         self.project_name = get_project_name()
-        if self.project_name is None:
-            console.print("No project name found. Please ensure your project has a valid pyproject.toml file.", style="bold red")
-            raise SystemExit
-
         self.client = CrewAPI(api_key=access_token)
 
     def _handle_error(self, json_response: Dict[str, Any]) -> None:
@@ -100,7 +90,6 @@ class DeployCommand:
         Args:
             uuid (Optional[str]): The UUID of the crew to deploy.
         """
-        self._start_deployment_span = self._telemetry.start_deployment_span(self, uuid)
         console.print("Starting deployment...", style="bold blue")
         if uuid:
             response = self.client.deploy_by_uuid(uuid)
@@ -120,18 +109,10 @@ class DeployCommand:
         """
         Create a new crew deployment.
         """
-        self._create_crew_deployment_span = self._telemetry.create_crew_deployment_span(
-            self
-        )
         console.print("Creating deployment...", style="bold blue")
         env_vars = fetch_and_json_env_file()
         remote_repo_url = get_git_remote_url()
 
-        if remote_repo_url is None:
-            console.print("No remote repository URL found.", style="bold red")
-            console.print("Please ensure your project has a valid remote repository.", style="yellow")
-            return
-
         self._confirm_input(env_vars, remote_repo_url)
         payload = self._create_payload(env_vars, remote_repo_url)
 
@@ -266,9 +247,6 @@ class DeployCommand:
             uuid (Optional[str]): The UUID of the crew to get logs for.
             log_type (str): The type of logs to retrieve (default: "deployment").
         """
-        self._get_crew_logs_span = self._telemetry.get_crew_logs_span(
-            self, uuid, log_type
-        )
         console.print(f"Fetching {log_type} logs...", style="bold blue")
 
         if uuid:
@@ -291,7 +269,6 @@ class DeployCommand:
         Args:
             uuid (Optional[str]): The UUID of the crew to remove.
         """
-        self._remove_crew_span = self._telemetry.remove_crew_span(self, uuid)
         console.print("Removing deployment...", style="bold blue")
 
         if uuid:

src/crewai/cli/deploy/utils.py

@@ -1,46 +1,12 @@
-import sys
 import re
 import subprocess
 
-from rich.console import Console
+import tomllib
 
 from ..authentication.utils import TokenManager
 
-console = Console()
 
-
-if sys.version_info >= (3, 11):
-    import tomllib
-
-
-# Drop the simple_toml_parser when we move to python3.11
-def simple_toml_parser(content):
-    result = {}
-    current_section = result
-    for line in content.split('\n'):
-        line = line.strip()
-        if line.startswith('[') and line.endswith(']'):
-            # New section
-            section = line[1:-1].split('.')
-            current_section = result
-            for key in section:
-                current_section = current_section.setdefault(key, {})
-        elif '=' in line:
-            key, value = line.split('=', 1)
-            key = key.strip()
-            value = value.strip().strip('"')
-            current_section[key] = value
-    return result
-
-
-def parse_toml(content):
-    if sys.version_info >= (3, 11):
-        return tomllib.loads(content)
-    else:
-        return simple_toml_parser(content)
-
-
-def get_git_remote_url() -> str | None:
+def get_git_remote_url() -> str:
     """Get the Git repository's remote URL."""
     try:
         # Run the git remote -v command
@@ -57,22 +23,21 @@ def get_git_remote_url() -> str | None:
         if matches:
             return matches[0]  # Return the first match (origin URL)
         else:
-            console.print("No origin remote found.", style="bold red")
+            print("No origin remote found.")
+            return "No remote URL found"
 
     except subprocess.CalledProcessError as e:
-        console.print(f"Error running trying to fetch the Git Repository: {e}", style="bold red")
+        return f"Error running trying to fetch the Git Repository: {e}"
     except FileNotFoundError:
-        console.print("Git command not found. Make sure Git is installed and in your PATH.", style="bold red")
-
-    return None
+        return "Git command not found. Make sure Git is installed and in your PATH."
 
 
-def get_project_name(pyproject_path: str = "pyproject.toml") -> str | None:
+def get_project_name(pyproject_path: str = "pyproject.toml"):
     """Get the project name from the pyproject.toml file."""
     try:
         # Read the pyproject.toml file
-        with open(pyproject_path, "r") as f:
-            pyproject_content = parse_toml(f.read())
+        with open(pyproject_path, "rb") as f:
+            pyproject_content = tomllib.load(f)
 
         # Extract the project name
         project_name = pyproject_content["tool"]["poetry"]["name"]
@@ -86,39 +51,36 @@ def get_project_name(pyproject_path: str = "pyproject.toml") -> str | None:
         print(f"Error: {pyproject_path} not found.")
     except KeyError:
         print(f"Error: {pyproject_path} is not a valid pyproject.toml file.")
-    except tomllib.TOMLDecodeError if sys.version_info >= (3, 11) else Exception as e:  # type: ignore
-        print(
-            f"Error: {pyproject_path} is not a valid TOML file."
-            if sys.version_info >= (3, 11)
-            else f"Error reading the pyproject.toml file: {e}"
-        )
+    except tomllib.TOMLDecodeError:
+        print(f"Error: {pyproject_path} is not a valid TOML file.")
     except Exception as e:
         print(f"Error reading the pyproject.toml file: {e}")
 
     return None
 
 
-def get_crewai_version(poetry_lock_path: str = "poetry.lock") -> str:
-    """Get the version number of crewai from the poetry.lock file."""
+def get_crewai_version(pyproject_path: str = "pyproject.toml") -> str:
+    """Get the version number of crewai from the pyproject.toml file."""
     try:
-        with open(poetry_lock_path, "r") as f:
-            lock_content = f.read()
+        # Read the pyproject.toml file
+        with open("pyproject.toml", "rb") as f:
+            pyproject_content = tomllib.load(f)
 
-        match = re.search(
-            r'\[\[package\]\]\s*name\s*=\s*"crewai"\s*version\s*=\s*"([^"]+)"',
-            lock_content,
-            re.DOTALL,
-        )
-        if match:
-            return match.group(1)
-        else:
-            print("crewai package not found in poetry.lock")
-            return "no-version-found"
+        # Extract the version number of crewai
+        crewai_version = pyproject_content["tool"]["poetry"]["dependencies"]["crewai"][
+            "version"
+        ]
+
+        return crewai_version
 
     except FileNotFoundError:
-        print(f"Error: {poetry_lock_path} not found.")
+        print(f"Error: {pyproject_path} not found.")
+    except KeyError:
+        print(f"Error: {pyproject_path} is not a valid pyproject.toml file.")
+    except tomllib.TOMLDecodeError:
+        print(f"Error: {pyproject_path} is not a valid TOML file.")
     except Exception as e:
-        print(f"Error reading the poetry.lock file: {e}")
+        print(f"Error reading the pyproject.toml file: {e}")
 
     return "no-version-found"
 

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

@@ -6,7 +6,7 @@ authors = ["Your Name <you@example.com>"]
 
 [tool.poetry.dependencies]
 python = ">=3.10,<=3.13"
-crewai = { extras = ["tools"], version = ">=0.54.0,<1.0.0" }
+crewai = { extras = ["tools"], version = ">=0.51.0,<1.0.0" }
 
 
 [tool.poetry.scripts]

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

@@ -6,7 +6,7 @@ authors = ["Your Name <you@example.com>"]
 
 [tool.poetry.dependencies]
 python = ">=3.10,<=3.13"
-crewai = { extras = ["tools"], version = ">=0.54.0,<1.0.0" }
+crewai = { extras = ["tools"], version = ">=0.51.0,<1.0.0" }
 asyncio = "*"
 
 [tool.poetry.scripts]

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

@@ -6,7 +6,7 @@ authors = ["Your Name <you@example.com>"]
 
 [tool.poetry.dependencies]
 python = ">=3.10,<=3.13"
-crewai = { extras = ["tools"], version = ">=0.54.0,<1.0.0" }
+crewai = { extras = ["tools"], version = ">=0.51.0,<1.0.0" }
 
 
 [tool.poetry.scripts]

src/crewai/telemetry/telemetry.py

@@ -4,7 +4,7 @@ import asyncio
 import json
 import os
 import platform
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 import pkg_resources
 from opentelemetry import trace
@@ -28,6 +28,18 @@ class Telemetry:
     agents backstories or goals nor responses or any data that is being
     processed by the agents, nor any secrets and env vars.
 
+    Data collected includes:
+    - Version of crewAI
+    - Version of Python
+    - General OS (e.g. number of CPUs, macOS/Windows/Linux)
+    - Number of agents and tasks in a crew
+    - Crew Process being used
+    - If Agents are using memory or allowing delegation
+    - If Tasks are being executed in parallel or sequentially
+    - Language model being used
+    - Roles of agents in a crew
+    - Tools names available
+
     Users can opt-in to sharing more complete data using the `share_crew`
     attribute in the Crew class.
     """
@@ -102,17 +114,10 @@ class Telemetry:
                                     "max_iter": agent.max_iter,
                                     "max_rpm": agent.max_rpm,
                                     "i18n": agent.i18n.prompt_file,
-                                    "function_calling_llm": json.dumps(
-                                        self._safe_llm_attributes(
-                                            agent.function_calling_llm
-                                        )
-                                    ),
                                     "llm": json.dumps(
                                         self._safe_llm_attributes(agent.llm)
                                     ),
                                     "delegation_enabled?": agent.allow_delegation,
-                                    "allow_code_execution?": agent.allow_code_execution,
-                                    "max_retry_limit": agent.max_retry_limit,
                                     "tools_names": [
                                         tool.name.casefold()
                                         for tool in agent.tools or []
@@ -160,62 +165,7 @@ class Telemetry:
                     self._add_attribute(
                         span, "crew_inputs", json.dumps(inputs) if inputs else None
                     )
-                else:
-                    self._add_attribute(
-                        span,
-                        "crew_agents",
-                        json.dumps(
-                            [
-                                {
-                                    "key": agent.key,
-                                    "id": str(agent.id),
-                                    "role": agent.role,
-                                    "verbose?": agent.verbose,
-                                    "max_iter": agent.max_iter,
-                                    "max_rpm": agent.max_rpm,
-                                    "function_calling_llm": json.dumps(
-                                        self._safe_llm_attributes(
-                                            agent.function_calling_llm
-                                        )
-                                    ),
-                                    "llm": json.dumps(
-                                        self._safe_llm_attributes(agent.llm)
-                                    ),
-                                    "delegation_enabled?": agent.allow_delegation,
-                                    "allow_code_execution?": agent.allow_code_execution,
-                                    "max_retry_limit": agent.max_retry_limit,
-                                    "tools_names": [
-                                        tool.name.casefold()
-                                        for tool in agent.tools or []
-                                    ],
-                                }
-                                for agent in crew.agents
-                            ]
-                        ),
-                    )
-                    self._add_attribute(
-                        span,
-                        "crew_tasks",
-                        json.dumps(
-                            [
-                                {
-                                    "key": task.key,
-                                    "id": str(task.id),
-                                    "async_execution?": task.async_execution,
-                                    "human_input?": task.human_input,
-                                    "agent_role": task.agent.role
-                                    if task.agent
-                                    else "None",
-                                    "agent_key": task.agent.key if task.agent else None,
-                                    "tools_names": [
-                                        tool.name.casefold()
-                                        for tool in task.tools or []
-                                    ],
-                                }
-                                for task in crew.tasks
-                            ]
-                        ),
-                    )
+
                 span.set_status(Status(StatusCode.OK))
                 span.end()
             except Exception:
@@ -399,63 +349,6 @@ class Telemetry:
             except Exception:
                 pass
 
-    def deploy_signup_error_span(self):
-        if self.ready:
-            try:
-                tracer = trace.get_tracer("crewai.telemetry")
-                span = tracer.start_span("Deploy Signup Error")
-                span.set_status(Status(StatusCode.OK))
-                span.end()
-            except Exception:
-                pass
-
-    def start_deployment_span(self, uuid: Optional[str] = None):
-        if self.ready:
-            try:
-                tracer = trace.get_tracer("crewai.telemetry")
-                span = tracer.start_span("Start Deployment")
-                if uuid:
-                    self._add_attribute(span, "uuid", uuid)
-                span.set_status(Status(StatusCode.OK))
-                span.end()
-            except Exception:
-                pass
-
-    def create_crew_deployment_span(self):
-        if self.ready:
-            try:
-                tracer = trace.get_tracer("crewai.telemetry")
-                span = tracer.start_span("Create Crew Deployment")
-                span.set_status(Status(StatusCode.OK))
-                span.end()
-            except Exception:
-                pass
-
-    def get_crew_logs_span(self, uuid: Optional[str], log_type: str = "deployment"):
-        if self.ready:
-            try:
-                tracer = trace.get_tracer("crewai.telemetry")
-                span = tracer.start_span("Get Crew Logs")
-                self._add_attribute(span, "log_type", log_type)
-                if uuid:
-                    self._add_attribute(span, "uuid", uuid)
-                span.set_status(Status(StatusCode.OK))
-                span.end()
-            except Exception:
-                pass
-
-    def remove_crew_span(self, uuid: Optional[str] = None):
-        if self.ready:
-            try:
-                tracer = trace.get_tracer("crewai.telemetry")
-                span = tracer.start_span("Remove Crew")
-                if uuid:
-                    self._add_attribute(span, "uuid", uuid)
-                span.set_status(Status(StatusCode.OK))
-                span.end()
-            except Exception:
-                pass
-
     def crew_execution_span(self, crew: Crew, inputs: dict[str, Any] | None):
         """Records the complete execution of a crew.
         This is only collected if the user has opted-in to share the crew.
@@ -569,7 +462,7 @@ class Telemetry:
             pass
 
     def _safe_llm_attributes(self, llm):
-        attributes = ["name", "model_name", "model", "top_k", "temperature"]
+        attributes = ["name", "model_name", "base_url", "model", "top_k", "temperature"]
         if llm:
             safe_attributes = {k: v for k, v in vars(llm).items() if k in attributes}
             safe_attributes["class"] = llm.__class__.__name__

tests/cli/deploy/test_api.py

@@ -17,7 +17,6 @@ class TestCrewAPI(unittest.TestCase):
             {
                 "Authorization": f"Bearer {self.api_key}",
                 "Content-Type": "application/json",
-                "User-Agent": "CrewAI-CLI/no-version-found"
             },
         )
 

tests/cli/deploy/test_deploy_main.py

@@ -1,10 +1,9 @@
 import unittest
 from io import StringIO
 from unittest.mock import MagicMock, patch
-import sys
 
 from crewai.cli.deploy.main import DeployCommand
-from crewai.cli.deploy.utils import parse_toml
+
 
 class TestDeployCommand(unittest.TestCase):
     @patch("crewai.cli.deploy.main.get_auth_token")
@@ -152,68 +151,3 @@ class TestDeployCommand(unittest.TestCase):
             self.assertIn(
                 "Crew 'test_project' removed successfully", fake_out.getvalue()
             )
-
-    @unittest.skipIf(sys.version_info < (3, 11), "Requires Python 3.11+")
-    def test_parse_toml_python_311_plus(self):
-        toml_content = """
-        [tool.poetry]
-        name = "test_project"
-        version = "0.1.0"
-
-        [tool.poetry.dependencies]
-        python = "^3.11"
-        crewai = { extras = ["tools"], version = ">=0.51.0,<1.0.0" }
-        """
-        parsed = parse_toml(toml_content)
-        self.assertEqual(parsed['tool']['poetry']['name'], 'test_project')
-
-    @patch('builtins.open', new_callable=unittest.mock.mock_open, read_data="""
-    [tool.poetry]
-    name = "test_project"
-    version = "0.1.0"
-
-    [tool.poetry.dependencies]
-    python = "^3.10"
-    crewai = { extras = ["tools"], version = ">=0.51.0,<1.0.0" }
-    """)
-    def test_get_project_name_python_310(self, mock_open):
-        from crewai.cli.deploy.utils import get_project_name
-        project_name = get_project_name()
-        self.assertEqual(project_name, 'test_project')
-
-    @unittest.skipIf(sys.version_info < (3, 11), "Requires Python 3.11+")
-    @patch('builtins.open', new_callable=unittest.mock.mock_open, read_data="""
-    [tool.poetry]
-    name = "test_project"
-    version = "0.1.0"
-
-    [tool.poetry.dependencies]
-    python = "^3.11"
-    crewai = { extras = ["tools"], version = ">=0.51.0,<1.0.0" }
-    """)
-    def test_get_project_name_python_311_plus(self, mock_open):
-        from crewai.cli.deploy.utils import get_project_name
-        project_name = get_project_name()
-        self.assertEqual(project_name, 'test_project')
-
-    @patch('builtins.open', new_callable=unittest.mock.mock_open, read_data="""
-    [[package]]
-    name = "crewai"
-    version = "0.51.1"
-    description = "Some description"
-    category = "main"
-    optional = false
-    python-versions = ">=3.10,<4.0"
-    """)
-    def test_get_crewai_version(self, mock_open):
-        from crewai.cli.deploy.utils import get_crewai_version
-        version = get_crewai_version()
-        self.assertEqual(version, '0.51.1')
-
-    @patch('builtins.open', side_effect=FileNotFoundError)
-    def test_get_crewai_version_file_not_found(self, mock_open):
-        from crewai.cli.deploy.utils import get_crewai_version
-        with patch('sys.stdout', new=StringIO()) as fake_out:
-            version = get_crewai_version()
-            self.assertEqual(version, 'no-version-found')
-            self.assertIn("Error: poetry.lock not found.", fake_out.getvalue())