Unverified Commit 3ec2eb8b authored by InvincibleDude's avatar InvincibleDude Committed by GitHub
Browse files

Merge branch 'master' into improved-hr-conflict-test

parents 0d834b93 ee9fdf7f

configs/instruct-pix2pix.yaml

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ model: 
    conditioning_key: hybrid

    monitor: val/loss_simple_ema

    scale_factor: 0.18215

    use_ema: true

    load_ema: true

    use_ema: false



    scheduler_config: # 10000 warmup steps

      target: ldm.lr_scheduler.LambdaLinearScheduler

javascript/ui.js

+28 −8
Original line number Diff line number Diff line
@@ -191,6 +191,28 @@ function confirm_clear_prompt(prompt, negative_prompt) { 
    return [prompt, negative_prompt]

}





promptTokecountUpdateFuncs = {}



function recalculatePromptTokens(name){

    if(promptTokecountUpdateFuncs[name]){

        promptTokecountUpdateFuncs[name]()

    }

}



function recalculate_prompts_txt2img(){

    recalculatePromptTokens('txt2img_prompt')

    recalculatePromptTokens('txt2img_neg_prompt')

    return args_to_array(arguments);

}



function recalculate_prompts_img2img(){

    recalculatePromptTokens('img2img_prompt')

    recalculatePromptTokens('img2img_neg_prompt')

    return args_to_array(arguments);

}





opts = {}

onUiUpdate(function(){

	if(Object.keys(opts).length != 0) return;
@@ -232,14 +254,12 @@ onUiUpdate(function(){ 
            return

        }





        prompt.parentElement.insertBefore(counter, prompt)

        counter.classList.add("token-counter")

        prompt.parentElement.style.position = "relative"



		textarea.addEventListener("input", function(){

		    update_token_counter(id_button);

		});

		promptTokecountUpdateFuncs[id] = function(){ update_token_counter(id_button); }

		textarea.addEventListener("input", promptTokecountUpdateFuncs[id]);

    }



    registerTextarea('txt2img_prompt', 'txt2img_token_counter', 'txt2img_token_button')
@@ -273,7 +293,7 @@ onOptionsChanged(function(){ 


let txt2img_textarea, img2img_textarea = undefined;

let wait_time = 800

let token_timeout;

let token_timeouts = {};



function update_txt2img_tokens(...args) {

	update_token_counter("txt2img_token_button")
@@ -290,9 +310,9 @@ function update_img2img_tokens(...args) { 
}



function update_token_counter(button_id) {

	if (token_timeout)

		clearTimeout(token_timeout);

	token_timeout = setTimeout(() => gradioApp().getElementById(button_id)?.click(), wait_time);

	if (token_timeouts[button_id])

		clearTimeout(token_timeouts[button_id]);

	token_timeouts[button_id] = setTimeout(() => gradioApp().getElementById(button_id)?.click(), wait_time);

}



function restart_reload(){

launch.py

+2 −1
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ def prepare_environment(): 
    requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")

    commandline_args = os.environ.get('COMMANDLINE_ARGS', "")



    xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.16rc425')

    gfpgan_package = os.environ.get('GFPGAN_PACKAGE', "git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379")

    clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1")

    openclip_package = os.environ.get('OPENCLIP_PACKAGE', "git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b")
@@ -282,7 +283,7 @@ def prepare_environment(): 
    if (not is_installed("xformers") or reinstall_xformers) and xformers:

        if platform.system() == "Windows":

            if platform.python_version().startswith("3.10"):

                run_pip(f"install -U -I --no-deps xformers==0.0.16rc425", "xformers")

                run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")

            else:

                print("Installation of xformers is not supported in this version of Python.")

                print("You can also check this and build manually: https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Xformers#building-xformers-on-windows-by-duckness")

modules/generation_parameters_copypaste.py

+137 −69
Original line number Diff line number Diff line 
import base64

import html

import io

import math

import os
@@ -16,13 +17,23 @@ re_param = re.compile(re_param_code) 
re_imagesize = re.compile(r"^(\d+)x(\d+)$")

re_hypernet_hash = re.compile("\(([0-9a-f]+)\)$")

type_of_gr_update = type(gr.update())



paste_fields = {}

bind_list = []

registered_param_bindings = []





class ParamBinding:

    def __init__(self, paste_button, tabname, source_text_component=None, source_image_component=None, source_tabname=None, override_settings_component=None):

        self.paste_button = paste_button

        self.tabname = tabname

        self.source_text_component = source_text_component

        self.source_image_component = source_image_component

        self.source_tabname = source_tabname

        self.override_settings_component = override_settings_component





def reset():

    paste_fields.clear()

    bind_list.clear()





def quote(text):
@@ -74,26 +85,6 @@ def add_paste_fields(tabname, init_img, fields): 
        modules.ui.img2img_paste_fields = fields





def integrate_settings_paste_fields(component_dict):

    from modules import ui



    settings_map = {

        'CLIP_stop_at_last_layers': 'Clip skip',

        'inpainting_mask_weight': 'Conditional mask weight',

        'sd_model_checkpoint': 'Model hash',

        'eta_noise_seed_delta': 'ENSD',

        'initial_noise_multiplier': 'Noise multiplier',

    }

    settings_paste_fields = [

        (component_dict[k], lambda d, k=k, v=v: ui.apply_setting(k, d.get(v, None)))

        for k, v in settings_map.items()

    ]



    for tabname, info in paste_fields.items():

        if info["fields"] is not None:

            info["fields"] += settings_paste_fields





def create_buttons(tabs_list):

    buttons = {}

    for tab in tabs_list:
@@ -101,71 +92,79 @@ def create_buttons(tabs_list): 
    return buttons





#if send_generate_info is a tab name, mean generate_info comes from the params fields of the tab

def bind_buttons(buttons, send_image, send_generate_info):

    bind_list.append([buttons, send_image, send_generate_info])



    """old function for backwards compatibility; do not use this, use register_paste_params_button"""

    for tabname, button in buttons.items():

        source_text_component = send_generate_info if isinstance(send_generate_info, gr.components.Component) else None

        source_tabname = send_generate_info if isinstance(send_generate_info, str) else None



def send_image_and_dimensions(x):

    if isinstance(x, Image.Image):

        img = x

    else:

        img = image_from_url_text(x)

        register_paste_params_button(ParamBinding(paste_button=button, tabname=tabname, source_text_component=source_text_component, source_image_component=send_image, source_tabname=source_tabname))



    if shared.opts.send_size and isinstance(img, Image.Image):

        w = img.width

        h = img.height

    else:

        w = gr.update()

        h = gr.update()



    return img, w, h

def register_paste_params_button(binding: ParamBinding):

    registered_param_bindings.append(binding)





def run_bind():

    for buttons, source_image_component, send_generate_info in bind_list:

        for tab in buttons:

            button = buttons[tab]

            destination_image_component = paste_fields[tab]["init_img"]

            fields = paste_fields[tab]["fields"]

def connect_paste_params_buttons():

    binding: ParamBinding

    for binding in registered_param_bindings:

        destination_image_component = paste_fields[binding.tabname]["init_img"]

        fields = paste_fields[binding.tabname]["fields"]



        destination_width_component = next(iter([field for field, name in fields if name == "Size-1"] if fields else []), None)

        destination_height_component = next(iter([field for field, name in fields if name == "Size-2"] if fields else []), None)



            if source_image_component and destination_image_component:

                if isinstance(source_image_component, gr.Gallery):

        if binding.source_image_component and destination_image_component:

            if isinstance(binding.source_image_component, gr.Gallery):

                func = send_image_and_dimensions if destination_width_component else image_from_url_text

                jsfunc = "extract_image_from_gallery"

            else:

                func = send_image_and_dimensions if destination_width_component else lambda x: x

                jsfunc = None



                button.click(

            binding.paste_button.click(

                fn=func,

                _js=jsfunc,

                    inputs=[source_image_component],

                inputs=[binding.source_image_component],

                outputs=[destination_image_component, destination_width_component, destination_height_component] if destination_width_component else [destination_image_component],

            )



            if send_generate_info and fields is not None:

                if send_generate_info in paste_fields:

        if binding.source_text_component is not None and fields is not None:

            connect_paste(binding.paste_button, fields, binding.source_text_component, binding.override_settings_component, binding.tabname)



        if binding.source_tabname is not None and fields is not None:

            paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration'] + (["Seed"] if shared.opts.send_seed else [])

                    button.click(

            binding.paste_button.click(

                fn=lambda *x: x,

                        inputs=[field for field, name in paste_fields[send_generate_info]["fields"] if name in paste_field_names],

                inputs=[field for field, name in paste_fields[binding.source_tabname]["fields"] if name in paste_field_names],

                outputs=[field for field, name in fields if name in paste_field_names],

            )

                else:

                    connect_paste(button, fields, send_generate_info)



            button.click(

        binding.paste_button.click(

            fn=None,

                _js=f"switch_to_{tab}",

            _js=f"switch_to_{binding.tabname}",

            inputs=None,

            outputs=None,

        )





def send_image_and_dimensions(x):

    if isinstance(x, Image.Image):

        img = x

    else:

        img = image_from_url_text(x)



    if shared.opts.send_size and isinstance(img, Image.Image):

        w = img.width

        h = img.height

    else:

        w = gr.update()

        h = gr.update()



    return img, w, h







def find_hypernetwork_key(hypernet_name, hypernet_hash=None):

    """Determines the config parameter name to use for the hypernet based on the parameters in the infotext.
@@ -290,7 +289,50 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model 
    return res





def connect_paste(button, paste_fields, input_comp, jsfunc=None):

settings_map = {}



infotext_to_setting_name_mapping = [

    ('Clip skip', 'CLIP_stop_at_last_layers', ),

    ('Conditional mask weight', 'inpainting_mask_weight'),

    ('Model hash', 'sd_model_checkpoint'),

    ('ENSD', 'eta_noise_seed_delta'),

    ('Noise multiplier', 'initial_noise_multiplier'),

    ('Eta', 'eta_ancestral'),

    ('Eta DDIM', 'eta_ddim'),

    ('Discard penultimate sigma', 'always_discard_next_to_last_sigma')

]





def create_override_settings_dict(text_pairs):

    """creates processing's override_settings parameters from gradio's multiselect



    Example input:

        ['Clip skip: 2', 'Model hash: e6e99610c4', 'ENSD: 31337']



    Example output:

        {'CLIP_stop_at_last_layers': 2, 'sd_model_checkpoint': 'e6e99610c4', 'eta_noise_seed_delta': 31337}

    """



    res = {}



    params = {}

    for pair in text_pairs:

        k, v = pair.split(":", maxsplit=1)



        params[k] = v.strip()



    for param_name, setting_name in infotext_to_setting_name_mapping:

        value = params.get(param_name, None)



        if value is None:

            continue



        res[setting_name] = shared.opts.cast_value(setting_name, value)



    return res





def connect_paste(button, paste_fields, input_comp, override_settings_component, tabname):

    def paste_func(prompt):

        if not prompt and not shared.cmd_opts.hide_ui_dir_config:

            filename = os.path.join(data_path, "params.txt")
@@ -327,9 +369,35 @@ def connect_paste(button, paste_fields, input_comp, jsfunc=None): 


        return res



    if override_settings_component is not None:

        def paste_settings(params):

            vals = {}



            for param_name, setting_name in infotext_to_setting_name_mapping:

                v = params.get(param_name, None)

                if v is None:

                    continue



                if setting_name == "sd_model_checkpoint" and shared.opts.disable_weights_auto_swap:

                    continue



                v = shared.opts.cast_value(setting_name, v)

                current_value = getattr(shared.opts, setting_name, None)



                if v == current_value:

                    continue



                vals[param_name] = v



            vals_pairs = [f"{k}: {v}" for k, v in vals.items()]



            return gr.Dropdown.update(value=vals_pairs, choices=vals_pairs, visible=len(vals_pairs) > 0)



        paste_fields = paste_fields + [(override_settings_component, paste_settings)]



    button.click(

        fn=paste_func,

        _js=jsfunc,

        _js=f"recalculate_prompts_{tabname}",

        inputs=[input_comp],

        outputs=[x[0] for x in paste_fields],

    )

modules/img2img.py

+5 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import numpy as np 
from PIL import Image, ImageOps, ImageFilter, ImageEnhance, ImageChops



from modules import devices, sd_samplers

from modules.generation_parameters_copypaste import create_override_settings_dict

from modules.processing import Processed, StableDiffusionProcessingImg2Img, process_images

from modules.shared import opts, state

import modules.shared as shared
@@ -75,7 +76,9 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args): 
                processed_image.save(os.path.join(output_dir, filename))





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, denoising_strength: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, 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, *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_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, denoising_strength: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, 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, *args):

    override_settings = create_override_settings_dict(override_settings_texts)



    is_batch = mode == 5



    if mode == 0:  # img2img
@@ -142,6 +145,7 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s 
        inpaint_full_res=inpaint_full_res,

        inpaint_full_res_padding=inpaint_full_res_padding,

        inpainting_mask_invert=inpainting_mask_invert,

        override_settings=override_settings,

    )



    p.scripts = modules.scripts.scripts_txt2img

CRA Git | Maintained and supported by SUSTech CRA and CCSE