From 1fe868e4d80a09e9b75ea45bcb2b8cfbac431b6d Mon Sep 17 00:00:00 2001 From: Gladson Date: Fri, 3 Nov 2023 02:03:18 -0400 Subject: [PATCH 1/5] fix(pyproject.toml): change appdirs dependency to platformdirs --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f3bee183c..1c4f321f8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ orjson = "3.9.3" multiprocess = "^0.70.14" cachetools = "^5.3.1" types-cachetools = "^5.3.0.5" -appdirs = "^1.4.4" +platformdirs = "^3.11.0" pinecone-client = "^2.2.2" supabase = "^1.0.3" pymongo = "^4.4.0" @@ -107,7 +107,6 @@ requests = "^2.28.0" pytest-cov = "^4.0.0" pandas-stubs = "^2.0.0.230412" types-pillow = "^9.5.0.2" -types-appdirs = "^1.4.3.5" types-pyyaml = "^6.0.12.8" types-python-jose = "^3.3.4.8" types-passlib = "^1.7.7.13" From 1023522e5e40e1e2c188531e32134b4ad7141738 Mon Sep 17 00:00:00 2001 From: Gladson Date: Fri, 3 Nov 2023 02:06:25 -0400 Subject: [PATCH 2/5] fix(utils.py): change appdirs dependency to platformdirs --- src/backend/langflow/services/cache/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/langflow/services/cache/utils.py b/src/backend/langflow/services/cache/utils.py index bd6b4fb0a..6443d2ea7 100644 --- a/src/backend/langflow/services/cache/utils.py +++ b/src/backend/langflow/services/cache/utils.py @@ -7,7 +7,7 @@ import tempfile from collections import OrderedDict from pathlib import Path from typing import TYPE_CHECKING, Any, Dict -from appdirs import user_cache_dir +from platformdirs import user_cache_dir from fastapi import UploadFile from langflow.api.v1.schemas import BuildStatus from langflow.services.database.models.base import orjson_dumps From 307c526d6ac1017bb7c6ee42ae3cd90fbe669ea9 Mon Sep 17 00:00:00 2001 From: Gladson Date: Fri, 3 Nov 2023 02:08:36 -0400 Subject: [PATCH 3/5] fix(base.py): change appdirs dependency to platformdirs --- src/backend/langflow/services/settings/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/services/settings/base.py b/src/backend/langflow/services/settings/base.py index 14e3f9928..be873629b 100644 --- a/src/backend/langflow/services/settings/base.py +++ b/src/backend/langflow/services/settings/base.py @@ -55,14 +55,14 @@ class Settings(BaseSettings): @validator("CONFIG_DIR", pre=True, allow_reuse=True) def set_langflow_dir(cls, value): if not value: - import appdirs + import platformdirs # Define the app name and author app_name = "langflow" app_author = "logspace" # Get the cache directory for the application - cache_dir = appdirs.user_cache_dir(app_name, app_author) + cache_dir = platformdirs.user_cache_dir(app_name, app_author) # Create a .langflow directory inside the cache directory value = Path(cache_dir) From 7713173da72e9be308dcfce376046fec567582ce Mon Sep 17 00:00:00 2001 From: Gladson Date: Fri, 3 Nov 2023 02:11:12 -0400 Subject: [PATCH 4/5] fix(logger.py): change appdirs dependency to platformdirs --- src/backend/langflow/utils/logger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/utils/logger.py b/src/backend/langflow/utils/logger.py index b08621410..08ac40c98 100644 --- a/src/backend/langflow/utils/logger.py +++ b/src/backend/langflow/utils/logger.py @@ -2,9 +2,9 @@ from typing import Optional from loguru import logger from pathlib import Path from rich.logging import RichHandler +from platformdirs import user_cache_dir import os import orjson -import appdirs VALID_LOG_LEVELS = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] @@ -50,7 +50,7 @@ def configure(log_level: Optional[str] = None, log_file: Optional[Path] = None): ) if not log_file: - cache_dir = Path(appdirs.user_cache_dir("langflow")) + cache_dir = Path(user_cache_dir("langflow")) log_file = cache_dir / "langflow.log" log_file = Path(log_file) From 819c283fe32a1f2645360d103bdb97c14cf50729 Mon Sep 17 00:00:00 2001 From: Gladson Date: Fri, 3 Nov 2023 02:36:05 -0400 Subject: [PATCH 5/5] fix(base.py): change import to from platformdirs --- src/backend/langflow/services/settings/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/services/settings/base.py b/src/backend/langflow/services/settings/base.py index be873629b..7ca3c3e4b 100644 --- a/src/backend/langflow/services/settings/base.py +++ b/src/backend/langflow/services/settings/base.py @@ -55,14 +55,14 @@ class Settings(BaseSettings): @validator("CONFIG_DIR", pre=True, allow_reuse=True) def set_langflow_dir(cls, value): if not value: - import platformdirs + from platformdirs import user_cache_dir # Define the app name and author app_name = "langflow" app_author = "logspace" # Get the cache directory for the application - cache_dir = platformdirs.user_cache_dir(app_name, app_author) + cache_dir = user_cache_dir(app_name, app_author) # Create a .langflow directory inside the cache directory value = Path(cache_dir)