Update app.py

app.py

@@ -6,16 +6,16 @@ import numpy as np
 def stitch_images(image_mode, image1, image2, images, detector, matcher, estimator, blender_type, crop, wave_correct, progress=gr.Progress(track_tqdm=True)):
     if image_mode == "Two Images":
         if image1 is None or image2 is None:
-            return None, "Please upload both images."
+            return None
         cv_images = [cv2.cvtColor(np.array(img), cv2.COLOR_RGB2BGR) for img in [image1, image2]]
     else:  # Multiple Images
         if not images or len(images) < 2:
-            return None, "Please upload at least 2 images."
+            return None
         cv_images = []
-        for img_path in images:
+        for img_path in progress.tqdm(images, desc="Loading images"):
             img = cv2.imread(img_path.name)
             if img is None:
-                return None, f"Failed to read image: {img_path.name}"
+                return None
             cv_images.append(img)
     
     try:
@@ -27,13 +27,14 @@ def stitch_images(image_mode, image1, image2, images, detector, matcher, estimat
             crop=crop,
             wave_correct_kind=wave_correct
         )
+        progress(0.5, desc="Stitching images")
         panorama = stitcher.stitch(cv_images)
         
         # Convert back to RGB for display
         panorama_rgb = cv2.cvtColor(panorama, cv2.COLOR_BGR2RGB)
-        return panorama_rgb, "Stitching successful!"
+        return panorama_rgb
     except Exception as e:
-        return None, f"Stitching failed: {str(e)}"
+        return None
 
 def update_image_input(choice):
     if choice == "Two Images":
@@ -67,22 +68,23 @@ with gr.Blocks() as iface:
     
     stitch_button = gr.Button("Stitch Images")
     
-    with gr.Row():
-        output_image = gr.Image(type="numpy", label="Stitched Panorama")
+    output_image = gr.Image(type="numpy", label="Stitched Panorama")
     
     stitch_button.click(
         stitch_images,
         inputs=[image_mode, image1, image2, images, detector, matcher, estimator, blender_type, crop, wave_correct],
-        outputs=[output_image]
+        outputs=output_image
     )
     
     gr.Examples(
-        [
+        examples=[
             ["Two Images", "exposure_error_1.jpg", "exposure_error_2.jpg", None, "orb", "homography", "homography", "multiband", True, "horiz"],
             ["Multiple Images", None, None, ["weir_1.jpg", "weir_2.jpg", "weir_3.jpg"], "orb", "homography", "homography", "multiband", True, "horiz"]
         ],
         inputs=[image_mode, image1, image2, images, detector, matcher, estimator, blender_type, crop, wave_correct],
-        cache_examples = True,
+        outputs=output_image,
+        fn=stitch_images,
+        cache_examples=True,
     )
 
 iface.launch()