From 11a2c0629a157f301fac17f63b70cf75dd2761f7 Mon Sep 17 00:00:00 2001 From: Serick Date: Thu, 29 Aug 2024 01:15:07 +0900 Subject: [PATCH] Apply settings in ui-config.json to "All" presets (#1541) * Add preset to load settings from ui-config.json * Remove added presets and apply ui-config.json to all --- modules_forge/main_entry.py | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/modules_forge/main_entry.py b/modules_forge/main_entry.py index 7ac7b853..58da0093 100644 --- a/modules_forge/main_entry.py +++ b/modules_forge/main_entry.py @@ -3,9 +3,10 @@ import torch import gradio as gr from gradio.context import Context -from modules import shared_items, shared, ui_common, sd_models, processing, infotext_utils, paths +from modules import shared_items, shared, ui_common, sd_models, processing, infotext_utils, paths, ui_loadsave from backend import memory_management, stream from backend.args import dynamic_args +from modules.shared import cmd_opts total_vram = int(memory_management.total_vram) @@ -21,6 +22,8 @@ ui_forge_async_loading: gr.Radio = None ui_forge_pin_shared_memory: gr.Radio = None ui_forge_inference_memory: gr.Slider = None + + forge_unet_storage_dtype_options = { 'Automatic': (None, False), 'Automatic (fp16 LoRA)': (None, True), @@ -360,6 +363,9 @@ def on_preset_change(preset=None): gr.update(value='Simple'), # ui_img2img_scheduler ] + loadsave = ui_loadsave.UiLoadsave(cmd_opts.ui_config_file) + ui_settings_from_file = loadsave.ui_settings.copy() + return [ gr.update(visible=True), # ui_vae gr.update(visible=True, value=1), # ui_clip_skip @@ -367,16 +373,16 @@ def on_preset_change(preset=None): gr.update(visible=True, value='Queue'), # ui_forge_async_loading gr.update(visible=True, value='CPU'), # ui_forge_pin_shared_memory gr.update(visible=True, value=total_vram - 1024), # ui_forge_inference_memory - gr.update(value=896), # ui_txt2img_width - gr.update(value=1024), # ui_img2img_width - gr.update(value=1152), # ui_txt2img_height - gr.update(value=1024), # ui_img2img_height - gr.update(value=7), # ui_txt2img_cfg - gr.update(value=7), # ui_img2img_cfg - gr.update(visible=True, value=3.5), # ui_txt2img_distilled_cfg - gr.update(visible=True, value=3.5), # ui_img2img_distilled_cfg - gr.update(value='DPM++ 2M'), # ui_txt2img_sampler - gr.update(value='DPM++ 2M'), # ui_img2img_sampler - gr.update(value='Automatic'), # ui_txt2img_scheduler - gr.update(value='Automatic'), # ui_img2img_scheduler + gr.update(value=ui_settings_from_file['txt2img/Width/value']), # ui_txt2img_width + gr.update(value=ui_settings_from_file['img2img/Width/value']), # ui_img2img_width + gr.update(value=ui_settings_from_file['txt2img/Height/value']), # ui_txt2img_height + gr.update(value=ui_settings_from_file['img2img/Height/value']), # ui_img2img_height + gr.update(value=ui_settings_from_file['txt2img/CFG Scale/value']), # ui_txt2img_cfg + gr.update(value=ui_settings_from_file['img2img/CFG Scale/value']), # ui_img2img_cfg + gr.update(visible=True, value=ui_settings_from_file['txt2img/Distilled CFG Scale/value']), # ui_txt2img_distilled_cfg + gr.update(visible=True, value=ui_settings_from_file['img2img/Distilled CFG Scale/value']), # ui_img2img_distilled_cfg + gr.update(value=ui_settings_from_file['customscript/sampler.py/txt2img/Sampling method/value']), # ui_txt2img_sampler + gr.update(value=ui_settings_from_file['customscript/sampler.py/img2img/Sampling method/value']), # ui_img2img_sampler + gr.update(value=ui_settings_from_file['customscript/sampler.py/txt2img/Schedule type/value']), # ui_txt2img_scheduler + gr.update(value=ui_settings_from_file['customscript/sampler.py/img2img/Schedule type/value']), # ui_img2img_scheduler ]