From d80ac2fd2df4e7fb8a28acfa512bb11472b5cc99 Mon Sep 17 00:00:00 2001 From: liugz18 <57401541+liugz18@users.noreply.github.com> Date: 星期四, 18 七月 2024 21:34:55 +0800 Subject: [PATCH] Rename 'res' in line 514 to avoid with naming conflict with line 365 --- runtime/docs/SDK_advanced_guide_online_zh.md | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/runtime/docs/SDK_advanced_guide_online_zh.md b/runtime/docs/SDK_advanced_guide_online_zh.md index 4d88c34..26ca4bc 100644 --- a/runtime/docs/SDK_advanced_guide_online_zh.md +++ b/runtime/docs/SDK_advanced_guide_online_zh.md @@ -3,7 +3,7 @@ [//]: # (FunASR鎻愪緵鍙究鎹锋湰鍦版垨鑰呬簯绔湇鍔″櫒閮ㄧ讲鐨勫疄鏃惰闊冲惉鍐欐湇鍔★紝鍐呮牳涓篎unASR宸插紑婧恟untime-SDK銆�) [//]: # (闆嗘垚浜嗚揪鎽╅櫌璇煶瀹為獙瀹ゅ湪Modelscope绀惧尯寮�婧愮殑璇煶绔偣妫�娴�(VAD)銆丳araformer-large闈炴祦寮忚闊宠瘑鍒�(ASR)銆丳araformer-large娴佸紡璇煶璇嗗埆(ASR)銆佹爣鐐�(PUNC) 绛夌浉鍏宠兘鍔涖�傝蒋浠跺寘鏃㈠彲浠ュ疄鏃跺湴杩涜璇煶杞枃瀛楋紝鑰屼笖鑳藉鍦ㄨ璇濆彞灏剧敤楂樼簿搴︾殑杞啓鏂囧瓧淇杈撳嚭锛岃緭鍑烘枃瀛楀甫鏈夋爣鐐癸紝鏀寔楂樺苟鍙戝璺姹�) -FunASR瀹炴椂璇煶鍚啓杞欢鍖咃紝闆嗘垚浜嗗疄鏃剁増鏈殑璇煶绔偣妫�娴嬫ā鍨嬨�佽闊宠瘑鍒�佽闊宠瘑鍒�佹爣鐐归娴嬫ā鍨嬬瓑銆傞噰鐢ㄥ妯″瀷鍗忓悓锛屾棦鍙互瀹炴椂鐨勮繘琛岃闊宠浆鏂囧瓧锛屼篃鍙互鍦ㄨ璇濆彞灏剧敤楂樼簿搴﹁浆鍐欐枃瀛椾慨姝ｈ緭鍑猴紝杈撳嚭鏂囧瓧甯︽湁鏍囩偣锛屾敮鎸佸璺姹傘�備緷鎹娇鐢ㄨ�呭満鏅笉鍚岋紝鏀寔瀹炴椂璇煶鍚啓鏈嶅姟锛坥nline锛夈�侀潪瀹炴椂涓�鍙ヨ瘽杞啓锛坥ffline锛変笌瀹炴椂涓庨潪瀹炴椂涓�浣撳寲鍗忓悓锛�2pass锛�3绉嶆湇鍔℃ā寮忋�傝蒋浠跺寘鎻愪緵鏈塰tml銆乸ython銆乧++銆乯ava涓巆#绛夊绉嶇紪绋嬭瑷�瀹㈡埛绔紝鐢ㄦ埛鍙互鐩存帴浣跨敤涓庤繘涓�姝ュ紑鍙戙�� +FunASR瀹炴椂璇煶鍚啓杞欢鍖咃紝闆嗘垚浜嗗疄鏃剁増鏈殑璇煶绔偣妫�娴嬫ā鍨嬨�佽闊宠瘑鍒�佹爣鐐归娴嬫ā鍨嬬瓑銆傞噰鐢ㄥ妯″瀷鍗忓悓锛屾棦鍙互瀹炴椂鐨勮繘琛岃闊宠浆鏂囧瓧锛屼篃鍙互鍦ㄨ璇濆彞灏剧敤楂樼簿搴﹁浆鍐欐枃瀛椾慨姝ｈ緭鍑猴紝杈撳嚭鏂囧瓧甯︽湁鏍囩偣锛屾敮鎸佸璺姹傘�備緷鎹娇鐢ㄨ�呭満鏅笉鍚岋紝鏀寔瀹炴椂璇煶鍚啓鏈嶅姟锛坥nline锛夈�侀潪瀹炴椂涓�鍙ヨ瘽杞啓锛坥ffline锛変笌瀹炴椂涓庨潪瀹炴椂涓�浣撳寲鍗忓悓锛�2pass锛�3绉嶆湇鍔℃ā寮忋�傝蒋浠跺寘鎻愪緵鏈塰tml銆乸ython銆乧++銆乯ava涓巆#绛夊绉嶇紪绋嬭瑷�瀹㈡埛绔紝鐢ㄦ埛鍙互鐩存帴浣跨敤涓庤繘涓�姝ュ紑鍙戙�� 鏈枃妗ｄ负FunASR瀹炴椂杞啓鏈嶅姟寮�鍙戞寚鍗椼�傚鏋滄偍鎯冲揩閫熶綋楠屽疄鏃惰闊冲惉鍐欐湇鍔★紝鍙弬鑰僛蹇�熶笂鎵媇(#蹇�熶笂鎵�)銆� @@ -12,6 +12,10 @@ | 鏃堕棿 | 璇︽儏 | 闀滃儚鐗堟湰 | 闀滃儚ID | |:-----------|:----------------------------------|--------------------------------------|--------------| +| 2024.05.15 | 閫傞厤FunASR 1.0妯″瀷缁撴瀯 | funasr-runtime-sdk-online-cpu-0.1.10 | 1c2adfcff84d | +| 2024.03.05 | docker闀滃儚鏀寔arm64骞冲彴锛屽崌绾odelscope鐗堟湰 | funasr-runtime-sdk-online-cpu-0.1.9 | 4a875e08c7a2 | +| 2024.01.25 | 瀹㈡埛绔紭鍖東 funasr-runtime-sdk-online-cpu-0.1.7 | 2aa23805572e | +| 2024.01.03 | 2pass-offline妯″紡鏀寔Ngram璇█妯″瀷瑙ｇ爜銆亀fst鐑瘝锛屽悓鏃朵慨澶嶅凡鐭ョ殑crash闂鍙婂唴瀛樻硠婕忛棶棰� | funasr-runtime-sdk-online-cpu-0.1.6 | f99925110d27 | | 2023.11.09 | 淇鏃犲疄鏃剁粨鏋滈棶棰� | funasr-runtime-sdk-online-cpu-0.1.5 | b16584b6d38b | | 2023.11.08 | 鏀寔鏈嶅姟绔姞杞界儹璇�(鏇存柊鐑瘝閫氫俊鍗忚)銆乺untime缁撴瀯鍙樺寲閫傞厤 | funasr-runtime-sdk-online-cpu-0.1.4 | 691974017c38 | | 2023.09.19 | 2pass妯″紡鏀寔鐑瘝銆佹椂闂存埑銆両TN妯″瀷 | funasr-runtime-sdk-online-cpu-0.1.2 | 7222c5319bcf | @@ -35,11 +39,11 @@ ```shell sudo docker pull \ - registry.cn-hangzhou.aliyuncs.com/funasr_repo/funasr:funasr-runtime-sdk-online-cpu-0.2.0 + registry.cn-hangzhou.aliyuncs.com/funasr_repo/funasr:funasr-runtime-sdk-online-cpu-0.1.10 mkdir -p ./funasr-runtime-resources/models sudo docker run -p 10096:10095 -it --privileged=true \ -v $PWD/funasr-runtime-resources/models:/workspace/models \ - registry.cn-hangzhou.aliyuncs.com/funasr_repo/funasr:funasr-runtime-sdk-online-cpu-0.2.0 + registry.cn-hangzhou.aliyuncs.com/funasr_repo/funasr:funasr-runtime-sdk-online-cpu-0.1.10 ``` ### 鏈嶅姟绔惎鍔� @@ -50,12 +54,12 @@ nohup bash run_server_2pass.sh \ --download-model-dir /workspace/models \ --vad-dir damo/speech_fsmn_vad_zh-cn-16k-common-onnx \ - --model-dir damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-onnx \ + --model-dir damo/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-onnx \ --online-model-dir damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-online-onnx \ --punc-dir damo/punc_ct-transformer_zh-cn-common-vad_realtime-vocab272727-onnx \ --lm-dir damo/speech_ngram_lm_zh-cn-ai-wesp-fst \ --itn-dir thuduj12/fst_itn_zh \ - --hotword /workspace/models/hotwords.txt > log.out 2>&1 & + --hotword /workspace/models/hotwords.txt > log.txt 2>&1 & # 濡傛灉鎮ㄦ兂鍏抽棴ssl锛屽鍔犲弬鏁帮細--certfile 0 # 濡傛灉鎮ㄦ兂浣跨敤鏃堕棿鎴虫垨鑰卬n鐑瘝妯″瀷杩涜閮ㄧ讲锛岃璁剧疆--model-dir涓哄搴旀ā鍨嬶細 @@ -73,7 +77,7 @@ ``` 鎴戜滑浠ython璇█瀹㈡埛绔负渚嬶紝杩涜璇存槑锛屾敮鎸侀煶棰戞牸寮忥紙.wav, .pcm锛夛紝浠ュ強澶氭枃浠跺垪琛╳av.scp杈撳叆锛屽叾浠栫増鏈鎴风璇峰弬鑰冩枃妗ｏ紙[鐐瑰嚮姝ゅ](#瀹㈡埛绔敤娉曡瑙�)锛夈�� ```shell -python3 wss_client_asr.py --host "127.0.0.1" --port 10095 --mode 2pass +python3 funasr_wss_client.py --host "127.0.0.1" --port 10096 --mode 2pass ``` ------------------ @@ -105,18 +109,15 @@ --itn-dir thuduj12/fst_itn_zh \ --certfile ../../../ssl_key/server.crt \ --keyfile ../../../ssl_key/server.key \ - --hotword ../../hotwords.txt > log.out 2>&1 & + --hotword ../../hotwords.txt > log.txt 2>&1 & ``` **run_server_2pass.sh鍛戒护鍙傛暟浠嬬粛** ```text --download-model-dir 妯″瀷涓嬭浇鍦板潃锛岄�氳繃璁剧疆model ID浠嶮odelscope涓嬭浇妯″瀷 --model-dir modelscope model ID 鎴栬�� 鏈湴妯″瀷璺緞 --online-model-dir modelscope model ID 鎴栬�� 鏈湴妯″瀷璺緞 ---quantize True涓洪噺鍖朅SR妯″瀷锛孎alse涓洪潪閲忓寲ASR妯″瀷锛岄粯璁ゆ槸True --vad-dir modelscope model ID 鎴栬�� 鏈湴妯″瀷璺緞 ---vad-quant True涓洪噺鍖朧AD妯″瀷锛孎alse涓洪潪閲忓寲VAD妯″瀷锛岄粯璁ゆ槸True --punc-dir modelscope model ID 鎴栬�� 鏈湴妯″瀷璺緞 ---punc-quant True涓洪噺鍖朠UNC妯″瀷锛孎alse涓洪潪閲忓寲PUNC妯″瀷锛岄粯璁ゆ槸True --lm-dir modelscope model ID 鎴栬�� 鏈湴妯″瀷璺緞 --itn-dir modelscope model ID 鎴栬�� 鏈湴妯″瀷璺緞 --port 鏈嶅姟绔洃鍚殑绔彛鍙凤紝榛樿涓� 10095 -- Gitblit v1.9.1