游雁 2 лет назад
Родитель
Сommit
7314f0795c

BIN
funasr/runtime/html5/demo.gif


+ 1 - 0
funasr/runtime/python/websocket/funasr_wss_client.py

@@ -204,6 +204,7 @@ async def message(id):
         
         
             meg = await websocket.recv()
             meg = await websocket.recv()
             meg = json.loads(meg)
             meg = json.loads(meg)
+            print(meg)
             wav_name = meg.get("wav_name", "demo")
             wav_name = meg.get("wav_name", "demo")
             text = meg["text"]
             text = meg["text"]
 
 

+ 4 - 2
funasr/runtime/python/websocket/funasr_wss_server.py

@@ -240,7 +240,8 @@ async def async_asr(websocket, audio_in):
                                                          param_dict=websocket.param_dict_punc)
                                                          param_dict=websocket.param_dict_punc)
                     # print("offline", rec_result)
                     # print("offline", rec_result)
                 if 'text' in 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)
                     await websocket.send(message)
 
 
 
 
@@ -256,7 +257,8 @@ async def async_asr_online(websocket, audio_in):
         if "text" in rec_result:
         if "text" in rec_result:
             if rec_result["text"] != "sil" and rec_result["text"] != "waiting_for_more_voice":
             if rec_result["text"] != "sil" and rec_result["text"] != "waiting_for_more_voice":
                 # print("online", rec_result)
                 # 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)
                 await websocket.send(message)
 
 
 if len(args.certfile)>0:
 if len(args.certfile)>0: