From 6427c834dfd97b1f05c6659cdc7ccf010bf82fe1 Mon Sep 17 00:00:00 2001
From: 嘉渊 <wangjiaming.wjm@alibaba-inc.com>
Date: 星期一, 24 四月 2023 19:50:07 +0800
Subject: [PATCH] update

---
 funasr/runtime/python/websocket/ASR_client.py |   89 +++++++++++++++++++++++++++++---------------
 1 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/funasr/runtime/python/websocket/ASR_client.py b/funasr/runtime/python/websocket/ASR_client.py
index 7dce880..fe67981 100644
--- a/funasr/runtime/python/websocket/ASR_client.py
+++ b/funasr/runtime/python/websocket/ASR_client.py
@@ -1,37 +1,42 @@
 import pyaudio
-import websocket #鍖哄埆鏈嶅姟绔繖閲屾槸 websocket-client搴�
+# import websocket #鍖哄埆鏈嶅姟绔繖閲屾槸 websocket-client搴�
 import time
 import websockets
 import asyncio
 from queue import Queue
-import threading
+# import threading
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--host",
+                    type=str,
+                    default="localhost",
+                    required=False,
+                    help="host ip, localhost, 0.0.0.0")
+parser.add_argument("--port",
+                    type=int,
+                    default=10095,
+                    required=False,
+                    help="grpc server port")
+parser.add_argument("--chunk_size",
+                    type=int,
+                    default=300,
+                    help="ms")
+
+args = parser.parse_args()
+
 voices = Queue()
-async def hello():
-    global ws # 瀹氫箟涓�涓叏灞�鍙橀噺ws锛岀敤浜庝繚瀛榳ebsocket杩炴帴瀵硅薄
-    uri = "ws://localhost:8899"
-    ws = await websockets.connect(uri, subprotocols=["binary"]) # 鍒涘缓涓�涓暱杩炴帴
-    ws.max_size = 1024 * 1024 * 20
-    print("connected ws server")
-async def send(data):
-    global ws # 寮曠敤鍏ㄥ眬鍙橀噺ws
-    try:
-        await ws.send(data) # 閫氳繃ws瀵硅薄鍙戦�佹暟鎹�
-    except Exception as e:
-        print('Exception occurred:', e)
+
+
     
-
-
-asyncio.get_event_loop().run_until_complete(hello()) # 鍚姩鍗忕▼  
-
-
 # 鍏朵粬鍑芥暟鍙互閫氳繃璋冪敤send(data)鏉ュ彂閫佹暟鎹紝渚嬪锛�
-async def test():
+async def record():
     #print("2")
-    global voices
+    global voices 
     FORMAT = pyaudio.paInt16
     CHANNELS = 1
     RATE = 16000
-    CHUNK = int(RATE / 1000 * 300)
+    CHUNK = int(RATE / 1000 * args.chunk_size)
 
     p = pyaudio.PyAudio()
 
@@ -47,27 +52,49 @@
         
         voices.put(data)
         #print(voices.qsize())
+
         await asyncio.sleep(0.01)
     
-      
-
 
 
 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()
-            await send(data)
+            try:
+                await websocket.send(data) # 閫氳繃ws瀵硅薄鍙戦�佹暟鎹�
+            except Exception as e:
+                print('Exception occurred:', e)
             await asyncio.sleep(0.01)
         await asyncio.sleep(0.01)
 
-async def main():
-    task = asyncio.create_task(test()) # 鍒涘缓涓�涓悗鍙颁换鍔�
-    task2 = asyncio.create_task(ws_send()) # 鍒涘缓涓�涓悗鍙颁换鍔�
-     
-    await asyncio.gather(task, task2)
 
-asyncio.run(main())
\ No newline at end of file
+
+async def message():
+    global websocket
+    while True:
+        try:
+            print(await websocket.recv())
+        except Exception as e:
+            print("Exception:", e)          
+        
+
+
+async def ws_client():
+    global websocket # 瀹氫箟涓�涓叏灞�鍙橀噺ws锛岀敤浜庝繚瀛榳ebsocket杩炴帴瀵硅薄
+    # uri = "ws://11.167.134.197:8899"
+    uri = "ws://{}:{}".format(args.host, args.port)
+    #ws = await websockets.connect(uri, subprotocols=["binary"]) # 鍒涘缓涓�涓暱杩炴帴
+    async for websocket in websockets.connect(uri, subprotocols=["binary"], ping_interval=None):
+        task = asyncio.create_task(record()) # 鍒涘缓涓�涓悗鍙颁换鍔″綍闊�
+        task2 = asyncio.create_task(ws_send()) # 鍒涘缓涓�涓悗鍙颁换鍔″彂閫�
+        task3 = asyncio.create_task(message()) # 鍒涘缓涓�涓悗鍙版帴鏀舵秷鎭殑浠诲姟
+        await asyncio.gather(task, task2, task3)
+
+
+asyncio.get_event_loop().run_until_complete(ws_client()) # 鍚姩鍗忕▼
+asyncio.get_event_loop().run_forever()

--
Gitblit v1.9.1