Skip to content

Commit 7283b97

Browse files
committed
feat: load environment variables from .env file and update config loading logic
1 parent 844b8fd commit 7283b97

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,5 @@ data
184184
.dev
185185
poetry.lock
186186
apps/setting/models_provider/impl/*/icon/
187-
tmp/
187+
tmp/
188+
config.yml

apps/maxkb/const.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,21 @@
22
#
33
import os
44

5+
from dotenv import load_dotenv
6+
57
from .conf import ConfigManager
68

79
__all__ = ['BASE_DIR', 'PROJECT_DIR', 'VERSION', 'CONFIG']
810

911
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
1012
PROJECT_DIR = os.path.dirname(BASE_DIR)
1113
VERSION = '2.0.0'
12-
CONFIG = ConfigManager.load_user_config(root_path=os.path.abspath('/opt/maxkb/conf'))
14+
15+
# load environment variables from .env file
16+
load_dotenv()
17+
# print(os.getenv('MAXKB_CONFIG'))
18+
if os.getenv('MAXKB_CONFIG') is not None:
19+
CONFIG = ConfigManager.load_user_config(root_path=PROJECT_DIR)
20+
else:
21+
CONFIG = ConfigManager.load_user_config(root_path=os.path.abspath('/opt/maxkb/conf'))
22+

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ drf-spectacular = {extras = ["sidecar"], version = "0.28.0"}
1212
django-redis = "5.4.0"
1313
psycopg2-binary = "2.9.10"
1414
django-db-connection-pool = "1.2.5"
15+
python-dotenv = "1.1.0"
1516

1617

1718
[build-system]

0 commit comments

Comments
 (0)