matrice-analytics 0.1.106__py3-none-any.whl → 0.1.124__py3-none-any.whl

matrice_analytics/post_processing/usecases/vehicle_monitoring.py

@@ -30,6 +30,10 @@ class VehicleMonitoringConfig(BaseConfig):
     smoothing_confidence_range_factor: float = 0.5
     confidence_threshold: float = 0.6
 
+    # Class Aggregation: Configuration parameters
+    enable_class_aggregation: bool = True
+    class_aggregation_window_size: int = 30  # 30 frames ≈ 1 second at 30 FPS
+
     #JBK_720_GATE POLYGON = [[86, 328], [844, 317], [1277, 520], [1273, 707], [125, 713]]
     zone_config: Optional[Dict[str, List[List[float]]]] = None #field(
 #     default_factory=lambda: {
@@ -107,8 +111,24 @@ class VehicleMonitoringUseCase(BaseProcessor):
     def process(self, data: Any, config: ConfigProtocol, context: Optional[ProcessingContext] = None,
                 stream_info: Optional[Dict[str, Any]] = None) -> ProcessingResult:
         processing_start = time.time()
-        if not isinstance(config, VehicleMonitoringConfig):
-            return self.create_error_result("Invalid config type", usecase=self.name, category=self.category, context=context)
+        # Relaxed check: Accept VehicleMonitoringConfig OR any config with matching usecase/category
+        # This handles multiprocessing module path mismatches while maintaining type safety
+        is_valid_config = (
+            isinstance(config, VehicleMonitoringConfig) or
+            (hasattr(config, 'usecase') and config.usecase == 'vehicle_monitoring' and
+             hasattr(config, 'category') and config.category == 'traffic')
+        )
+        if not is_valid_config:
+            self.logger.error(
+                f"Config validation failed in vehicle_monitoring. "
+                f"Got type={type(config).__name__}, module={type(config).__module__}, "
+                f"usecase={getattr(config, 'usecase', 'N/A')}, category={getattr(config, 'category', 'N/A')}"
+            )
+            return self.create_error_result(
+                f"Invalid config type: expected VehicleMonitoringConfig or config with usecase='vehicle_monitoring', "
+                f"got {type(config).__name__} with usecase={getattr(config, 'usecase', 'N/A')}",
+                usecase=self.name, category=self.category, context=context
+            )
         if context is None:
             context = ProcessingContext()
 
@@ -158,9 +178,15 @@ class VehicleMonitoringUseCase(BaseProcessor):
             from ..advanced_tracker import AdvancedTracker
             from ..advanced_tracker.config import TrackerConfig
             if self.tracker is None:
-                tracker_config = TrackerConfig()
+                tracker_config = TrackerConfig(
+                    enable_class_aggregation=config.enable_class_aggregation,
+                    class_aggregation_window_size=config.class_aggregation_window_size
+                )
                 self.tracker = AdvancedTracker(tracker_config)
-                self.logger.info("Initialized AdvancedTracker for Vehicle Monitoring")
+                self.logger.info(
+                    f"Initialized AdvancedTracker for Vehicle Monitoring "
+                    f"(class_aggregation={config.enable_class_aggregation})"
+                )
             processed_data = self.tracker.update(processed_data)
         except Exception as e:
             self.logger.warning(f"AdvancedTracker failed: {e}")

matrice_analytics/post_processing/usecases/vehicle_monitoring_drone_view.py

@@ -1115,18 +1115,33 @@ class VehicleMonitoringDroneViewUseCase(BaseProcessor):
         self._tracking_start_time = time.time()
 
 
-    def _log_detection_stats(self, data: Any, stage_name: str, show_samples: bool = False) -> None:
+    def _log_detection_stats(
+        self, 
+        data: Any, 
+        stage_name: str,
+        show_samples: bool = False
+    ) -> None:
         """
-        Log detailed detection statistics at any pipeline stage.
+        Log detailed detection statistics at any pipeline stage with frame identification.
         
         Args:
             data: Detection data (list or dict format)
             stage_name: Name of the pipeline stage for identification
             show_samples: If True, show sample detection structure
         """
+        if not getattr(self, '_debug_detection_flow', True):
+            return
+        
+        # Use existing frame counter
+        frame_id = self._total_frame_counter
+        timestamp_str = datetime.now(timezone.utc).strftime('%H:%M:%S.%f')[:-3]
+        
+        # Create unique log identifier for grep
+        log_id = f"FRAME_{frame_id:06d}"
+        
         separator = "=" * 80
         print(f"\n{separator}")
-        print(f"[DETECTION_STATS] Stage: {stage_name}")
+        print(f"[DETECTION_STATS] {log_id} | Time: {timestamp_str} | Stage: {stage_name}")
         print(separator)
         
         # Handle different data formats
@@ -1135,12 +1150,12 @@ class VehicleMonitoringDroneViewUseCase(BaseProcessor):
             detections = data
         elif isinstance(data, dict):
             # Frame-based format
-            for frame_id, frame_dets in data.items():
+            for fid, frame_dets in data.items():
                 if isinstance(frame_dets, list):
                     detections.extend(frame_dets)
         
         if not detections:
-            print(f"  Total Detections: 0")
+            print(f"  Frame: #{frame_id} | Total Detections: 0")
             print(separator)
             return
         
@@ -1153,6 +1168,7 @@ class VehicleMonitoringDroneViewUseCase(BaseProcessor):
         confidence_min = {}
         confidence_max = {}
         bbox_format_count = {"x1/y1/x2/y2": 0, "xmin/ymin/xmax/ymax": 0, "other": 0}
+        has_track_id = 0
         
         for det in detections:
             if not isinstance(det, dict):
@@ -1181,9 +1197,17 @@ class VehicleMonitoringDroneViewUseCase(BaseProcessor):
                     bbox_format_count["xmin/ymin/xmax/ymax"] += 1
                 else:
                     bbox_format_count["other"] += 1
+            
+            # Track ID presence
+            if det.get('track_id') is not None:
+                has_track_id += 1
         
         # Print summary
-        print(f"  Total Detections: {total_count}")
+        print(f"  Frame: #{frame_id} | Total Detections: {total_count}")
+        
+        if has_track_id > 0:
+            print(f"  Detections with Track ID: {has_track_id} ({100*has_track_id/total_count:.1f}%)")
+        
         print(f"\n  Category Distribution:")
         
         # Sort categories by count (descending)
@@ -1213,6 +1237,9 @@ class VehicleMonitoringDroneViewUseCase(BaseProcessor):
             print(f"    Category: {sample.get('category')} (type: {type(sample.get('category')).__name__})")
             print(f"    Confidence: {sample.get('confidence')} (type: {type(sample.get('confidence')).__name__})")
             
+            if sample.get('track_id') is not None:
+                print(f"    Track ID: {sample.get('track_id')} (type: {type(sample.get('track_id')).__name__})")
+            
             bbox = sample.get('bounding_box', sample.get('bbox', {}))
             if isinstance(bbox, dict):
                 print(f"    BBox Keys: {list(bbox.keys())}")

matrice_analytics/post_processing/usecases/vehicle_monitoring_parking_lot.py

@@ -110,8 +110,24 @@ class VehicleMonitoringParkingLotUseCase(BaseProcessor):
     def process(self, data: Any, config: ConfigProtocol, context: Optional[ProcessingContext] = None,
                 stream_info: Optional[Dict[str, Any]] = None) -> ProcessingResult:
         processing_start = time.time()
-        if not isinstance(config, VehicleMonitoringParkingLotConfig):
-            return self.create_error_result("Invalid config type", usecase=self.name, category=self.category, context=context)
+        # Relaxed check: Accept VehicleMonitoringParkingLotConfig OR any config with matching usecase/category
+        # This handles multiprocessing module path mismatches while maintaining type safety
+        is_valid_config = (
+            isinstance(config, VehicleMonitoringParkingLotConfig) or
+            (hasattr(config, 'usecase') and config.usecase == 'vehicle_monitoring_parking_lot' and
+             hasattr(config, 'category') and config.category == 'traffic')
+        )
+        if not is_valid_config:
+            self.logger.error(
+                f"Config validation failed in vehicle_monitoring_parking_lot. "
+                f"Got type={type(config).__name__}, module={type(config).__module__}, "
+                f"usecase={getattr(config, 'usecase', 'N/A')}, category={getattr(config, 'category', 'N/A')}"
+            )
+            return self.create_error_result(
+                f"Invalid config type: expected VehicleMonitoringParkingLotConfig or config with usecase='vehicle_monitoring_parking_lot', "
+                f"got {type(config).__name__} with usecase={getattr(config, 'usecase', 'N/A')}",
+                usecase=self.name, category=self.category, context=context
+            )
         if context is None:
             context = ProcessingContext()