remove unwanted formatting/functionality from the PR

1 files changed, 18 insertions, 17 deletions

diff --git a/modules/extras.py b/modules/extras.py
index 1d4e9fa8..1bff5874 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -67,28 +67,29 @@ def run_extras(extras_mode, image, image_folder, gfpgan_visibility, codeformer_v
             info += f"CodeFormer w: {round(codeformer_weight, 2)}, CodeFormer visibility:{round(codeformer_visibility, 2)}\n"

             image = res

 

-        def upscale(image, scaler_index, resize):

-            small = image.crop((image.width // 2, image.height // 2, image.width // 2 + 10, image.height // 2 + 10))

-            pixels = tuple(np.array(small).flatten().tolist())

-            key = (resize, scaler_index, image.width, image.height, gfpgan_visibility, codeformer_visibility, codeformer_weight) + pixels

+        if upscaling_resize != 1.0:

+            def upscale(image, scaler_index, resize):

+                small = image.crop((image.width // 2, image.height // 2, image.width // 2 + 10, image.height // 2 + 10))

+                pixels = tuple(np.array(small).flatten().tolist())

+                key = (resize, scaler_index, image.width, image.height, gfpgan_visibility, codeformer_visibility, codeformer_weight) + pixels

 

-            c = cached_images.get(key)

-            if c is None:

-                upscaler = shared.sd_upscalers[scaler_index]

-                c = upscaler.scaler.upscale(image, resize, upscaler.data_path)

-                cached_images[key] = c

+                c = cached_images.get(key)

+                if c is None:

+                    upscaler = shared.sd_upscalers[scaler_index]

+                    c = upscaler.scaler.upscale(image, resize, upscaler.data_path)

+                    cached_images[key] = c

 

-            return c

+                return c

 

-        info += f"Upscale: {round(upscaling_resize, 3)}, model:{shared.sd_upscalers[extras_upscaler_1].name}\n"

-        res = upscale(image, extras_upscaler_1, upscaling_resize)

+            info += f"Upscale: {round(upscaling_resize, 3)}, model:{shared.sd_upscalers[extras_upscaler_1].name}\n"

+            res = upscale(image, extras_upscaler_1, upscaling_resize)

 

-        if extras_upscaler_2 != 0 and extras_upscaler_2_visibility > 0:

-            res2 = upscale(image, extras_upscaler_2, upscaling_resize)

-            info += f"Upscale: {round(upscaling_resize, 3)}, visibility: {round(extras_upscaler_2_visibility, 3)}, model:{shared.sd_upscalers[extras_upscaler_2].name}\n"

-            res = Image.blend(res, res2, extras_upscaler_2_visibility)

+            if extras_upscaler_2 != 0 and extras_upscaler_2_visibility > 0:

+                res2 = upscale(image, extras_upscaler_2, upscaling_resize)

+                info += f"Upscale: {round(upscaling_resize, 3)}, visibility: {round(extras_upscaler_2_visibility, 3)}, model:{shared.sd_upscalers[extras_upscaler_2].name}\n"

+                res = Image.blend(res, res2, extras_upscaler_2_visibility)

 

-        image = res

+            image = res

 

         while len(cached_images) > 2:

             del cached_images[next(iter(cached_images.keys()))]