diff --git a/fooocus_version.py b/fooocus_version.py index d59dbaa9..4ad444eb 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.1.28' +version = '2.1.29' diff --git a/modules/flags.py b/modules/flags.py index 9fd60adf..b9a0a690 100644 --- a/modules/flags.py +++ b/modules/flags.py @@ -1,6 +1,3 @@ -import comfy.samplers - - disabled = 'Disabled' enabled = 'Enabled' subtle_variation = 'Vary (Subtle)' @@ -13,10 +10,17 @@ uov_list = [ disabled, subtle_variation, strong_variation, upscale_15, upscale_2, upscale_fast ] -sampler_list = comfy.samplers.SAMPLER_NAMES +KSAMPLER_NAMES = ["euler", "euler_ancestral", "heun", "dpm_2", "dpm_2_ancestral", + "lms", "dpm_fast", "dpm_adaptive", "dpmpp_2s_ancestral", "dpmpp_sde", "dpmpp_sde_gpu", + "dpmpp_2m", "dpmpp_2m_sde", "dpmpp_2m_sde_gpu", "dpmpp_3m_sde", "dpmpp_3m_sde_gpu", "ddpm"] + +SCHEDULER_NAMES = ["normal", "karras", "exponential", "sgm_uniform", "simple", "ddim_uniform"] +SAMPLER_NAMES = KSAMPLER_NAMES + ["ddim", "uni_pc", "uni_pc_bh2"] + +sampler_list = SAMPLER_NAMES default_sampler = 'dpmpp_2m_sde_gpu' -scheduler_list = comfy.samplers.SCHEDULER_NAMES +scheduler_list = SCHEDULER_NAMES default_scheduler = "karras" cn_ip = "Image Prompt" diff --git a/webui.py b/webui.py index dd13f261..eab5bdc5 100644 --- a/webui.py +++ b/webui.py @@ -10,7 +10,6 @@ import modules.async_worker as worker import modules.flags as flags import modules.gradio_hijack as grh import modules.advanced_parameters as advanced_parameters -import comfy.model_management as model_management from modules.sdxl_styles import style_keys, aspect_ratios, fooocus_expansion, default_styles, default_aspect_ratio @@ -60,6 +59,7 @@ with shared.gradio_root: stop_button = gr.Button(label="Stop", value="Stop", elem_classes='type_row', visible=False) def stop_clicked(): + import comfy.model_management as model_management model_management.interrupt_current_processing() return gr.update(interactive=False)