From 911d450a596a711d6faea37c2abfba13d3a511fd Mon Sep 17 00:00:00 2001
From: haoneng.lhn <haoneng.lhn@alibaba-inc.com>
Date: 星期四, 27 四月 2023 14:15:11 +0800
Subject: [PATCH] Merge branch 'dev_lhn' into dev_websocket
---
funasr/runtime/python/websocket/ASR_client.py | 105 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 72 insertions(+), 33 deletions(-)
diff --git a/funasr/runtime/python/websocket/ASR_client.py b/funasr/runtime/python/websocket/ASR_client.py
index 8010b18..cc0e7b6 100644
--- a/funasr/runtime/python/websocket/ASR_client.py
+++ b/funasr/runtime/python/websocket/ASR_client.py
@@ -1,11 +1,11 @@
-import pyaudio
+
# import websocket #鍖哄埆鏈嶅姟绔繖閲屾槸 websocket-client搴�
import time
import websockets
import asyncio
-from queue import Queue
# import threading
import argparse
+import json
parser = argparse.ArgumentParser()
parser.add_argument("--host",
@@ -22,34 +22,22 @@
type=int,
default=300,
help="ms")
+parser.add_argument("--audio_in",
+ type=str,
+ default=None,
+ help="audio_in")
args = parser.parse_args()
+# voices = asyncio.Queue()
+from queue import Queue
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_microphone():
+ import pyaudio
#print("2")
- global voices
+ global voices
FORMAT = pyaudio.paInt16
CHANNELS = 1
RATE = 16000
@@ -69,27 +57,78 @@
voices.put(data)
#print(voices.qsize())
+
await asyncio.sleep(0.01)
-
-
-
+# 鍏朵粬鍑芥暟鍙互閫氳繃璋冪敤send(data)鏉ュ彂閫佹暟鎹紝渚嬪锛�
+async def record_from_scp():
+ global voices
+ if args.audio_in.endswith(".scp"):
+ f_scp = open(args.audio_in)
+ wavs = f_scp.readlines()
+ else:
+ wavs = [args.audio_in]
+ for wav in wavs:
+ wav_splits = wav.strip().split()
+ wav_path = wav_splits[1] if len(wav_splits) > 1 else wav_splits[0]
+ bytes = open(wav_path, "rb")
+ bytes = bytes.read()
+
+ stride = int(args.chunk_size/1000*16000*2)
+ chunk_num = (len(bytes)-1)//stride + 1
+ for i in range(chunk_num):
+ beg = i*stride
+ data_chunk = bytes[beg:beg+stride]
+ voices.put(data_chunk)
+ # print("data_chunk: ", len(data_chunk))
+ # print(voices.qsize())
+
+ await asyncio.sleep(args.chunk_size/1000)
+
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:
+ meg = await websocket.recv()
+ meg = json.loads(meg)
+ print(meg)
+ 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):
+ if args.audio_in is not None:
+ task = asyncio.create_task(record_from_scp()) # 鍒涘缓涓�涓悗鍙颁换鍔″綍闊�
+ else:
+ task = asyncio.create_task(record_microphone()) # 鍒涘缓涓�涓悗鍙颁换鍔″綍闊�
+ 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()
--
Gitblit v1.9.1