fz-mirrors/AstrBot
1
0
Fork 0
mirror of https://github.com/AstrBotDevs/AstrBot synced 2026-07-15 17:30:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize .env loading sequence in astrbot_path.py

Browse Source 
Refactor environment variable loading order in astrbot_path.py.
This commit is contained in:
LIghtJUNction
2026-03-21 04:51:53 +08:00
committed by GitHub
parent b2a04ffed1
commit 93cab0e198
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
astrbot/core/utils/astrbot_path.py
View File

@@ -29,31 +29,21 @@ class AstrbotPaths:
def __init__(self) -> None:
self._root_override: Path | None = None
# Load .env candidates early to avoid environment-dependent initialization issues.
# This is intentionally conservative and best-effort: failure to find or parse a .env
# must never raise during import time.
# Use python-dotenv if available; do not make it a hard dependency at import-time.
from dotenv import load_dotenv
env_candidates = []
# 1) packaged project root .env (best effort)
with resources.as_file(resources.files("astrbot")) as pkg_path:
pkg_env = Path(pkg_path) / ".env"
env_candidates.append(pkg_env)
# 2) current working directory .env
env_candidates.append(Path.cwd() / ".env")
# 1) current working directory .env
env_candidates.append(Path.cwd() / ".env")
# 3) ASTRBOT_ROOT/.env if ASTRBOT_ROOT already set in the environment
root_env = os.environ.get("ASTRBOT_ROOT")
if root_env:
env_candidates.append(Path(root_env) / ".env")
for p in env_candidates:
if p.exists():
load_dotenv(dotenv_path=str(p), override=False)
# 2) ASTRBOT_ROOT/.env if ASTRBOT_ROOT already set in the environment
root_env = os.environ.get("ASTRBOT_ROOT")
if root_env:
env_candidates.append(Path(root_env) / ".env")
for p in env_candidates:
if p.exists():
load_dotenv(dotenv_path=str(p), override=False)
def _resolve_root(self) -> Path:
if path := os.environ.get("ASTRBOT_ROOT"):