From 39e8e97033a2637621673acf8973ef92a234426e Mon Sep 17 00:00:00 2001 From: "shichen.fsc" Date: Thu, 7 Jul 2022 17:02:01 +0800 Subject: [PATCH] [to #42322933] Fix remove useless Tasks.key_word_spotting Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9303027 --- .../models/audio/kws/generic_key_word_spotting.py | 3 ++- modelscope/pipelines/audio/kws_kwsbp_pipeline.py | 2 +- modelscope/utils/constant.py | 1 - tests/pipelines/test_key_word_spotting.py | 15 ++++++--------- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/modelscope/models/audio/kws/generic_key_word_spotting.py b/modelscope/models/audio/kws/generic_key_word_spotting.py index 7a738d5b..19128d3a 100644 --- a/modelscope/models/audio/kws/generic_key_word_spotting.py +++ b/modelscope/models/audio/kws/generic_key_word_spotting.py @@ -9,7 +9,8 @@ from modelscope.utils.constant import Tasks __all__ = ['GenericKeyWordSpotting'] -@MODELS.register_module(Tasks.key_word_spotting, module_name=Models.kws_kwsbp) +@MODELS.register_module( + Tasks.auto_speech_recognition, module_name=Models.kws_kwsbp) class GenericKeyWordSpotting(Model): def __init__(self, model_dir: str, *args, **kwargs): diff --git a/modelscope/pipelines/audio/kws_kwsbp_pipeline.py b/modelscope/pipelines/audio/kws_kwsbp_pipeline.py index bdefdd48..27b31386 100644 --- a/modelscope/pipelines/audio/kws_kwsbp_pipeline.py +++ b/modelscope/pipelines/audio/kws_kwsbp_pipeline.py @@ -18,7 +18,7 @@ __all__ = ['KeyWordSpottingKwsbpPipeline'] @PIPELINES.register_module( - Tasks.key_word_spotting, module_name=Pipelines.kws_kwsbp) + Tasks.auto_speech_recognition, module_name=Pipelines.kws_kwsbp) class KeyWordSpottingKwsbpPipeline(Pipeline): """KWS Pipeline - key word spotting decoding """ diff --git a/modelscope/utils/constant.py b/modelscope/utils/constant.py index 640e55e2..ebed30fb 100644 --- a/modelscope/utils/constant.py +++ b/modelscope/utils/constant.py @@ -60,7 +60,6 @@ class Tasks(object): auto_speech_recognition = 'auto-speech-recognition' text_to_speech = 'text-to-speech' speech_signal_process = 'speech-signal-process' - key_word_spotting = 'key-word-spotting' # multi-modal tasks image_captioning = 'image-captioning' diff --git a/tests/pipelines/test_key_word_spotting.py b/tests/pipelines/test_key_word_spotting.py index 91acaa66..7999b421 100644 --- a/tests/pipelines/test_key_word_spotting.py +++ b/tests/pipelines/test_key_word_spotting.py @@ -6,11 +6,8 @@ import unittest import requests -from modelscope.metainfo import Pipelines, Preprocessors -from modelscope.models import Model from modelscope.pipelines import pipeline -from modelscope.preprocessors import build_preprocessor -from modelscope.utils.constant import Fields, InputFields, Tasks +from modelscope.utils.constant import Tasks from modelscope.utils.test_utils import test_level KWSBP_URL = 'https://isv-data.oss-cn-hangzhou.aliyuncs.com/ics/MaaS/KWS/tools/kwsbp' @@ -58,7 +55,7 @@ class KeyWordSpottingTest(unittest.TestCase): f.write(r.content) kwsbp_16k_pipline = pipeline( - task=Tasks.key_word_spotting, model=self.model_id) + task=Tasks.auto_speech_recognition, model=self.model_id) self.assertTrue(kwsbp_16k_pipline is not None) kws_result = kwsbp_16k_pipline( @@ -107,7 +104,7 @@ class KeyWordSpottingTest(unittest.TestCase): keywords = [{'keyword': '播放音乐'}] kwsbp_16k_pipline = pipeline( - task=Tasks.key_word_spotting, + task=Tasks.auto_speech_recognition, model=self.model_id, keywords=keywords) self.assertTrue(kwsbp_16k_pipline is not None) @@ -169,7 +166,7 @@ class KeyWordSpottingTest(unittest.TestCase): f.write(r.content) kwsbp_16k_pipline = pipeline( - task=Tasks.key_word_spotting, model=self.model_id) + task=Tasks.auto_speech_recognition, model=self.model_id) self.assertTrue(kwsbp_16k_pipline is not None) kws_result = kwsbp_16k_pipline( @@ -232,7 +229,7 @@ class KeyWordSpottingTest(unittest.TestCase): f.write(r.content) kwsbp_16k_pipline = pipeline( - task=Tasks.key_word_spotting, model=self.model_id) + task=Tasks.auto_speech_recognition, model=self.model_id) self.assertTrue(kwsbp_16k_pipline is not None) kws_result = kwsbp_16k_pipline( @@ -318,7 +315,7 @@ class KeyWordSpottingTest(unittest.TestCase): f.write(r.content) kwsbp_16k_pipline = pipeline( - task=Tasks.key_word_spotting, model=self.model_id) + task=Tasks.auto_speech_recognition, model=self.model_id) self.assertTrue(kwsbp_16k_pipline is not None) kws_result = kwsbp_16k_pipline(