Update app.py

app.py

@@ -1,19 +1,16 @@
 import gradio as gr
 from gradio_client import Client
 import os
+import tempfile
+from PIL import Image
 
 BACKEND_URL = os.environ.get("BACKEND_URL", "").strip()
 
-# Create persistent client and check available endpoints
+# Create persistent client
 try:
     client = Client(BACKEND_URL, headers={"ngrok-skip-browser-warning": "true"})
     backend_available = True
-    
-    # Debug: Check what endpoints are available
-    print("Available endpoints:")
-    for endpoint in client.endpoints:
-        print(f"  - {endpoint}")
-        
+    print(f"Connected to backend at {BACKEND_URL}")
 except Exception as e:
     client = None
     backend_available = False
@@ -22,56 +19,45 @@ except Exception as e:
 def process_media(file_obj, webcam_img, model_type, conf_thresh, max_dets, task_type):
     """Main processing function"""
     if not client:
-        return [None] * 5
+        return [gr.update()] * 5
     
     try:
-        # The main endpoint is likely at index 0 or 1
-        # Try to find the process_media endpoint
+        # Handle webcam image - save PIL to temp file
+        webcam_file = None
+        if webcam_img is not None:
+            with tempfile.NamedTemporaryFile(suffix='.png', delete=False) as tmp:
+                webcam_img.save(tmp, 'PNG')
+                webcam_file = tmp.name
+        
+        # Call backend - process_media is likely at index 3
         result = client.predict(
             file_obj,
-            webcam_img,
+            webcam_file,  # Pass file path instead of PIL object
             model_type,
             conf_thresh,
             max_dets,
             task_type,
-            fn_index=1  # Usually the main function is at index 1
+            fn_index=3  # process_media endpoint
         )
+        
+        # Clean up temp file
+        if webcam_file and os.path.exists(webcam_file):
+            os.unlink(webcam_file)
+            
         return result
+        
     except Exception as e:
         print(f"Error in process_media: {e}")
-        # Return empty updates for all outputs
-        return [
-            gr.update(visible=False),  # display_raw_image_file
-            gr.update(visible=False),  # display_raw_video_file
-            gr.update(visible=False),  # display_raw_image_webcam
-            gr.update(visible=False),  # display_processed_image
-            gr.update(visible=False)   # display_processed_video
-        ]
-
-def handle_file_preview(file_obj):
-    """Handle file upload and show preview"""
-    if file_obj is None:
-        return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
-    
-    # Check if it's an image or video
-    if file_obj.name.lower().endswith(('.png', '.jpg', '.jpeg', '.bmp', '.webp')):
-        return gr.update(value=file_obj.name, visible=True), gr.update(visible=False), gr.update(visible=False)
-    elif file_obj.name.lower().endswith(('.mp4', '.avi', '.mov', '.mkv', '.webm')):
-        return gr.update(visible=False), gr.update(value=file_obj.name, visible=True), gr.update(visible=False)
-    else:
-        return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
+        return [gr.update()] * 5
 
 def clear_all():
     """Clear all inputs and outputs"""
-    return [
-        gr.update(value=None),      # input_file
-        gr.update(value=None),      # input_webcam
-        gr.update(visible=False),   # display_raw_image_file
-        gr.update(visible=False),   # display_raw_video_file
-        gr.update(visible=False),   # display_raw_image_webcam
-        gr.update(visible=False),   # display_processed_image
-        gr.update(visible=False)    # display_processed_video
-    ]
+    try:
+        # Call backend clear function at index 4
+        return client.predict(fn_index=4)
+    except:
+        # Fallback to local clear
+        return [gr.update(value=None)] * 7
 
 # Build the interface
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
@@ -87,12 +73,13 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
                 with gr.Tabs():
                     with gr.TabItem("Upload File"):
                         input_file = gr.File(label="Upload Image or Video Here", file_types=["image", "video"])
-                        display_raw_image_file = gr.Image(label="Raw Image Preview", type="filepath", visible=False)
+                        display_raw_image_file = gr.Image(label="Raw Image Preview", type="pil", visible=False)
                         display_raw_video_file = gr.Video(label="Raw Video Preview", visible=False)
                     
                     with gr.TabItem("Webcam"):
-                        input_webcam = gr.Image(sources=["webcam"], type="pil", label="Click to capture")
-                        display_raw_image_webcam = gr.Image(label="Captured", type="pil", visible=False)
+                        gr.Markdown("Click on feed or press Enter to capture")
+                        input_webcam = gr.Image(sources=["webcam"], type="pil")
+                        display_raw_image_webcam = gr.Image(label="Captured Snapshot", type="pil", visible=False)
                 
                 clear_all_button = gr.Button("Clear All Inputs & Outputs")
             
@@ -101,19 +88,23 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
                 display_processed_image = gr.Image(label="Processed Image", type="pil", visible=False)
                 display_processed_video = gr.Video(label="Processed Video", visible=False)
         
-        # Examples
-        gr.Examples(
-            examples=[
-                ["images/allocebus_000003.jpeg"],
-                ["images/tarsius_000120.jpeg"],
-                ["images/nasalis_proboscis-monkey.png"],
-                ["images/macaca_000032.jpeg"],
-                ["images/mandrillus_000011.jpeg"],
-                ["images/pongo_000006.jpeg"]
-            ],
-            inputs=input_file,
-            label="Example Images"
-        )
+        # Examples with preview
+        example_images = [
+            "images/allocebus_000003.jpeg",
+            "images/tarsius_000120.jpeg",
+            "images/nasalis_proboscis-monkey.png",
+            "images/macaca_000032.jpeg",
+            "images/mandrillus_000011.jpeg",
+            "images/pongo_000006.jpeg"
+        ]
+        
+        with gr.Row():
+            gr.Examples(
+                examples=[[img] for img in example_images],
+                inputs=input_file,
+                label="Example Images (Click to load)",
+                examples_per_page=6
+            )
         
         submit_button = gr.Button("Detect Faces", variant="primary", scale=2)
         
@@ -128,24 +119,54 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             conf_threshold = gr.Slider(0.05, 0.95, 0.25, step=0.05, label="Confidence Threshold")
             max_detections = gr.Slider(1, 10, 3, step=1, label="Max Detections")
         
-        # Simple file preview
+        # Event handlers
+        def handle_file_change(file_obj):
+            """Handle file upload preview locally"""
+            if file_obj is None:
+                return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
+            
+            try:
+                # Forward to backend for preview
+                result = client.predict(file_obj, fn_index=0)
+                return result[:3]  # Return first 3 outputs for preview
+            except:
+                # Fallback local preview
+                if file_obj.name.lower().endswith(('.png', '.jpg', '.jpeg', '.bmp')):
+                    return gr.update(value=file_obj.name, visible=True), gr.update(visible=False), gr.update(visible=False)
+                else:
+                    return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
+        
+        def handle_webcam_change(img):
+            """Handle webcam capture"""
+            if img is None:
+                return gr.update(visible=False), gr.update(visible=True)
+            try:
+                # Save and forward to backend
+                with tempfile.NamedTemporaryFile(suffix='.png', delete=False) as tmp:
+                    img.save(tmp, 'PNG')
+                    result = client.predict(tmp.name, fn_index=1)
+                    os.unlink(tmp.name)
+                return result[:2]  # Return webcam-related outputs
+            except:
+                # Fallback
+                return gr.update(value=img, visible=True), gr.update(visible=False)
+        
+        # Wire events
         input_file.change(
-            handle_file_preview,
+            handle_file_change,
             inputs=[input_file],
             outputs=[display_raw_image_file, display_raw_video_file, input_file]
         )
         
-        # Webcam capture
         input_webcam.change(
-            lambda img: gr.update(value=img, visible=True) if img else gr.update(visible=False),
+            handle_webcam_change,
             inputs=[input_webcam],
-            outputs=[display_raw_image_webcam]
+            outputs=[display_raw_image_webcam, input_webcam]
         )
         
-        # Process button
         submit_button.click(
             process_media,
-            inputs=[input_file, display_raw_image_webcam, model_choice, conf_threshold, max_detections, task_type],
+            inputs=[input_file, input_webcam, model_choice, conf_threshold, max_detections, task_type],
             outputs=[
                 display_raw_image_file,
                 display_raw_video_file,
@@ -155,7 +176,6 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             ]
         )
         
-        # Clear button
         clear_all_button.click(
             clear_all,
             outputs=[