From dfda4511207cc06dd58412c1e757eccf2487fc01 Mon Sep 17 00:00:00 2001
From: zhaomingwork <61895407+zhaomingwork@users.noreply.github.com>
Date: 星期三, 05 七月 2023 10:27:25 +0800
Subject: [PATCH] for python ws client multiple files bug (#710)
---
funasr/runtime/python/websocket/wss_client_asr.py | 42 +++++++++++++-----------------------------
1 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/funasr/runtime/python/websocket/wss_client_asr.py b/funasr/runtime/python/websocket/wss_client_asr.py
index 0f1d1d0..2b3f875 100644
--- a/funasr/runtime/python/websocket/wss_client_asr.py
+++ b/funasr/runtime/python/websocket/wss_client_asr.py
@@ -42,10 +42,10 @@
action="store_true",
default=True,
help="if audio_in is set, send_without_sleep")
-parser.add_argument("--test_thread_num",
+parser.add_argument("--thread_num",
type=int,
default=1,
- help="test_thread_num")
+ help="thread_num")
parser.add_argument("--words_max_print",
type=int,
default=10000,
@@ -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 = ""
@@ -234,6 +218,7 @@
text_print = text_print[-args.words_max_print:]
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)
@@ -311,16 +295,16 @@
f'Not supported audio type: {audio_type}')
total_len = len(wavs)
- if total_len >= args.test_thread_num:
- chunk_size = int(total_len / args.test_thread_num)
- remain_wavs = total_len - chunk_size * args.test_thread_num
+ if total_len >= args.thread_num:
+ chunk_size = int(total_len / args.thread_num)
+ remain_wavs = total_len - chunk_size * args.thread_num
else:
chunk_size = 1
remain_wavs = 0
process_list = []
chunk_begin = 0
- for i in range(args.test_thread_num):
+ for i in range(args.thread_num):
now_chunk_size = chunk_size
if remain_wavs > 0:
now_chunk_size = chunk_size + 1
--
Gitblit v1.9.1