From 63a1799fa9199e1200e2623daf081d46f62bad95 Mon Sep 17 00:00:00 2001 From: WilliamZhang06 Date: Mon, 24 Jan 2022 19:43:27 +0800 Subject: [PATCH 1/2] added engine framework, test=asr --- speechserving/setup.py | 13 ++++ speechserving/speechserving/__init__.py | 13 ++++ speechserving/speechserving/bin/main.py | 16 +++-- .../speechserving/bin/paddlespeech-client.py | 16 +++-- .../speechserving/bin/paddlespeech-server.py | 16 +++-- .../speechserving/conf/application.yaml | 8 +++ .../speechserving/engine/__init__.py | 13 ++++ .../engine/asr/python/asr_engine.py | 17 +++-- .../speechserving/engine/base_engine.py | 1 + speechserving/speechserving/main.py | 42 +++++++++--- .../speechserving/restful/__init__.py | 13 ++++ speechserving/speechserving/restful/api.py | 20 ++---- .../speechserving/restful/asr_api.py | 63 ++++++++++++++++++ .../speechserving/restful/request.py | 10 +-- .../speechserving/restful/response.py | 7 +- .../{controller/api.py => restful/tts_api.py} | 37 +++-------- speechserving/speechserving/utils/__init__.py | 0 speechserving/speechserving/utils/errors.py | 0 speechserving/speechserving/utils/log.py | 59 +++++++++++++++++ speechserving/tests/http_client.py | 66 +++++++++++++++++++ 20 files changed, 345 insertions(+), 85 deletions(-) create mode 100644 speechserving/speechserving/restful/asr_api.py rename speechserving/speechserving/{controller/api.py => restful/tts_api.py} (58%) create mode 100644 speechserving/speechserving/utils/__init__.py create mode 100644 speechserving/speechserving/utils/errors.py create mode 100644 speechserving/speechserving/utils/log.py create mode 100644 speechserving/tests/http_client.py diff --git a/speechserving/setup.py b/speechserving/setup.py index e69de29b..97043fd7 100644 --- a/speechserving/setup.py +++ b/speechserving/setup.py @@ -0,0 +1,13 @@ +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/speechserving/speechserving/__init__.py b/speechserving/speechserving/__init__.py index e69de29b..97043fd7 100644 --- a/speechserving/speechserving/__init__.py +++ b/speechserving/speechserving/__init__.py @@ -0,0 +1,13 @@ +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/speechserving/speechserving/bin/main.py b/speechserving/speechserving/bin/main.py index ffc2228f..c5167dd4 100644 --- a/speechserving/speechserving/bin/main.py +++ b/speechserving/speechserving/bin/main.py @@ -14,7 +14,6 @@ import argparse - def init(args): """ 系统初始化 """ @@ -27,13 +26,18 @@ def main(args): app.run(host='0.0.0.0', port=conf.port) - if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("--config_file", action="store", - help="yaml file of the app", default="./conf/application.yaml") - parser.add_argument("--log_file", action="store", - help="log file", default="./log/paddlespeech.log") + parser.add_argument( + "--config_file", + action="store", + help="yaml file of the app", + default="./conf/application.yaml") + parser.add_argument( + "--log_file", + action="store", + help="log file", + default="./log/paddlespeech.log") args = parser.parse_args() main(args) diff --git a/speechserving/speechserving/bin/paddlespeech-client.py b/speechserving/speechserving/bin/paddlespeech-client.py index ffc2228f..c5167dd4 100644 --- a/speechserving/speechserving/bin/paddlespeech-client.py +++ b/speechserving/speechserving/bin/paddlespeech-client.py @@ -14,7 +14,6 @@ import argparse - def init(args): """ 系统初始化 """ @@ -27,13 +26,18 @@ def main(args): app.run(host='0.0.0.0', port=conf.port) - if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("--config_file", action="store", - help="yaml file of the app", default="./conf/application.yaml") - parser.add_argument("--log_file", action="store", - help="log file", default="./log/paddlespeech.log") + parser.add_argument( + "--config_file", + action="store", + help="yaml file of the app", + default="./conf/application.yaml") + parser.add_argument( + "--log_file", + action="store", + help="log file", + default="./log/paddlespeech.log") args = parser.parse_args() main(args) diff --git a/speechserving/speechserving/bin/paddlespeech-server.py b/speechserving/speechserving/bin/paddlespeech-server.py index ffc2228f..c5167dd4 100644 --- a/speechserving/speechserving/bin/paddlespeech-server.py +++ b/speechserving/speechserving/bin/paddlespeech-server.py @@ -14,7 +14,6 @@ import argparse - def init(args): """ 系统初始化 """ @@ -27,13 +26,18 @@ def main(args): app.run(host='0.0.0.0', port=conf.port) - if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("--config_file", action="store", - help="yaml file of the app", default="./conf/application.yaml") - parser.add_argument("--log_file", action="store", - help="log file", default="./log/paddlespeech.log") + parser.add_argument( + "--config_file", + action="store", + help="yaml file of the app", + default="./conf/application.yaml") + parser.add_argument( + "--log_file", + action="store", + help="log file", + default="./log/paddlespeech.log") args = parser.parse_args() main(args) diff --git a/speechserving/speechserving/conf/application.yaml b/speechserving/speechserving/conf/application.yaml index e69de29b..358a76dc 100644 --- a/speechserving/speechserving/conf/application.yaml +++ b/speechserving/speechserving/conf/application.yaml @@ -0,0 +1,8 @@ +# This is the parameter configuration file for PaddleSpeech Serving. + +################################################################## +# SERVER SETTING # +################################################################## +host: '0.0.0.0' +port: 8090 + diff --git a/speechserving/speechserving/engine/__init__.py b/speechserving/speechserving/engine/__init__.py index e69de29b..97043fd7 100644 --- a/speechserving/speechserving/engine/__init__.py +++ b/speechserving/speechserving/engine/__init__.py @@ -0,0 +1,13 @@ +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/speechserving/speechserving/engine/asr/python/asr_engine.py b/speechserving/speechserving/engine/asr/python/asr_engine.py index 1ea3cd2a..6bd8b616 100644 --- a/speechserving/speechserving/engine/asr/python/asr_engine.py +++ b/speechserving/speechserving/engine/asr/python/asr_engine.py @@ -11,15 +11,19 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from engine import BaseEngine +from engine.base_engine import BaseEngine + +from utils.log import logger __all__ = ['ASREngine'] -class ASREngine(BaseEngine): - def __init__(self, name): +class ASREngine(BaseEngine): + def __init__(self, name=None): super(ASREngine, self).__init__() - + self.executor = name + self.input = None + self.output = None def init(self): pass @@ -28,8 +32,8 @@ class ASREngine(BaseEngine): pass def run(self): - pass - + logger.info("start run asr engine") + return "hello world" if __name__ == "__main__": @@ -39,4 +43,3 @@ if __name__ == "__main__": print(class1 is class2) print(id(class1)) print(id(class2)) - diff --git a/speechserving/speechserving/engine/base_engine.py b/speechserving/speechserving/engine/base_engine.py index 1f9f6fa0..36048dcc 100644 --- a/speechserving/speechserving/engine/base_engine.py +++ b/speechserving/speechserving/engine/base_engine.py @@ -18,6 +18,7 @@ from typing import Union from pattern_singleton import Singleton + class BaseEngine(metaclass=Singleton): """ An base engine class diff --git a/speechserving/speechserving/main.py b/speechserving/speechserving/main.py index 91046984..8374b291 100644 --- a/speechserving/speechserving/main.py +++ b/speechserving/speechserving/main.py @@ -13,31 +13,55 @@ # limitations under the License. import argparse -import asr_api as api_run -import tts_api as api_run +import uvicorn +import yaml +from engine.asr.python.asr_engine import ASREngine +from fastapi import FastAPI +from restful.api import router as api_router +from utils.log import logger + +app = FastAPI( + title="PaddleSpeech Serving API", description="Api", version="0.0.1") def init(args): """ 系统初始化 """ + app.include_router(api_router) + + # engine single + ASR_ENGINE = ASREngine("asr") + + # todo others + + return True def main(args): """主程序入口""" - if init(args): - api_run.run() - app.run(host='0.0.0.0', port=conf.port) + #TODO configuration + from yacs.config import CfgNode + with open(args.config_file, 'rt') as f: + config = CfgNode(yaml.safe_load(f)) + if init(args): + uvicorn.run(app, host=config.host, port=config.port, debug=True) if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("--config_file", action="store", - help="yaml file of the app", default="./conf/application.yaml") - parser.add_argument("--log_file", action="store", - help="log file", default="./log/paddlespeech.log") + parser.add_argument( + "--config_file", + action="store", + help="yaml file of the app", + default="./conf/application.yaml") + parser.add_argument( + "--log_file", + action="store", + help="log file", + default="./log/paddlespeech.log") args = parser.parse_args() main(args) diff --git a/speechserving/speechserving/restful/__init__.py b/speechserving/speechserving/restful/__init__.py index e69de29b..97043fd7 100644 --- a/speechserving/speechserving/restful/__init__.py +++ b/speechserving/speechserving/restful/__init__.py @@ -0,0 +1,13 @@ +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/speechserving/speechserving/restful/api.py b/speechserving/speechserving/restful/api.py index 6324fac2..dc309fab 100644 --- a/speechserving/speechserving/restful/api.py +++ b/speechserving/speechserving/restful/api.py @@ -13,19 +13,9 @@ # limitations under the License. from fastapi import APIRouter -router = APIRouter() - - -router.include_router(auth_router) -router.include_router(user_router) -router.include_router(profile_router) -router.include_router(comment_router) -router.include_router(article_router) -router.include_router(tag_router) - +from .asr_api import router as asr_router +from .tts_api import router as tts_router - - -def init_app(app): - - app.include_router(router) +router = APIRouter() +router.include_router(asr_router) +router.include_router(tts_router) diff --git a/speechserving/speechserving/restful/asr_api.py b/speechserving/speechserving/restful/asr_api.py new file mode 100644 index 00000000..eb335e09 --- /dev/null +++ b/speechserving/speechserving/restful/asr_api.py @@ -0,0 +1,63 @@ +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +from fastapi import APIRouter +import base64 + + +from engine.asr.python.asr_engine import ASREngine +from .response import ASRResponse +from .request import ASRRequest + +router = APIRouter() + + +@router.get('/paddlespeech/asr/help') +def help(): + """help + + Returns: + json: [description] + """ + return {'hello': 'world'} + + +@router.post("/paddlespeech/asr", response_model=ASRResponse) +def asr(request_body: ASRRequest): + """asr api + + Args: + request_body (ASRRequest): [description] + + Returns: + json: [description] + """ + # single + asr_engine = ASREngine() + + asr_engine.init() + asr_results = asr_engine.run() + asr_engine.postprocess() + + json_body = { + "success": True, + "code": 0, + "message": { + "description": "success" + }, + "result": { + "transcription": asr_results + } + } + + return json_body diff --git a/speechserving/speechserving/restful/request.py b/speechserving/speechserving/restful/request.py index 4721decd..df47038f 100644 --- a/speechserving/speechserving/restful/request.py +++ b/speechserving/speechserving/restful/request.py @@ -11,14 +11,14 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from typing import Optional from typing import List +from typing import Optional from pydantic import BaseModel - __all__ = ['ASRRequest, TTSRequest'] + #****************************************************************************************/ #************************************ ASR request ***************************************/ #****************************************************************************************/ @@ -29,8 +29,8 @@ class ASRRequest(BaseModel): "audio": "exSI6ICJlbiIsCgkgICAgInBvc2l0aW9uIjogImZhbHNlIgoJf...", "audio_format": "wav", "sample_rate": 16000, - "lang ": "zh_cn", - "ptt ":false + "lang": "zh_cn", + "ptt":false } """ audio: str @@ -53,4 +53,4 @@ class TTSRequest(BaseModel): "lang ": "zh_cn", "ptt ":false } - """ \ No newline at end of file + """ diff --git a/speechserving/speechserving/restful/response.py b/speechserving/speechserving/restful/response.py index fdb07a84..de61c99c 100644 --- a/speechserving/speechserving/restful/response.py +++ b/speechserving/speechserving/restful/response.py @@ -11,8 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from typing import Optional from typing import List +from typing import Optional from pydantic import BaseModel @@ -22,12 +22,14 @@ __all__ = ['ASRResponse'] class Message(BaseModel): description: str + #****************************************************************************************/ #************************************ ASR response **************************************/ #****************************************************************************************/ class AsrResult(BaseModel): transcription: str + class ASRResponse(BaseModel): """ response example @@ -36,7 +38,7 @@ class ASRResponse(BaseModel): "code": 0, "message": { "description": "success" - } + }, "result": { "transcription": "你好，飞桨" } @@ -47,6 +49,7 @@ class ASRResponse(BaseModel): message: Message result: AsrResult + #****************************************************************************************/ #************************************ TTS response **************************************/ #****************************************************************************************/ diff --git a/speechserving/speechserving/controller/api.py b/speechserving/speechserving/restful/tts_api.py similarity index 58% rename from speechserving/speechserving/controller/api.py rename to speechserving/speechserving/restful/tts_api.py index 188dba30..05121718 100644 --- a/speechserving/speechserving/controller/api.py +++ b/speechserving/speechserving/restful/tts_api.py @@ -13,38 +13,17 @@ # limitations under the License. from fastapi import APIRouter -router = APIRouter() - - -router.include_router(auth_router) -router.include_router(user_router) -router.include_router(profile_router) -router.include_router(comment_router) -router.include_router(article_router) -router.include_router(tag_router) - - - - -def init_app(app): - - asr,tts - +router = APIRouter() - - - if asr - backend - dyload(asr) - asr.register_router(router) - if tts - backend - dyload(asr) +@router.get('/paddlespeech/tts/help') +def help(): + """help + Returns: + json: [description] + """ + return {'hello': 'world'} - asr.register_router(router) - app.include_router(router) - diff --git a/speechserving/speechserving/utils/__init__.py b/speechserving/speechserving/utils/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/speechserving/speechserving/utils/errors.py b/speechserving/speechserving/utils/errors.py new file mode 100644 index 00000000..e69de29b diff --git a/speechserving/speechserving/utils/log.py b/speechserving/speechserving/utils/log.py new file mode 100644 index 00000000..8644064c --- /dev/null +++ b/speechserving/speechserving/utils/log.py @@ -0,0 +1,59 @@ +# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +import functools +import logging + +__all__ = [ + 'logger', +] + + +class Logger(object): + def __init__(self, name: str=None): + name = 'PaddleSpeech' if not name else name + self.logger = logging.getLogger(name) + + log_config = { + 'DEBUG': 10, + 'INFO': 20, + 'TRAIN': 21, + 'EVAL': 22, + 'WARNING': 30, + 'ERROR': 40, + 'CRITICAL': 50, + 'EXCEPTION': 100, + } + for key, level in log_config.items(): + logging.addLevelName(level, key) + if key == 'EXCEPTION': + self.__dict__[key.lower()] = self.logger.exception + else: + self.__dict__[key.lower()] = functools.partial(self.__call__, + level) + + self.format = logging.Formatter( + fmt='[%(asctime)-15s] [%(levelname)8s] - %(message)s') + + self.handler = logging.StreamHandler() + self.handler.setFormatter(self.format) + + self.logger.addHandler(self.handler) + self.logger.setLevel(logging.DEBUG) + self.logger.propagate = False + + def __call__(self, log_level: str, msg: str): + self.logger.log(log_level, msg) + + +logger = Logger() diff --git a/speechserving/tests/http_client.py b/speechserving/tests/http_client.py new file mode 100644 index 00000000..3787d764 --- /dev/null +++ b/speechserving/tests/http_client.py @@ -0,0 +1,66 @@ +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the +import requests +import json +import time +import base64 + +import argparse + +def readwav2base64(wav_file): + """ + read wave file and covert to base64 string + """ + with open(wav_file, 'rb') as f: + base64_bytes = base64.b64encode(f.read()) + base64_string = base64_bytes.decode('utf-8') + return base64_string + + +def main(args): + """ + main func + """ + url = "http://127.0.0.1:8090/paddlespeech/asr" + + # start Timestamp + time_start=time.time() + + # test_audio_dir = "test_data/16_audio.wav" + # audio = readwav2base64(test_audio_dir) + + data = { + "audio": "exSI6ICJlbiIsCgkgICAgInBvc2l0aW9uIjogImZhbHNlIgoJf", + "audio_format": "wav", + "sample_rate": 16000, + "lang": "zh_cn", + } + + r = requests.post(url=url, data=json.dumps(data)) + + # ending Timestamp + time_end=time.time() + print('time cost',time_end - time_start, 's') + + print(r.json()) + + + + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("--model_type", action="store", + help="model type: u2, dp2", default="dp2") + args = parser.parse_args() + + main(args) From b5a2675e2bdce83abe406ccb3e69ed524a4753e3 Mon Sep 17 00:00:00 2001 From: WilliamZhang06 <97937340+WilliamZhang06@users.noreply.github.com> Date: Thu, 27 Jan 2022 15:37:09 +0800 Subject: [PATCH 2/2] [Server] added engine factory and config (#1399) * added engine other works, test=server * fix comments, test=doc --- speechserving/speechserving/bin/main.py | 30 --------------- .../speechserving/bin/paddlespeech-client.py | 30 --------------- .../speechserving/bin/paddlespeech-server.py | 30 --------------- .../speechserving/conf/application.yaml | 6 +++ speechserving/speechserving/conf/asr/asr.yaml | 4 ++ .../engine/asr/python/asr_engine.py | 20 ++++------ .../speechserving/engine/engine_factory.py | 26 +++++++++++++ speechserving/speechserving/main.py | 37 +++++++++---------- speechserving/speechserving/restful/api.py | 20 ++++++++-- .../speechserving/restful/asr_api.py | 5 +-- speechserving/speechserving/utils/config.py | 30 +++++++++++++++ speechserving/speechserving/utils/util.py | 35 ++++++++++++++++++ 12 files changed, 144 insertions(+), 129 deletions(-) create mode 100644 speechserving/speechserving/engine/engine_factory.py create mode 100644 speechserving/speechserving/utils/config.py create mode 100644 speechserving/speechserving/utils/util.py diff --git a/speechserving/speechserving/bin/main.py b/speechserving/speechserving/bin/main.py index c5167dd4..97043fd7 100644 --- a/speechserving/speechserving/bin/main.py +++ b/speechserving/speechserving/bin/main.py @@ -11,33 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import argparse - - -def init(args): - """ 系统初始化 - """ - - -def main(args): - """主程序入口""" - - if init(args): - app.run(host='0.0.0.0', port=conf.port) - - -if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument( - "--config_file", - action="store", - help="yaml file of the app", - default="./conf/application.yaml") - parser.add_argument( - "--log_file", - action="store", - help="log file", - default="./log/paddlespeech.log") - args = parser.parse_args() - - main(args) diff --git a/speechserving/speechserving/bin/paddlespeech-client.py b/speechserving/speechserving/bin/paddlespeech-client.py index c5167dd4..97043fd7 100644 --- a/speechserving/speechserving/bin/paddlespeech-client.py +++ b/speechserving/speechserving/bin/paddlespeech-client.py @@ -11,33 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import argparse - - -def init(args): - """ 系统初始化 - """ - - -def main(args): - """主程序入口""" - - if init(args): - app.run(host='0.0.0.0', port=conf.port) - - -if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument( - "--config_file", - action="store", - help="yaml file of the app", - default="./conf/application.yaml") - parser.add_argument( - "--log_file", - action="store", - help="log file", - default="./log/paddlespeech.log") - args = parser.parse_args() - - main(args) diff --git a/speechserving/speechserving/bin/paddlespeech-server.py b/speechserving/speechserving/bin/paddlespeech-server.py index c5167dd4..97043fd7 100644 --- a/speechserving/speechserving/bin/paddlespeech-server.py +++ b/speechserving/speechserving/bin/paddlespeech-server.py @@ -11,33 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import argparse - - -def init(args): - """ 系统初始化 - """ - - -def main(args): - """主程序入口""" - - if init(args): - app.run(host='0.0.0.0', port=conf.port) - - -if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument( - "--config_file", - action="store", - help="yaml file of the app", - default="./conf/application.yaml") - parser.add_argument( - "--log_file", - action="store", - help="log file", - default="./log/paddlespeech.log") - args = parser.parse_args() - - main(args) diff --git a/speechserving/speechserving/conf/application.yaml b/speechserving/speechserving/conf/application.yaml index 358a76dc..29b40b15 100644 --- a/speechserving/speechserving/conf/application.yaml +++ b/speechserving/speechserving/conf/application.yaml @@ -6,3 +6,9 @@ host: '0.0.0.0' port: 8090 +################################################################## +# CONFIG FILE # +################################################################## +# add engine type (Options: asr, tts) and config file here. +engine_backend: + asr: 'conf/asr/asr.yaml' \ No newline at end of file diff --git a/speechserving/speechserving/conf/asr/asr.yaml b/speechserving/speechserving/conf/asr/asr.yaml index e69de29b..cfa3a68f 100644 --- a/speechserving/speechserving/conf/asr/asr.yaml +++ b/speechserving/speechserving/conf/asr/asr.yaml @@ -0,0 +1,4 @@ +model: 'conformer_wenetspeech' +lang: 'zh' +sample_rate: 16000 +decode_method: 'attention_rescoring' diff --git a/speechserving/speechserving/engine/asr/python/asr_engine.py b/speechserving/speechserving/engine/asr/python/asr_engine.py index 6bd8b616..8dbc7a3e 100644 --- a/speechserving/speechserving/engine/asr/python/asr_engine.py +++ b/speechserving/speechserving/engine/asr/python/asr_engine.py @@ -14,18 +14,21 @@ from engine.base_engine import BaseEngine from utils.log import logger +from utils.config import get_config __all__ = ['ASREngine'] class ASREngine(BaseEngine): - def __init__(self, name=None): + def __init__(self): super(ASREngine, self).__init__() - self.executor = name + + def init(self, config_file: str): + self.config_file = config_file + self.executor = None self.input = None self.output = None - - def init(self): + config = get_config(self.config_file) pass def postprocess(self): @@ -34,12 +37,3 @@ class ASREngine(BaseEngine): def run(self): logger.info("start run asr engine") return "hello world" - - -if __name__ == "__main__": - # test Singleton - class1 = ASREngine("ASREngine") - class2 = ASREngine() - print(class1 is class2) - print(id(class1)) - print(id(class2)) diff --git a/speechserving/speechserving/engine/engine_factory.py b/speechserving/speechserving/engine/engine_factory.py new file mode 100644 index 00000000..336a9a6f --- /dev/null +++ b/speechserving/speechserving/engine/engine_factory.py @@ -0,0 +1,26 @@ +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +from engine.asr.python.asr_engine import ASREngine +from engine.tts.python.tts_engine import TTSEngine + + +class EngineFactory(object): + @staticmethod + def get_engine(engine_name): + if engine_name == 'asr': + return ASREngine() + elif engine_name == 'tts': + return TTSEngine() + else: + return None diff --git a/speechserving/speechserving/main.py b/speechserving/speechserving/main.py index d3e6edc1..3b367418 100644 --- a/speechserving/speechserving/main.py +++ b/speechserving/speechserving/main.py @@ -12,43 +12,42 @@ # See the License for the specific language governing permissions and # limitations under the License. import argparse - import uvicorn import yaml - -from engine.tts.python.tts_engine import TTSEngine from fastapi import FastAPI -from restful.api import router as api_router -from paddlespeech.cli.log import logger +from restful.api import setup_router +from utils.log import logger +from utils.config import get_config +from engine.engine_factory import EngineFactory app = FastAPI( title="PaddleSpeech Serving API", description="Api", version="0.0.1") -def init(args): - """ 系统初始化 +def init(config): + """ system initialization """ + # init api + api_list = list(config.engine_backend) + api_router = setup_router(api_list) app.include_router(api_router) - # engine single - - TTS_ENGINE = TTSEngine() - - # todo others + # init engine + engine_list = [] + for engine in config.engine_backend: + engine_list.append(EngineFactory.get_engine(engine_name=engine)) + engine_list[-1].init(config_file=config.engine_backend[engine]) return True def main(args): - """主程序入口""" + """main function""" - #TODO configuration - from yacs.config import CfgNode - with open(args.config_file, 'rt') as f: - config = CfgNode(yaml.safe_load(f)) + config = get_config(args.config_file) - if init(args): + if init(config): uvicorn.run(app, host=config.host, port=config.port, debug=True) @@ -58,7 +57,7 @@ if __name__ == "__main__": "--config_file", action="store", help="yaml file of the app", - default="./conf/tts/tts.yaml") + default="./conf/application.yaml") parser.add_argument( "--log_file", diff --git a/speechserving/speechserving/restful/api.py b/speechserving/speechserving/restful/api.py index c6250ce7..c5539f24 100644 --- a/speechserving/speechserving/restful/api.py +++ b/speechserving/speechserving/restful/api.py @@ -11,11 +11,23 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +from typing import List from fastapi import APIRouter from .tts_api import router as tts_router -#from .asr_api import router as asr_router +from .asr_api import router as asr_router + +_router = APIRouter() + +def setup_router(api_list: List): + + for api_name in api_list: + if api_name == 'asr': + _router.include_router(asr_router) + elif api_name == 'tts': + _router.include_router(tts_router) + else: + pass + + return _router -router = APIRouter() -#router.include_router(asr_router) -router.include_router(tts_router) diff --git a/speechserving/speechserving/restful/asr_api.py b/speechserving/speechserving/restful/asr_api.py index eb335e09..9d97b380 100644 --- a/speechserving/speechserving/restful/asr_api.py +++ b/speechserving/speechserving/restful/asr_api.py @@ -14,13 +14,12 @@ from fastapi import APIRouter import base64 - from engine.asr.python.asr_engine import ASREngine from .response import ASRResponse from .request import ASRRequest -router = APIRouter() +router = APIRouter() @router.get('/paddlespeech/asr/help') def help(): @@ -44,8 +43,8 @@ def asr(request_body: ASRRequest): """ # single asr_engine = ASREngine() + print("asr_engine id :" ,id(asr_engine)) - asr_engine.init() asr_results = asr_engine.run() asr_engine.postprocess() diff --git a/speechserving/speechserving/utils/config.py b/speechserving/speechserving/utils/config.py new file mode 100644 index 00000000..513c16f6 --- /dev/null +++ b/speechserving/speechserving/utils/config.py @@ -0,0 +1,30 @@ +# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +import yaml +from yacs.config import CfgNode + + +def get_config(config_file): + """[summary] + + Args: + config_file (str): config_file + + Returns: + CfgNode: + """ + with open(config_file, 'rt') as f: + config = CfgNode(yaml.safe_load(f)) + + return config diff --git a/speechserving/speechserving/utils/util.py b/speechserving/speechserving/utils/util.py new file mode 100644 index 00000000..cf568572 --- /dev/null +++ b/speechserving/speechserving/utils/util.py @@ -0,0 +1,35 @@ +# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the +import base64 + + +def wav2base64(wav_file): + """ + read wave file and covert to base64 string + """ + with open(wav_file, 'rb') as f: + base64_bytes = base64.b64encode(f.read()) + base64_string = base64_bytes.decode('utf-8') + return base64_string + + +def base64towav(base64_string): + pass + + + + +def self_check(): + """ self check resource + """ + return True