Merge branch 'release_candidate'

1 files changed, 60 insertions, 5 deletions

diff --git a/modules/txt2img.py b/modules/txt2img.py
index e4e18ceb..fc56b8a8 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -1,17 +1,22 @@
+import json

 from contextlib import closing

 

 import modules.scripts

-from modules import processing

-from modules.generation_parameters_copypaste import create_override_settings_dict

+from modules import processing, infotext_utils

+from modules.infotext_utils import create_override_settings_dict, parse_generation_parameters

 from modules.shared import opts

 import modules.shared as shared

 from modules.ui import plaintext_to_html

+from PIL import Image

 import gradio as gr

 

 

-def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, steps: int, sampler_name: str, n_iter: int, batch_size: int, cfg_scale: float, height: int, width: int, enable_hr: bool, denoising_strength: float, hr_scale: float, hr_upscaler: str, hr_second_pass_steps: int, hr_resize_x: int, hr_resize_y: int, hr_checkpoint_name: str, hr_sampler_name: str, hr_prompt: str, hr_negative_prompt, override_settings_texts, request: gr.Request, *args):

+def txt2img_create_processing(id_task: str, request: gr.Request, prompt: str, negative_prompt: str, prompt_styles, steps: int, sampler_name: str, n_iter: int, batch_size: int, cfg_scale: float, height: int, width: int, enable_hr: bool, denoising_strength: float, hr_scale: float, hr_upscaler: str, hr_second_pass_steps: int, hr_resize_x: int, hr_resize_y: int, hr_checkpoint_name: str, hr_sampler_name: str, hr_prompt: str, hr_negative_prompt, override_settings_texts, *args, force_enable_hr=False):

     override_settings = create_override_settings_dict(override_settings_texts)

 

+    if force_enable_hr:

+        enable_hr = True

+

     p = processing.StableDiffusionProcessingTxt2Img(

         sd_model=shared.sd_model,

         outpath_samples=opts.outdir_samples or opts.outdir_txt2img_samples,

@@ -27,7 +32,7 @@ def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, step
         width=width,

         height=height,

         enable_hr=enable_hr,

-        denoising_strength=denoising_strength if enable_hr else None,

+        denoising_strength=denoising_strength,

         hr_scale=hr_scale,

         hr_upscaler=hr_upscaler,

         hr_second_pass_steps=hr_second_pass_steps,

@@ -48,8 +53,58 @@ def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, step
     if shared.opts.enable_console_prompts:

         print(f"\ntxt2img: {prompt}", file=shared.progress_print_out)

 

+    return p

+

+

+def txt2img_upscale(id_task: str, request: gr.Request, gallery, gallery_index, generation_info, *args):

+    assert len(gallery) > 0, 'No image to upscale'

+    assert 0 <= gallery_index < len(gallery), f'Bad image index: {gallery_index}'

+

+    p = txt2img_create_processing(id_task, request, *args, force_enable_hr=True)

+    p.batch_size = 1

+    p.n_iter = 1

+    # txt2img_upscale attribute that signifies this is called by txt2img_upscale

+    p.txt2img_upscale = True

+

+    geninfo = json.loads(generation_info)

+

+    image_info = gallery[gallery_index] if 0 <= gallery_index < len(gallery) else gallery[0]

+    p.firstpass_image = infotext_utils.image_from_url_text(image_info)

+

+    parameters = parse_generation_parameters(geninfo.get('infotexts')[gallery_index], [])

+    p.seed = parameters.get('Seed', -1)

+    p.subseed = parameters.get('Variation seed', -1)

+

+    p.override_settings['save_images_before_highres_fix'] = False

+

+    with closing(p):

+        processed = modules.scripts.scripts_txt2img.run(p, *p.script_args)

+

+        if processed is None:

+            processed = processing.process_images(p)

+

+    shared.total_tqdm.clear()

+

+    new_gallery = []

+    for i, image in enumerate(gallery):

+        if i == gallery_index:

+            geninfo["infotexts"][gallery_index: gallery_index+1] = processed.infotexts

+            new_gallery.extend(processed.images)

+        else:

+            fake_image = Image.new(mode="RGB", size=(1, 1))

+            fake_image.already_saved_as = image["name"].rsplit('?', 1)[0]

+            new_gallery.append(fake_image)

+

+    geninfo["infotexts"][gallery_index] = processed.info

+

+    return new_gallery, json.dumps(geninfo), plaintext_to_html(processed.info), plaintext_to_html(processed.comments, classname="comments")

+

+

+def txt2img(id_task: str, request: gr.Request, *args):

+    p = txt2img_create_processing(id_task, request, *args)

+

     with closing(p):

-        processed = modules.scripts.scripts_txt2img.run(p, *args)

+        processed = modules.scripts.scripts_txt2img.run(p, *p.script_args)

 

         if processed is None:

             processed = processing.process_images(p)