Merge pull request #12856 from catboxanon/extra-noise-noisy-latent

Add noisy latent to `ExtraNoiseParams` for callback
AUTOMATIC1111 · Aug 30, 2023 · 834f4c7 · 834f4c7
2 parents 04b9032 + 549b475
commit 834f4c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/modules/script_callbacks.py b/modules/script_callbacks.py
@@ -29,12 +29,15 @@ def __init__(self, image, p, filename, pnginfo):
 
 
 class ExtraNoiseParams:
-    def __init__(self, noise, x):
+    def __init__(self, noise, x, xi):
         self.noise = noise
         """Random noise generated by the seed"""
 
         self.x = x
-        """Latent image representation of the image"""
+        """Latent representation of the image"""
+
+        self.xi = xi
+        """Noisy latent representation of the image"""
 
 
 class CFGDenoiserParams:

diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py
@@ -148,7 +148,7 @@ def sample_img2img(self, p, x, noise, conditioning, unconditional_conditioning,
 
         if opts.img2img_extra_noise > 0:
             p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise
-            extra_noise_params = ExtraNoiseParams(noise, x)
+            extra_noise_params = ExtraNoiseParams(noise, x, xi)
             extra_noise_callback(extra_noise_params)
             noise = extra_noise_params.noise
             xi += noise * opts.img2img_extra_noise

diff --git a/modules/sd_samplers_timesteps.py b/modules/sd_samplers_timesteps.py
@@ -107,7 +107,7 @@ def sample_img2img(self, p, x, noise, conditioning, unconditional_conditioning,
 
         if opts.img2img_extra_noise > 0:
             p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise
-            extra_noise_params = ExtraNoiseParams(noise, x)
+            extra_noise_params = ExtraNoiseParams(noise, x, xi)
             extra_noise_callback(extra_noise_params)
             noise = extra_noise_params.noise
             xi += noise * opts.img2img_extra_noise * sqrt_alpha_cumprod