matrice 1.0.99301__py3-none-any.whl → 1.0.99303__py3-none-any.whl

matrice/deploy/utils/post_processing/usecases/color_detection.py

@@ -127,8 +127,8 @@ class ColorDetectionUseCase(BaseProcessor):
         self.smoothing_tracker = None  # BBoxSmoothingTracker instance
         self._total_frame_counter = 0  # Total frames processed
         self._global_frame_offset = 0  # Frame offset for new sessions
-        self._color_total_track_ids = {}  # Cumulative track IDs per category and color
-        self._color_current_frame_track_ids = {}  # Per-frame track IDs per category and color
+        self._color_total_track_ids = defaultdict(set)  # Cumulative track IDs per category-color
+        self._color_current_frame_track_ids = defaultdict(set)  # Per-frame track IDs per category-color
         
         self._tracking_start_time = None
         
@@ -149,8 +149,8 @@ class ColorDetectionUseCase(BaseProcessor):
 
     def reset_color_tracking(self) -> None:
         """Reset color tracking state."""
-        self._color_total_track_ids = {}
-        self._color_current_frame_track_ids = {}
+        self._color_total_track_ids = defaultdict(set)
+        self._color_current_frame_track_ids = defaultdict(set)
         self._total_frame_counter = 0
         self._global_frame_offset = 0
         self.logger.info("Color tracking state reset")
@@ -249,7 +249,13 @@ class ColorDetectionUseCase(BaseProcessor):
     
     def _update_color_tracking_state(self, detections: List[Dict]):
         """Track unique track_ids per category and color for total count."""
-        self._color_total_track_ids = getattr(self, '_color_total_track_ids', defaultdict(set))
+        # Ensure storage is a defaultdict(set) to allow safe .add()
+        existing_store = getattr(self, '_color_total_track_ids', None)
+        if not isinstance(existing_store, defaultdict):
+            existing_store = {} if existing_store is None else dict(existing_store)
+            self._color_total_track_ids = defaultdict(set, existing_store)
+        else:
+            self._color_total_track_ids = existing_store
         self._color_current_frame_track_ids = defaultdict(set)
         for det in detections:
             cat = det.get('category')
@@ -261,8 +267,20 @@ class ColorDetectionUseCase(BaseProcessor):
                 self._color_current_frame_track_ids[key].add(track_id)
 
     def get_total_color_counts(self):
-        """Return total unique track_id count for each category-color pair."""
-        return {key: len(ids) for key, ids in getattr(self, '_color_total_track_ids', {}).items()}
+        """Return total unique track_id count per category (across all colors)."""
+        store = getattr(self, '_color_total_track_ids', {})
+        if not isinstance(store, dict):
+            return {}
+        category_to_ids = defaultdict(set)
+        for key, id_set in store.items():
+            if isinstance(key, str) and ':' in key:
+                cat, _ = key.split(':', 1)
+            else:
+                cat = key
+            # Support both set and iterable
+            ids = id_set if isinstance(id_set, set) else set(id_set or [])
+            category_to_ids[cat].update(ids)
+        return {cat: len(ids) for cat, ids in category_to_ids.items()}
 
     def _get_track_ids_info(self, detections: List[Dict]) -> Dict[str, Any]:
         """Get detailed information about track IDs for color detections (per frame)."""
@@ -335,9 +353,9 @@ class ColorDetectionUseCase(BaseProcessor):
             if config.target_categories:
                 color_processed_data = [d for d in processed_data if d.get('category') in self.target_categories]
                 self.logger.debug("Applied category filtering")
-            print("-------------------COLOR_PROCESSED_DATA-------------------")
-            print(color_processed_data)
-            print("-------------------COLOR_PROCESSED_DATA-------------------")
+                print("-------------------COLOR_PROCESSED_DATA-------------------")
+                print(color_processed_data)
+                print("-------------------COLOR_PROCESSED_DATA-------------------")
             
             # Step 2.5: Filter to only include target categories
             # color_processed_data = filter_by_categories(processed_data.copy(), config.target_categories)
@@ -927,7 +945,7 @@ class ColorDetectionUseCase(BaseProcessor):
         # frame_tracking_stats = tracking_stats[0][frame_key]
         tracking_stats = []
 
-        total_detections = counting_summary.get("total_detections", 0)
+        total_detections = counting_summary.get("total_count", 0)
         total_counts = counting_summary.get("total_color_counts", {})
         cumulative_total = sum(total_counts.values()) if total_counts else 0
         per_category_count = counting_summary.get("per_category_count", {})
@@ -1149,7 +1167,7 @@ class ColorDetectionUseCase(BaseProcessor):
         # Use frame number as key, fallback to 'current_frame' if not available
         frame_key = str(frame_number) if frame_number is not None else "current_frame"
         incidents=[]
-        total_detections = counting_summary.get("total_detections", 0)
+        total_detections = counting_summary.get("total_count", 0)
         current_timestamp = self._get_current_timestamp_str(stream_info)
         camera_info = self.get_camera_info_from_stream(stream_info)
         
@@ -1257,15 +1275,17 @@ class ColorDetectionUseCase(BaseProcessor):
 
         frame_key = str(frame_number) if frame_number is not None else "current_frame"
         alerts = []
-        total_detections = summary.get("total_detections", 0) #CURRENT combined total count of all classes
+        total_detections = summary.get("total_count", 0) #CURRENT combined total count of all classes
         total_counts_dict = summary.get("total_color_counts", {}) #TOTAL cumulative counts per class
+        if isinstance(total_counts_dict, int):
+            total_counts_dict = {}
         cumulative_total = sum(total_counts_dict.values()) if total_counts_dict else 0 #TOTAL combined cumulative count
         per_category_count = summary.get("per_category_count", {}) #CURRENT count per class
 
         if not config.alert_config:
             return alerts
 
-        total = summary.get("total_detections", 0)
+        total = summary.get("total_count", 0)
         #self._ascending_alert_list
         if hasattr(config.alert_config, 'count_thresholds') and config.alert_config.count_thresholds:
 

{matrice-1.0.99301.dist-info → matrice-1.0.99303.dist-info}/METADATA

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

{matrice-1.0.99301.dist-info → matrice-1.0.99303.dist-info}/RECORD

@@ -170,7 +170,7 @@ matrice/deploy/utils/post_processing/usecases/car_part_segmentation.py,sha256=Jb
 matrice/deploy/utils/post_processing/usecases/cardiomegaly_classification.py,sha256=1P6DyOU6R1XKmQ-55BbKMU8CSsm4-wR5wS827UJG2JU,41244
 matrice/deploy/utils/post_processing/usecases/chicken_pose_detection.py,sha256=-e8di7Am-E-FCQFrSY8qJTO1aWtdRAVJoE-VKBgcyyI,29291
 matrice/deploy/utils/post_processing/usecases/child_monitoring.py,sha256=z3oymoqq4hDGwA8MkdEONZW_Vx5CAZmvzZaNLsqmCfw,39380
-matrice/deploy/utils/post_processing/usecases/color_detection.py,sha256=YsY1EDx7Lq1es9-Jg1DJYyHPB4u0NskqaXwFovL2zn8,70289
+matrice/deploy/utils/post_processing/usecases/color_detection.py,sha256=jK8Vy_3MJfijpqezvpvHn6yDGtpilX_1Q0CvSKcKM0U,71226
 matrice/deploy/utils/post_processing/usecases/color_map_utils.py,sha256=SP-AEVcjLmL8rxblu-ixqUJC2fqlcr7ab4hWo4Fcr_k,2677
 matrice/deploy/utils/post_processing/usecases/concrete_crack_detection.py,sha256=pxhOH_hG4hq9yytNepbGMdk2W_lTG8D1_2RAagaPBkg,40252
 matrice/deploy/utils/post_processing/usecases/crop_weed_detection.py,sha256=Ao1k5fJDYU_f6yZ8VO-jW8-esECV0-zY5Q570c_fako,35674
@@ -244,8 +244,8 @@ matrice/deployment/camera_manager.py,sha256=e1Lc81RJP5wUWRdTgHO6tMWF9BkBdHOSVyx3
 matrice/deployment/deployment.py,sha256=HFt151eWq6iqIAMsQvurpV2WNxW6Cx_gIUVfnVy5SWE,48093
 matrice/deployment/inference_pipeline.py,sha256=6b4Mm3-qt-Zy0BeiJfFQdImOn3FzdNCY-7ET7Rp8PMk,37911
 matrice/deployment/streaming_gateway_manager.py,sha256=ifYGl3g25wyU39HwhPQyI2OgF3M6oIqKMWt8RXtMxY8,21401
-matrice-1.0.99301.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-matrice-1.0.99301.dist-info/METADATA,sha256=Yie8iz9jzoz34X3E_TxfIZ0YnCZXW6vOw2-xx1vzuIw,14624
-matrice-1.0.99301.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice-1.0.99301.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
-matrice-1.0.99301.dist-info/RECORD,,
+matrice-1.0.99303.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+matrice-1.0.99303.dist-info/METADATA,sha256=DE5H_2ihQtvIU36jRs2tOr6KvFZgleQO1825yqXrXlI,14624
+matrice-1.0.99303.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice-1.0.99303.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
+matrice-1.0.99303.dist-info/RECORD,,