From b18f7d121f2f17df8bf2d0c2bbb223bc5ddbcc0f Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期四, 25 五月 2023 16:11:22 +0800
Subject: [PATCH] docs
---
funasr/runtime/python/websocket/ws_client.py | 97 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 40 deletions(-)
diff --git a/funasr/runtime/python/websocket/ws_client.py b/funasr/runtime/python/websocket/ws_client.py
index 7ae44df..f7dfcaf 100644
--- a/funasr/runtime/python/websocket/ws_client.py
+++ b/funasr/runtime/python/websocket/ws_client.py
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
import os
import time
-import websockets
+import websockets,ssl
import asyncio
# import threading
import argparse
@@ -47,12 +47,17 @@
help="test_thread_num")
parser.add_argument("--words_max_print",
type=int,
- default=100,
+ default=10000,
help="chunk")
parser.add_argument("--output_dir",
type=str,
default=None,
help="output_dir")
+
+parser.add_argument("--ssl",
+ type=int,
+ default=1,
+ help="1 for ssl connect, 0 for no ssl")
args = parser.parse_args()
args.chunk_size = [int(x) for x in args.chunk_size.split(",")]
@@ -85,9 +90,8 @@
input=True,
frames_per_buffer=CHUNK)
- message = json.dumps({"chunk_size": args.chunk_size, "chunk_interval": args.chunk_interval, "wav_name": wav_name,"is_speaking": True})
+ message = json.dumps({"chunk_size": args.chunk_size, "chunk_interval": args.chunk_interval, "wav_name": "microphone", "is_speaking": True})
voices.put(message)
- is_speaking = True
while True:
data = stream.read(CHUNK)
@@ -146,9 +150,6 @@
sleep_duration = 0.001 if args.send_without_sleep else 60*args.chunk_size[1]/args.chunk_interval/1000
await asyncio.sleep(sleep_duration)
- is_finished = True
- message = json.dumps({"is_finished": is_finished})
- voices.put(message)
async def ws_send():
global voices
@@ -185,7 +186,7 @@
ibest_writer["text"][wav_name] = text
if meg["mode"] == "online":
- text_print += " {}".format(text)
+ text_print += "{}".format(text)
text_print = text_print[-args.words_max_print:]
os.system('clear')
print("\rpid"+str(id)+": "+text_print)
@@ -196,7 +197,7 @@
print("\rpid"+str(id)+": "+text_print)
else:
if meg["mode"] == "2pass-online":
- text_print_2pass_online += " {}".format(text)
+ text_print_2pass_online += "{}".format(text)
text_print = text_print_2pass_offline + text_print_2pass_online
else:
text_print_2pass_online = ""
@@ -225,8 +226,16 @@
async def ws_client(id,chunk_begin,chunk_size):
global websocket
- uri = "ws://{}:{}".format(args.host, args.port)
- async for websocket in websockets.connect(uri, subprotocols=["binary"], ping_interval=None):
+ if args.ssl==1:
+ ssl_context = ssl.SSLContext()
+ ssl_context.check_hostname = False
+ ssl_context.verify_mode = ssl.CERT_NONE
+ uri = "wss://{}:{}".format(args.host, args.port)
+ else:
+ uri = "ws://{}:{}".format(args.host, args.port)
+ ssl_context=None
+ print("connect to",uri)
+ async for websocket in websockets.connect(uri, subprotocols=["binary"], ping_interval=None,ssl=ssl_context):
if args.audio_in is not None:
task = asyncio.create_task(record_from_scp(chunk_begin,chunk_size))
else:
@@ -241,35 +250,43 @@
if __name__ == '__main__':
- # calculate the number of wavs for each preocess
- if args.audio_in.endswith(".scp"):
- f_scp = open(args.audio_in)
- wavs = f_scp.readlines()
- else:
- wavs = [args.audio_in]
- 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
- else:
- chunk_size=0
-
- process_list = []
- chunk_begin=0
- for i in range(args.test_thread_num):
- now_chunk_size= chunk_size
- if remain_wavs>0:
- now_chunk_size=chunk_size+1
- remain_wavs=remain_wavs-1
- # process i handle wavs at chunk_begin and size of now_chunk_size
- p = Process(target=one_thread,args=(i,chunk_begin,now_chunk_size))
- chunk_begin=chunk_begin+now_chunk_size
- p.start()
- process_list.append(p)
+ # for microphone
+ if args.audio_in is None:
+ p = Process(target=one_thread,args=(0, 0, 0))
+ p.start()
+ p.join()
+ print('end')
+ else:
+ # calculate the number of wavs for each preocess
+ if args.audio_in.endswith(".scp"):
+ f_scp = open(args.audio_in)
+ wavs = f_scp.readlines()
+ else:
+ wavs = [args.audio_in]
+ 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
+ else:
+ chunk_size=1
+ remain_wavs=0
- for i in process_list:
- p.join()
+ process_list = []
+ chunk_begin=0
+ for i in range(args.test_thread_num):
+ now_chunk_size= chunk_size
+ if remain_wavs>0:
+ now_chunk_size=chunk_size+1
+ remain_wavs=remain_wavs-1
+ # process i handle wavs at chunk_begin and size of now_chunk_size
+ p = Process(target=one_thread,args=(i,chunk_begin,now_chunk_size))
+ chunk_begin=chunk_begin+now_chunk_size
+ p.start()
+ process_list.append(p)
- print('end')
-
+ for i in process_list:
+ p.join()
+
+ print('end')
+
--
Gitblit v1.9.1