Update app.py

app.py

@@ -7,7 +7,6 @@ from pathlib import Path
 import sys
 import importlib.util
 import time
-from concurrent.futures import ThreadPoolExecutor
 
 # Ensure models directory exists
 MODELS_DIR = Path("models")
@@ -87,7 +86,7 @@ def run_tracking_single(video_file, yolo_model, reid_model, tracking_method, cla
                     cmd.append("--classes")
                     cmd.extend(str(c) for c in class_list)
             except ValueError:
-                return None, f"Invalid class IDs for {tracking_method}. Please enter comma-separated numbers."
+                return None, f"Invalid class IDs for {tracking_method}. Please enter comma-separated numbers.", 0
         
         # Special handling for OcSort
         if tracking_method == "ocsort":
@@ -171,7 +170,11 @@ def run_tracking_single(video_file, yolo_model, reid_model, tracking_method, cla
 def benchmark_trackers(video_path, yolo_model, reid_model, class_ids, conf_threshold):
     """Run all tracking methods and return their results."""
     if not video_path:
-        return [None] * 4, ["Please upload a video file"] * 4, [0] * 4
+        return (None, None, None, None,  # Videos
+                "Please upload a video file", "Please upload a video file", 
+                "Please upload a video file", "Please upload a video file",  # Statuses
+                "", "", "", "",  # Times
+                None)  # DataFrame
     
     print(f"Benchmarking video: {video_path}")
     print(f"Parameters: model={yolo_model}, reid={reid_model}, classes={class_ids}, conf={conf_threshold}")
@@ -200,7 +203,7 @@ def benchmark_trackers(video_path, yolo_model, reid_model, class_ids, conf_thres
                 if result:
                     results[i] = os.path.abspath(result)
                 statuses[i] = status
-                times[i] = process_time
+                times[i] = f"{process_time:.2f} seconds"
     
     except Exception as e:
         import traceback
@@ -211,7 +214,15 @@ def benchmark_trackers(video_path, yolo_model, reid_model, class_ids, conf_thres
             if statuses[i] == "Processing...":
                 statuses[i] = error_msg
     
-    return results, statuses, times
+    # Create the DataFrame data
+    comparison_data = [[tracking_methods[i], times[i], "Success" if results[i] else "Failed"] 
+                      for i in range(len(tracking_methods))]
+    
+    # Return all results as separate outputs
+    return (results[0], results[1], results[2], results[3],
+            statuses[0], statuses[1], statuses[2], statuses[3],
+            times[0], times[1], times[2], times[3],
+            comparison_data)
 
 # Available models
 yolo_models = ["yolov8n.pt", "yolov8s.pt", "yolov8m.pt"]
@@ -307,8 +318,8 @@ with gr.Blocks(title="YOLO Object Tracking Benchmark") as app:
     with gr.Tabs() as comparison_tab:
         with gr.TabItem("Performance Comparison"):
             perf_table = gr.DataFrame(
-                headers=["Tracker", "Processing Time (s)", "Status"],
-                datatype=["str", "number", "str"],
+                headers=["Tracker", "Processing Time", "Status"],
+                datatype=["str", "str", "str"],
                 label="Performance Comparison"
             )
     
@@ -317,26 +328,12 @@ with gr.Blocks(title="YOLO Object Tracking Benchmark") as app:
         fn=benchmark_trackers,
         inputs=[input_video, yolo_model, reid_model, class_ids, conf_threshold],
         outputs=[
-            [bytetrack_video, botsort_video, ocsort_video, strongsort_video],
-            [bytetrack_status, botsort_status, ocsort_status, strongsort_status],
-            [bytetrack_time, botsort_time, ocsort_time, strongsort_time]
+            bytetrack_video, botsort_video, ocsort_video, strongsort_video,
+            bytetrack_status, botsort_status, ocsort_status, strongsort_status,
+            bytetrack_time, botsort_time, ocsort_time, strongsort_time,
+            perf_table
         ],
         show_progress="full"
-    ).then(
-        fn=lambda videos, statuses, times: gr.DataFrame(
-            data=[
-                ["ByteTrack", float(times[0]), statuses[0]],
-                ["BoTSORT", float(times[1]), statuses[1]],
-                ["OC-SORT", float(times[2]), statuses[2]],
-                ["StrongSORT", float(times[3]), statuses[3]]
-            ]
-        ),
-        inputs=[
-            [bytetrack_video, botsort_video, ocsort_video, strongsort_video],
-            [bytetrack_status, botsort_status, ocsort_status, strongsort_status],
-            [bytetrack_time, botsort_time, ocsort_time, strongsort_time]
-        ],
-        outputs=perf_table
     )
     
     # Add a debug section