Update app.py

app.py

@@ -72,21 +72,27 @@ def preprocess_image(image, blur_radius, sharpen_radius, noise_reduction, detail
 
     return image
 
+def upscale_image(image, upscale_factor):
+    """Upscale the image before further processing."""
+    try:
+        if upscale_factor > 1:
+            new_size = (int(image.width * upscale_factor), int(image.height * upscale_factor))
+            image = image.resize(new_size, Image.LANCZOS)
+        return image
+    except Exception as e:
+        print(f"Error during upscaling: {e}")
+        raise
+
 def convert_image(image, blur_radius, sharpen_radius, noise_reduction, detail_level, edge_method, color_quantization,
                   color_mode, hierarchical, mode, filter_speckle, color_precision, layer_difference,
                   corner_threshold, length_threshold, max_iterations, splice_threshold, path_precision,
-                  enhance_with_ai, remove_bg, upscale_factor):
+                  enhance_with_ai, remove_bg):
     """Convert an image to SVG using vtracer with customizable and advanced parameters."""
     
     try:
         # Preprocess the image with additional detail level settings
         image = preprocess_image(image, blur_radius, sharpen_radius, noise_reduction, detail_level, edge_method, color_quantization, enhance_with_ai, remove_bg)
 
-        # Upscale the image if needed
-        if upscale_factor > 1:
-            new_size = (int(image.width * upscale_factor), int(image.height * upscale_factor))
-            image = image.resize(new_size, Image.LANCZOS)
-
         # Convert Gradio image to bytes for vtracer compatibility
         img_byte_array = io.BytesIO()
         image.save(img_byte_array, format='PNG')
@@ -130,12 +136,14 @@ with iface:
     
     with gr.Row():
         image_input = gr.Image(type="pil", label="Upload Image")
+        upscale_factor_input = gr.Slider(minimum=1, maximum=4, value=1, step=0.1, label="Upscale Factor (1 = No Upscaling)")
+    
+    with gr.Row():
         blur_radius_input = gr.Slider(minimum=0, maximum=10, value=0, step=0.1, label="Blur Radius (for smoothing)")
         sharpen_radius_input = gr.Slider(minimum=0, maximum=5, value=0, step=0.1, label="Sharpen Radius")
         noise_reduction_input = gr.Slider(minimum=0, maximum=30, value=0, step=1, label="Noise Reduction")
         enhance_with_ai_input = gr.Checkbox(label="AI Edge Enhance", value=False)
         remove_bg_input = gr.Checkbox(label="Remove Background", value=False)
-        upscale_factor_input = gr.Slider(minimum=1, maximum=4, value=1, step=0.1, label="Upscale Factor (1 = No Upscaling)")
     
     with gr.Row():
         detail_level_input = gr.Slider(minimum=0, maximum=10, value=5, step=1, label="Detail Level")
@@ -161,20 +169,24 @@ with iface:
         splice_threshold_input = gr.Slider(minimum=1, maximum=100, value=45, step=1, label="Splice Threshold")
         path_precision_input = gr.Slider(minimum=1, maximum=100, value=8, step=1, label="Path Precision")
     
+    def process_and_convert(image, upscale_factor, *args):
+        """Handles upscaling and then calls the convert_image function."""
+        image = upscale_image(image, upscale_factor)
+        return convert_image(image, *args)
+    
     convert_button = gr.Button("Convert Image to SVG")
     svg_output = gr.HTML(label="SVG Output")
     download_output = gr.File(label="Download SVG")
     
     convert_button.click(
-        fn=convert_image,
+        fn=process_and_convert,
         inputs=[
-            image_input, blur_radius_input, sharpen_radius_input, noise_reduction_input, detail_level_input, edge_method_input, color_quantization_input,
-            color_mode_input, hierarchical_input, mode_input, filter_speckle_input, color_precision_input,
-            layer_difference_input, corner_threshold_input, length_threshold_input, max_iterations_input,
-            splice_threshold_input, path_precision_input, enhance_with_ai_input, remove_bg_input, upscale_factor_input
+            image_input, upscale_factor_input, blur_radius_input, sharpen_radius_input, noise_reduction_input, detail_level_input, edge_method_input, color_quantization_input,
+            color_mode_input, hierarchical_input, mode_input, filter_speckle_input, color_precision_input, layer_difference_input,
+            corner_threshold_input, length_threshold_input, max_iterations_input, splice_threshold_input, path_precision_input,
+            enhance_with_ai_input, remove_bg_input
         ],
         outputs=[svg_output, download_output]
     )
 
-
 iface.launch()