Upload 2 files

fixed display issues

app.py

@@ -583,12 +583,13 @@ def handle_video_upload(video_input, video_url, input_type, model_name,
         process_interval: 處理間隔（每N幀處理一次）
         
     Returns:
-        Tuple: (output_video_path, summary_html, formatted_stats)
+        Tuple: (output_video_path, summary_html, formatted_stats, object_details)
     """
     if video_processor is None:
         error_msg = "Error: Video processor not initialized."
         error_html = f"<div class='video-summary-content-wrapper'><pre>{error_msg}</pre></div>"
-        return None, error_html, {"error": "Video processor not available"}
+        empty_object_details = {}
+        return None, error_html, {"error": "Video processor not available"}, empty_object_details
 
     video_path = None
     
@@ -601,12 +602,14 @@ def handle_video_upload(video_input, video_url, input_type, model_name,
         video_path, error_msg = download_video_from_url(video_url)
         if error_msg:
             error_html = f"<div class='video-summary-content-wrapper'><pre>{error_msg}</pre></div>"
-            return None, error_html, {"error": error_msg}
+            empty_object_details = {}
+            return None, error_html, {"error": error_msg}, empty_object_details
     
     if not video_path:
         error_msg = "Please provide a video file or valid URL."
         error_html = f"<div class='video-summary-content-wrapper'><pre>{error_msg}</pre></div>"
-        return None, error_html, {"error": "No video input provided"}
+        empty_object_details = {}
+        return None, error_html, {"error": "No video input provided"}, empty_object_details
 
     print(f"Starting practical video analysis: model={model_name}, confidence={confidence_threshold}, interval={process_interval}")
     
@@ -625,7 +628,8 @@ def handle_video_upload(video_input, video_url, input_type, model_name,
         if output_video_path is None:
             error_msg = analysis_results.get("error", "Unknown error occurred during video processing")
             error_html = f"<div class='video-summary-content-wrapper'><pre>Processing failed: {error_msg}</pre></div>"
-            return None, error_html, analysis_results
+            empty_object_details = {}
+            return None, error_html, analysis_results, empty_object_details
         
         # 生成摘要，直接用統計數據
         basic_summary = generate_basic_video_summary(analysis_results)
@@ -644,14 +648,34 @@ def handle_video_upload(video_input, video_url, input_type, model_name,
         summary_content = '\n'.join(summary_lines)
         summary_html = f"<div class='video-summary-content-wrapper'><pre>{summary_content}</pre></div>"
         
-        return output_video_path, summary_html, analysis_results
+        # 提取物體詳情數據用於第四個輸出組件
+        timeline_analysis = analysis_results.get("timeline_analysis", {})
+        object_appearances = timeline_analysis.get("object_appearances", {})
+        
+        # 格式化物體詳情數據以便在JSON組件中顯示
+        object_details_formatted = {}
+        for obj_name, details in object_appearances.items():
+            object_details_formatted[obj_name] = {
+                "Estimated Count": details.get("estimated_count", 0),
+                "First Appearance": details.get("first_appearance", "Unknown"),
+                "Last Seen": details.get("last_seen", "Unknown"), 
+                "Duration in Video": details.get("duration_in_video", "Unknown"),
+                "Detection Confidence": details.get("detection_confidence", 0.0),
+                "First Appearance (seconds)": details.get("first_appearance_seconds", 0),
+                "Duration (seconds)": details.get("duration_seconds", 0)
+            }
+        
+        print(f"Extracted object details for {len(object_details_formatted)} object types")
+        
+        return output_video_path, summary_html, analysis_results, object_details_formatted
 
     except Exception as e:
         print(f"Error in handle_video_upload: {e}")
         traceback.print_exc()
-        error_msg = f"影片處理失敗: {str(e)}"
+        error_msg = f"Video processing failed: {str(e)}"
         error_html = f"<div class='video-summary-content-wrapper'><pre>{error_msg}</pre></div>"
-        return None, error_html, {"error": str(e)}
+        empty_object_details = {}
+        return None, error_html, {"error": str(e)}, empty_object_details
 
 def main():
     """主函數，初始化並啟動Gradio"""

ui_manager.py

@@ -749,6 +749,7 @@ class UIManager:
         outputs=[
             video_components['video_output'],
             video_components['video_summary_text'],
-            video_components['video_stats_json']
+            video_components['video_stats_json'],
+            video_components['video_object_details'] 
             ]
         )