From b639e136b4a37400e569fbd0e64dc5aed066ce33 Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期六, 06 五月 2023 22:15:10 +0800
Subject: [PATCH] Merge pull request #466 from zhaomingwork/fix_bug_for_python_websocket
---
funasr/runtime/python/websocket/ws_server_online.py | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/funasr/runtime/python/websocket/ws_server_online.py b/funasr/runtime/python/websocket/ws_server_online.py
index 7ef0e21..a395d73 100644
--- a/funasr/runtime/python/websocket/ws_server_online.py
+++ b/funasr/runtime/python/websocket/ws_server_online.py
@@ -41,8 +41,6 @@
websocket_users.add(websocket)
websocket.param_dict_asr_online = {"cache": dict()}
websocket.speek_online = Queue()
- ss_online = threading.Thread(target=asr_online, args=(websocket,))
- ss_online.start()
try:
async for message in websocket:
@@ -56,18 +54,12 @@
websocket.param_dict_asr_online["chunk_size"] = message["chunk_size"]
-
frames_online.append(audio)
-
if len(frames_online) % message["chunk_interval"] == 0 or not is_speaking:
-
audio_in = b"".join(frames_online)
- websocket.speek_online.put(audio_in)
+ await async_asr_online(websocket,audio_in)
frames_online = []
- if not websocket.send_msg.empty():
- await websocket.send(websocket.send_msg.get())
- websocket.send_msg.task_done()
except websockets.ConnectionClosed:
@@ -78,29 +70,21 @@
except Exception as e:
print("Exception:", e)
-
-
-def asr_online(websocket): # ASR鎺ㄧ悊
- global websocket_users
- while websocket in websocket_users:
- if not websocket.speek_online.empty():
- audio_in = websocket.speek_online.get()
- websocket.speek_online.task_done()
+async def async_asr_online(websocket,audio_in): # ASR鎺ㄧ悊
if len(audio_in) > 0:
- # print(len(audio_in))
audio_in = load_bytes(audio_in)
rec_result = inference_pipeline_asr_online(audio_in=audio_in,
param_dict=websocket.param_dict_asr_online)
if websocket.param_dict_asr_online["is_final"]:
websocket.param_dict_asr_online["cache"] = dict()
-
if "text" in rec_result:
if rec_result["text"] != "sil" and rec_result["text"] != "waiting_for_more_voice":
- print(rec_result["text"])
+ if len(rec_result["text"])>0:
+ rec_result["text"][0]=rec_result["text"][0].replace(" ","")
message = json.dumps({"mode": "online", "text": rec_result["text"]})
- websocket.send_msg.put(message)
-
- time.sleep(0.005)
+ await websocket.send(message)
+
+
start_server = websockets.serve(ws_serve, args.host, args.port, subprotocols=["binary"], ping_interval=None)
--
Gitblit v1.9.1