Commit 4c72377b authored by AUTOMATIC1111's avatar AUTOMATIC1111
Browse files

Options in main UI update 

- correctly read values from pasted infotext
- setting for column count
- infotext paste: do not add a field to override settings if some other component is already handling it
parent 0ea20a0d

extensions-builtin/extra-options-section/scripts/extra_options_section.py

+31 −8
Original line number Diff line number Diff line 
import math



import gradio as gr

from modules import scripts, shared, ui_components, ui_settings

from modules import scripts, shared, ui_components, ui_settings, generation_parameters_copypaste

from modules.ui_components import FormColumn
@@ -19,16 +21,34 @@ class ExtraOptionsSection(scripts.Script): 
    def ui(self, is_img2img):

        self.comps = []

        self.setting_names = []

        self.infotext_fields = []



        mapping = {k: v for v, k in generation_parameters_copypaste.infotext_to_setting_name_mapping}



        with gr.Blocks() as interface:

            with gr.Accordion("Options", open=False) if shared.opts.extra_options_accordion and shared.opts.extra_options else gr.Group(), gr.Row():

                for setting_name in shared.opts.extra_options:

            with gr.Accordion("Options", open=False) if shared.opts.extra_options_accordion and shared.opts.extra_options else gr.Group():



                row_count = math.ceil(len(shared.opts.extra_options) / shared.opts.extra_options_cols)



                for row in range(row_count):

                    with gr.Row():

                        for col in range(shared.opts.extra_options_cols):

                            index = row * shared.opts.extra_options_cols + col

                            if index >= len(shared.opts.extra_options):

                                break



                            setting_name = shared.opts.extra_options[index]



                            with FormColumn():

                                comp = ui_settings.create_setting_component(setting_name)



                            self.comps.append(comp)

                            self.setting_names.append(setting_name)



                            setting_infotext_name = mapping.get(setting_name)

                            if setting_infotext_name is not None:

                                self.infotext_fields.append((comp, setting_infotext_name))



        def get_settings_values():

            return [ui_settings.get_value_for_setting(key) for key in self.setting_names]
@@ -44,5 +64,8 @@ class ExtraOptionsSection(scripts.Script): 


shared.options_templates.update(shared.options_section(('ui', "User interface"), {

    "extra_options": shared.OptionInfo([], "Options in main UI", ui_components.DropdownMulti, lambda: {"choices": list(shared.opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that also appear in txt2img/img2img interfaces").needs_reload_ui(),

    "extra_options_accordion": shared.OptionInfo(False, "Place options in main UI into an accordion").needs_restart()

    "extra_options_cols": shared.OptionInfo(1, "Options in main UI - number of columns", gr.Number, {"precision": 0}).needs_reload_ui(),

    "extra_options_accordion": shared.OptionInfo(False, "Options in main UI - place into an accordion").needs_reload_ui()

}))

modules/generation_parameters_copypaste.py

+5 −0
Original line number Diff line number Diff line
@@ -414,10 +414,15 @@ def connect_paste(button, paste_fields, input_comp, override_settings_component, 
        return res



    if override_settings_component is not None:

        already_handled_fields = {key: 1 for _, key in paste_fields}



        def paste_settings(params):

            vals = {}



            for param_name, setting_name in infotext_to_setting_name_mapping:

                if param_name in already_handled_fields:

                    continue



                v = params.get(param_name, None)

                if v is None:

                    continue

modules/shared.py

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ options_templates.update(options_section(('sampler-params', "Sampler parameters" 
    's_tmin':  OptionInfo(0.0, "sigma tmin",  gr.Slider, {"minimum": 0.0, "maximum": 10.0, "step": 0.01}).info('enable stochasticity; start value of the sigma range; only applies to Euler, Heun, and DPM2'),

    's_tmax':  OptionInfo(0.0, "sigma tmax",  gr.Slider, {"minimum": 0.0, "maximum": 999.0, "step": 0.01}).info("0 = inf; end value of the sigma range; only applies to Euler, Heun, and DPM2"),

    's_noise': OptionInfo(1.0, "sigma noise", gr.Slider, {"minimum": 0.0, "maximum": 1.1, "step": 0.001}).info('amount of additional noise to counteract loss of detail during sampling; only applies to Euler, Heun, and DPM2'),

    'k_sched_type':  OptionInfo("Automatic", "scheduler type", gr.Dropdown, {"choices": ["Automatic", "karras", "exponential", "polyexponential"]}).info("lets you override the noise schedule for k-diffusion samplers; choosing Automatic disables the three parameters below"),

    'k_sched_type':  OptionInfo("Automatic", "Scheduler type", gr.Dropdown, {"choices": ["Automatic", "karras", "exponential", "polyexponential"]}).info("lets you override the noise schedule for k-diffusion samplers; choosing Automatic disables the three parameters below"),

    'sigma_min': OptionInfo(0.0, "sigma min", gr.Number).info("0 = default (~0.03); minimum noise strength for k-diffusion noise scheduler"),

    'sigma_max': OptionInfo(0.0, "sigma max", gr.Number).info("0 = default (~14.6); maximum noise strength for k-diffusion noise scheduler"),

    'rho':  OptionInfo(0.0, "rho", gr.Number).info("0 = default (7 for karras, 1 for polyexponential); higher values result in a steeper noise schedule (decreases faster)"),

CRA Git | Maintained and supported by SUSTech CRA and CCSE