From 4e44c9f46e550eab4ec6b70c099dcdae44eb9d61 Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期四, 23 三月 2023 20:34:21 +0800
Subject: [PATCH] Merge pull request #288 from alibaba-damo-academy/dev_gzf
---
funasr/runtime/python/websocket/ASR_server.py | 20 +++++++++++---------
funasr/punctuation/espnet_model.py | 4 ++--
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/funasr/punctuation/espnet_model.py b/funasr/punctuation/espnet_model.py
index c513779..7266b38 100644
--- a/funasr/punctuation/espnet_model.py
+++ b/funasr/punctuation/espnet_model.py
@@ -24,8 +24,8 @@
# ignore_id may be assumed as 0, shared with CTC-blank symbol for ASR.
self.ignore_id = ignore_id
- if self.punc_model.with_vad():
- print("This is a vad puncuation model.")
+ #if self.punc_model.with_vad():
+ # print("This is a vad puncuation model.")
def nll(
self,
diff --git a/funasr/runtime/python/websocket/ASR_server.py b/funasr/runtime/python/websocket/ASR_server.py
index 17f73bb..9d0fd0b 100644
--- a/funasr/runtime/python/websocket/ASR_server.py
+++ b/funasr/runtime/python/websocket/ASR_server.py
@@ -70,14 +70,16 @@
param_dict=param_dict_asr,
ngpu=args.ngpu,
)
-
-param_dict_punc = {'cache': list()}
-inference_pipeline_punc = pipeline(
- task=Tasks.punctuation,
- model=args.punc_model,
- model_revision=None,
- ngpu=args.ngpu,
-)
+if args.punc_model is not None:
+ param_dict_punc = {'cache': list()}
+ inference_pipeline_punc = pipeline(
+ task=Tasks.punctuation,
+ model=args.punc_model,
+ model_revision=None,
+ ngpu=args.ngpu,
+ )
+else:
+ inference_pipeline_punc = None
print("model loaded")
@@ -124,7 +126,7 @@
speek.task_done()
if len(audio_in) > 0:
rec_result = inference_pipeline_asr(audio_in=audio_in)
- if 'text' in rec_result:
+ if inference_pipeline_punc is not None and 'text' in rec_result:
rec_result = inference_pipeline_punc(text_in=rec_result['text'], param_dict=param_dict_punc)
print(rec_result["text"])
time.sleep(0.1)
--
Gitblit v1.9.1