[to #42322933] Fix bug in KWS when setting customized keyword

Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10412829

modelscope/models/audio/asr/generic_automatic_speech_recognition.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import os
 from typing import Any, Dict
 

modelscope/models/audio/kws/generic_key_word_spotting.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import os
 from typing import Any, Dict
 

modelscope/pipelines/audio/kws_kwsbp_pipeline.py

@@ -37,6 +37,12 @@ class KeyWordSpottingKwsbpPipeline(Pipeline):
                  **kwargs) -> Dict[str, Any]:
         if 'keywords' in kwargs.keys():
             self.keywords = kwargs['keywords']
+            if isinstance(self.keywords, str):
+                word_list = []
+                word = {}
+                word['keyword'] = self.keywords
+                word_list.append(word)
+                self.keywords = word_list
         else:
             self.keywords = None
 
@@ -96,6 +102,9 @@ class KeyWordSpottingKwsbpPipeline(Pipeline):
             pos_list=pos_kws_list,
             neg_list=neg_kws_list)
 
+        if 'kws_list' not in rst_dict:
+            rst_dict['kws_list'] = []
+
         return rst_dict
 
     def run_with_kwsbp(self, inputs: Dict[str, Any]) -> Dict[str, Any]:

modelscope/preprocessors/asr.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import os
 from typing import Any, Dict, List, Union
 

modelscope/preprocessors/kws.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import os
 from typing import Any, Dict, List, Union
 

tests/pipelines/test_key_word_spotting.py

@@ -245,7 +245,7 @@ class KeyWordSpottingTest(unittest.TestCase, DemoCompatibilityCheck):
 
     @unittest.skipUnless(test_level() >= 0, 'skip test in current test level')
     def test_run_with_wav_by_customized_keywords(self):
-        keywords = [{'keyword': '播放音乐'}]
+        keywords = '播放音乐'
 
         kws_result = self.run_pipeline(
             model_id=self.model_id,