Merge branch 'main' into feature/add-workflow-permissions

src/crewai/cli/cli.py

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

src/crewai/telemetry/telemetry.py

@@ -6,7 +6,6 @@ import os
 import platform
 import warnings
 from contextlib import contextmanager
-from importlib.metadata import version
 from typing import TYPE_CHECKING, Any, Optional
 
 
@@ -17,6 +16,10 @@ def suppress_warnings():
         yield
 
 
+with suppress_warnings():
+    import pkg_resources
+
+
 from opentelemetry import trace  # noqa: E402
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     OTLPSpanExporter,  # noqa: E402
@@ -103,7 +106,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "python_version", platform.python_version())
             self._add_attribute(span, "crew_key", crew.key)
@@ -305,7 +308,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "tool_name", tool_name)
             self._add_attribute(span, "attempts", attempts)
@@ -325,7 +328,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "tool_name", tool_name)
             self._add_attribute(span, "attempts", attempts)
@@ -345,7 +348,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             if llm:
                 self._add_attribute(span, "llm", llm.model)
@@ -364,7 +367,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "crew_key", crew.key)
             self._add_attribute(span, "crew_id", str(crew.id))
@@ -390,7 +393,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "crew_key", crew.key)
             self._add_attribute(span, "crew_id", str(crew.id))
@@ -471,7 +474,7 @@ class Telemetry:
             self._add_attribute(
                 span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(span, "crew_key", crew.key)
             self._add_attribute(span, "crew_id", str(crew.id))
@@ -540,7 +543,7 @@ class Telemetry:
             self._add_attribute(
                 crew._execution_span,
                 "crewai_version",
-                version("crewai"),
+                pkg_resources.get_distribution("crewai").version,
             )
             self._add_attribute(
                 crew._execution_span, "crew_output", final_string_output