diff --git a/preprocess_all.py b/preprocess_all.py index fd3dcd5..62c0b4f 100644 --- a/preprocess_all.py +++ b/preprocess_all.py @@ -1,5 +1,5 @@ import argparse -from webui_train import preprocess_all +from webui.train import preprocess_all from multiprocessing import cpu_count if __name__ == "__main__": @@ -75,7 +75,10 @@ if __name__ == "__main__": default=200, ) parser.add_argument( - "--yomi_error", type=str, help="Yomi error. raise, skip, use", default="raise" + "--yomi_error", + type=str, + help="Yomi error. Options: raise, skip, use", + default="raise", ) args = parser.parse_args() diff --git a/webui/merge.py b/webui/merge.py index 357d59f..1fc3cee 100644 --- a/webui/merge.py +++ b/webui/merge.py @@ -254,8 +254,7 @@ def simple_tts(model_name, text, style=DEFAULT_STYLE, style_weight=1.0): return model.infer(text, style=style, style_weight=style_weight) -def update_two_model_names_dropdown(): - model_holder = ModelHolder(Path(assets_root), device) +def update_two_model_names_dropdown(model_holder: ModelHolder): new_names, new_files, _ = model_holder.update_model_names_gr() return new_names, new_files, new_names, new_files @@ -456,7 +455,7 @@ def create_merge_app(model_holder: ModelHolder) -> gr.Blocks: ) refresh_button.click( - update_two_model_names_dropdown, + lambda: update_two_model_names_dropdown(model_holder), outputs=[model_name_a, model_path_a, model_name_b, model_path_b], )