diff --git a/modelscope/pipelines/audio/asr_inference_pipeline.py b/modelscope/pipelines/audio/asr_inference_pipeline.py index b9c0bd03..08b21c30 100644 --- a/modelscope/pipelines/audio/asr_inference_pipeline.py +++ b/modelscope/pipelines/audio/asr_inference_pipeline.py @@ -387,8 +387,9 @@ class AutomaticSpeechRecognitionPipeline(Pipeline): ] for user_args in user_args_dict: - if user_args in extra_args and extra_args[user_args] is not None: - cmd[user_args] = extra_args[user_args] + if user_args in extra_args: + if extra_args.get(user_args) is not None: + cmd[user_args] = extra_args[user_args] del extra_args[user_args] return cmd diff --git a/modelscope/pipelines/audio/lm_infer_pipeline.py b/modelscope/pipelines/audio/lm_infer_pipeline.py index 75d835d6..0e252399 100644 --- a/modelscope/pipelines/audio/lm_infer_pipeline.py +++ b/modelscope/pipelines/audio/lm_infer_pipeline.py @@ -192,8 +192,9 @@ class LanguageModelPipeline(Pipeline): ] for user_args in user_args_dict: - if user_args in extra_args and extra_args[user_args] is not None: - cmd[user_args] = extra_args[user_args] + if user_args in extra_args: + if extra_args.get(user_args) is not None: + cmd[user_args] = extra_args[user_args] del extra_args[user_args] return cmd diff --git a/modelscope/pipelines/audio/punctuation_processing_pipeline.py b/modelscope/pipelines/audio/punctuation_processing_pipeline.py index 3ab3481d..53bc82ad 100644 --- a/modelscope/pipelines/audio/punctuation_processing_pipeline.py +++ b/modelscope/pipelines/audio/punctuation_processing_pipeline.py @@ -144,8 +144,9 @@ class PunctuationProcessingPipeline(Pipeline): ] for user_args in user_args_dict: - if user_args in extra_args and extra_args[user_args] is not None: - cmd[user_args] = extra_args[user_args] + if user_args in extra_args: + if extra_args.get(user_args) is not None: + cmd[user_args] = extra_args[user_args] del extra_args[user_args] return cmd diff --git a/modelscope/pipelines/audio/speaker_diarization_pipeline.py b/modelscope/pipelines/audio/speaker_diarization_pipeline.py index 71715ecd..3cf8bce7 100644 --- a/modelscope/pipelines/audio/speaker_diarization_pipeline.py +++ b/modelscope/pipelines/audio/speaker_diarization_pipeline.py @@ -199,12 +199,13 @@ class SpeakerDiarizationPipeline(Pipeline): # rewrite the config with user args for user_args in user_args_dict: - if user_args in extra_args and extra_args[user_args] is not None: - if isinstance(cmd[user_args], dict) and isinstance( - extra_args[user_args], dict): - cmd[user_args].update(extra_args[user_args]) - else: - cmd[user_args] = extra_args[user_args] + if user_args in extra_args: + if extra_args.get(user_args) is not None: + if isinstance(cmd[user_args], dict) and isinstance( + extra_args[user_args], dict): + cmd[user_args].update(extra_args[user_args]) + else: + cmd[user_args] = extra_args[user_args] del extra_args[user_args] return cmd diff --git a/modelscope/pipelines/audio/speaker_verification_pipeline.py b/modelscope/pipelines/audio/speaker_verification_pipeline.py index e576885a..7eace5ea 100644 --- a/modelscope/pipelines/audio/speaker_verification_pipeline.py +++ b/modelscope/pipelines/audio/speaker_verification_pipeline.py @@ -166,12 +166,13 @@ class SpeakerVerificationPipeline(Pipeline): # rewrite the config with user args for user_args in user_args_dict: - if user_args in extra_args and extra_args[user_args] is not None: - if isinstance(cmd[user_args], dict) and isinstance( - extra_args[user_args], dict): - cmd[user_args].update(extra_args[user_args]) - else: - cmd[user_args] = extra_args[user_args] + if user_args in extra_args: + if extra_args.get(user_args) is not None: + if isinstance(cmd[user_args], dict) and isinstance( + extra_args[user_args], dict): + cmd[user_args].update(extra_args[user_args]) + else: + cmd[user_args] = extra_args[user_args] del extra_args[user_args] return cmd diff --git a/modelscope/pipelines/audio/timestamp_pipeline.py b/modelscope/pipelines/audio/timestamp_pipeline.py index 0968b359..d21207d9 100644 --- a/modelscope/pipelines/audio/timestamp_pipeline.py +++ b/modelscope/pipelines/audio/timestamp_pipeline.py @@ -267,8 +267,9 @@ class TimestampPipeline(Pipeline): ] for user_args in user_args_dict: - if user_args in extra_args and extra_args[user_args] is not None: - cmd[user_args] = extra_args[user_args] + if user_args in extra_args: + if extra_args.get(user_args) is not None: + cmd[user_args] = extra_args[user_args] del extra_args[user_args] return cmd diff --git a/modelscope/pipelines/audio/voice_activity_detection_pipeline.py b/modelscope/pipelines/audio/voice_activity_detection_pipeline.py index 0121b242..2ffa2181 100644 --- a/modelscope/pipelines/audio/voice_activity_detection_pipeline.py +++ b/modelscope/pipelines/audio/voice_activity_detection_pipeline.py @@ -212,8 +212,9 @@ class VoiceActivityDetectionPipeline(Pipeline): ] for user_args in user_args_dict: - if user_args in extra_args and extra_args[user_args] is not None: - cmd[user_args] = extra_args[user_args] + if user_args in extra_args: + if extra_args.get(user_args) is not None: + cmd[user_args] = extra_args[user_args] del extra_args[user_args] return cmd