fix extra_args

Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/12839071
* fix extra_args

* update extra_args
This commit is contained in:
wucong.lyb
2023-06-08 19:39:05 +08:00
committed by wenmeng.zwm
parent ae672b73df
commit a77d390238
7 changed files with 29 additions and 22 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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