From b7c82bbb57eaeff0418dca0e5fe87299244c5f82 Mon Sep 17 00:00:00 2001
From: wucong.lyb <wucong.lyb@alibaba-inc.com>
Date: 星期三, 05 七月 2023 14:22:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
funasr/runtime/python/websocket/funasr_wss_client.py | 36 ++++++++++--------------------------
1 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/funasr/runtime/python/websocket/wss_client_asr.py b/funasr/runtime/python/websocket/funasr_wss_client.py
similarity index 92%
rename from funasr/runtime/python/websocket/wss_client_asr.py
rename to funasr/runtime/python/websocket/funasr_wss_client.py
index dcd9576..fc4d516 100644
--- a/funasr/runtime/python/websocket/wss_client_asr.py
+++ b/funasr/runtime/python/websocket/funasr_wss_client.py
@@ -100,11 +100,13 @@
message = json.dumps({"mode": args.mode, "chunk_size": args.chunk_size, "chunk_interval": args.chunk_interval,
"wav_name": "microphone", "is_speaking": True})
- voices.put(message)
+ #voices.put(message)
+ await websocket.send(message)
while True:
data = stream.read(CHUNK)
message = data
- voices.put(message)
+ #voices.put(message)
+ await websocket.send(message)
await asyncio.sleep(0.005)
async def record_from_scp(chunk_begin, chunk_size):
@@ -178,25 +180,7 @@
await websocket.close()
-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()
- try:
- await websocket.send(data)
- except Exception as e:
- print('Exception occurred:', e)
- traceback.print_exc()
- exit(0)
- await asyncio.sleep(0.005)
- await asyncio.sleep(0.005)
-
-
-
+
async def message(id):
global websocket,voices,offline_msg_done
text_print = ""
@@ -215,12 +199,12 @@
if meg["mode"] == "online":
text_print += "{}".format(text)
text_print = text_print[-args.words_max_print:]
- os.system('clear')
+ # os.system('clear')
print("\rpid" + str(id) + ": " + text_print)
elif meg["mode"] == "offline":
text_print += "{}".format(text)
text_print = text_print[-args.words_max_print:]
- os.system('clear')
+ # os.system('clear')
print("\rpid" + str(id) + ": " + text_print)
offline_msg_done=True
else:
@@ -232,8 +216,9 @@
text_print = text_print_2pass_offline + "{}".format(text)
text_print_2pass_offline += "{}".format(text)
text_print = text_print[-args.words_max_print:]
- os.system('clear')
+ # os.system('clear')
print("\rpid" + str(id) + ": " + text_print)
+ offline_msg_done=True
except Exception as e:
print("Exception:", e)
@@ -277,9 +262,8 @@
task = asyncio.create_task(record_from_scp(i, 1))
else:
task = asyncio.create_task(record_microphone())
- task2 = asyncio.create_task(ws_send())
task3 = asyncio.create_task(message(str(id)+"_"+str(i))) #processid+fileid
- await asyncio.gather(task, task2, task3)
+ await asyncio.gather(task, task3)
exit(0)
--
Gitblit v1.9.1