matrice 1.0.99294__py3-none-any.whl → 1.0.99296__py3-none-any.whl

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

@@ -23,6 +23,7 @@ from ..core.config import BaseConfig, AlertConfig, ZoneConfig
 class AbandonedObjectConfig(BaseConfig):
     """Configuration for abandoned object detection use case."""
     enable_smoothing: bool = True
+    centroid_threshold: float = 10.0
     smoothing_algorithm: str = "observability"
     smoothing_window_size: int = 20
     smoothing_cooldown_frames: int = 5
@@ -193,7 +194,7 @@ class AbandonedObjectDetectionUseCase(BaseProcessor):
                 track_info['bbox'] = bbox
 
                 # Check if centroid has moved significantly
-                if self._is_centroid_stationary(centroid, prev_centroid):
+                if self._is_centroid_stationary(centroid, prev_centroid, config.centroid_threshold):
                     if track_info['frame_count'] >= config.stationary_threshold_frames:
                         # Check for overlap with person
                         if not self._overlaps_with_person(bbox):
@@ -222,6 +223,7 @@ class AbandonedObjectDetectionUseCase(BaseProcessor):
 
     def _is_centroid_stationary(self, centroid: tuple, prev_centroid: tuple, threshold: float = 5.0) -> bool:
         """Check if centroid movement is within threshold."""
+        threshold = threshold or self.config.centroid_threshold
         x1, y1 = centroid
         x2, y2 = prev_centroid
         distance = ((x1 - x2) ** 2 + (y1 - y2) ** 2) ** 0.5
@@ -230,7 +232,7 @@ class AbandonedObjectDetectionUseCase(BaseProcessor):
     def _overlaps_with_person(self, bbox: Dict) -> bool:
         """Check if bbox overlaps with any person bbox."""
         for person_bbox in self._person_bboxes:
-            if person_bbox and self._compute_iou(bbox, person_bbox) > 0.1:
+            if person_bbox and self._compute_iou(bbox, person_bbox) > 0.5:
                 return True
         return False
 

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

@@ -35,9 +35,16 @@ class ColorDetectionConfig(BaseConfig):
     confidence_threshold: float = 0.5
     top_k_colors: int = 3
     frame_skip: int = 1
-    target_categories: Optional[List[str]] = field(default_factory=lambda: [
-        "person", "people", "car", "cars", "truck", "trucks", "motorcycle", "motorcycles", "vehicle", "vehicles", "bus", "bicycle"
-    ])
+    usecase_categories: List[str] = field(
+        default_factory=lambda: [
+            "bicycle", "car", "motorbike", "auto rickshaw", "bus", "garbagevan",
+            "truck", "minibus", "army vehicle", "pickup", "policecar", "rickshaw",
+            "scooter", "suv", "taxi", "three wheelers -CNG-", "human hauler", "van", "wheelbarrow"
+        ]
+    )
+    target_categories: List[str] = field(
+        default_factory=lambda: ['car', 'bicycle', 'bus', 'garbagevan', 'truck', 'motorbike', 'van']
+    )
     fps: Optional[float] = None
     bbox_format: str = "auto"
     index_to_category: Optional[Dict[int, str]] = None
@@ -51,6 +58,30 @@ class ColorDetectionConfig(BaseConfig):
     smoothing_window_size: int = 20
     smoothing_cooldown_frames: int = 5
     smoothing_confidence_range_factor: float = 0.5
+    index_to_category: Optional[Dict[int, str]] = field(
+        default_factory=lambda: {
+                0: "ambulance",
+                1: "army vehicle",
+                2: "car",
+                3: "bicycle",
+                4: "bus",
+                5: "auto rickshaw",
+                6: "garbagevan",
+                7: "truck",
+                8: "minibus",
+                9: "minivan",
+                10: "motorbike",
+                11: "pickup",
+                12: "policecar",
+                13: "rickshaw",
+                14: "scooter",
+                15: "suv",
+                16: "taxi",
+                17: "three wheelers -CNG-",
+                18: "human hauler",
+                19: "van",
+                20: "wheelbarrow"
+            })
 
     def validate(self) -> List[str]:
         """Validate configuration parameters."""
@@ -74,12 +105,20 @@ class ColorDetectionConfig(BaseConfig):
 
 class ColorDetectionUseCase(BaseProcessor):
     """Color detection processor for analyzing object colors in video streams with tracking."""
+    CATEGORY_DISPLAY = {
+        "bicycle": "Bicycle", "car": "Car", "motorbike": "Motorbike", "auto rickshaw": "Auto Rickshaw",
+        "bus": "Bus", "garbagevan": "Garbage Van", "truck": "Truck", "minibus": "Minibus",
+        "army vehicle": "Army Vehicle", "pickup": "Pickup", "policecar": "Police Car",
+        "rickshaw": "Rickshaw", "scooter": "Scooter", "suv": "SUV", "taxi": "Taxi",
+        "three wheelers -CNG-": "Three Wheelers (CNG)", "human hauler": "Human Hauler",
+        "van": "Van", "wheelbarrow": "Wheelbarrow"
+    }
     
     def __init__(self):
         super().__init__("color_detection")
         self.category = "visual_appearance"
         
-        self.target_categories = ["person", "people", "car", "cars", "truck", "trucks", "motorcycle", "motorcycles", "vehicle", "vehicles", "bus", "bicycle"]
+        self.target_categories = ['car', 'bicycle', 'bus', 'garbagevan', 'truck', 'motorbike', 'van']
         
         self.CASE_TYPE: Optional[str] = 'color_detection'
         self.CASE_VERSION: Optional[str] = '1.3'
@@ -292,10 +331,14 @@ class ColorDetectionUseCase(BaseProcessor):
             if config.index_to_category:
                 processed_data = apply_category_mapping(processed_data, config.index_to_category)
                 self.logger.debug("Applied category mapping")
+
+            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")
             
             # Step 2.5: Filter to only include target categories
-            color_processed_data = filter_by_categories(processed_data.copy(), config.target_categories)
-            self.logger.debug(f"Applied target category filtering for: {config.target_categories}")
+            # color_processed_data = filter_by_categories(processed_data.copy(), config.target_categories)
+            # self.logger.debug(f"Applied target category filtering for: {config.target_categories}")
             
             raw_processed_data = [copy.deepcopy(det) for det in color_processed_data]
             # Step 3: Apply bounding box smoothing if enabled

{matrice-1.0.99294.dist-info → matrice-1.0.99296.dist-info}/METADATA

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

{matrice-1.0.99294.dist-info → matrice-1.0.99296.dist-info}/RECORD

@@ -157,7 +157,7 @@ matrice/deploy/utils/post_processing/test_cases/test_utilities.py,sha256=lmT5bp5
 matrice/deploy/utils/post_processing/test_cases/test_utils.py,sha256=bfmOT1rr9asv3jpr-p_UrjnnSZ1qEWM2LEqNKkyvJZ8,29370
 matrice/deploy/utils/post_processing/usecases/Histopathological_Cancer_Detection_img.py,sha256=bHDXxxG3QgWMFZbDuBaJWpkIvxTXsFMTqCPBCFm3SDs,30247
 matrice/deploy/utils/post_processing/usecases/__init__.py,sha256=aTVBEy8PnIEQdxFKpyB6_bYW5WWed6S2JBkYK57VT2s,9571
-matrice/deploy/utils/post_processing/usecases/abandoned_object_detection.py,sha256=W6thVUxNzZc2vDaXG69DNvENP8WVPQh-vE52YXtLEHU,31750
+matrice/deploy/utils/post_processing/usecases/abandoned_object_detection.py,sha256=l0s0BZKuK6XpfD85zJSb-cgbfLxWnP9Mzb5JwAFPX7k,31878
 matrice/deploy/utils/post_processing/usecases/advanced_customer_service.py,sha256=ELt5euxr6P4X2s8-YGngmj27QscOHefjOsx3774sNFk,75914
 matrice/deploy/utils/post_processing/usecases/age_detection.py,sha256=yn1LXOgbnOWSMDnsCds6-uN6W-I1Hy4_-AMrjbT5PtY,41318
 matrice/deploy/utils/post_processing/usecases/anti_spoofing_detection.py,sha256=XdtDdXGzZMLQdWcoOoiE5t4LPYHhgOtJ7tZCNlq1A2E,31329
@@ -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=s7Qi4i-44DekS9tWM9NLkx8yVoTUCHfyMqi_qed-wjc,67335
+matrice/deploy/utils/post_processing/usecases/color_detection.py,sha256=n6oI0nSTKYz0ZAPVvLovMVEgrBz3QfcWEokH3JyZ93Y,69096
 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.99294.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-matrice-1.0.99294.dist-info/METADATA,sha256=lXvLsYMYQbH8vQxZlhIDVAdn4rKiem6xy5gtVfRVaig,14624
-matrice-1.0.99294.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice-1.0.99294.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
-matrice-1.0.99294.dist-info/RECORD,,
+matrice-1.0.99296.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+matrice-1.0.99296.dist-info/METADATA,sha256=X8NmjUp1h3-0ggOqCfmTFha8Ki0wkJMZB7SAGViJb7k,14624
+matrice-1.0.99296.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice-1.0.99296.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
+matrice-1.0.99296.dist-info/RECORD,,