matrice 1.0.99143__tar.gz → 1.0.99144__tar.gz

{matrice-1.0.99143/src/matrice.egg-info → matrice-1.0.99144}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrice
-Version: 1.0.99143
+Version: 1.0.99144
 Summary: SDK for connecting to matrice.ai services
 Home-page: https://github.com/matrice-ai/python-sdk
 Author: Matrice.ai

{matrice-1.0.99143 → matrice-1.0.99144}/setup.py

@@ -14,7 +14,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 setup(
     name="matrice",
 
-    version = "1.0.99143",
+    version = "1.0.99144",
     
     description="SDK for connecting to matrice.ai services",
     long_description=long_description,

{matrice-1.0.99143 → matrice-1.0.99144}/src/matrice/deploy/utils/post_processing/usecases/road_lane_detection.py

@@ -305,6 +305,7 @@ class LaneDetectionUseCase(BaseProcessor):
 
     def _generate_tracking_stats(self, counting_summary: Dict, alerts: List, config: LaneDetectionConfig,
                                 frame_number: Optional[int] = None, stream_info: Optional[Dict[str, Any]] = None) -> List[Dict]:
+        """Generate structured tracking stats matching expected format."""
         camera_info = self.get_camera_info_from_stream(stream_info)
         tracking_stats = []
         total_detections = counting_summary.get("total_count", 0)
@@ -315,8 +316,13 @@ class LaneDetectionUseCase(BaseProcessor):
         high_precision_start_timestamp = self._get_current_timestamp_str(stream_info, precision=True)
         high_precision_reset_timestamp = self._get_start_timestamp_str(stream_info, precision=True)
 
-        total_counts = [{"category": cat, "count": count} for cat, count in total_counts_dict.items() if count > 0]
-        current_counts = [{"category": cat, "count": count} for cat, count in per_category_count.items() if count > 0 or total_detections > 0]
+        # Build total_counts and current_counts arrays
+        total_counts = [{"category": cat, "count": count} for cat, count in total_counts_dict.items()]
+        current_counts = [{"category": cat, "count": count} for cat, count in per_category_count.items()]
+
+        # Log counts for debugging
+        self.logger.debug(f"Total counts: {total_counts}")
+        self.logger.debug(f"Current counts: {current_counts}")
 
         detections = []
         for detection in counting_summary.get("detections", []):
@@ -343,7 +349,7 @@ class LaneDetectionUseCase(BaseProcessor):
                 "threshold_level": config.alert_config.count_thresholds if hasattr(config.alert_config, 'count_thresholds') else {},
                 "ascending": True,
                 "settings": {t: v for t, v in zip(getattr(config.alert_config, 'alert_type', ['Default']),
-                                                 getattr(config.alert_config, 'alert_value', ['JSON']))}
+                                                getattr(config.alert_config, 'alert_value', ['JSON']))}
             })
 
         human_text_lines = [f"Tracking Statistics:"]
@@ -352,8 +358,7 @@ class LaneDetectionUseCase(BaseProcessor):
             human_text_lines.append(f"\t{cat}: {count}")
         human_text_lines.append(f"TOTAL SINCE {start_timestamp}")
         for cat, count in total_counts_dict.items():
-            if count > 0:
-                human_text_lines.append(f"\t{cat}: {count}")
+            human_text_lines.append(f"\t{cat}: {count}")
         if alerts:
             for alert in alerts:
                 human_text_lines.append(f"Alerts: {alert.get('settings', {})} sent @ {current_timestamp}")
@@ -501,23 +506,34 @@ class LaneDetectionUseCase(BaseProcessor):
             return dt.strftime('%Y:%m:%d %H:%M:%S')
 
     def _count_categories(self, detections: list, config: LaneDetectionConfig) -> dict:
-        counts = {}
+        """
+        Count the number of detections per category and return a summary dict.
+        """
+        counts = {cat: 0 for cat in self.target_categories}  # Initialize with all target categories
+        valid_detections = []
+        
         for det in detections:
             cat = det.get('category', 'unknown')
-            counts[cat] = counts.get(cat, 0) + 1
+            # Normalize category to match target_categories
+            normalized_cat = cat.replace('-', ' ').title().replace(' ', '-')  # e.g., "solid-line" -> "Solid-Line"
+            if normalized_cat not in self.target_categories:
+                self.logger.debug(f"Skipping detection with category {normalized_cat}, not in target categories")
+                continue
+            counts[normalized_cat] += 1
+            det['category'] = normalized_cat  # Update detection with normalized category
+            valid_detections.append({
+                "bounding_box": det.get("bounding_box"),
+                "category": normalized_cat,
+                "confidence": det.get("confidence"),
+                "track_id": det.get("track_id"),
+                "frame_id": det.get("frame_id")
+            })
+            self.logger.debug(f"Counted detection for category {normalized_cat}, confidence {det.get('confidence')}")
+
         return {
             "total_count": sum(counts.values()),
             "per_category_count": counts,
-            "detections": [
-                {
-                    "bounding_box": det.get("bounding_box"),
-                    "category": det.get("category"),
-                    "confidence": det.get("confidence"),
-                    "track_id": det.get("track_id"),
-                    "frame_id": det.get("frame_id")
-                }
-                for det in detections
-            ]
+            "detections": valid_detections
         }
 
     def _extract_predictions(self, detections: list) -> List[Dict[str, Any]]:

{matrice-1.0.99143 → matrice-1.0.99144/src/matrice.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrice
-Version: 1.0.99143
+Version: 1.0.99144
 Summary: SDK for connecting to matrice.ai services
 Home-page: https://github.com/matrice-ai/python-sdk
 Author: Matrice.ai