From 45698b0b21e97bf850586c1ecd5a55da0e14e674 Mon Sep 17 00:00:00 2001
From: cgisky1980 <new448885@gmail.com>
Date: 星期五, 24 三月 2023 15:11:56 +0800
Subject: [PATCH] 多端连接
---
funasr/runtime/python/websocket/ASR_server.py | 155 +++++++++++++++++---------------------
funasr/runtime/python/websocket/ASR_client.py | 65 ++++++++-------
2 files changed, 106 insertions(+), 114 deletions(-)
diff --git a/funasr/runtime/python/websocket/ASR_client.py b/funasr/runtime/python/websocket/ASR_client.py
index 8010b18..fe67981 100644
--- a/funasr/runtime/python/websocket/ASR_client.py
+++ b/funasr/runtime/python/websocket/ASR_client.py
@@ -26,30 +26,13 @@
args = parser.parse_args()
voices = Queue()
-async def ws_client():
- global ws # 瀹氫箟涓�涓叏灞�鍙橀噺ws锛岀敤浜庝繚瀛榳ebsocket杩炴帴瀵硅薄
- # 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:
- await ws.send(data) # 閫氳繃ws瀵硅薄鍙戦�佹暟鎹�
- except Exception as e:
- print('Exception occurred:', e)
-
-
-
-asyncio.get_event_loop().run_until_complete(ws_client()) # 鍚姩鍗忕▼
-
-
# 鍏朵粬鍑芥暟鍙互閫氳繃璋冪敤send(data)鏉ュ彂閫佹暟鎹紝渚嬪锛�
-async def test():
+async def record():
#print("2")
- global voices
+ global voices
FORMAT = pyaudio.paInt16
CHANNELS = 1
RATE = 16000
@@ -69,27 +52,49 @@
voices.put(data)
#print(voices.qsize())
+
await asyncio.sleep(0.01)
-
-
async def ws_send():
global voices
+ global websocket
print("started to sending data!")
while True:
while not voices.empty():
data = voices.get()
voices.task_done()
- await send(data)
+ try:
+ await websocket.send(data) # 閫氳繃ws瀵硅薄鍙戦�佹暟鎹�
+ except Exception as e:
+ print('Exception occurred:', e)
await asyncio.sleep(0.01)
await asyncio.sleep(0.01)
-async def main():
- task = asyncio.create_task(test()) # 鍒涘缓涓�涓悗鍙颁换鍔�
- task2 = asyncio.create_task(ws_send()) # 鍒涘缓涓�涓悗鍙颁换鍔�
-
- await asyncio.gather(task, task2)
-asyncio.run(main())
+
+async def message():
+ global websocket
+ while True:
+ try:
+ print(await websocket.recv())
+ except Exception as e:
+ print("Exception:", e)
+
+
+
+async def ws_client():
+ global websocket # 瀹氫箟涓�涓叏灞�鍙橀噺ws锛岀敤浜庝繚瀛榳ebsocket杩炴帴瀵硅薄
+ # uri = "ws://11.167.134.197:8899"
+ uri = "ws://{}:{}".format(args.host, args.port)
+ #ws = await websockets.connect(uri, subprotocols=["binary"]) # 鍒涘缓涓�涓暱杩炴帴
+ async for websocket in websockets.connect(uri, subprotocols=["binary"], ping_interval=None):
+ task = asyncio.create_task(record()) # 鍒涘缓涓�涓悗鍙颁换鍔″綍闊�
+ task2 = asyncio.create_task(ws_send()) # 鍒涘缓涓�涓悗鍙颁换鍔″彂閫�
+ task3 = asyncio.create_task(message()) # 鍒涘缓涓�涓悗鍙版帴鏀舵秷鎭殑浠诲姟
+ await asyncio.gather(task, task2, task3)
+
+
+asyncio.get_event_loop().run_until_complete(ws_client()) # 鍚姩鍗忕▼
+asyncio.get_event_loop().run_forever()
diff --git a/funasr/runtime/python/websocket/ASR_server.py b/funasr/runtime/python/websocket/ASR_server.py
index 1fd02b5..79c3a7a 100644
--- a/funasr/runtime/python/websocket/ASR_server.py
+++ b/funasr/runtime/python/websocket/ASR_server.py
@@ -9,10 +9,14 @@
from modelscope.utils.constant import Tasks
from modelscope.utils.logger import get_logger
import logging
+import tracemalloc
+tracemalloc.start()
logger = get_logger(log_level=logging.CRITICAL)
logger.setLevel(logging.CRITICAL)
+
+websocket_users = set() #缁存姢瀹㈡埛绔垪琛�
parser = argparse.ArgumentParser()
parser.add_argument("--host",
@@ -46,8 +50,7 @@
args = parser.parse_args()
print("model loading")
-voices = Queue()
-speek = Queue()
+
# vad
inference_pipeline_vad = pipeline(
@@ -86,20 +89,76 @@
async def ws_serve(websocket, path):
- global voices
+ #speek = Queue()
+ frames = [] # 瀛樺偍鎵�鏈夌殑甯ф暟鎹�
+ buffer = [] # 瀛樺偍缂撳瓨涓殑甯ф暟鎹紙鏈�澶氫袱涓墖娈碉級
+ RECORD_NUM = 0
+ global websocket_users
+ speech_start, speech_end = False, False
+ # 璋冪敤asr鍑芥暟
+ websocket.speek = Queue() #websocket 娣诲姞杩涢槦鍒楀璞� 璁゛sr璇诲彇璇煶鏁版嵁鍖�
+ websocket.send_msg = Queue() #websocket 娣诲姞涓槦鍒楀璞� 璁﹚s鍙戦�佹秷鎭埌瀹㈡埛绔�
+ websocket_users.add(websocket)
+ ss = threading.Thread(target=asr, args=(websocket,))
+ ss.start()
+
try:
async for message in websocket:
- voices.put(message)
+ #voices.put(message)
#print("put")
- except websockets.exceptions.ConnectionClosedError as e:
- print('Connection closed with exception:', e)
+ #await websocket.send("123")
+ buffer.append(message)
+ if len(buffer) > 2:
+ buffer.pop(0) # 濡傛灉缂撳瓨瓒呰繃涓や釜鐗囨锛屽垯鍒犻櫎鏈�鏃╃殑涓�涓�
+
+ if speech_start:
+ frames.append(message)
+ RECORD_NUM += 1
+ speech_start_i, speech_end_i = vad(message)
+ #print(speech_start_i, speech_end_i)
+ if speech_start_i:
+ speech_start = speech_start_i
+ frames = []
+ frames.extend(buffer) # 鎶婁箣鍓�2涓闊虫暟鎹揩鍔犲叆
+ if speech_end_i or RECORD_NUM > 300:
+ speech_start = False
+ audio_in = b"".join(frames)
+ websocket.speek.put(audio_in)
+ frames = [] # 娓呯┖鎵�鏈夌殑甯ф暟鎹�
+ buffer = [] # 娓呯┖缂撳瓨涓殑甯ф暟鎹紙鏈�澶氫袱涓墖娈碉級
+ RECORD_NUM = 0
+ if not websocket.send_msg.empty():
+ await websocket.send(websocket.send_msg.get())
+ websocket.send_msg.task_done()
+
+
+ except websockets.ConnectionClosed:
+ print("ConnectionClosed...", websocket_users) # 閾炬帴鏂紑
+ websocket_users.remove(websocket)
+ except websockets.InvalidState:
+ print("InvalidState...") # 鏃犳晥鐘舵��
except Exception as e:
- print('Exception occurred:', e)
+ print("Exception:", e)
+
-start_server = websockets.serve(ws_serve, args.host, args.port, subprotocols=["binary"], ping_interval=None)
+def asr(websocket): # ASR鎺ㄧ悊
+ global inference_pipeline2
+ global param_dict_punc
+ global websocket_users
+ while websocket in websocket_users:
+ if not websocket.speek.empty():
+ audio_in = websocket.speek.get()
+ websocket.speek.task_done()
+ if len(audio_in) > 0:
+ rec_result = inference_pipeline_asr(audio_in=audio_in)
+ if inference_pipeline_punc is not None and 'text' in rec_result:
+ rec_result = inference_pipeline_punc(text_in=rec_result['text'], param_dict=param_dict_punc)
+ results = (rec_result["text"] if "text" in rec_result else rec_result)
+ websocket.send_msg.put(results) # 瀛樺叆鍙戦�侀槦鍒� 鐩存帴璋冪敤send鍙戦�佷笉浜�
+
+ time.sleep(0.1)
-
-def vad(data): # 鎺ㄧ悊
+def vad(data): # VAD鎺ㄧ悊
global vad_pipline, param_dict_vad
#print(type(data))
# print(param_dict_vad)
@@ -117,79 +176,7 @@
speech_end = True
return speech_start, speech_end
-def asr(): # 鎺ㄧ悊
- global inference_pipeline2
- global speek, param_dict_punc
- while True:
- while not speek.empty():
- audio_in = speek.get()
- speek.task_done()
- if len(audio_in) > 0:
- rec_result = inference_pipeline_asr(audio_in=audio_in)
- if inference_pipeline_punc is not None and 'text' in rec_result:
- rec_result = inference_pipeline_punc(text_in=rec_result['text'], param_dict=param_dict_punc)
- print(rec_result["text"] if "text" in rec_result else rec_result)
- time.sleep(0.1)
- time.sleep(0.1)
-
-
-def main(): # 鎺ㄧ悊
- frames = [] # 瀛樺偍鎵�鏈夌殑甯ф暟鎹�
- buffer = [] # 瀛樺偍缂撳瓨涓殑甯ф暟鎹紙鏈�澶氫袱涓墖娈碉級
- # 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():
-
- data = voices.get()
- #print("闃熷垪鎺掗槦鏁�",voices.qsize())
- voices.task_done()
- buffer.append(data)
- if len(buffer) > 2:
- buffer.pop(0) # 濡傛灉缂撳瓨瓒呰繃涓や釜鐗囨锛屽垯鍒犻櫎鏈�鏃╃殑涓�涓�
-
- if speech_start:
- frames.append(data)
- 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)
-
-
-
-s = threading.Thread(target=main)
-s.start()
-s = threading.Thread(target=asr)
-s.start()
-
+
+start_server = websockets.serve(ws_serve, args.host, args.port, subprotocols=["binary"], ping_interval=None)
asyncio.get_event_loop().run_until_complete(start_server)
asyncio.get_event_loop().run_forever()
\ No newline at end of file
--
Gitblit v1.9.1