Update app.py

app.py

@@ -111,26 +111,18 @@ def predict_image(image):
             print("[ERROR] No image provided")
             return None, "No image provided", "N/A"
         
-        # Si l'image est un chemin (string), la charger
-        if isinstance(image, str):
-            print(f"[DEBUG] Image is a path/string: {image[:50]}...")
+        # Avec type="pil", Gradio nous donne directement une PIL Image
+        # On vérifie quand même au cas où
+        if not isinstance(image, Image.Image):
+            print(f"[DEBUG] Converting {type(image)} to PIL Image...")
             from PIL import Image as PILImage
-            import base64
-            import io
-            
-            # Si c'est un data URL base64
-            if image.startswith('data:image'):
-                print("[DEBUG] Decoding base64 image...")
-                header, encoded = image.split(',', 1)
-                image_data = base64.b64decode(encoded)
-                image = PILImage.open(io.BytesIO(image_data))
-                print(f"[DEBUG] Decoded image size: {image.size}")
+            if isinstance(image, np.ndarray):
+                image = PILImage.fromarray(image)
             else:
-                # C'est un chemin de fichier
-                print(f"[DEBUG] Loading image from path...")
-                image = PILImage.open(image)
+                print(f"[ERROR] Unexpected image type: {type(image)}")
+                return None, f"Unexpected type: {type(image)}", "N/A"
         
-        print(f"[DEBUG] Image type before classification: {type(image)}")
+        print(f"[DEBUG] Image size: {image.size}, mode: {image.mode}")
         annotated_img, label, conf = classify_image(image)
         print(f"[DEBUG] Classification successful: {label} ({conf})")
         return annotated_img, label, conf
@@ -197,7 +189,7 @@ with gr.Blocks(title="SerraSafe - Détection de Pestes") as demo:
     with gr.Tab("📷 Télécharger Image"):
         with gr.Row():
             with gr.Column():
-                image_input = gr.Image(type="numpy", label="Télécharger une image")
+                image_input = gr.Image(type="pil", label="Télécharger une image")
                 image_button = gr.Button("Analyser l'image", variant="primary")
             with gr.Column():
                 image_output = gr.Image(label="Résultat")
@@ -228,7 +220,7 @@ with gr.Blocks(title="SerraSafe - Détection de Pestes") as demo:
         gr.Markdown("### Capturez une image avec votre webcam pour l'analyser")
         with gr.Row():
             with gr.Column():
-                webcam_input = gr.Image(sources=["webcam"], type="numpy", label="Webcam", streaming=False)
+                webcam_input = gr.Image(sources=["webcam"], type="pil", label="Webcam", streaming=False)
                 webcam_button = gr.Button("Analyser", variant="primary")
             with gr.Column():
                 webcam_output = gr.Image(label="Résultat")