Merge branch 'dev' into Branch_AddNewFilenameGen

1 files changed, 9 insertions, 3 deletions

diff --git a/modules/images.py b/modules/images.py
index cdbb77e1..559de810 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -261,9 +261,12 @@ def resize_image(resize_mode, im, width, height, upscaler_name=None):
 

         if scale > 1.0:

             upscalers = [x for x in shared.sd_upscalers if x.name == upscaler_name]

-            assert len(upscalers) > 0, f"could not find upscaler named {upscaler_name}"

+            if len(upscalers) == 0:

+                upscaler = shared.sd_upscalers[0]

+                print(f"could not find upscaler named {upscaler_name or '<empty string>'}, using {upscaler.name} as a fallback")

+            else:

+                upscaler = upscalers[0]

 

-            upscaler = upscalers[0]

             im = upscaler.scaler.upscale(im, scale, upscaler.data_path)

 

         if im.width != w or im.height != h:

@@ -350,6 +353,7 @@ class FilenameGenerator:
         'prompt_spaces': lambda self: sanitize_filename_part(self.prompt, replace_spaces=False),

         'prompt_words': lambda self: self.prompt_words(),

         'hasprompt': lambda self, *args: self.hasprompt(*args), #accept formats:[hasprompt<prompt1|default><prompt2>..]

+        'clip_skip': lambda self: opts.data["CLIP_stop_at_last_layers"],

     }

     default_time_format = '%Y%m%d%H%M%S'

 

@@ -662,6 +666,8 @@ Steps: {json_info["steps"]}, Sampler: {sampler}, CFG scale: {json_info["scale"]}
 

 

 def image_data(data):

+    import gradio as gr

+

     try:

         image = Image.open(io.BytesIO(data))

         textinfo, _ = read_info_from_image(image)

@@ -677,7 +683,7 @@ def image_data(data):
     except Exception:

         pass

 

-    return '', None

+    return gr.update(), None

 

 

 def flatten(img, bgcolor):