Merge branch 'dev'

Fix method 1 : pin Setuptools==69.5.1

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.9.4
+
+### Bug Fixes:
+*  pin setuptools version to fix the startup error ([#15883](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15883)) 
+
 ## 1.9.3
 
 ### Bug Fixes:

modules/postprocessing.py

@@ -2,7 +2,7 @@ import os
 
 from PIL import Image
 
-from modules import shared, images, devices, scripts, scripts_postprocessing, ui_common, infotext_utils, util
+from modules import shared, images, devices, scripts, scripts_postprocessing, ui_common, infotext_utils
 from modules.shared import opts
 
 
@@ -31,8 +31,6 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
             for filename in image_list:
                 yield filename, filename
         else:
-            if isinstance(image, str):
-                image = util.decode_base64_to_image(image)
             assert image, 'image not selected'
             yield image, None
 
@@ -64,13 +62,11 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
         else:
             image_data = image_placeholder
 
-        image_data = image_data if image_data.mode in ("RGBA", "RGB") else image_data.convert("RGB")
-
         parameters, existing_pnginfo = images.read_info_from_image(image_data)
         if parameters:
             existing_pnginfo["parameters"] = parameters
 
-        initial_pp = scripts_postprocessing.PostprocessedImage(image_data)
+        initial_pp = scripts_postprocessing.PostprocessedImage(image_data if image_data.mode in ("RGBA", "RGB") else image_data.convert("RGB"))
 
         scripts.scripts_postproc.run(initial_pp, args)
 

modules/ui_postprocessing.py

@@ -54,7 +54,6 @@ def create_ui():
             output_panel.html_log,
         ],
         show_progress=False,
-        preprocess=False,
     )
 
     parameters_copypaste.add_paste_fields("extras", extras_image, None)

modules/util.py

@@ -211,13 +211,3 @@ Requested path was: {path}
         subprocess.Popen(["wsl-open", path])
     else:
         subprocess.Popen(["xdg-open", path])
-
-
-def decode_base64_to_image(base64_str: str):
-    from modules import images
-    from io import BytesIO
-    import base64
-    if base64_str.startswith("data:image/"):
-        base64_str = base64_str.partition(';')[2].partition(',')[2]
-    image = images.read(BytesIO(base64.b64decode(base64_str)))
-    return image

requirements_versions.txt

@@ -1,3 +1,4 @@
+setuptools==69.5.1  # temp fix for compatibility with some old packages
 GitPython==3.1.32
 Pillow==9.5.0
 accelerate==0.21.0