Update app.py

app.py

@@ -46,7 +46,7 @@ def apply_patches():
     else:
         print("⚠️ tracker_patch.py not found, skipping patches")
 
-def run_tracking(video_file, yolo_model, reid_model, tracking_method, class_ids, conf_threshold, line_position, line_orientation):
+def run_tracking(video_file, yolo_model, reid_model, tracking_method, class_ids, conf_threshold):
     """Run object tracking on the uploaded video."""
     try:
         # Create temporary workspace
@@ -73,11 +73,6 @@ def run_tracking(video_file, yolo_model, reid_model, tracking_method, class_ids,
                 "--exist-ok"
             ]
             
-            # Add line counter parameters
-            cmd.extend(["--line-pos", str(line_position)])
-            cmd.extend(["--line-direction", line_orientation])
-            cmd.extend(["--count-objects"])
-            
             # Add class filtering if specific classes are provided
             if class_ids and class_ids.strip():
                 # Parse the comma-separated class IDs
@@ -137,22 +132,10 @@ def run_tracking(video_file, yolo_model, reid_model, tracking_method, class_ids,
                     return None, "Output video was generated but has zero size."
                 
                 # Copy to permanent location with unique name
-                permanent_path = os.path.join(OUTPUT_DIR, f"line_counted_{os.path.basename(video_file)}")
+                permanent_path = os.path.join(OUTPUT_DIR, f"output_{os.path.basename(video_file)}")
                 shutil.copy(output_file, permanent_path)
                 print(f"Copied output to permanent location: {permanent_path}")
                 
-                # Extract counting information from output
-                count_summary = "Object counting complete"
-                try:
-                    # Try to find any count results in the process output
-                    output_text = process.stdout
-                    if "counts" in output_text or "Counted" in output_text:
-                        count_lines = [line for line in output_text.split('\n') if "counts" in line or "Counted" in line]
-                        if count_lines:
-                            count_summary = "\n".join(count_lines)
-                except:
-                    pass
-                
                 # Ensure the file is in MP4 format for better compatibility with Gradio
                 if not permanent_path.lower().endswith('.mp4'):
                     mp4_path = os.path.splitext(permanent_path)[0] + '.mp4'
@@ -169,7 +152,7 @@ def run_tracking(video_file, yolo_model, reid_model, tracking_method, class_ids,
                         print(f"Failed to convert to MP4: {str(e)}")
                         # Continue with original file if conversion fails
                 
-                return permanent_path, f"Processing completed successfully with {line_orientation} line at position {line_position}.\n{count_summary}"
+                return permanent_path, "Processing completed successfully!"
             else:
                 print(f"Output file not found at {output_file}")
                 return None, "Output file was referenced but doesn't exist on disk."
@@ -180,14 +163,13 @@ def run_tracking(video_file, yolo_model, reid_model, tracking_method, class_ids,
         return None, f"Error: {str(e)}"
 
 # Define the Gradio interface
-def process_video(video_path, yolo_model, reid_model, tracking_method, class_ids, conf_threshold, line_position, line_orientation):
+def process_video(video_path, yolo_model, reid_model, tracking_method, class_ids, conf_threshold):
     # Validate inputs
     if not video_path:
         return None, "Please upload a video file"
     
     print(f"Processing video: {video_path}")
     print(f"Parameters: model={yolo_model}, reid={reid_model}, tracker={tracking_method}, classes={class_ids}, conf={conf_threshold}")
-    print(f"Line counter: {line_orientation} at position {line_position}")
     
     output_path, status = run_tracking(
         video_path,
@@ -195,9 +177,7 @@ def process_video(video_path, yolo_model, reid_model, tracking_method, class_ids
         reid_model,
         tracking_method,
         class_ids,
-        conf_threshold,
-        line_position,
-        line_orientation
+        conf_threshold
     )
     
     if output_path:
@@ -213,29 +193,15 @@ def process_video(video_path, yolo_model, reid_model, tracking_method, class_ids
 yolo_models = ["yolov8n.pt", "yolov8s.pt", "yolov8m.pt"]
 reid_models = ["osnet_x0_25_msmt17.pt"]
 tracking_methods = ["bytetrack", "botsort", "ocsort", "strongsort"]
-line_orientations = ["horizontal", "vertical"]
 
 # Ensure dependencies and apply patches at startup
 ensure_dependencies()
 apply_patches()
 
 # Create the Gradio interface
-with gr.Blocks(title="Object Tracking with Line Counter") as app:
-    gr.Markdown("# 🚀 Object Tracking with Line Counter")
-    gr.Markdown("Upload a video file to detect, track and count objects crossing a line. Processing may take a few minutes depending on video length.")
-    
-    # Add instructions for line counter
-    with gr.Accordion("Line Counter Instructions", open=True):
-        gr.Markdown("""
-        ## Line Counter Feature
-        
-        Use the line counter to count objects that cross a specified line in the video:
-        
-        1. **Line Orientation**: Choose 'horizontal' for a line across the video or 'vertical' for a line from top to bottom
-        2. **Line Position**: Adjust the slider to position the line (0.1 = top/left, 0.9 = bottom/right)
-        
-        The count will appear in the output video and in the status box below.
-        """)
+with gr.Blocks(title="YOLO Object Tracking") as app:
+    gr.Markdown("# 🚀 YOLO Object Tracking")
+    gr.Markdown("Upload a video file to detect and track objects. Processing may take a few minutes depending on video length.")
     
     # Add class reference information
     with gr.Accordion("YOLO Class Reference", open=False):
@@ -295,31 +261,15 @@ with gr.Blocks(title="Object Tracking with Line Counter") as app:
                     label="Confidence Threshold"
                 )
                 
-                # Line counter settings
-                gr.Markdown("### Line Counter Settings")
-                line_orientation = gr.Dropdown(
-                    choices=line_orientations,
-                    value="horizontal",
-                    label="Line Orientation"
-                )
-                line_position = gr.Slider(
-                    minimum=0.1,
-                    maximum=0.9,
-                    value=0.5,
-                    step=0.05,
-                    label="Line Position (0.1 = top/left, 0.9 = bottom/right)"
-                )
-                
             process_btn = gr.Button("Process Video", variant="primary")
         
         with gr.Column(scale=1):
-            output_video = gr.Video(label="Output Video with Tracking and Counting")
-            status_text = gr.Textbox(label="Count Results", value="Ready to process video", lines=3)
+            output_video = gr.Video(label="Output Video with Tracking")
+            status_text = gr.Textbox(label="Status", value="Ready to process video")
     
     process_btn.click(
         fn=process_video,
-        inputs=[input_video, yolo_model, reid_model, tracking_method, class_ids, conf_threshold, 
-                line_position, line_orientation],
+        inputs=[input_video, yolo_model, reid_model, tracking_method, class_ids, conf_threshold],
         outputs=[output_video, status_text]
     )