Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 073636f

Browse files
committed
Remove all pkg_resources
1 parent 3718bed commit 073636f

File tree

6 files changed

+19
-21
lines changed

6 files changed

+19
-21
lines changed

‎interpreter/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def print_markdown(message):
2828
# Aesthetic choice. For these tags, they need a space below them
2929
print("")
3030

31-
import pkg_resources
31+
fromimportlib.metadataimport version
3232
import requests
3333
from packaging import version
3434

@@ -37,8 +37,8 @@ def check_for_update():
3737
response = requests.get(f"https://pypi.org/pypi/open-interpreter/json")
3838
latest_version = response.json()["info"]["version"]
3939

40-
# Get the current version using pkg_resources
41-
current_version = pkg_resources.get_distribution("open-interpreter").version
40+
# Get the current version using importlib.metadata
41+
current_version = version("open-interpreter")
4242

4343
return version.parse(latest_version) > version.parse(current_version)
4444

‎interpreter/core/utils/telemetry.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import threading
1616
import uuid
1717

18-
import pkg_resources
18+
fromimportlib.metadataimport version, PackageNotFoundError
1919
import requests
2020

2121

@@ -47,9 +47,7 @@ def get_or_create_uuid():
4747
def send_telemetry(event_name, properties=None):
4848
if properties is None:
4949
properties = {}
50-
properties["oi_version"] = pkg_resources.get_distribution(
51-
"open-interpreter"
52-
).version
50+
properties["oi_version"] = version("open-interpreter")
5351
try:
5452
url = "https://app.posthog.com/capture"
5553
headers = {"Content-Type": "application/json"}

‎interpreter/terminal_interface/contributing_conversations.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import time
44
from typing import List, TypedDict
55

6-
import pkg_resources
6+
fromimportlib.metadataimport version, PackageNotFoundError
77
import requests
88

99
from interpreter.terminal_interface.profiles.profiles import write_key_to_profile
@@ -173,12 +173,12 @@ def contribute_conversations(
173173
return None
174174

175175
url = "https://api.openinterpreter.com/v0/contribute/"
176-
version = pkg_resources.get_distribution("open-interpreter").version
176+
oi_version = version("open-interpreter")
177177

178178
payload = {
179179
"conversation_id": conversation_id,
180180
"conversations": conversations,
181-
"oi_version": version,
181+
"oi_version": oi_version,
182182
"feedback": feedback,
183183
}
184184

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Images sent to the model will be described with `moondream`. The model will be instructed how to control your mouse and keyboard.
55
"""
66

7-
import pkg_resources
7+
fromimportlib.metadataimport version, PackageNotFoundError
88

99
REQUIRED_PACKAGES = [
1010
"opencv-python",
@@ -23,8 +23,8 @@
2323

2424
for package in REQUIRED_PACKAGES:
2525
try:
26-
dist = pkg_resources.get_distribution(package)
27-
except pkg_resources.DistributionNotFound:
26+
dist = version(package)
27+
except PackageNotFoundError:
2828
missing_packages.append(package)
2929

3030
if missing_packages:

‎interpreter/terminal_interface/start_terminal_interface.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import sys
44
import time
55

6-
import pkg_resources
6+
fromimportlib.metadataimport version, PackageNotFoundError
77

88
from interpreter.terminal_interface.contributing_conversations import (
99
contribute_conversation_launch_logic,
@@ -409,9 +409,9 @@ def print_help(self, *args, **kwargs):
409409
return
410410

411411
if args.version:
412-
version = pkg_resources.get_distribution("open-interpreter").version
412+
oi_version = version("open-interpreter")
413413
update_name = "Developer Preview" # Change this with each major update
414-
print(f"Open Interpreter {version} {update_name}")
414+
print(f"Open Interpreter {oi_version} {update_name}")
415415
return
416416

417417
if args.no_highlight_active_line:
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import pkg_resources
1+
fromimportlib.metadataimport version, PackageNotFoundError
22
import requests
3-
frompackagingimportversion
3+
44

55

66
def check_for_update():
77
# Fetch the latest version from the PyPI API
88
response = requests.get(f"https://pypi.org/pypi/open-interpreter/json")
99
latest_version = response.json()["info"]["version"]
1010

11-
# Get the current version using pkg_resources
12-
current_version = pkg_resources.get_distribution("open-interpreter").version
11+
# Get the current version using importlib.metadata
12+
current_version = version("open-interpreter")
1313

14-
return version.parse(latest_version) > version.parse(current_version)
14+
return latest_version > current_version

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /