From 7314f0795c47f09d3ccc0ed81dc4a51a483b64f6 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期四, 13 七月 2023 18:00:53 +0800
Subject: [PATCH] websocket bug

---
 /dev/null                                            |    0 
 funasr/runtime/python/websocket/funasr_wss_client.py |    1 +
 funasr/runtime/python/websocket/funasr_wss_server.py |    6 ++++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/funasr/runtime/html5/demo.gif b/funasr/runtime/html5/demo.gif
deleted file mode 100644
index f487f2c..0000000
--- a/funasr/runtime/html5/demo.gif
+++ /dev/null
Binary files differ
diff --git a/funasr/runtime/python/websocket/funasr_wss_client.py b/funasr/runtime/python/websocket/funasr_wss_client.py
index 72121f7..264014f 100644
--- a/funasr/runtime/python/websocket/funasr_wss_client.py
+++ b/funasr/runtime/python/websocket/funasr_wss_client.py
@@ -204,6 +204,7 @@
         
             meg = await websocket.recv()
             meg = json.loads(meg)
+            print(meg)
             wav_name = meg.get("wav_name", "demo")
             text = meg["text"]
 
diff --git a/funasr/runtime/python/websocket/funasr_wss_server.py b/funasr/runtime/python/websocket/funasr_wss_server.py
index 4929090..2aff9ba 100644
--- a/funasr/runtime/python/websocket/funasr_wss_server.py
+++ b/funasr/runtime/python/websocket/funasr_wss_server.py
@@ -240,7 +240,8 @@
                                                          param_dict=websocket.param_dict_punc)
                     # print("offline", rec_result)
                 if 'text' in rec_result:
-                    message = json.dumps({"mode": websocket.mode, "text": rec_result["text"], "wav_name": websocket.wav_name})
+                    mode = "2pass-offline" if "2pass" in websocket.mode else websocket.mode
+                    message = json.dumps({"mode": mode, "text": rec_result["text"], "wav_name": websocket.wav_name})
                     await websocket.send(message)
 
 
@@ -256,7 +257,8 @@
         if "text" in rec_result:
             if rec_result["text"] != "sil" and rec_result["text"] != "waiting_for_more_voice":
                 # print("online", rec_result)
-                message = json.dumps({"mode": websocket.mode, "text": rec_result["text"], "wav_name": websocket.wav_name})
+                mode = "2pass-online" if "2pass" in websocket.mode else websocket.mode
+                message = json.dumps({"mode": mode, "text": rec_result["text"], "wav_name": websocket.wav_name})
                 await websocket.send(message)
 
 if len(args.certfile)>0:

--
Gitblit v1.9.1