From d7108526149709391e09187202dd664841c6f79d Mon Sep 17 00:00:00 2001 From: lombad <7153379+lombad@users.noreply.github.com> Date: Mon, 26 Feb 2024 11:46:38 +0000 Subject: [PATCH 1/2] Removed appdirs and switched from appdirs to platformdirs --- .../utils/local_storage_path.py | 6 ++--- .../terminal_interface/utils/oi_dir.py | 4 ++-- poetry.lock | 23 +++++-------------- pyproject.toml | 1 - 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/interpreter/terminal_interface/utils/local_storage_path.py b/interpreter/terminal_interface/utils/local_storage_path.py index 502c9d169c..a91cd1a723 100644 --- a/interpreter/terminal_interface/utils/local_storage_path.py +++ b/interpreter/terminal_interface/utils/local_storage_path.py @@ -1,9 +1,9 @@ import os -import appdirs +import platformdirs -# Using appdirs to determine user-specific config path -config_dir = appdirs.user_config_dir("Open Interpreter") +# Using platformdirs to determine user-specific config path +config_dir = platformdirs.user_config_dir("Open Interpreter") def get_storage_path(subdirectory=None): diff --git a/interpreter/terminal_interface/utils/oi_dir.py b/interpreter/terminal_interface/utils/oi_dir.py index 65436bd1dd..80b5d6b6a8 100644 --- a/interpreter/terminal_interface/utils/oi_dir.py +++ b/interpreter/terminal_interface/utils/oi_dir.py @@ -1,3 +1,3 @@ -import appdirs +import platformdirs -oi_dir = appdirs.user_config_dir("Open Interpreter Terminal") +oi_dir = platformdirs.user_config_dir("Open Interpreter Terminal") diff --git a/poetry.lock b/poetry.lock index 44bd25931a..7dc777a447 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.0 and should not be changed by hand. [[package]] name = "aifs" @@ -169,17 +169,6 @@ doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphin test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] trio = ["trio (>=0.23)"] -[[package]] -name = "appdirs" -version = "1.4.4" -description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -optional = false -python-versions = "*" -files = [ - {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, - {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, -] - [[package]] name = "appnope" version = "0.1.4" @@ -1082,13 +1071,13 @@ boltons = ">=20.0.0" [[package]] name = "fastapi" -version = "0.109.2" +version = "0.110.0" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" optional = false python-versions = ">=3.8" files = [ - {file = "fastapi-0.109.2-py3-none-any.whl", hash = "sha256:2c9bab24667293b501cad8dd388c05240c850b58ec5876ee3283c47d6e1e3a4d"}, - {file = "fastapi-0.109.2.tar.gz", hash = "sha256:f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73"}, + {file = "fastapi-0.110.0-py3-none-any.whl", hash = "sha256:87a1f6fb632a218222c5984be540055346a8f5d8a68e8f6fb647b1dc9934de4b"}, + {file = "fastapi-0.110.0.tar.gz", hash = "sha256:266775f0dcc95af9d3ef39bad55cff525329a931d5fd51930aadd4f428bf7ff3"}, ] [package.dependencies] @@ -2880,10 +2869,10 @@ files = [ [package.dependencies] numpy = [ {version = ">=1.21.0", markers = "python_version == \"3.9\" and platform_system == \"Darwin\" and platform_machine == \"arm64\""}, + {version = ">=1.23.5", markers = "python_version >= \"3.11\""}, {version = ">=1.21.4", markers = "python_version >= \"3.10\" and platform_system == \"Darwin\" and python_version < \"3.11\""}, {version = ">=1.21.2", markers = "platform_system != \"Darwin\" and python_version >= \"3.10\" and python_version < \"3.11\""}, {version = ">=1.19.3", markers = "platform_system == \"Linux\" and platform_machine == \"aarch64\" and python_version >= \"3.8\" and python_version < \"3.10\" or python_version > \"3.9\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_system != \"Darwin\" and python_version < \"3.10\" or python_version >= \"3.9\" and platform_machine != \"arm64\" and python_version < \"3.10\""}, - {version = ">=1.23.5", markers = "python_version >= \"3.11\""}, ] [[package]] @@ -8542,4 +8531,4 @@ safe = ["semgrep", "yaspin"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "a09e258c3297977d7f37f5322d01f87a2f9f0afb66123274bb5545d5b1db2f89" +content-hash = "f2918f2610e0bd18460c8763c1a8758466cd89f27695494d9b2fb52e6fc497de" diff --git a/pyproject.toml b/pyproject.toml index 5e5073e36c..31b09ba5cb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,6 @@ readme = "README.md" [tool.poetry.dependencies] python = ">=3.9,<3.12" -appdirs = "^1.4.4" astor = "^0.8.1" git-python = "^1.0.3" inquirer = "^3.1.3" From b0322b018ccc261547792f7cdbe380df07d182a3 Mon Sep 17 00:00:00 2001 From: lombad <7153379+lombad@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:25:18 +0000 Subject: [PATCH 2/2] dependency added --- poetry.lock | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 7dc777a447..53b819bebf 100644 --- a/poetry.lock +++ b/poetry.lock @@ -8531,4 +8531,4 @@ safe = ["semgrep", "yaspin"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "f2918f2610e0bd18460c8763c1a8758466cd89f27695494d9b2fb52e6fc497de" +content-hash = "7f3c56e7483a1079e3a3f8b85bce73ffd92926960d46b02a75190bbf88f2bcf2" diff --git a/pyproject.toml b/pyproject.toml index 31b09ba5cb..2efd4315ed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,6 +43,7 @@ send2trash = "^1.8.2" uvicorn = "^0.27.0" fastapi = "^0.110.0" aifs = "^0.0.9" +platformdirs = "^4.2.0" [tool.poetry.extras] os = ["opencv-python", "pyautogui", "plyer", "pywinctl", "pytesseract"]