Update app.py

app.py

@@ -1,4 +1,5 @@
 
+
 import gradio as gr
 from PIL import Image, ImageEnhance, ImageFilter, ImageOps
 import numpy as np
@@ -6,6 +7,7 @@ import random
 import cv2
 import os
 
+# --- Core Transformation Logic ---
 
 def apply_transformations(
     image,
@@ -31,22 +33,17 @@ def apply_transformations(
     cutout_ratio
 ):
     """
-    Applies a series of transformations to an input image. This function is now
-    called ONLY when the 'Apply Transformations' button is clicked.
+    Applies a series of transformations to an input image.
     """
-    # Handle the dictionary input from gr.ImageEditor, which contains the background image
     if isinstance(image, dict) and image.get("background") is not None:
         image_data = image["background"]
     elif isinstance(image, np.ndarray):
         image_data = image
     else:
-        # If there's no image data, return None for output and reset mosaic trigger
         return None, False
 
-    # Convert NumPy array to PIL Image
     img = Image.fromarray(image_data).convert("RGB")
 
-    # Enhanced Augmentation: Mosaic
     if apply_mosaic_trigger:
         w, h = img.size
         cx, cy = w // 2, h // 2
@@ -59,7 +56,6 @@ def apply_transformations(
         mosaic_img.paste(crops[3].resize((cx, cy), Image.Resampling.LANCZOS), (cx, cy))
         img = mosaic_img
 
-    # Geometric Augmentation: Crop (uses the stored state)
     if crop_box is not None:
         try:
             x1, y1, x2, y2 = map(int, crop_box)
@@ -68,7 +64,6 @@ def apply_transformations(
         except (ValueError, TypeError):
             pass
 
-    # Apply all other transformations...
     if scale_factor != 1.0: img = img.resize((int(img.width * scale_factor), int(img.height * scale_factor)), Image.Resampling.LANCZOS)
     if shear_x != 0 or shear_y != 0: img = img.transform(img.size, Image.Transform.AFFINE, (1, shear_x, 0, shear_y, 1, 0), Image.Resampling.BICUBIC)
     if rotation_angle != 0: img = img.rotate(rotation_angle, expand=True, fillcolor=(128, 128, 128))
@@ -110,13 +105,10 @@ def apply_transformations(
     if grayscale: img = ImageOps.grayscale(img)
     if invert: img = ImageOps.invert(img.convert('RGB') if img.mode != 'L' else img)
 
-    # Return final image for the output component and reset the mosaic trigger
     return img, False
 
 # --- UI Helper Functions ---
-
 def process_selection(evt: gr.SelectData):
-    """Callback function to CAPTURE the coordinates of a user's selection, to be used later."""
     return (evt.index[0], evt.index[1], evt.index[2], evt.index[3])
 
 def update_slider(min_val, max_val, current_val):
@@ -125,7 +117,6 @@ def update_slider(min_val, max_val, current_val):
     return gr.update(minimum=min_val, maximum=max_val, value=new_val)
 
 def reset_all_controls():
-    """Returns a tuple of default values to reset all UI components to their initial state."""
     return (
         False, None, 1.0, 0, False, False, 0.0, 0.0, 1.0, 1.0, 1.0, 0, 1.0, False, False, 0.0, 0, 0, 0, 0.0,
         0.1, 3.0, -180, 180, -0.5, 0.5, -0.5, 0.5, 0.0, 3.0, 0.0, 3.0, 0.0, 3.0,
@@ -134,25 +125,21 @@ def reset_all_controls():
     )
 
 def on_upload():
-    """Returns a partial reset tuple, specifically clearing the output image and resetting controls, but leaves the input image alone."""
-    # Slices the full reset tuple to exclude the last two items (image_input, image_output)
-    # and then adds a None for image_output.
     return reset_all_controls()[:-2] + (None,)
 
-
 # --- Gradio UI Layout ---
 
-with gr.Blocks(theme=gr.themes.Soft(), css="footer {display: none !important}") as demo:
+with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.Markdown("# Advanced Image Augmentation Tool (Manual Control)")
     gr.Markdown("Set your parameters on the left, then click **Apply Transformations** to see the result.")
     
+    # State and Control Panels remain the same...
     crop_box_state = gr.State(None)
     mosaic_trigger = gr.State(False)
 
     with gr.Row(variant="panel"):
         with gr.Column(scale=1, min_width=400):
             gr.Markdown("### Control Panel")
-            # All control panels remain the same...
             with gr.Accordion("Geometric Transformations", open=True):
                 scale_slider = gr.Slider(0.1, 3.0, 1.0, step=0.05, label="Scale")
                 rotation_slider = gr.Slider(-180, 180, 0, step=1, label="Rotation Angle")
@@ -174,7 +161,6 @@ with gr.Blocks(theme=gr.themes.Soft(), css="footer {display: none !important}")
                 mosaic_btn = gr.Button("Apply Mosaic")
 
             with gr.Accordion("Parameter Range Control (Advanced)", open=False):
-                # This panel remains unchanged
                 with gr.Tabs():
                     with gr.TabItem("Geometric"):
                         scale_min, scale_max, rotation_min, rotation_max = gr.Number(0.1, label="Scale Min"), gr.Number(3.0, label="Scale Max"), gr.Number(-180, label="Rotation Min"), gr.Number(180, label="Rotation Max")
@@ -191,88 +177,28 @@ with gr.Blocks(theme=gr.themes.Soft(), css="footer {display: none !important}")
 
         with gr.Column(scale=3):
             apply_btn = gr.Button("Apply Transformations", variant="primary")
-            
             image_input = gr.ImageEditor(type="numpy", label="Original Image (Select an area to crop)", interactive=True)
             image_output = gr.Image(label="Transformed Image", interactive=False)
-            gr.Examples(
-                examples=[os.path.join(os.path.dirname(__file__), f) for f in ["cat.jpg", "cheetah.jpg", "lion.jpg"] if os.path.exists(os.path.join(os.path.dirname(__file__), f))],
-                inputs=image_input, label="Example Images"
-            )
+            gr.Examples(examples=[os.path.join(os.path.dirname(__file__), f) for f in ["cat.jpg", "cheetah.jpg", "lion.jpg"] if os.path.exists(os.path.join(os.path.dirname(__file__), f))], inputs=image_input, label="Example Images")
 
-    # --- LIST OF ALL INPUTS AND RESETTABLE COMPONENTS ---
-    all_inputs_for_transform = [
-        image_input, mosaic_trigger, crop_box_state, scale_slider, rotation_slider, h_flip_check, v_flip_check,
-        shear_x_slider, shear_y_slider, brightness_slider, contrast_slider, saturation_slider, 
-        hue_slider, gamma_slider, grayscale_check, invert_check, blur_slider, sharpen_slider, noise_slider,
-        cutout_n_slider, cutout_ratio_slider
-    ]
-    
-    all_resettable_components = [
-        mosaic_trigger, crop_box_state, scale_slider, rotation_slider, h_flip_check, v_flip_check,
-        shear_x_slider, shear_y_slider, brightness_slider, contrast_slider, saturation_slider, 
-        hue_slider, gamma_slider, grayscale_check, invert_check, blur_slider, sharpen_slider, noise_slider,
-        cutout_n_slider, cutout_ratio_slider,
-        scale_min, scale_max, rotation_min, rotation_max, shear_x_min, shear_x_max, shear_y_min, shear_y_max,
-        brightness_min, brightness_max, contrast_min, contrast_max, saturation_min, saturation_max,
-        hue_min, hue_max, gamma_min, gamma_max, blur_min, blur_max, noise_min, noise_max,
-        cutout_n_min, cutout_n_max, cutout_ratio_min, cutout_ratio_max,
-        image_input, image_output
-    ]
-    
+    all_inputs_for_transform = [image_input, mosaic_trigger, crop_box_state, scale_slider, rotation_slider, h_flip_check, v_flip_check, shear_x_slider, shear_y_slider, brightness_slider, contrast_slider, saturation_slider, hue_slider, gamma_slider, grayscale_check, invert_check, blur_slider, sharpen_slider, noise_slider, cutout_n_slider, cutout_ratio_slider]
+    all_resettable_components = [mosaic_trigger, crop_box_state, scale_slider, rotation_slider, h_flip_check, v_flip_check, shear_x_slider, shear_y_slider, brightness_slider, contrast_slider, saturation_slider, hue_slider, gamma_slider, grayscale_check, invert_check, blur_slider, sharpen_slider, noise_slider, cutout_n_slider, cutout_ratio_slider, scale_min, scale_max, rotation_min, rotation_max, shear_x_min, shear_x_max, shear_y_min, shear_y_max, brightness_min, brightness_max, contrast_min, contrast_max, saturation_min, saturation_max, hue_min, hue_max, gamma_min, gamma_max, blur_min, blur_max, noise_min, noise_max, cutout_n_min, cutout_n_max, cutout_ratio_min, cutout_ratio_max, image_input, image_output]
     partial_resettable_components = all_resettable_components[:-2] + [image_output]
 
-    # --- STABLE EVENT HANDLING (MANUAL TRIGGER) ---
-
-    # 1. THE MAIN TRIGGER: Apply button click
-    apply_btn.click(
-        fn=apply_transformations,
-        inputs=all_inputs_for_transform,
-        outputs=[image_output, mosaic_trigger]
-    )
+    # FIX 2: Added `api_name="predict"` to the main button's click event.
+    apply_btn.click(fn=apply_transformations, inputs=all_inputs_for_transform, outputs=[image_output, mosaic_trigger], api_name="predict")
             
-    # 2. Selecting a crop area ONLY updates the crop state silently. No transformation is run.
-    image_input.select(
-        fn=process_selection,
-        inputs=None,
-        outputs=[crop_box_state]
-    )
-
-    # 3. Use SPECIFIC events for upload/clear to reset the UI in a controlled way.
-    #    These do NOT trigger any transformations.
-    image_input.upload(
-        fn=on_upload,
-        inputs=None,
-        outputs=partial_resettable_components
-    )
-    image_input.clear(
-        fn=reset_all_controls,
-        inputs=None,
-        outputs=all_resettable_components
-    )
-    reset_btn.click(
-        fn=reset_all_controls,
-        inputs=None,
-        outputs=all_resettable_components
-    )
+    image_input.select(fn=process_selection, inputs=None, outputs=[crop_box_state])
+    image_input.upload(fn=on_upload, inputs=None, outputs=partial_resettable_components)
+    image_input.clear(fn=reset_all_controls, inputs=None, outputs=all_resettable_components)
+    reset_btn.click(fn=reset_all_controls, inputs=None, outputs=all_resettable_components)
     
-    # 4. Other helper buttons also have no effect on images until "Apply" is clicked.
     rotate_90_btn.click(lambda x: (x + 90) % 360, inputs=[rotation_slider], outputs=[rotation_slider])
     rotate_180_btn.click(lambda: 180, inputs=None, outputs=[rotation_slider])
     rotate_270_btn.click(lambda: -90, inputs=None, outputs=[rotation_slider])
-    
-    # Mosaic button only updates the state, to be used when "Apply" is clicked.
     mosaic_btn.click(lambda: True, None, mosaic_trigger)
 
-    # 5. Range control handlers update the sliders, but do not trigger transformations.
-    range_map = {
-        (scale_min, scale_max): scale_slider, (rotation_min, rotation_max): rotation_slider,
-        (shear_x_min, shear_x_max): shear_x_slider, (shear_y_min, shear_y_max): shear_y_slider,
-        (brightness_min, brightness_max): brightness_slider, (contrast_min, contrast_max): contrast_slider,
-        (saturation_min, saturation_max): saturation_slider, (hue_min, hue_max): hue_slider,
-        (gamma_min, gamma_max): gamma_slider, (blur_min, blur_max): blur_slider,
-        (noise_min, noise_max): noise_slider, (cutout_n_min, cutout_n_max): cutout_n_slider,
-        (cutout_ratio_min, cutout_ratio_max): cutout_ratio_slider
-    }
+    range_map = {(scale_min, scale_max): scale_slider, (rotation_min, rotation_max): rotation_slider, (shear_x_min, shear_x_max): shear_x_slider, (shear_y_min, shear_y_max): shear_y_slider, (brightness_min, brightness_max): brightness_slider, (contrast_min, contrast_max): contrast_slider, (saturation_min, saturation_max): saturation_slider, (hue_min, hue_max): hue_slider, (gamma_min, gamma_max): gamma_slider, (blur_min, blur_max): blur_slider, (noise_min, noise_max): noise_slider, (cutout_n_min, cutout_n_max): cutout_n_slider, (cutout_ratio_min, cutout_ratio_max): cutout_ratio_slider}
     for (min_comp, max_comp), slider in range_map.items():
         min_comp.change(fn=update_slider, inputs=[min_comp, max_comp, slider], outputs=[slider])
         max_comp.change(fn=update_slider, inputs=[min_comp, max_comp, slider], outputs=[slider])