From 4137f5cf26e7c4b40853959cd2574edfde03aa60 Mon Sep 17 00:00:00 2001
From: 志浩 <neo.dzh@alibaba-inc.com>
Date: 星期五, 07 四月 2023 21:03:34 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR into dev_dzh
---
funasr/runtime/python/grpc/grpc_server.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/funasr/runtime/python/grpc/grpc_server.py b/funasr/runtime/python/grpc/grpc_server.py
index 95fe96c..4fd4f95 100644
--- a/funasr/runtime/python/grpc/grpc_server.py
+++ b/funasr/runtime/python/grpc/grpc_server.py
@@ -8,7 +8,7 @@
class ASRServicer(paraformer_pb2_grpc.ASRServicer):
- def __init__(self, user_allowed, model, sample_rate, backend, onnx_dir):
+ def __init__(self, user_allowed, model, sample_rate, backend, onnx_dir, vad_model='', punc_model=''):
print("ASRServicer init")
self.backend = backend
self.init_flag = 0
@@ -21,10 +21,10 @@
from modelscope.utils.constant import Tasks
except ImportError:
raise ImportError(f"Please install modelscope")
- self.inference_16k_pipeline = pipeline(task=Tasks.auto_speech_recognition, model=model)
+ self.inference_16k_pipeline = pipeline(task=Tasks.auto_speech_recognition, model=model, vad_model=vad_model, punc_model=punc_model)
elif self.backend == "onnxruntime":
try:
- from rapid_paraformer.paraformer_onnx import Paraformer
+ from funasr_onnx import Paraformer
except ImportError:
raise ImportError(f"Please install onnxruntime environment")
self.inference_16k_pipeline = Paraformer(model_dir=onnx_dir)
@@ -109,7 +109,7 @@
else:
asr_result = ""
elif self.backend == "onnxruntime":
- from rapid_paraformer.utils.frontend import load_bytes
+ from funasr_onnx.utils.frontend import load_bytes
array = load_bytes(tmp_data)
asr_result = self.inference_16k_pipeline(array)[0]
end_time = int(round(time.time() * 1000))
--
Gitblit v1.9.1