From 0e622e694e6cb4459955f1e5942a7c53349ce640 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期二, 19 十二月 2023 21:58:14 +0800
Subject: [PATCH] funasr2

---
 funasr/download/download_from_hub.py |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/funasr/download/download_from_hub.py b/funasr/download/download_from_hub.py
index 24ab797..eeb5d0c 100644
--- a/funasr/download/download_from_hub.py
+++ b/funasr/download/download_from_hub.py
@@ -22,11 +22,17 @@
 	kwargs = OmegaConf.merge(cfg, kwargs)
 	init_param = os.path.join(model_or_path, "model.pb")
 	kwargs["init_param"] = init_param
-	kwargs["token_list"] = os.path.join(model_or_path, "tokens.txt")
+	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.txt")):
+		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")
 	
-	return kwargs
+	return OmegaConf.to_container(kwargs, resolve=True)
 
 def get_or_download_model_dir(
                               model,

--
Gitblit v1.9.1