From 743c0aeb5cad5db8fd23a70ee0c5a0eb28cc294e Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 1 Jul 2025 21:03:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E7=AD=BE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=A4=B1=E8=B4=A5=E6=97=B6=E7=BB=99=E5=87=BA?= =?UTF-8?q?=E6=98=8E=E7=A1=AE=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/hentai/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/hentai/server.py b/internal/hentai/server.py index cec90e3..de24bf3 100644 --- a/internal/hentai/server.py +++ b/internal/hentai/server.py @@ -140,8 +140,9 @@ def _ensure_model(model_dir): _download_file(HF_TAGS_URL, tags_path) print("=== 标签文件下载完成", flush=True) except Exception as exc: - print("=== 标签文件下载失败: %s" % exc, flush=True) - return None, None + # 标签文件下载失败不影响模型运行，只是无法解析输出标签 + print("=== 警告: 标签文件下载失败，将无法解析输出标签: %s" % exc, flush=True) + tags_path = "" # 标记标签文件不可用，但仍返回模型路径 return model_path, tags_path @@ -180,6 +181,10 @@ def get_session(): global _session if "_session" not in dir() or _session is None: model_path, tags_path = _ensure_model(MODEL_DIR) + if not model_path: + raise RuntimeError("wd-tagger 模型不可用") + if not tags_path: + raise RuntimeError("wd-tagger 标签文件不可用，无法解析输出。请手动下载 %s 到 %s" % (TAGS_FILENAME, os.path.join(MODEL_DIR, MODEL_DIR_NAME))) _load_tags(tags_path) _session = _new_session(model_path) return _session