Merge branch 'dev' into refiner

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

    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]

            res = [ui_settings.get_value_for_setting(key) for key in self.setting_names]

            return res[0] if len(res) == 1 else res

        interface.load(fn=get_settings_values, inputs=[], outputs=self.comps, queue=False, show_progress=False)

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()

}))

    var event = isFirefox ? 'mousedown' : 'click';

    e.addEventListener(event, function(evt) {

        if (evt.button == 1) {

            open(evt.target.src);

            evt.preventDefault();

            return;

        }

        if (!opts.js_modal_lightbox || evt.button != 0) return;

        modalZoomSet(gradioApp().getElementById('modalImage'), opts.js_modal_lightbox_initially_zoomed);

        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

from PIL import Image, ImageOps, ImageFilter, ImageEnhance, UnidentifiedImageError

import gradio as gr

from modules import sd_samplers, images as imgutil

from modules import images as imgutil

from modules.generation_parameters_copypaste import create_override_settings_dict, parse_generation_parameters

from modules.processing import Processed, StableDiffusionProcessingImg2Img, process_images

from modules.shared import opts, state

            process_images(p)

def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_styles, init_img, sketch, init_img_with_mask, inpaint_color_sketch, inpaint_color_sketch_orig, init_img_inpaint, init_mask_inpaint, steps: int, sampler_index: int, mask_blur: int, mask_alpha: float, inpainting_fill: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, image_cfg_scale: float, denoising_strength: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, selected_scale_tab: int, height: int, width: int, scale_by: float, resize_mode: int, inpaint_full_res: bool, inpaint_full_res_padding: int, inpainting_mask_invert: int, img2img_batch_input_dir: str, img2img_batch_output_dir: str, img2img_batch_inpaint_mask_dir: str, override_settings_texts, img2img_batch_use_png_info: bool, img2img_batch_png_info_props: list, img2img_batch_png_info_dir: str, request: gr.Request, *args):

def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_styles, init_img, sketch, init_img_with_mask, inpaint_color_sketch, inpaint_color_sketch_orig, init_img_inpaint, init_mask_inpaint, steps: int, sampler_name: str, mask_blur: int, mask_alpha: float, inpainting_fill: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, image_cfg_scale: float, denoising_strength: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, selected_scale_tab: int, height: int, width: int, scale_by: float, resize_mode: int, inpaint_full_res: bool, inpaint_full_res_padding: int, inpainting_mask_invert: int, img2img_batch_input_dir: str, img2img_batch_output_dir: str, img2img_batch_inpaint_mask_dir: str, override_settings_texts, img2img_batch_use_png_info: bool, img2img_batch_png_info_props: list, img2img_batch_png_info_dir: str, request: gr.Request, *args):

    override_settings = create_override_settings_dict(override_settings_texts)

    is_batch = mode == 5

        seed_resize_from_h=seed_resize_from_h,

        seed_resize_from_w=seed_resize_from_w,

        seed_enable_extras=seed_enable_extras,

        sampler_name=sd_samplers.samplers_for_img2img[sampler_index].name,

        sampler_name=sampler_name,

        batch_size=batch_size,

        n_iter=n_iter,

        steps=steps,

    return result.returncode == 0

def git_fix_workspace(dir, name):

    run(f'"{git}" -C "{dir}" fetch --refetch --no-auto-gc', f"Fetching all contents for {name}", f"Couldn't fetch {name}", live=True)

    run(f'"{git}" -C "{dir}" gc --aggressive --prune=now', f"Pruning {name}", f"Couldn't prune {name}", live=True)

    return

def run_git(dir, name, command, desc=None, errdesc=None, custom_env=None, live: bool = default_command_live, autofix=True):

    try:

        return run(f'"{git}" -C "{dir}" {command}', desc=desc, errdesc=errdesc, custom_env=custom_env, live=live)

    except RuntimeError:

        pass

    if not autofix:

        return None

    print(f"{errdesc}, attempting autofix...")

    git_fix_workspace(dir, name)

    return run(f'"{git}" -C "{dir}" {command}', desc=desc, errdesc=errdesc, custom_env=custom_env, live=live)

def git_clone(url, dir, name, commithash=None):

    # TODO clone into temporary dir and move if successful

        if commithash is None:

            return

        current_hash = run(f'"{git}" -C "{dir}" rev-parse HEAD', None, f"Couldn't determine {name}'s hash: {commithash}", live=False).strip()

        current_hash = run_git(dir, name, 'rev-parse HEAD', None, f"Couldn't determine {name}'s hash: {commithash}", live=False).strip()

        if current_hash == commithash:

            return

        run(f'"{git}" -C "{dir}" fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}")

        run(f'"{git}" -C "{dir}" checkout {commithash}', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}", live=True)

        run_git('fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}")

        run_git('checkout', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}", live=True)

        return

    run(f'"{git}" clone "{url}" "{dir}"', f"Cloning {name} into {dir}...", f"Couldn't clone {name}", live=True)