From c3193dd784d36c5ed4b9375cd75b6cb84db6c3c0 Mon Sep 17 00:00:00 2001
From: Rumio <32546670+webjoin111@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20(config):=20=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=80=BC=E8=A7=A3=E6=9E=90=E4=B8=8E=E9=94=99?=
=?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86=20(#1962)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: webjoin111 <455457521@qq.com>
---
zhenxun/configs/utils/__init__.py | 37 +++++++++++++++++++++----------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/zhenxun/configs/utils/__init__.py b/zhenxun/configs/utils/__init__.py
index bd84d9b1..21a6ff63 100644
--- a/zhenxun/configs/utils/__init__.py
+++ b/zhenxun/configs/utils/__init__.py
@@ -106,21 +106,34 @@ class ConfigGroup(BaseModel):
if value_to_process is None:
return default
- if cfg.type:
- if _is_pydantic_type(cfg.type):
- if build_model:
- try:
- return parse_as(cfg.type, value_to_process)
- except Exception as e:
- logger.warning(
- f"Pydantic 模型解析失败 (key: {c.upper()}). ", e=e
- )
+ if cfg.arg_parser:
try:
- return cattrs.structure(value_to_process, cfg.type)
+ return cfg.arg_parser(value_to_process)
except Exception as e:
- logger.warning(f"Cattrs 结构化失败 (key: {key})，返回原始值。", e=e)
+ logger.debug(
+ f"配置项类型转换 MODULE: [{self.module}] | "
+ f"KEY: [{key}] 的自定义解析器失败，将使用原始值",
+ e=e,
+ )
+ return value_to_process
- return value_to_process
+ if not build_model or not cfg.type:
+ return value_to_process
+
+ try:
+ if _is_pydantic_type(cfg.type):
+ parsed_value = parse_as(cfg.type, value_to_process)
+ return parsed_value
+ else:
+ structured_value = cattrs.structure(value_to_process, cfg.type)
+ return structured_value
+ except Exception as e:
+ logger.error(
+ f"❌ 配置项 '{self.module}.{key}' 自动类型转换失败 "
+ f"(目标类型: {cfg.type})，将返回原始值。请检查配置文件格式。错误: {e}",
+ e=e,
+ )
+ return value_to_process
def to_dict(self, **kwargs):
return model_dump(self, **kwargs)