Update app.py

app.py

@@ -120,7 +120,7 @@ def get_first_frame(video_path):
 def compute_duration_text(video_path, text_prompt, max_frames, timeout_seconds):
     return timeout_seconds
 
-def compute_duration_tracker(video_path, first_frame_click, max_frames, timeout_seconds):
+def compute_duration_tracker(video_path, x, y, max_frames, timeout_seconds):
     return timeout_seconds
 
 # --- LOGIQUE AVEC DÉCORATEURS ZEROGPU ---
@@ -144,10 +144,11 @@ def process_image_text(image, text_prompt, threshold, mask_threshold):
     except Exception as e:
         return image, f"Error: {str(e)}"
 
+# MODIFICATION IMPORTANTE : Cette fonction GPU ne prend plus 'evt', mais 'x' et 'y' directement
 @spaces.GPU
-def process_image_tracker(image, evt: gr.SelectData, points_state, labels_state, multimask):
+def process_image_tracker_gpu(image, x, y, points_state, labels_state, multimask):
     if image is None: return image, [], []
-    x, y = evt.index
+    # x et y sont maintenant des entiers simples
     if points_state is None: points_state = []; labels_state = []
     points_state.append([x, y])
     labels_state.append(1) 
@@ -175,6 +176,14 @@ def process_image_tracker(image, evt: gr.SelectData, points_state, labels_state,
         print(f"Tracker Error: {e}")
         return image, points_state, labels_state
 
+# WRAPPER CPU POUR IMAGE TRACKER : Extrait les données avant d'appeler le GPU
+def process_image_tracker_wrapper(image, evt: gr.SelectData, points_state, labels_state, multimask):
+    if evt is None: return image, points_state, labels_state
+    x, y = evt.index
+    # Appel de la fonction GPU avec des types simples
+    return process_image_tracker_gpu(image, x, y, points_state, labels_state, multimask)
+
+
 @spaces.GPU(duration=compute_duration_text)
 def process_video_text(video_path, text_prompt, max_frames, timeout_seconds):
     if not video_path or not text_prompt: return None, "Missing video or prompt."
@@ -211,11 +220,9 @@ def process_video_text(video_path, text_prompt, max_frames, timeout_seconds):
         return output_path, "Done!"
     except Exception as e: return None, f"Error: {str(e)}"
 
+# MODIFICATION IMPORTANTE : Cette fonction GPU ne prend plus 'first_frame_click' (objet complexe) mais x, y
 @spaces.GPU(duration=compute_duration_tracker)
-def process_video_tracker(video_path, first_frame_click, max_frames, timeout_seconds):
-    if not video_path or not first_frame_click: return None, "Please click on the first frame."
-    if hasattr(first_frame_click, 'index'): x, y = first_frame_click.index
-    else: return None, "Click error."
+def process_video_tracker_gpu(video_path, x, y, max_frames, timeout_seconds):
     try:
         model, processor = get_model("sam3_video_tracker")
         cap = cv2.VideoCapture(video_path)
@@ -250,6 +257,18 @@ def process_video_tracker(video_path, first_frame_click, max_frames, timeout_sec
         print(f"Video Tracker Error: {e}")
         return None, f"Fatal Error: {str(e)}"
 
+# WRAPPER CPU POUR VIDEO TRACKER
+def process_video_tracker_wrapper(video_path, first_frame_click, max_frames, timeout_seconds):
+    if not video_path or not first_frame_click: return None, "Please click on the first frame."
+    # Extraction des données simples ici, sur le CPU
+    if hasattr(first_frame_click, 'index'): 
+        x, y = first_frame_click.index
+    else: 
+        return None, "Click error."
+    
+    # Appel de la fonction GPU avec des entiers
+    return process_video_tracker_gpu(video_path, x, y, max_frames, timeout_seconds)
+
 # --- INTERFACE GRADIO ---
 
 with gr.Blocks(title="SAM3 Ultimate Suite") as demo:
@@ -287,7 +306,8 @@ with gr.Blocks(title="SAM3 Ultimate Suite") as demo:
                 with gr.Column():
                     i2_output = gr.Image(type="pil", label="Interactive Result")
             
-            i2_input.select(process_image_tracker, [i2_input, points_state, labels_state, i2_multimask], [i2_output, points_state, labels_state])
+            # APPEL DU WRAPPER CPU, PAS DE LA FONCTION GPU DIRECTEMENT
+            i2_input.select(process_image_tracker_wrapper, [i2_input, points_state, labels_state, i2_multimask], [i2_output, points_state, labels_state])
             i2_clear.click(lambda: (None, [], []), outputs=[i2_output, points_state, labels_state])
 
         # TAB 3 : VIDEO + TEXTE
@@ -326,8 +346,9 @@ with gr.Blocks(title="SAM3 Ultimate Suite") as demo:
             click_state = gr.State()
             def save_click(evt: gr.SelectData): return evt
             v4_frame0.select(save_click, None, click_state)
-            # Ajout v4_duration aux inputs
-            v4_btn.click(process_video_tracker, [v4_input, click_state, v4_max_frames, v4_duration], [v4_output, v4_status])
+            
+            # APPEL DU WRAPPER CPU, PAS DE LA FONCTION GPU DIRECTEMENT
+            v4_btn.click(process_video_tracker_wrapper, [v4_input, click_state, v4_max_frames, v4_duration], [v4_output, v4_status])
 
 if __name__ == "__main__":
     demo.launch(share=False, debug=True, theme=gr.themes.Soft())