Merge branch 'master' into saving

1 files changed, 13 insertions, 7 deletions

diff --git a/modules/processing.py b/modules/processing.py
index 90e00bf8..4ecdfcd2 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -49,7 +49,7 @@ def apply_color_correction(correction, image):
 

 

 class StableDiffusionProcessing:

-    def __init__(self, sd_model=None, outpath_samples=None, outpath_grids=None, prompt="", styles=None, seed=-1, subseed=-1, subseed_strength=0, seed_resize_from_h=-1, seed_resize_from_w=-1, seed_enable_extras=True, sampler_index=0, batch_size=1, n_iter=1, steps=50, cfg_scale=7.0, width=512, height=512, restore_faces=False, tiling=False, do_not_save_samples=False, do_not_save_grid=False, extra_generation_params=None, overlay_images=None, negative_prompt=None):

+    def __init__(self, sd_model=None, outpath_samples=None, outpath_grids=None, prompt="", styles=None, seed=-1, subseed=-1, subseed_strength=0, seed_resize_from_h=-1, seed_resize_from_w=-1, seed_enable_extras=True, sampler_index=0, batch_size=1, n_iter=1, steps=50, cfg_scale=7.0, width=512, height=512, restore_faces=False, tiling=False, do_not_save_samples=False, do_not_save_grid=False, extra_generation_params=None, overlay_images=None, negative_prompt=None, eta=None):

         self.sd_model = sd_model

         self.outpath_samples: str = outpath_samples

         self.outpath_grids: str = outpath_grids

@@ -75,15 +75,15 @@ class StableDiffusionProcessing:
         self.do_not_save_grid: bool = do_not_save_grid

         self.extra_generation_params: dict = extra_generation_params or {}

         self.overlay_images = overlay_images

+        self.eta = eta

         self.paste_to = None

         self.color_corrections = None

         self.denoising_strength: float = 0

-        

-        self.eta = opts.eta

+

         self.ddim_discretize = opts.ddim_discretize

         self.s_churn = opts.s_churn

         self.s_tmin = opts.s_tmin

-        self.s_tmax = float('inf') # not representable as a standard ui option

+        self.s_tmax = float('inf')  # not representable as a standard ui option

         self.s_noise = opts.s_noise

         

         if not seed_enable_extras:

@@ -100,7 +100,7 @@ class StableDiffusionProcessing:
 

 

 class Processed:

-    def __init__(self, p: StableDiffusionProcessing, images_list, seed=-1, info="", subseed=None, all_prompts=None, all_seeds=None, all_subseeds=None, index_of_first_image=0):

+    def __init__(self, p: StableDiffusionProcessing, images_list, seed=-1, info="", subseed=None, all_prompts=None, all_seeds=None, all_subseeds=None, index_of_first_image=0, infotexts=None):

         self.images = images_list

         self.prompt = p.prompt

         self.negative_prompt = p.negative_prompt

@@ -139,6 +139,7 @@ class Processed:
         self.all_prompts = all_prompts or [self.prompt]

         self.all_seeds = all_seeds or [self.seed]

         self.all_subseeds = all_subseeds or [self.subseed]

+        self.infotexts = infotexts or [info]

 

     def js(self):

         obj = {

@@ -165,6 +166,7 @@ class Processed:
             "denoising_strength": self.denoising_strength,

             "extra_generation_params": self.extra_generation_params,

             "index_of_first_image": self.index_of_first_image,

+            "infotexts": self.infotexts,

         }

 

         return json.dumps(obj)

@@ -269,6 +271,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration
         "Variation seed strength": (None if p.subseed_strength == 0 else p.subseed_strength),

         "Seed resize from": (None if p.seed_resize_from_w == 0 or p.seed_resize_from_h == 0 else f"{p.seed_resize_from_w}x{p.seed_resize_from_h}"),

         "Denoising strength": getattr(p, 'denoising_strength', None),

+        "Eta": (None if p.sampler.eta == p.sampler.default_eta else p.sampler.eta),

     }

 

     generation_params.update(p.extra_generation_params)

@@ -277,7 +280,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration
 

     negative_prompt_text = "\nNegative prompt: " + p.negative_prompt if p.negative_prompt else ""

 

-    return f"{all_prompts[index]}{negative_prompt_text}\n{generation_params_text}".strip() + "".join(["\n\n" + x for x in comments])

+    return f"{all_prompts[index]}{negative_prompt_text}\n{generation_params_text}".strip()

 

 

 def process_images(p: StableDiffusionProcessing) -> Processed:

@@ -322,6 +325,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
     if os.path.exists(cmd_opts.embeddings_dir):

         model_hijack.load_textual_inversion_embeddings(cmd_opts.embeddings_dir, p.sd_model)

 

+    infotexts = []

     output_images = []

     precision_scope = torch.autocast if cmd_opts.precision == "autocast" else contextlib.nullcontext

     ema_scope = (contextlib.nullcontext if cmd_opts.lowvram else p.sd_model.ema_scope)

@@ -404,6 +408,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
                 if opts.samples_save and not p.do_not_save_samples:

                     images.save_image(image, p.outpath_samples, "", seeds[i], prompts[i], opts.samples_format, info=infotext(n, i), p=p)

 

+                infotexts.append(infotext(n, i))

                 output_images.append(image)

 

             state.nextjob()

@@ -416,6 +421,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
             grid = images.image_grid(output_images, p.batch_size)

 

             if opts.return_grid:

+                infotexts.insert(0, infotext())

                 output_images.insert(0, grid)

                 index_of_first_image = 1

 

@@ -423,7 +429,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
                 images.save_image(grid, p.outpath_grids, "grid", all_seeds[0], all_prompts[0], opts.grid_format, info=infotext(), short_filename=not opts.grid_extended_filename, p=p, grid=True)

 

     devices.torch_gc()

-    return Processed(p, output_images, all_seeds[0], infotext(), subseed=all_subseeds[0], all_prompts=all_prompts, all_seeds=all_seeds, all_subseeds=all_subseeds, index_of_first_image=index_of_first_image)

+    return Processed(p, output_images, all_seeds[0], infotext() + "".join(["\n\n" + x for x in comments]), subseed=all_subseeds[0], all_prompts=all_prompts, all_seeds=all_seeds, all_subseeds=all_subseeds, index_of_first_image=index_of_first_image, infotexts=infotexts)

 

 

 class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):