Merge branch 'dev_gzf' of github.com:alibaba-damo-academy/FunASR into dev_g...

游雁

2024-02-29 70d6dcf09d255e47929bdd6717b99f3c56558c2b

Merge branch 'dev_gzf' of github.com:alibaba-damo-academy/FunASR into dev_gzf
merge

 README.md

@@ -66,7 +66,7 @@
## Model Zoo
FunASR has open-sourced a large number of pre-trained models on industrial data. You are free to use, copy, modify, and share FunASR models under the [Model License Agreement](./MODEL_LICENSE). Below are some representative models, for more models please refer to the [Model Zoo]().

(Note: 🤗 represents the Huggingface model zoo link, ⭐ represents the ModelScope model zoo link)
(Note: ⭐ represents the ModelScope model zoo link, 🤗 represents the Huggingface model zoo link)


|                                                                                                         Model Name                                                                                                         |                    Task Details                    |          Training Data           | Parameters |

 README_zh.md

@@ -68,7 +68,7 @@

FunASR开源了大量在工业数据上预训练模型，您可以在[模型许可协议](./MODEL_LICENSE)下自由使用、复制、修改和分享FunASR模型，下面列举代表性的模型，更多模型请参考[模型仓库]()。

（注：[🤗]()表示Huggingface模型仓库链接，[⭐]()表示ModelScope模型仓库链接）
（注：⭐ 表示ModelScope模型仓库链接，🤗 表示Huggingface模型仓库链接）


|                                         模型名字                                                                                                                 |        任务详情        |     训练数据     | 参数量  |

 funasr/auto/auto_model.py

@@ -392,7 +392,8 @@
            # step.3 compute punc model
            if self.punc_model is not None:
                if not len(result["text"]):
                    result['raw_text'] = ''
                    if return_raw_text:
                        result['raw_text'] = ''
                else:
                    self.punc_kwargs.update(cfg)
                    punc_res = self.inference(result["text"], model=self.punc_model, kwargs=self.punc_kwargs, **cfg)
@@ -434,10 +435,13 @@
                distribute_spk(sentence_list, sv_output)
                result['sentence_info'] = sentence_list
            elif kwargs.get("sentence_timestamp", False):
                sentence_list = timestamp_sentence(punc_res[0]['punc_array'],
                                                   result['timestamp'],
                                                   raw_text,
                                                   return_raw_text=return_raw_text)
                if not len(result['text']):
                    sentence_list = []
                else:
                    sentence_list = timestamp_sentence(punc_res[0]['punc_array'],
                                                       result['timestamp'],
                                                       raw_text,
                                                       return_raw_text=return_raw_text)
                result['sentence_info'] = sentence_list
            if "spk_embedding" in result: del result['spk_embedding']