UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-11-16 13:40:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: avoid overriding DATA_DIR and prevent errors when directories are the same

Browse Source 
Previously, the `DATA_DIR` environment variable was always overridden by defaulting to `OPEN_WEBUI_DIR / "data"`, which ignored user-defined `DATA_DIR` values. Additionally, when `DATA_DIR` and `NEW_DATA_DIR` were the same, the script attempted to copy files into themselves, leading to errors or redundant operations.

This commit ensures that:
1. The `DATA_DIR` environment variable is respected and not overridden.
2. Copy operations between `DATA_DIR` and `NEW_DATA_DIR` are only performed if the directories are different, preventing errors when they point to the same location.

These changes resolve potential file copy errors and preserve user configurations.
This commit is contained in:
vikrantrathore 2024-09-05 14:17:58 +08:00 committed by GitHub
parent 83574ccf6c
commit 74169b0320
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/open_webui/env.py
View File

@ -196,7 +196,7 @@ if PIP_INSTALL:
NEW_DATA_DIR.mkdir(parents=True, exist_ok=True) NEW_DATA_DIR.mkdir(parents=True, exist_ok=True)
# Check if the data directory exists in the package directory # Check if the data directory exists in the package directory
if DATA_DIR.exists(): if DATA_DIR.exists() and DATA_DIR != NEW_DATA_DIR::
log.info(f"Moving {DATA_DIR} to {NEW_DATA_DIR}") log.info(f"Moving {DATA_DIR} to {NEW_DATA_DIR}")
for item in DATA_DIR.iterdir(): for item in DATA_DIR.iterdir():
dest = NEW_DATA_DIR / item.name dest = NEW_DATA_DIR / item.name
@ -205,7 +205,7 @@ if PIP_INSTALL:
else: else:
shutil.copy2(item, dest) shutil.copy2(item, dest)
DATA_DIR = OPEN_WEBUI_DIR / "data" DATA_DIR = Path(os.getenv("DATA_DIR", OPEN_WEBUI_DIR / "data"))
FRONTEND_BUILD_DIR = Path(os.getenv("FRONTEND_BUILD_DIR", BASE_DIR / "build")).resolve() FRONTEND_BUILD_DIR = Path(os.getenv("FRONTEND_BUILD_DIR", BASE_DIR / "build")).resolve()