update sketchpad dimensions

app.py

@@ -619,12 +619,22 @@ def replace_input_with_sketch_image(sketch_image):
 def on_input_image_change(image_path):
     if image_path is None:
         gr.Warning("Please upload an Input Image to get started.")
-        return None, None
+        return None, gr.update()
     img, img_path = convert_to_rgba_png(image_path)
     with Image.open(img_path) as pil_img:
         width, height = pil_img.size
     return [img_path, gr.update(width=width, height=height)]
 
+def update_sketch_dimensions(input_image, sketch_image):
+    # Load the images using open_image() if they are provided as file paths.
+    in_img = open_image(input_image) if isinstance(input_image, str) else input_image
+    sk_img_path, _ = get_image_from_dict(sketch_image)
+    sk_img = open_image(sk_img_path)
+    # Resize sketch image if dimensions don't match input image.
+    if in_img.size != sk_img.size:
+        sk_img = sk_img.resize(in_img.size, Image.LANCZOS)
+    return sk_img
+
 @spaces.GPU()
 def getVersions():
     return versions_html()
@@ -919,6 +929,10 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
         fn=run_lora,
         inputs=[prompt, map_options, input_image, image_strength, cfg_scale, steps, selected_index, randomize_seed, seed, width, height, lora_scale, enlarge_to_default, gr.State(True)],
         outputs=[input_image, seed, progress_bar], scroll_to_output=True
+    ).then(
+        fn=update_sketch_dimensions,
+        inputs=[input_image, sketch_image],
+        outputs=[sketch_image]
     )
     prerendered_image_gallery.select(
         fn=on_prerendered_gallery_selection, 
@@ -942,6 +956,10 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
         lambda: current_prerendered_image.value,
         inputs=None,
         outputs=[input_image], scroll_to_output=True
+    ).then(
+        fn=update_sketch_dimensions,
+        inputs=[input_image, sketch_image],
+        outputs=[sketch_image]
     )
     lora_gallery.select(
         update_selection,
@@ -962,6 +980,10 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
         fn=run_lora,
         inputs=[prompt, map_options, input_image, image_strength, cfg_scale, steps, selected_index, randomize_seed, seed, width, height, lora_scale, enlarge_to_default, gr.State(False)],
         outputs=[input_image, seed, progress_bar]
+    ).then(
+        fn=update_sketch_dimensions,
+        inputs=[input_image, sketch_image],
+        outputs=[sketch_image]
     )
 
 load_env_vars(dotenv_path)

modules/image_utils.py

@@ -95,21 +95,34 @@ def build_prerendered_images(images_list):
 # Example usage
 # filtered_maps = get_maps_with_quality_less_than(3)
 # print(filtered_maps)
-def build_prerendered_images_by_quality(quality_limit,key='file'):
+def build_prerendered_images_by_quality(quality_limit, key='file'):
     """
-    Retrieve all file paths from PRE_RENDERED_MAPS_JSON_LEVELS where quality is less than the given limit.
-
+    Retrieve and sort file paths from PRE_RENDERED_MAPS_JSON_LEVELS where quality is less than or equal to the given limit.
+    The sorting order matches pre_rendered_maps_paths based on quality and a case-insensitive alphanumeric key.
+    
     Args:
-        limit (int): The quality threshold.
-
+        quality_limit (int): The quality threshold.
+        key (str): The key to extract the file path from each map info (default is 'file').
+    
     Returns:
-        list: A list of file paths meeting the quality criteria.
-    """
+        list: A list of sorted file paths meeting the quality criteria.
+    """
+    # Sort the PRE_RENDERED_MAPS_JSON_LEVELS items by quality and alphanumeric key
+    sorted_maps = sorted(
+        PRE_RENDERED_MAPS_JSON_LEVELS.items(),
+        key=lambda x: (
+            x[1]['quality'],
+            ''.join(char.lower() for char in x[0] if char.isalnum())
+        )
+    )
+    
+    # Filter and extract the file paths that meet the quality limit
     images_list = [
-        map_info[key]
-        for map_info in PRE_RENDERED_MAPS_JSON_LEVELS.values()
+        map_info[key].replace("\\", "/")
+        for _, map_info in sorted_maps
         if map_info['quality'] <= quality_limit
     ]
+    
     return build_prerendered_images(images_list)