From c21c3d220df5859c32ed9e1dc1ae5a6e7278ae87 Mon Sep 17 00:00:00 2001 From: huangyuxin Date: Sun, 24 Apr 2022 12:16:16 +0000 Subject: [PATCH 1/3] fix infer, test=doc --- paddlespeech/cli/asr/infer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paddlespeech/cli/asr/infer.py b/paddlespeech/cli/asr/infer.py index 97a1b3219..050d6f7f9 100644 --- a/paddlespeech/cli/asr/infer.py +++ b/paddlespeech/cli/asr/infer.py @@ -346,7 +346,7 @@ class ASRExecutor(BaseExecutor): max_duration = 50.0 if audio_duration >= max_duration: logger.error("Please input audio file less then 50 seconds.\n") - return + exit(1) except Exception as e: logger.exception(e) logger.error( From 25cb4d62acd1aa039a276401df0c9b8a392b27ed Mon Sep 17 00:00:00 2001 From: huangyuxin Date: Sun, 24 Apr 2022 12:48:17 +0000 Subject: [PATCH 2/3] add cli test case, test=doc --- tests/unit/cli/test_cli.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/unit/cli/test_cli.sh b/tests/unit/cli/test_cli.sh index 96e1e0235..c00e5e294 100755 --- a/tests/unit/cli/test_cli.sh +++ b/tests/unit/cli/test_cli.sh @@ -12,7 +12,12 @@ paddlespeech text --input 今天的天气真不错啊你下午有空吗我想约 # Speech_recognition wget -c https://paddlespeech.bj.bcebos.com/PaddleAudio/zh.wav https://paddlespeech.bj.bcebos.com/PaddleAudio/en.wav paddlespeech asr --input ./zh.wav +paddlespeech asr --model conformer_aishell --input ./zh.wav +paddlespeech asr --model conformer_online_aishell --input ./zh.wav paddlespeech asr --model transformer_librispeech --lang en --input ./en.wav +paddlespeech asr --model deepspeech2offline_aishell --input ./zh.wav +paddlespeech asr --model deepspeech2online_aishell --input ./zh.wav +paddlespeech asr --model deepspeech2offline_librispeech --lang en --input ./en.wav # long audio restriction wget -c wget https://paddlespeech.bj.bcebos.com/datasets/single_wav/zh/test_long_audio_01.wav From 1e999c27e94ffc275aee486d131a75ec8073e85d Mon Sep 17 00:00:00 2001 From: huangyuxin Date: Mon, 25 Apr 2022 03:11:54 +0000 Subject: [PATCH 3/3] fix exit, test=doc --- paddlespeech/cli/asr/infer.py | 4 ++-- tests/unit/cli/test_cli.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/paddlespeech/cli/asr/infer.py b/paddlespeech/cli/asr/infer.py index 050d6f7f9..0fb548683 100644 --- a/paddlespeech/cli/asr/infer.py +++ b/paddlespeech/cli/asr/infer.py @@ -346,7 +346,7 @@ class ASRExecutor(BaseExecutor): max_duration = 50.0 if audio_duration >= max_duration: logger.error("Please input audio file less then 50 seconds.\n") - exit(1) + return False except Exception as e: logger.exception(e) logger.error( @@ -383,7 +383,7 @@ class ASRExecutor(BaseExecutor): ) == "n" or content.strip() == "no" or content.strip( ) == "No": logger.info("Exit the program") - exit(1) + return False else: logger.warning("Not regular input, please input again") diff --git a/tests/unit/cli/test_cli.sh b/tests/unit/cli/test_cli.sh index c00e5e294..926b1ac0b 100755 --- a/tests/unit/cli/test_cli.sh +++ b/tests/unit/cli/test_cli.sh @@ -22,7 +22,7 @@ paddlespeech asr --model deepspeech2offline_librispeech --lang en --input ./en.w # long audio restriction wget -c wget https://paddlespeech.bj.bcebos.com/datasets/single_wav/zh/test_long_audio_01.wav paddlespeech asr --input test_long_audio_01.wav -if [ $? -ne 1 ]; then +if [ $? -ne -1 ]; then exit 1 fi