From 32905d8cdedd53dad26680b0bd41397aaf0e51ae Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期五, 05 一月 2024 11:52:48 +0800
Subject: [PATCH] funasr1.0

---
 funasr/download/download_from_hub.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/funasr/download/download_from_hub.py b/funasr/download/download_from_hub.py
index 2e7578f..4f05b42 100644
--- a/funasr/download/download_from_hub.py
+++ b/funasr/download/download_from_hub.py
@@ -26,12 +26,15 @@
 	kwargs["init_param"] = init_param
 	if os.path.exists(os.path.join(model_or_path, "tokens.txt")):
 		kwargs["tokenizer_conf"]["token_list"] = os.path.join(model_or_path, "tokens.txt")
+	if os.path.exists(os.path.join(model_or_path, "tokens.json")):
+		kwargs["tokenizer_conf"]["token_list"] = os.path.join(model_or_path, "tokens.json")
 	if os.path.exists(os.path.join(model_or_path, "seg_dict")):
 		kwargs["tokenizer_conf"]["seg_dict"] = os.path.join(model_or_path, "seg_dict")
 	if os.path.exists(os.path.join(model_or_path, "bpe.model")):
 		kwargs["tokenizer_conf"]["bpemodel"] = os.path.join(model_or_path, "bpe.model")
 	kwargs["model"] = cfg["model"]
-	kwargs["frontend_conf"]["cmvn_file"] = os.path.join(model_or_path, "am.mvn")
+	if os.path.exists(os.path.join(model_or_path, "am.mvn")):
+		kwargs["frontend_conf"]["cmvn_file"] = os.path.join(model_or_path, "am.mvn")
 	
 	return OmegaConf.to_container(kwargs, resolve=True)
 

--
Gitblit v1.9.1