move some settings to the new Optimization page

add slider for token merging for img2img
rework StableDiffusionProcessing to have the token_merging_ratio field
fix a bug with applying png optimizations for live previews when they shouldn't be applied

1 files changed, 5 insertions, 1 deletions

diff --git a/modules/progress.py b/modules/progress.py
index 269863c9..f405f07f 100644
--- a/modules/progress.py
+++ b/modules/progress.py
@@ -98,7 +98,11 @@ def progressapi(req: ProgressRequest):
 

             if opts.live_previews_image_format == "png":

                 # using optimize for large images takes an enormous amount of time

-                save_kwargs = {"optimize": max(*image.size) > 256}

+                if max(*image.size) <= 256:

+                    save_kwargs = {"optimize": True}

+                else:

+                    save_kwargs = {"optimize": False, "compress_level": 1}

+

             else:

                 save_kwargs = {}