open_pub/Uni-Lab-OS
1
0
Fork 0
mirror of https://github.com/dptech-corp/Uni-Lab-OS.git synced 2025-12-17 13:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

更正环境变量使用说明

Browse Source
This commit is contained in:
Xuwznln
2025-08-01 12:53:09 +08:00
parent 51b47596ce
commit 0b56378287
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unilabos/app/main.py
View File

@@ -24,7 +24,7 @@ from unilabos.utils.banner_print import print_status, print_unilab_banner
def load_config_from_file(config_path, override_labid=None): def load_config_from_file(config_path, override_labid=None):
if config_path is None: if config_path is None:
config_path = os.environ.get("UNILABOS.BASICCONFIG.CONFIG_PATH", None) config_path = os.environ.get("UNILABOS_BASICCONFIG_CONFIG_PATH", None)
if config_path: if config_path:
if not os.path.exists(config_path): if not os.path.exists(config_path):
print_status(f"配置文件 {config_path} 不存在", "error") print_status(f"配置文件 {config_path} 不存在", "error")
@@ -126,7 +126,7 @@ def parse_args():
"--labid", "--labid",
type=str, type=str,
default="", default="",
help="实验室唯一ID，也可通过环境变量 UNILABOS.MQCONFIG.LABID 设置或传入--config设置", help="实验室唯一ID，也可通过环境变量 UNILABOS_MQCONFIG_LABID 设置或传入--config设置",
) )
return parser return parser

6
unilabos/config/config.py
View File

@@ -109,13 +109,13 @@ def _update_config_from_module(module, override_labid: str):
def _update_config_from_env(): def _update_config_from_env():
prefix = "UNILABOS." prefix = "UNILABOS_"
for env_key, env_value in os.environ.items(): for env_key, env_value in os.environ.items():
if not env_key.startswith(prefix): if not env_key.startswith(prefix):
continue continue
try: try:
key_path = env_key[len(prefix):] # Remove UNILAB_ prefix key_path = env_key[len(prefix):] # Remove UNILAB_ prefix
class_field = key_path.upper().split(".", 1) class_field = key_path.upper().split("_", 1)
if len(class_field) != 2: if len(class_field) != 2:
logger.warning(f"[ENV] 环境变量格式不正确：{env_key}") logger.warning(f"[ENV] 环境变量格式不正确：{env_key}")
continue continue
@@ -163,7 +163,7 @@ def _update_config_from_env():
def load_config(config_path=None, override_labid=None): def load_config(config_path=None, override_labid=None):
# 如果提供了配置文件路径，从该文件导入配置 # 如果提供了配置文件路径，从该文件导入配置
if config_path: if config_path:
env_config_path = os.environ.get("UNILABOS.BASICCONFIG.CONFIG_PATH") env_config_path = os.environ.get("UNILABOS_BASICCONFIG_CONFIG_PATH")
config_path = env_config_path if env_config_path else config_path config_path = env_config_path if env_config_path else config_path
BasicConfig.config_path = os.path.abspath(os.path.dirname(config_path)) BasicConfig.config_path = os.path.abspath(os.path.dirname(config_path))
if not os.path.exists(config_path): if not os.path.exists(config_path):