Remove all pkg_resources

Author: Notnaton

interpreter/__init__.py

@@ -28,7 +28,7 @@ def print_markdown(message):
             # Aesthetic choice. For these tags, they need a space below them
             print("")
 
-    import pkg_resources
+    from importlib.metadata import version
     import requests
     from packaging import version
 
@@ -37,8 +37,8 @@ def check_for_update():
         response = requests.get(f"https://pypi.org/pypi/open-interpreter/json")
         latest_version = response.json()["info"]["version"]
 
-        # Get the current version using pkg_resources
-        current_version = pkg_resources.get_distribution("open-interpreter").version
+        # Get the current version using importlib.metadata
+        current_version = version("open-interpreter")
 
         return version.parse(latest_version) > version.parse(current_version)
 

interpreter/core/utils/telemetry.py

@@ -15,7 +15,7 @@
 import threading
 import uuid
 
-import pkg_resources
+from importlib.metadata import version, PackageNotFoundError
 import requests
 
 
@@ -47,9 +47,7 @@ def get_or_create_uuid():
 def send_telemetry(event_name, properties=None):
     if properties is None:
         properties = {}
-    properties["oi_version"] = pkg_resources.get_distribution(
-        "open-interpreter"
-    ).version
+    properties["oi_version"] = version("open-interpreter")
     try:
         url = "https://app.posthog.com/capture"
         headers = {"Content-Type": "application/json"}

interpreter/terminal_interface/contributing_conversations.py

@@ -3,7 +3,7 @@
 import time
 from typing import List, TypedDict
 
-import pkg_resources
+from importlib.metadata import version, PackageNotFoundError
 import requests
 
 from interpreter.terminal_interface.profiles.profiles import write_key_to_profile
@@ -173,12 +173,12 @@ def contribute_conversations(
         return None
 
     url = "https://api.openinterpreter.com/v0/contribute/"
-    version = pkg_resources.get_distribution("open-interpreter").version
+    oi_version = version("open-interpreter")
 
     payload = {
         "conversation_id": conversation_id,
         "conversations": conversations,
-        "oi_version": version,
+        "oi_version": oi_version,
         "feedback": feedback,
     }
 

interpreter/terminal_interface/profiles/defaults/codestral-os.py

@@ -4,7 +4,7 @@
 Images sent to the model will be described with `moondream`. The model will be instructed how to control your mouse and keyboard.
 """
 
-import pkg_resources
+from importlib.metadata import version, PackageNotFoundError
 
 REQUIRED_PACKAGES = [
     "opencv-python",
@@ -23,8 +23,8 @@
 
 for package in REQUIRED_PACKAGES:
     try:
-        dist = pkg_resources.get_distribution(package)
-    except pkg_resources.DistributionNotFound:
+        dist = version(package)
+    except PackageNotFoundError:
         missing_packages.append(package)
 
 if missing_packages:

interpreter/terminal_interface/start_terminal_interface.py

@@ -3,7 +3,7 @@
 import sys
 import time
 
-import pkg_resources
+from importlib.metadata import version, PackageNotFoundError
 
 from interpreter.terminal_interface.contributing_conversations import (
     contribute_conversation_launch_logic,
@@ -409,9 +409,9 @@ def print_help(self, *args, **kwargs):
         return
 
     if args.version:
-        version = pkg_resources.get_distribution("open-interpreter").version
+        oi_version = version("open-interpreter")
         update_name = "Developer Preview"  # Change this with each major update
-        print(f"Open Interpreter {version} {update_name}")
+        print(f"Open Interpreter {oi_version} {update_name}")
         return
 
     if args.no_highlight_active_line:

interpreter/terminal_interface/utils/check_for_update.py

@@ -1,14 +1,14 @@
-import pkg_resources
+from importlib.metadata import version, PackageNotFoundError
 import requests
-from packaging import version
+
 
 
 def check_for_update():
     # Fetch the latest version from the PyPI API
     response = requests.get(f"https://pypi.org/pypi/open-interpreter/json")
     latest_version = response.json()["info"]["version"]
 
-    # Get the current version using pkg_resources
-    current_version = pkg_resources.get_distribution("open-interpreter").version
+    # Get the current version using importlib.metadata
+    current_version = version("open-interpreter")
 
-    return version.parse(latest_version) > version.parse(current_version)
+    return latest_version > current_version