loopback moved to scripts, added support for multiple batches, changed to honor save grids and how grids in web setting

1 files changed, 3 insertions, 40 deletions

diff --git a/modules/img2img.py b/modules/img2img.py
index 08e15911..bfcd7598 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -11,10 +11,9 @@ from modules.ui import plaintext_to_html
 import modules.images as images

 import modules.scripts

 

-def img2img(prompt: str, negative_prompt: str, prompt_style: str, init_img, init_img_with_mask, init_mask, mask_mode, steps: int, sampler_index: int, mask_blur: int, inpainting_fill: int, restore_faces: bool, tiling: bool, mode: int, n_iter: int, batch_size: int, cfg_scale: float, denoising_strength: float, denoising_strength_change_factor: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, height: int, width: int, resize_mode: int, upscaler_index: str, upscale_overlap: int, inpaint_full_res: bool, inpainting_mask_invert: int, *args):

+def img2img(prompt: str, negative_prompt: str, prompt_style: str, init_img, init_img_with_mask, init_mask, mask_mode, steps: int, sampler_index: int, mask_blur: int, inpainting_fill: int, restore_faces: bool, tiling: bool, mode: int, 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, height: int, width: int, resize_mode: int, upscaler_index: str, upscale_overlap: int, inpaint_full_res: bool, inpainting_mask_invert: int, *args):

     is_inpaint = mode == 1

-    is_loopback = mode == 2

-    is_upscale = mode == 3

+    is_upscale = mode == 2

 

     if is_inpaint:

         if mask_mode == 0:

@@ -61,46 +60,10 @@ def img2img(prompt: str, negative_prompt: str, prompt_style: str, init_img, init
         denoising_strength=denoising_strength,

         inpaint_full_res=inpaint_full_res,

         inpainting_mask_invert=inpainting_mask_invert,

-        extra_generation_params={

-            "Denoising strength change factor": (denoising_strength_change_factor if is_loopback else None)

-        }

     )

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

 

-    if is_loopback:

-        output_images, info = None, None

-        history = []

-        initial_seed = None

-        initial_info = None

-

-        state.job_count = n_iter

-

-        for i in range(n_iter):

-            p.n_iter = 1

-            p.batch_size = 1

-            p.do_not_save_grid = True

-

-            state.job = f"Batch {i + 1} out of {n_iter}"

-            processed = process_images(p)

-

-            if initial_seed is None:

-                initial_seed = processed.seed

-                initial_info = processed.info

-            

-            init_img = processed.images[0]

-

-            p.init_images = [init_img]

-            p.seed = processed.seed + 1

-            p.denoising_strength = min(max(p.denoising_strength * denoising_strength_change_factor, 0.1), 1)

-            history.append(processed.images[0])

-

-        grid = images.image_grid(history, batch_size, rows=1)

-

-        images.save_image(grid, p.outpath_grids, "grid", initial_seed, prompt, opts.grid_format, info=info, short_filename=not opts.grid_extended_filename, grid=True, p=p)

-

-        processed = Processed(p, history, initial_seed, initial_info)

-

-    elif is_upscale:

+    if is_upscale:

         initial_info = None

 

         processing.fix_seed(p)