From 28ccfbfc51068a663a80764e14074df5edf2b5ba Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期五, 13 三月 2026 17:41:41 +0800
Subject: [PATCH] 提交
---
funasr/download/download_model_from_hub.py | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/funasr/download/download_model_from_hub.py b/funasr/download/download_model_from_hub.py
index df4f33d..80aa588 100644
--- a/funasr/download/download_model_from_hub.py
+++ b/funasr/download/download_model_from_hub.py
@@ -1,3 +1,4 @@
+import logging
import os
import json
from omegaconf import OmegaConf, DictConfig
@@ -7,9 +8,9 @@
def download_model(**kwargs):
hub = kwargs.get("hub", "ms")
- if hub == "ms":
+ if hub == "ms" or hub == "modelscope":
kwargs = download_from_ms(**kwargs)
- elif hub == "hf":
+ elif hub == "hf" or hub == "huggingface":
kwargs = download_from_hf(**kwargs)
elif hub == "openai":
model_or_path = kwargs.get("model")
@@ -43,7 +44,7 @@
print(f"Download: {model_or_path} failed!: {e}")
kwargs["model_path"] = model_or_path if "model_path" not in kwargs else kwargs["model_path"]
-
+ model_or_path = kwargs["model_path"]
if os.path.exists(os.path.join(model_or_path, "configuration.json")):
with open(os.path.join(model_or_path, "configuration.json"), "r", encoding="utf-8") as f:
conf_json = json.load(f)
@@ -51,7 +52,8 @@
cfg = {}
if "file_path_metas" in conf_json:
add_file_root_path(model_or_path, conf_json["file_path_metas"], cfg)
- cfg.update(kwargs)
+ # cfg.update(kwargs)
+ cfg = OmegaConf.merge(cfg, kwargs)
if "config" in cfg:
config = OmegaConf.load(cfg["config"])
kwargs = OmegaConf.merge(config, cfg)
@@ -78,7 +80,10 @@
kwargs["jieba_usr_dict"] = os.path.join(model_or_path, "jieba_usr_dict")
if isinstance(kwargs, DictConfig):
kwargs = OmegaConf.to_container(kwargs, resolve=True)
- if os.path.exists(os.path.join(model_or_path, "requirements.txt")):
+ logging.warning(f'trust_remote_code: {kwargs.get("trust_remote_code", False)}')
+ if os.path.exists(os.path.join(model_or_path, "requirements.txt")) and kwargs.get(
+ "trust_remote_code", False
+ ):
requirements = os.path.join(model_or_path, "requirements.txt")
print(f"Detect model requirements, begin to install it: {requirements}")
from funasr.utils.install_model_requirements import install_requirements
@@ -159,15 +164,42 @@
def add_file_root_path(model_or_path: str, file_path_metas: dict, cfg={}):
if isinstance(file_path_metas, dict):
+ if isinstance(cfg, list):
+ cfg.append({})
+
for k, v in file_path_metas.items():
if isinstance(v, str):
p = os.path.join(model_or_path, v)
if os.path.exists(p):
- cfg[k] = p
+ if isinstance(cfg, dict):
+ cfg[k] = p
+ elif isinstance(cfg, list):
+ # if len(cfg) == 0:
+ # cfg.append({})
+ cfg[-1][k] = p
+
elif isinstance(v, dict):
- if k not in cfg:
- cfg[k] = {}
- add_file_root_path(model_or_path, v, cfg[k])
+ if isinstance(cfg, dict):
+ if k not in cfg:
+ cfg[k] = {}
+ add_file_root_path(model_or_path, v, cfg[k])
+ # elif isinstance(cfg, list):
+ # cfg.append({})
+ # add_file_root_path(model_or_path, v, cfg)
+ elif isinstance(v, (list, tuple)):
+ for i, vv in enumerate(v):
+ if k not in cfg:
+ cfg[k] = []
+ if isinstance(vv, str):
+ p = os.path.join(model_or_path, vv)
+ # file_path_metas[i] = p
+ if os.path.exists(p):
+ if isinstance(cfg[k], dict):
+ cfg[k] = p
+ elif isinstance(cfg[k], list):
+ cfg[k].append(p)
+ elif isinstance(vv, dict):
+ add_file_root_path(model_or_path, vv, cfg[k])
return cfg
--
Gitblit v1.9.1