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

1 files changed, 5 insertions, 2 deletions

diff --git a/modules/processing.py b/modules/processing.py
index 49b1b4ea..61e6dfcd 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -186,7 +186,7 @@ class StableDiffusionProcessing:
         return conditioning

 

     def edit_image_conditioning(self, source_image):

-        conditioning_image = self.sd_model.get_first_stage_encoding(self.sd_model.encode_first_stage(source_image))

+        conditioning_image = self.sd_model.encode_first_stage(source_image).mode()

 

         return conditioning_image

 

@@ -268,6 +268,7 @@ class Processed:
         self.height = p.height

         self.sampler_name = p.sampler_name

         self.cfg_scale = p.cfg_scale

+        self.image_cfg_scale = getattr(p, 'image_cfg_scale', None)

         self.steps = p.steps

         self.batch_size = p.batch_size

         self.restore_faces = p.restore_faces

@@ -445,6 +446,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
         "Steps": p.steps,

         "Sampler": p.sampler_name,

         "CFG scale": p.cfg_scale,

+        "Image CFG scale": getattr(p, 'image_cfg_scale', None),

         "Seed": all_seeds[index],

         "Face restoration": (opts.face_restoration_model if p.restore_faces else None),

         "Size": f"{p.width}x{p.height}",

@@ -961,12 +963,13 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
 class StableDiffusionProcessingImg2Img(StableDiffusionProcessing):

     sampler = None

 

-    def __init__(self, init_images: list = None, resize_mode: int = 0, denoising_strength: float = 0.75, mask: Any = None, mask_blur: int = 4, inpainting_fill: int = 0, inpaint_full_res: bool = True, inpaint_full_res_padding: int = 0, inpainting_mask_invert: int = 0, initial_noise_multiplier: float = None, **kwargs):

+    def __init__(self, init_images: list = None, resize_mode: int = 0, denoising_strength: float = 0.75, image_cfg_scale: float = None, mask: Any = None, mask_blur: int = 4, inpainting_fill: int = 0, inpaint_full_res: bool = True, inpaint_full_res_padding: int = 0, inpainting_mask_invert: int = 0, initial_noise_multiplier: float = None, **kwargs):

         super().__init__(**kwargs)

 

         self.init_images = init_images

         self.resize_mode: int = resize_mode

         self.denoising_strength: float = denoising_strength

+        self.image_cfg_scale: float = image_cfg_scale if shared.sd_model.cond_stage_key == "edit" else None

         self.init_latent = None

         self.image_mask = mask

         self.latent_mask = None