From 15696da9b8eb1adb24f1fb5c9386edcf8d74c5e7 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sat, 4 May 2024 20:37:30 +0200 Subject: [PATCH] feat: use different default label, add translation --- language/en.json | 2 ++ modules/config.py | 2 +- modules/default_pipeline.py | 3 ++- modules/flags.py | 2 ++ webui.py | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/language/en.json b/language/en.json index fefc79c4..9ce95164 100644 --- a/language/en.json +++ b/language/en.json @@ -339,6 +339,8 @@ "sgm_uniform": "sgm_uniform", "simple": "simple", "ddim_uniform": "ddim_uniform", + "VAE": "VAE", + "Default (model)": "Default (model)", "Forced Overwrite of Sampling Step": "Forced Overwrite of Sampling Step", "Set as -1 to disable. For developer debugging.": "Set as -1 to disable. For developer debugging.", "Forced Overwrite of Refiner Switch Step": "Forced Overwrite of Refiner Switch Step", diff --git a/modules/config.py b/modules/config.py index fdb47157..f11460c8 100644 --- a/modules/config.py +++ b/modules/config.py @@ -349,7 +349,7 @@ default_scheduler = get_config_item_or_set_default( ) default_vae = get_config_item_or_set_default( key='default_vae', - default_value='None', + default_value=modules.flags.default_vae, validator=lambda x: isinstance(x, str) ) default_styles = get_config_item_or_set_default( diff --git a/modules/default_pipeline.py b/modules/default_pipeline.py index b74faf46..9f94170c 100644 --- a/modules/default_pipeline.py +++ b/modules/default_pipeline.py @@ -3,6 +3,7 @@ import os import torch import modules.patch import modules.config +import modules.flags import ldm_patched.modules.model_management import ldm_patched.modules.latent_formats import modules.inpaint_worker @@ -64,7 +65,7 @@ def refresh_base_model(name, vae_name=None): filename = get_file_from_folder_list(name, modules.config.paths_checkpoints) vae_filename = None - if vae_name is not None and vae_name != 'None': + if vae_name is not None and vae_name != modules.flags.default_vae: vae_filename = get_file_from_folder_list(vae_name, modules.config.path_vae) if model_base.filename == filename and model_base.vae_filename == vae_filename: diff --git a/modules/flags.py b/modules/flags.py index c9d13fd8..9f2aefb3 100644 --- a/modules/flags.py +++ b/modules/flags.py @@ -53,6 +53,8 @@ SAMPLER_NAMES = KSAMPLER_NAMES + list(SAMPLER_EXTRA.keys()) sampler_list = SAMPLER_NAMES scheduler_list = SCHEDULER_NAMES +default_vae = 'Default (model)' + refiner_swap_method = 'joint' cn_ip = "ImagePrompt" diff --git a/webui.py b/webui.py index ab52a63f..ad221a96 100644 --- a/webui.py +++ b/webui.py @@ -406,7 +406,7 @@ with shared.gradio_root: value=modules.config.default_sampler) scheduler_name = gr.Dropdown(label='Scheduler', choices=flags.scheduler_list, value=modules.config.default_scheduler) - vae_name = gr.Dropdown(label='VAE', choices=['None'] + modules.config.vae_filenames, + vae_name = gr.Dropdown(label='VAE', choices=[modules.flags.default_vae] + modules.config.vae_filenames, value=modules.config.default_vae, show_label=True) generate_image_grid = gr.Checkbox(label='Generate Image Grid for Each Batch',