From 423f007304c58fdab5739a346f68506449f4ee2c Mon Sep 17 00:00:00 2001
From: nichongjia-2007 <nichongjia@gmail.com>
Date: 星期四, 23 三月 2023 19:55:38 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR
---
funasr/runtime/python/websocket/ASR_server.py | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/funasr/runtime/python/websocket/ASR_server.py b/funasr/runtime/python/websocket/ASR_server.py
index cfa9a42..ee1a7c6 100644
--- a/funasr/runtime/python/websocket/ASR_server.py
+++ b/funasr/runtime/python/websocket/ASR_server.py
@@ -1,4 +1,10 @@
-# server.py 娉ㄦ剰鏈緥浠呭鐞嗗崟涓猚lent鍙戦�佺殑璇煶鏁版嵁锛屽苟鏈澶歝lient杩炴帴杩涜鍒ゆ柇鍜屽鐞�
+import asyncio
+import websockets
+import time
+from queue import Queue
+import threading
+import argparse
+
from modelscope.pipelines import pipeline
from modelscope.utils.constant import Tasks
from modelscope.utils.logger import get_logger
@@ -7,12 +13,6 @@
logger = get_logger(log_level=logging.CRITICAL)
logger.setLevel(logging.CRITICAL)
-import asyncio
-import websockets
-import time
-from queue import Queue
-import threading
-import argparse
parser = argparse.ArgumentParser()
parser.add_argument("--host",
@@ -36,7 +36,7 @@
parser.add_argument("--punc_model",
type=str,
- default="",
+ default="damo/punc_ct-transformer_zh-cn-common-vad_realtime-vocab272727",
help="model from modelscope")
parser.add_argument("--ngpu",
type=int,
@@ -49,25 +49,35 @@
voices = Queue()
speek = Queue()
-# 鍒涘缓涓�涓猇AD瀵硅薄
-vad_pipline = pipeline(
+# vad
+inference_pipeline_vad = pipeline(
task=Tasks.voice_activity_detection,
model=args.vad_model,
model_revision="v1.2.0",
output_dir=None,
batch_size=1,
- mode='online'
+ mode='online',
+ ngpu=args.ngpu,
)
param_dict_vad = {'in_cache': dict(), "is_final": False}
-# 鍒涘缓涓�涓狝SR瀵硅薄
-param_dict = dict()
+# asr
+param_dict_asr = dict()
# param_dict["hotword"] = "灏忎簲 灏忎簲鏈�" # 璁剧疆鐑瘝锛岀敤绌烘牸闅斿紑
-inference_pipeline2 = pipeline(
+inference_pipeline_asr = pipeline(
task=Tasks.auto_speech_recognition,
model=args.asr_model,
- param_dict=param_dict,
+ param_dict=param_dict_asr,
+ ngpu=args.ngpu,
)
+
+inference_pipline_punc = pipeline(
+ task=Tasks.punctuation,
+ model=args.punc_model,
+ model_revision="v1.0.1",
+ ngpu=args.ngpu,
+)
+
print("model loaded")
@@ -90,7 +100,7 @@
global vad_pipline, param_dict_vad
#print(type(data))
# print(param_dict_vad)
- segments_result = vad_pipline(audio_in=data, param_dict=param_dict_vad)
+ segments_result = inference_pipeline_vad(audio_in=data, param_dict=param_dict_vad)
# print(segments_result)
# print(param_dict_vad)
speech_start = False
@@ -111,7 +121,7 @@
while not speek.empty():
audio_in = speek.get()
speek.task_done()
- rec_result = inference_pipeline2(audio_in=audio_in)
+ rec_result = inference_pipeline_asr(audio_in=audio_in)
print(rec_result)
time.sleep(0.1)
time.sleep(0.1)
--
Gitblit v1.9.1