From 748fabf22fee0de834d8cd4a7bec0ba4a456d8c4 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 05 七月 2023 16:45:06 +0800
Subject: [PATCH] funasr sdk
---
funasr/runtime/python/websocket/funasr_wss_client.py | 37 +++++++++++++++++--------------------
funasr/runtime/python/websocket/funasr_wss_server.py | 4 ++--
funasr/runtime/docs/SDK_tutorial.md | 6 +++---
funasr/runtime/docs/SDK_tutorial_zh.md | 4 ++--
funasr/runtime/docs/SDK_advanced_guide_offline.md | 2 +-
funasr/runtime/docs/SDK_advanced_guide_offline_zh.md | 2 +-
6 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/funasr/runtime/docs/SDK_advanced_guide_offline.md b/funasr/runtime/docs/SDK_advanced_guide_offline.md
index 6dd468d..4bbc69c 100644
--- a/funasr/runtime/docs/SDK_advanced_guide_offline.md
+++ b/funasr/runtime/docs/SDK_advanced_guide_offline.md
@@ -169,7 +169,7 @@
### python-client
```shell
-python wss_client_asr.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "./data/wav.scp" --send_without_sleep --output_dir "./results"
+python funasr_wss_client.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "./data/wav.scp" --send_without_sleep --output_dir "./results"
```
Introduction to command parameters:
diff --git a/funasr/runtime/docs/SDK_advanced_guide_offline_zh.md b/funasr/runtime/docs/SDK_advanced_guide_offline_zh.md
index b3fe980..7b864fb 100644
--- a/funasr/runtime/docs/SDK_advanced_guide_offline_zh.md
+++ b/funasr/runtime/docs/SDK_advanced_guide_offline_zh.md
@@ -186,7 +186,7 @@
### python-client
```shell
-python wss_client_asr.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "./data/wav.scp" --send_without_sleep --output_dir "./results"
+python funasr_wss_client.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "./data/wav.scp" --send_without_sleep --output_dir "./results"
```
鍛戒护鍙傛暟浠嬬粛锛�
```text
diff --git a/funasr/runtime/docs/SDK_tutorial.md b/funasr/runtime/docs/SDK_tutorial.md
index 0943466..c8f9971 100644
--- a/funasr/runtime/docs/SDK_tutorial.md
+++ b/funasr/runtime/docs/SDK_tutorial.md
@@ -275,7 +275,7 @@
Looking in indexes: http://mirrors.cloud.aliyuncs.com/pypi/simple/
Requirement already satisfied: websockets in /usr/local/lib/python3.8/dist-packages (from -r /root/funasr_samples/python/requirements_client.txt (line 1)) (11.0.3)
- Run python3 /root/funasr_samples/python/wss_client_asr.py --host 127.0.0.1 --port 10095 --mode offline --audio_in /root/funasr_samples/audio/asr_example.wav --send_without_sleep --output_dir ./funasr_samples/python
+ Run python3 /root/funasr_samples/python/funasr_wss_client.py --host 127.0.0.1 --port 10095 --mode offline --audio_in /root/funasr_samples/audio/asr_example.wav --send_without_sleep --output_dir ./funasr_samples/python
...
...
@@ -284,7 +284,7 @@
Exception: sent 1000 (OK); then received 1000 (OK)
end
- If failed, you can try (python3 /root/funasr_samples/python/wss_client_asr.py --host 127.0.0.1 --port 10095 --mode offline --audio_in /root/funasr_samples/audio/asr_example.wav --send_without_sleep --output_dir ./funasr_samples/python) in your Shell.
+ If failed, you can try (python3 /root/funasr_samples/python/funasr_wss_client.py --host 127.0.0.1 --port 10095 --mode offline --audio_in /root/funasr_samples/audio/asr_example.wav --send_without_sleep --output_dir ./funasr_samples/python) in your Shell.
```
@@ -292,7 +292,7 @@
If you want to directly run the client for testing, you can refer to the following simple instructions, taking the Python version as an example:
```shell
-python3 wss_client_asr.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "../audio/asr_example.wav" --send_without_sleep --output_dir "./results"
+python3 funasr_wss_client.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "../audio/asr_example.wav" --send_without_sleep --output_dir "./results"
```
Command parameter instructions:
diff --git a/funasr/runtime/docs/SDK_tutorial_zh.md b/funasr/runtime/docs/SDK_tutorial_zh.md
index e6c0199..08ecf8a 100644
--- a/funasr/runtime/docs/SDK_tutorial_zh.md
+++ b/funasr/runtime/docs/SDK_tutorial_zh.md
@@ -37,7 +37,7 @@
鎴戜滑浠ython璇█瀹㈡埛绔负渚嬶紝杩涜璇存槑锛屾敮鎸佸绉嶉煶棰戞牸寮忚緭鍏ワ紙.wav, .pcm, .mp3绛夛級锛屼篃鏀寔瑙嗛杈撳叆(.mp4绛�)锛屼互鍙婂鏂囦欢鍒楄〃wav.scp杈撳叆锛屽叾浠栫増鏈鎴风璇峰弬鑰冩枃妗ｏ紙[鐐瑰嚮姝ゅ](#瀹㈡埛绔敤娉曡瑙�)锛�
```shell
-python3 wss_client_asr.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "../audio/asr_example.wav" --output_dir "./results"
+python3 funasr_wss_client.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "../audio/asr_example.wav" --output_dir "./results"
```
## 瀹㈡埛绔敤娉曡瑙�
@@ -56,7 +56,7 @@
鑻ユ兂鐩存帴杩愯client杩涜娴嬭瘯锛屽彲鍙傝�冨涓嬬畝鏄撹鏄庯紝浠ython鐗堟湰涓轰緥锛�
```shell
-python3 wss_client_asr.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "../audio/asr_example.wav" --output_dir "./results"
+python3 funasr_wss_client.py --host "127.0.0.1" --port 10095 --mode offline --audio_in "../audio/asr_example.wav" --output_dir "./results"
```
鍛戒护鍙傛暟璇存槑锛�
diff --git a/funasr/runtime/python/websocket/funasr_wss_client.py b/funasr/runtime/python/websocket/funasr_wss_client.py
index fc4d516..a3f5405 100644
--- a/funasr/runtime/python/websocket/funasr_wss_client.py
+++ b/funasr/runtime/python/websocket/funasr_wss_client.py
@@ -8,7 +8,7 @@
import json
import traceback
from multiprocessing import Process
-from funasr.fileio.datadir_writer import DatadirWriter
+# from funasr.fileio.datadir_writer import DatadirWriter
import logging
@@ -72,11 +72,13 @@
voices = Queue()
offline_msg_done=False
-
-ibest_writer = None
+
if args.output_dir is not None:
- writer = DatadirWriter(args.output_dir)
- ibest_writer = writer[f"1best_recog"]
+ # if os.path.exists(args.output_dir):
+ # os.remove(args.output_dir)
+
+ if not os.path.exists(args.output_dir):
+ os.makedirs(args.output_dir)
async def record_microphone():
@@ -186,6 +188,10 @@
text_print = ""
text_print_2pass_online = ""
text_print_2pass_offline = ""
+ if args.output_dir is not None:
+ ibest_writer = open(os.path.join(args.output_dir, "text.{}".format(id)), "w+", encoding="utf-8")
+ else:
+ ibest_writer = None
try:
while True:
@@ -193,13 +199,15 @@
meg = json.loads(meg)
wav_name = meg.get("wav_name", "demo")
text = meg["text"]
- if ibest_writer is not None:
- ibest_writer["text"][wav_name] = text
+ if ibest_writer is not None:
+ text_write_line = "{}\t{}\n".format(wav_name, text)
+ ibest_writer.write(text_write_line)
+
if meg["mode"] == "online":
text_print += "{}".format(text)
text_print = text_print[-args.words_max_print:]
- # os.system('clear')
+ os.system('clear')
print("\rpid" + str(id) + ": " + text_print)
elif meg["mode"] == "offline":
text_print += "{}".format(text)
@@ -216,7 +224,7 @@
text_print = text_print_2pass_offline + "{}".format(text)
text_print_2pass_offline += "{}".format(text)
text_print = text_print[-args.words_max_print:]
- # os.system('clear')
+ os.system('clear')
print("\rpid" + str(id) + ": " + text_print)
offline_msg_done=True
@@ -227,17 +235,6 @@
-async def print_messge():
- global websocket
- while True:
- try:
- meg = await websocket.recv()
- meg = json.loads(meg)
- print(meg)
- except Exception as e:
- print("Exception:", e)
- #traceback.print_exc()
- exit(0)
async def ws_client(id, chunk_begin, chunk_size):
if args.audio_in is None:
diff --git a/funasr/runtime/python/websocket/funasr_wss_server.py b/funasr/runtime/python/websocket/funasr_wss_server.py
index fd039ae..821f847 100644
--- a/funasr/runtime/python/websocket/funasr_wss_server.py
+++ b/funasr/runtime/python/websocket/funasr_wss_server.py
@@ -243,7 +243,7 @@
param_dict=websocket.param_dict_punc)
# print("offline", rec_result)
if 'text' in rec_result:
- message = json.dumps({"mode": "2pass-offline", "text": rec_result["text"], "wav_name": websocket.wav_name})
+ message = json.dumps({"mode": websocket.mode, "text": rec_result["text"], "wav_name": websocket.wav_name})
await websocket.send(message)
@@ -260,7 +260,7 @@
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": "2pass-online", "text": rec_result["text"], "wav_name": websocket.wav_name})
+ message = json.dumps({"mode": websocket.mode, "text": rec_result["text"], "wav_name": websocket.wav_name})
await websocket.send(message)
if len(args.certfile)>0:
--
Gitblit v1.9.1