From f9896b7b72314f2b4e1054b5ed8214a3086f50f0 Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期日, 07 五月 2023 23:04:01 +0800
Subject: [PATCH] Merge pull request #467 from alibaba-damo-academy/dev_websocket_offline
---
funasr/runtime/python/websocket/ws_client.py | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/funasr/runtime/python/websocket/ws_client.py b/funasr/runtime/python/websocket/ws_client.py
index d32ce0a..d8bbb65 100644
--- a/funasr/runtime/python/websocket/ws_client.py
+++ b/funasr/runtime/python/websocket/ws_client.py
@@ -31,7 +31,10 @@
type=str,
default=None,
help="audio_in")
-
+parser.add_argument("--send_without_sleep",
+ action="store_true",
+ default=False,
+ help="if audio_in is set, send_without_sleep")
parser.add_argument("--test_thread_num",
type=int,
default=1,
@@ -43,12 +46,11 @@
args = parser.parse_args()
args.chunk_size = [int(x) for x in args.chunk_size.split(",")]
-
+print(args)
# voices = asyncio.Queue()
from queue import Queue
voices = Queue()
-# 鍏朵粬鍑芥暟鍙互閫氳繃璋冪敤send(data)鏉ュ彂閫佹暟鎹紝渚嬪锛�
async def record_microphone():
is_finished = False
import pyaudio
@@ -75,11 +77,9 @@
message = json.dumps({"chunk_size": args.chunk_size, "chunk_interval": args.chunk_interval, "audio": data, "is_speaking": is_speaking, "is_finished": is_finished})
voices.put(message)
- #print(voices.qsize())
await asyncio.sleep(0.005)
-# 鍏朵粬鍑芥暟鍙互閫氳繃璋冪敤send(data)鏉ュ彂閫佹暟鎹紝渚嬪锛�
async def record_from_scp():
import wave
global voices
@@ -95,15 +95,11 @@
# bytes_f = open(wav_path, "rb")
# bytes_data = bytes_f.read()
with wave.open(wav_path, "rb") as wav_file:
- # 鑾峰彇闊抽鍙傛暟
params = wav_file.getparams()
- # 鑾峰彇澶翠俊鎭殑闀垮害
# header_length = wav_file.getheaders()[0][1]
- # 璇诲彇闊抽甯ф暟鎹紝璺宠繃澶翠俊鎭�
# wav_file.setpos(header_length)
frames = wav_file.readframes(wav_file.getnframes())
- # 灏嗛煶棰戝抚鏁版嵁杞崲涓哄瓧鑺傜被鍨嬬殑鏁版嵁
audio_bytes = bytes(frames)
# stride = int(args.chunk_size/1000*16000*2)
stride = int(60*args.chunk_size[1]/args.chunk_interval/1000*16000*2)
@@ -120,8 +116,8 @@
voices.put(message)
# print("data_chunk: ", len(data_chunk))
# print(voices.qsize())
-
- await asyncio.sleep(60*args.chunk_size[1]/args.chunk_interval/1000)
+ sleep_duration = 0.001 if args.send_without_sleep else 60*args.chunk_size[1]/args.chunk_interval/1000
+ await asyncio.sleep(sleep_duration)
is_finished = True
message = json.dumps({"is_finished": is_finished})
@@ -136,7 +132,7 @@
data = voices.get()
voices.task_done()
try:
- await websocket.send(data) # 閫氳繃ws瀵硅薄鍙戦�佹暟鎹�
+ await websocket.send(data)
except Exception as e:
print('Exception occurred:', e)
traceback.print_exc()
@@ -155,9 +151,14 @@
meg = json.loads(meg)
# print(meg, end = '')
# print("\r")
- text_print += " {}".format(meg["text"][0])
+ # print(meg)
+ text = meg["text"][0]
+ if meg["mode"] == "online":
+ text_print += " {}".format(text)
+ else:
+ text_print += "{}".format(text)
text_print = text_print[-args.words_max_print:]
- #os.system('clear')
+ os.system('clear')
print("\r"+str(id)+":"+text_print)
except Exception as e:
print("Exception:", e)
@@ -177,17 +178,15 @@
exit(0)
async def ws_client(id):
- global websocket # 瀹氫箟涓�涓叏灞�鍙橀噺ws锛岀敤浜庝繚瀛榳ebsocket杩炴帴瀵硅薄
- # uri = "ws://11.167.134.197:8899"
+ global websocket
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()) # 鍒涘缓涓�涓悗鍙颁换鍔″綍闊�
+ 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(id)) # 鍒涘缓涓�涓悗鍙版帴鏀舵秷鎭殑浠诲姟
+ task = asyncio.create_task(record_microphone())
+ task2 = asyncio.create_task(ws_send())
+ task3 = asyncio.create_task(message(id))
await asyncio.gather(task, task2, task3)
def one_thread(id):
@@ -198,13 +197,13 @@
if __name__ == '__main__':
process_list = []
for i in range(args.test_thread_num):
- p = Process(target=one_thread,args=(i,)) #瀹炰緥鍖栬繘绋嬪璞�
+ p = Process(target=one_thread,args=(i,))
p.start()
process_list.append(p)
for i in process_list:
p.join()
- print('缁撴潫娴嬭瘯')
+ print('end')
--
Gitblit v1.9.1