From 72d561531ffedfbefa1456f6b0c6c88466154c55 Mon Sep 17 00:00:00 2001
From: nichongjia-2007 <nichongjia@gmail.com>
Date: 星期四, 23 三月 2023 18:44:36 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR
---
funasr/runtime/python/websocket/ASR_server.py | 142 ++++++++++++++++++++++-------------
funasr/runtime/python/websocket/ASR_client.py | 32 ++++++-
funasr/bin/vad_inference_online.py | 7 -
funasr/runtime/python/websocket/README.md | 46 +++++++++++
funasr/runtime/python/websocket/requirements_client.txt | 2
funasr/runtime/python/websocket/requirements_server.txt | 1
6 files changed, 165 insertions(+), 65 deletions(-)
diff --git a/funasr/bin/vad_inference_online.py b/funasr/bin/vad_inference_online.py
index faee1fc..dadfd8c 100644
--- a/funasr/bin/vad_inference_online.py
+++ b/funasr/bin/vad_inference_online.py
@@ -30,14 +30,7 @@
from funasr.models.frontend.wav_frontend import WavFrontend
from funasr.bin.vad_inference import Speech2VadSegment
-header_colors = '\033[95m'
-end_colors = '\033[0m'
-global_asr_language: str = 'zh-cn'
-global_sample_rate: Union[int, Dict[Any, int]] = {
- 'audio_fs': 16000,
- 'model_fs': 16000
-}
class Speech2VadSegmentOnline(Speech2VadSegment):
diff --git a/funasr/runtime/python/websocket/ASR_client.py b/funasr/runtime/python/websocket/ASR_client.py
index 081e6d5..8010b18 100644
--- a/funasr/runtime/python/websocket/ASR_client.py
+++ b/funasr/runtime/python/websocket/ASR_client.py
@@ -5,13 +5,35 @@
import asyncio
from queue import Queue
# import threading
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--host",
+ type=str,
+ default="localhost",
+ required=False,
+ help="host ip, localhost, 0.0.0.0")
+parser.add_argument("--port",
+ type=int,
+ default=10095,
+ required=False,
+ help="grpc server port")
+parser.add_argument("--chunk_size",
+ type=int,
+ default=300,
+ help="ms")
+
+args = parser.parse_args()
+
voices = Queue()
-async def hello():
+async def ws_client():
global ws # 瀹氫箟涓�涓叏灞�鍙橀噺ws锛岀敤浜庝繚瀛榳ebsocket杩炴帴瀵硅薄
- uri = "ws://localhost:8899"
+ # uri = "ws://11.167.134.197:8899"
+ uri = "ws://{}:{}".format(args.host, args.port)
ws = await websockets.connect(uri, subprotocols=["binary"]) # 鍒涘缓涓�涓暱杩炴帴
ws.max_size = 1024 * 1024 * 20
print("connected ws server")
+
async def send(data):
global ws # 寮曠敤鍏ㄥ眬鍙橀噺ws
try:
@@ -21,7 +43,7 @@
-asyncio.get_event_loop().run_until_complete(hello()) # 鍚姩鍗忕▼
+asyncio.get_event_loop().run_until_complete(ws_client()) # 鍚姩鍗忕▼
# 鍏朵粬鍑芥暟鍙互閫氳繃璋冪敤send(data)鏉ュ彂閫佹暟鎹紝渚嬪锛�
@@ -31,7 +53,7 @@
FORMAT = pyaudio.paInt16
CHANNELS = 1
RATE = 16000
- CHUNK = int(RATE / 1000 * 300)
+ CHUNK = int(RATE / 1000 * args.chunk_size)
p = pyaudio.PyAudio()
@@ -70,4 +92,4 @@
await asyncio.gather(task, task2)
-asyncio.run(main())
\ No newline at end of file
+asyncio.run(main())
diff --git a/funasr/runtime/python/websocket/ASR_server.py b/funasr/runtime/python/websocket/ASR_server.py
index 0796a79..cfa9a42 100644
--- a/funasr/runtime/python/websocket/ASR_server.py
+++ b/funasr/runtime/python/websocket/ASR_server.py
@@ -6,37 +6,73 @@
logger = get_logger(log_level=logging.CRITICAL)
logger.setLevel(logging.CRITICAL)
+
import asyncio
-import websockets #鍖哄埆瀹㈡埛绔繖閲屾槸 websockets搴�
+import websockets
import time
from queue import Queue
import threading
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--host",
+ type=str,
+ default="0.0.0.0",
+ required=False,
+ help="host ip, localhost, 0.0.0.0")
+parser.add_argument("--port",
+ type=int,
+ default=10095,
+ required=False,
+ help="grpc server port")
+parser.add_argument("--asr_model",
+ type=str,
+ default="damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch",
+ help="model from modelscope")
+parser.add_argument("--vad_model",
+ type=str,
+ default="damo/speech_fsmn_vad_zh-cn-16k-common-pytorch",
+ help="model from modelscope")
+
+parser.add_argument("--punc_model",
+ type=str,
+ default="",
+ help="model from modelscope")
+parser.add_argument("--ngpu",
+ type=int,
+ default=1,
+ help="0 for cpu, 1 for gpu")
+
+args = parser.parse_args()
print("model loading")
voices = Queue()
speek = Queue()
+
# 鍒涘缓涓�涓猇AD瀵硅薄
vad_pipline = pipeline(
task=Tasks.voice_activity_detection,
- model="damo/speech_fsmn_vad_zh-cn-16k-common-pytorch",
+ model=args.vad_model,
model_revision="v1.2.0",
output_dir=None,
batch_size=1,
+ mode='online'
)
+param_dict_vad = {'in_cache': dict(), "is_final": False}
# 鍒涘缓涓�涓狝SR瀵硅薄
param_dict = dict()
-param_dict["hotword"] = "灏忎簲 灏忎簲鏈�" # 璁剧疆鐑瘝锛岀敤绌烘牸闅斿紑
+# param_dict["hotword"] = "灏忎簲 灏忎簲鏈�" # 璁剧疆鐑瘝锛岀敤绌烘牸闅斿紑
inference_pipeline2 = pipeline(
task=Tasks.auto_speech_recognition,
- model="damo/speech_paraformer-large-contextual_asr_nat-zh-cn-16k-common-vocab8404",
+ model=args.asr_model,
param_dict=param_dict,
)
print("model loaded")
-async def echo(websocket, path):
+async def ws_serve(websocket, path):
global voices
try:
async for message in websocket:
@@ -47,18 +83,26 @@
except Exception as e:
print('Exception occurred:', e)
-start_server = websockets.serve(echo, "localhost", 8899, subprotocols=["binary"],ping_interval=None)
+start_server = websockets.serve(ws_serve, args.host, args.port, subprotocols=["binary"], ping_interval=None)
def vad(data): # 鎺ㄧ悊
- global vad_pipline
+ global vad_pipline, param_dict_vad
#print(type(data))
- segments_result = vad_pipline(audio_in=data)
- #print(segments_result)
- if len(segments_result) == 0:
- return False
- else:
- return True
+ # print(param_dict_vad)
+ segments_result = vad_pipline(audio_in=data, param_dict=param_dict_vad)
+ # print(segments_result)
+ # print(param_dict_vad)
+ speech_start = False
+ speech_end = False
+
+ if len(segments_result) == 0 or len(segments_result["text"]) > 1:
+ return speech_start, speech_end
+ if segments_result["text"][0][0] != -1:
+ speech_start = True
+ if segments_result["text"][0][1] != -1:
+ speech_end = True
+ return speech_start, speech_end
def asr(): # 鎺ㄧ悊
global inference_pipeline2
@@ -76,11 +120,12 @@
def main(): # 鎺ㄧ悊
frames = [] # 瀛樺偍鎵�鏈夌殑甯ф暟鎹�
buffer = [] # 瀛樺偍缂撳瓨涓殑甯ф暟鎹紙鏈�澶氫袱涓墖娈碉級
- silence_count = 0 # 缁熻杩炵画闈欓煶鐨勬鏁�
- speech_detected = False # 鏍囪鏄惁妫�娴嬪埌璇煶
+ # silence_count = 0 # 缁熻杩炵画闈欓煶鐨勬鏁�
+ # speech_detected = False # 鏍囪鏄惁妫�娴嬪埌璇煶
RECORD_NUM = 0
global voices
global speek
+ speech_start, speech_end = False, False
while True:
while not voices.empty():
@@ -91,32 +136,35 @@
if len(buffer) > 2:
buffer.pop(0) # 濡傛灉缂撳瓨瓒呰繃涓や釜鐗囨锛屽垯鍒犻櫎鏈�鏃╃殑涓�涓�
- if speech_detected:
+ if speech_start:
frames.append(data)
- RECORD_NUM += 1
-
- if vad(data):
- if not speech_detected:
- print("妫�娴嬪埌浜哄０...")
- speech_detected = True # 鏍囪涓烘娴嬪埌璇煶
- frames = []
- frames.extend(buffer) # 鎶婁箣鍓�2涓闊虫暟鎹揩鍔犲叆
- silence_count = 0 # 閲嶇疆闈欓煶娆℃暟
- else:
- silence_count += 1 # 澧炲姞闈欓煶娆℃暟
-
- if speech_detected and (silence_count > 4 or RECORD_NUM > 50): #杩欓噷 50 鍙牴鎹渶姹傛敼涓哄悎閫傜殑鏁版嵁蹇暟閲�
- print("璇磋瘽缁撴潫鎴栬�呰秴杩囪缃渶闀挎椂闂�...")
- audio_in = b"".join(frames)
- #asrt = threading.Thread(target=asr,args=(audio_in,))
- #asrt.start()
- speek.put(audio_in)
- #rec_result = inference_pipeline2(audio_in=audio_in) # ASR 妯″瀷閲岃窇涓�璺�
- frames = [] # 娓呯┖鎵�鏈夌殑甯ф暟鎹�
- buffer = [] # 娓呯┖缂撳瓨涓殑甯ф暟鎹紙鏈�澶氫袱涓墖娈碉級
- silence_count = 0 # 缁熻杩炵画闈欓煶鐨勬鏁版竻闆�
- speech_detected = False # 鏍囪鏄惁妫�娴嬪埌璇煶
- RECORD_NUM = 0
+ RECORD_NUM += 1
+ speech_start_i, speech_end_i = vad(data)
+ # print(speech_start_i, speech_end_i)
+ if speech_start_i:
+ speech_start = speech_start_i
+ # if not speech_detected:
+ # print("妫�娴嬪埌浜哄０...")
+ # speech_detected = True # 鏍囪涓烘娴嬪埌璇煶
+ frames = []
+ frames.extend(buffer) # 鎶婁箣鍓�2涓闊虫暟鎹揩鍔犲叆
+ # silence_count = 0 # 閲嶇疆闈欓煶娆℃暟
+ if speech_end_i or RECORD_NUM > 300:
+ # silence_count += 1 # 澧炲姞闈欓煶娆℃暟
+ # speech_end = speech_end_i
+ speech_start = False
+ # if RECORD_NUM > 300: #杩欓噷 50 鍙牴鎹渶姹傛敼涓哄悎閫傜殑鏁版嵁蹇暟閲�
+ # print("璇磋瘽缁撴潫鎴栬�呰秴杩囪缃渶闀挎椂闂�...")
+ audio_in = b"".join(frames)
+ #asrt = threading.Thread(target=asr,args=(audio_in,))
+ #asrt.start()
+ speek.put(audio_in)
+ #rec_result = inference_pipeline2(audio_in=audio_in) # ASR 妯″瀷閲岃窇涓�璺�
+ frames = [] # 娓呯┖鎵�鏈夌殑甯ф暟鎹�
+ buffer = [] # 娓呯┖缂撳瓨涓殑甯ф暟鎹紙鏈�澶氫袱涓墖娈碉級
+ # silence_count = 0 # 缁熻杩炵画闈欓煶鐨勬鏁版竻闆�
+ # speech_detected = False # 鏍囪鏄惁妫�娴嬪埌璇煶
+ RECORD_NUM = 0
time.sleep(0.01)
time.sleep(0.01)
@@ -128,16 +176,4 @@
s.start()
asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()
-
-
-
-
-
-
-
-
-
-
-
-
+asyncio.get_event_loop().run_forever()
\ No newline at end of file
diff --git a/funasr/runtime/python/websocket/README.md b/funasr/runtime/python/websocket/README.md
new file mode 100644
index 0000000..2c0dec1
--- /dev/null
+++ b/funasr/runtime/python/websocket/README.md
@@ -0,0 +1,46 @@
+# Using funasr with websocket
+We can send streaming audio data to server in real-time with grpc client every 300 ms e.g., and get transcribed text when stop speaking.
+The audio data is in streaming, the asr inference process is in offline.
+
+# Steps
+
+## For the Server
+
+Install the modelscope and funasr
+
+```shell
+pip install "modelscope[audio_asr]" -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html
+git clone https://github.com/alibaba/FunASR.git && cd FunASR
+pip install --editable ./
+```
+
+Install the requirements for server
+
+```shell
+cd funasr/runtime/python/websocket
+pip install -r requirements_server.txt
+```
+
+Start server
+
+```shell
+python ASR_server.py --host "0.0.0.0" --port 10095 --asr_model "damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch"
+```
+
+## For the client
+
+Install the requirements for client
+```shell
+git clone https://github.com/alibaba/FunASR.git && cd FunASR
+cd funasr/runtime/python/websocket
+pip install -r requirements_client.txt
+```
+
+Start client
+
+```shell
+python ASR_client.py --host "127.0.0.1" --port 10095 --chunk_size 300
+```
+
+## Acknowledge
+1. We acknowledge [cgisky1980](https://github.com/cgisky1980/FunASR) for contributing the websocket service.
diff --git a/funasr/runtime/python/websocket/requirements_client.txt b/funasr/runtime/python/websocket/requirements_client.txt
new file mode 100644
index 0000000..9498d6d
--- /dev/null
+++ b/funasr/runtime/python/websocket/requirements_client.txt
@@ -0,0 +1,2 @@
+websockets
+pyaudio
\ No newline at end of file
diff --git a/funasr/runtime/python/websocket/requirements_server.txt b/funasr/runtime/python/websocket/requirements_server.txt
new file mode 100644
index 0000000..14774b4
--- /dev/null
+++ b/funasr/runtime/python/websocket/requirements_server.txt
@@ -0,0 +1 @@
+websockets
--
Gitblit v1.9.1