matrice 1.0.99302__py3-none-any.whl → 1.0.99304__py3-none-any.whl

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

@@ -261,8 +261,9 @@ class ColorDetectionUseCase(BaseProcessor):
             cat = det.get('category')
             color = det.get('main_color')
             track_id = det.get('track_id')
-            if cat and color and track_id is not None:
-                key = f"{cat}:{color}"  # Unique key for category-color pair
+            if cat and track_id is not None:
+                # If color not yet computed at this stage, fall back to category-only key
+                key = f"{cat}:{color}" if color else cat
                 self._color_total_track_ids[key].add(track_id)
                 self._color_current_frame_track_ids[key].add(track_id)
 
@@ -419,10 +420,22 @@ class ColorDetectionUseCase(BaseProcessor):
             print("-------------------COLOR_ANALYSIS-------------------")
             
             # Step 8: Calculate summaries
+            # After color extraction, update cumulative color-aware tracking totals
+            self._update_color_tracking_state_from_analysis(color_analysis)
             color_summary = self._calculate_color_summary(color_analysis, config)
+            # Ensure total_color_counts is populated even on first frame/session
+            totals = self.get_total_color_counts()
+            if not totals:
+                tmp = defaultdict(set)
+                for rec in color_analysis:
+                    cat = rec.get('category')
+                    tid = rec.get('track_id') or rec.get('detection_id')
+                    if cat and tid is not None:
+                        tmp[cat].add(tid)
+                totals = {cat: len(ids) for cat, ids in tmp.items()}
             
             general_summary = self._calculate_general_summary(processed_data, config)
-            color_summary['total_color_counts'] = self.get_total_color_counts()
+            color_summary['total_color_counts'] = totals
             print("-------------------COLOR_SUMMARY-------------------")
             print(color_summary)
             print("-------------------COLOR_SUMMARY-------------------")
@@ -511,6 +524,25 @@ class ColorDetectionUseCase(BaseProcessor):
             return self._analyze_colors_in_video(data, media_bytes, config)
         else:
             return self._analyze_colors_in_image(data, media_bytes, config)
+
+    def _update_color_tracking_state_from_analysis(self, color_analysis: List[Dict[str, Any]]) -> None:
+        """Update total tracking store using analyzed color results.
+        Ensures totals are populated even if pre-analysis detections lacked colors/track_ids."""
+        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
+        for rec in color_analysis:
+            cat = rec.get('category')
+            color = rec.get('main_color')
+            track_id = rec.get('track_id')
+            if track_id is None:
+                track_id = rec.get('detection_id')
+            if cat and track_id is not None:
+                key = f"{cat}:{color}" if color else cat
+                self._color_total_track_ids[key].add(track_id)
     
     def _is_video_bytes(self, media_bytes: bytes) -> bool:
         """Determine if bytes represent a video file."""
@@ -1276,7 +1308,9 @@ class ColorDetectionUseCase(BaseProcessor):
         frame_key = str(frame_number) if frame_number is not None else "current_frame"
         alerts = []
         total_detections = summary.get("total_count", 0) #CURRENT combined total count of all classes
-        total_counts_dict = summary.get("total_count", {}) #TOTAL cumulative counts per class
+        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
 

{matrice-1.0.99302.dist-info → matrice-1.0.99304.dist-info}/METADATA

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

{matrice-1.0.99302.dist-info → matrice-1.0.99304.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=r94P0wlFTswexqllSENZbFAuJtBxlgUCzWtDaeHExcw,71137
+matrice/deploy/utils/post_processing/usecases/color_detection.py,sha256=_HLg4ow1aDi61-ZW4yefNF5zn_netAIwPfvpPhd8BYA,72977
 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.99302.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-matrice-1.0.99302.dist-info/METADATA,sha256=c66lAc24CgiYHMXa-frCOoZjQHKdZ8uiMu0zmkfzXjA,14624
-matrice-1.0.99302.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice-1.0.99302.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
-matrice-1.0.99302.dist-info/RECORD,,
+matrice-1.0.99304.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+matrice-1.0.99304.dist-info/METADATA,sha256=iZgoXZczNzjS2LQTGNaHYLAK_Pa8TJZpPWvLbFI0KBE,14624
+matrice-1.0.99304.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice-1.0.99304.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
+matrice-1.0.99304.dist-info/RECORD,,