matrice 1.0.99215__py3-none-any.whl → 1.0.99217__py3-none-any.whl

matrice/deploy/utils/post_processing/config.py

@@ -46,6 +46,7 @@ APP_NAME_TO_USECASE = {
     "litter_detection" : "litter_detection",
     "human_activity_recognition": "human_activity_recognition",
     "leak_detection": "leak_detection",
+    "fire_smoke_detection": "fire_smoke_detection",
 }
 
 APP_NAME_TO_CATEGORY = {
@@ -96,6 +97,7 @@ APP_NAME_TO_CATEGORY = {
     "litter_detection" : "litter_detection",
     "human_activity_recognition": "general",
     "leak_detection": "oil_gas",
+    "fire_smoke_detection": "hazard",
 }
 
 def get_usecase_from_app_name(app_name: str) -> str:

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

@@ -97,7 +97,9 @@ class FireSmokeUseCase(BaseProcessor):
 
         self._ascending_alert_list: List[str] = []
         self.current_incident_end_timestamp: str = "N/A"
-        #self.fire_smoke_stack:List[int] = []
+        self.id_hit_list = ["low","medium","significant","critical","low"]
+        self.id_hit_counter = 0
+        self.latest_stack:str = None
 
     def process(
             self,
@@ -254,7 +256,7 @@ class FireSmokeUseCase(BaseProcessor):
             if len(data) < lookback:
                 return True
             post=lookback-prior-1
-            levels_list = ["low","medium","significant","critical"]
+            levels_list = ["low","medium","significant","critical","low"]
 
             current_dominant_incident = Counter(data[-lookback:][:-prior]).most_common(1)[0][0] #from LAST 23 elements fetch FIRST 15 elements
             potential_dominant_incident = Counter(data[-post:]).most_common(1)[0][0] #fetch LAST 8 elements
@@ -276,16 +278,16 @@ class FireSmokeUseCase(BaseProcessor):
             return []
         if not config.alert_config:
             return alerts
-        
 
         if hasattr(config.alert_config, 'count_thresholds') and config.alert_config.count_thresholds:
+            alert_id = self._get_alert_incident_ids(self._ascending_alert_list[-1:])
 
             for category, threshold in config.alert_config.count_thresholds.items():
                 if category == "all" and total > threshold:  
                     
                     alerts.append({
                         "alert_type": getattr(config.alert_config, 'alert_type', ['Default']) if hasattr(config.alert_config, 'alert_type') else ['Default'],
-                        "alert_id": "alert_"+category+'_'+frame_key,
+                        "alert_id": "alert_"+category+'_'+str(alert_id),
                         "incident_category": self.CASE_TYPE,
                         "threshold_level": threshold,
                         "ascending": get_trend(self._ascending_alert_list, lookback=23, prior=14),
@@ -299,7 +301,7 @@ class FireSmokeUseCase(BaseProcessor):
                     if count > threshold:  # Fixed logic: alert when EXCEEDING threshold
                         alerts.append({
                             "alert_type": getattr(config.alert_config, 'alert_type', ['Default']) if hasattr(config.alert_config, 'alert_type') else ['Default'],
-                            "alert_id": "alert_"+category+'_'+frame_key,
+                            "alert_id": "alert_"+category+'_'+str(alert_id),
                             "incident_category": self.CASE_TYPE,
                             "threshold_level": threshold,
                             "ascending": get_trend(self._ascending_alert_list, lookback=23, prior=14),
@@ -358,7 +360,7 @@ class FireSmokeUseCase(BaseProcessor):
         if total > 0:
            # Calculate total bbox area
             total_area = 0.0
-
+        
             for category, threshold in config.alert_config.count_thresholds.items():
                 if category in summary.get("per_category_count", {}):
                     
@@ -428,6 +430,8 @@ class FireSmokeUseCase(BaseProcessor):
                     human_text_lines.append(f"\tSeverity Level: {(self.CASE_TYPE,level)}")
                     human_text = "\n".join(human_text_lines)
 
+                    incident_id = self._get_alert_incident_ids(self._ascending_alert_list[-1:])
+
                     alert_settings=[]
                     if config.alert_config and hasattr(config.alert_config, 'alert_type'):
                         alert_settings.append({
@@ -440,7 +444,7 @@ class FireSmokeUseCase(BaseProcessor):
                                         }
                         })
                 
-                    event= self.create_incident(incident_id=self.CASE_TYPE+'_'+str(frame_number), incident_type=self.CASE_TYPE,
+                    event= self.create_incident(incident_id=self.CASE_TYPE+'_'+str(incident_id), incident_type=self.CASE_TYPE,
                             severity_level=level, human_text=human_text, camera_info=camera_info, alerts=alerts, alert_settings=alert_settings,
                             start_time=start_timestamp, end_time=self.current_incident_end_timestamp,
                             level_settings= {"low": 3, "medium": 5, "significant":15, "critical": 30})
@@ -923,5 +927,41 @@ class FireSmokeUseCase(BaseProcessor):
 
         return delta.total_seconds()
 
+    def _get_alert_incident_ids(self, sev_level):
+
+        if sev_level!="":
+            if sev_level==self.id_hit_list[0] and len(self.id_hit_list)>=2:
+                self.id_hit_counter+=1
+                if self.id_hit_counter>7:
+                    self.latest_stack = self.id_hit_list[0]
+                    self.id_hit_list.pop(0)
+                    self.id_hit_counter=0
+                    return int(5-len(self.id_hit_list))
+                
+            elif self.id_hit_counter>0:
+                self.id_hit_counter-=1
+            elif self.id_hit_counter<0:
+                self.id_hit_counter=0
+
+            if len(self.id_hit_list) > 1:
+                if sev_level==self.latest_stack:
+                    return int(5-len(self.id_hit_list))
+                else:
+                    return 0
+        else:
+            if len(self.id_hit_list)==1:
+                self.id_hit_counter+=1
+                if self.id_hit_counter>120:
+                    return int(5)
+                if sev_level==self.latest_stack:
+                    return int(5-len(self.id_hit_list))
+                else:
+                    return 0
+            elif self.id_hit_counter>0:
+                self.id_hit_counter-=1
+            elif self.id_hit_counter<0:
+                self.id_hit_counter=0
+        return ""
+
 
 

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

@@ -393,7 +393,7 @@ class LeakDetectionUseCase(BaseProcessor):
             self,
             counting_summary: Dict,
             alerts: List,
-            config: LeakdetectionConfig,
+            config: LeakDetectionConfig,
             frame_number: Optional[int] = None,
             stream_info: Optional[Dict[str, Any]] = None
     ) -> List[Dict]:

{matrice-1.0.99215.dist-info → matrice-1.0.99217.dist-info}/METADATA

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

{matrice-1.0.99215.dist-info → matrice-1.0.99217.dist-info}/RECORD

@@ -129,7 +129,7 @@ matrice/deploy/utils/boundary_drawing_internal/boundary_drawing_internal.py,sha2
 matrice/deploy/utils/boundary_drawing_internal/boundary_drawing_tool.py,sha256=eY0VQGZ8BfTmR4_ThIAXaumBjh8_c7w69w-d3kta8p0,15421
 matrice/deploy/utils/boundary_drawing_internal/example_usage.py,sha256=cUBhxxsVdTQWIPvIOjCUGrhqon7ZBr5N6qNewjrTIuk,6434
 matrice/deploy/utils/post_processing/__init__.py,sha256=Z4Hr-GVsk55UEo2J7zmYAXPS-a9lAh1PlVrUdnRkiZE,24591
-matrice/deploy/utils/post_processing/config.py,sha256=z0u0IaXf8BbV-ilNvdjfWosJdgoYUVINws8umxoH85k,4882
+matrice/deploy/utils/post_processing/config.py,sha256=FmZb7phtss9Vh-8_b311WcGazpa15wpbRCcX-KCG20M,4972
 matrice/deploy/utils/post_processing/processor.py,sha256=rwV5fMz1B_0qErOfEs1MDsqGeil4uBipBlHzWn85Sto,33842
 matrice/deploy/utils/post_processing/advanced_tracker/__init__.py,sha256=tAPFzI_Yep5TLX60FDwKqBqppc-EbxSr0wNsQ9DGI1o,423
 matrice/deploy/utils/post_processing/advanced_tracker/base.py,sha256=VqWy4dd5th5LK-JfueTt2_GSEoOi5QQfQxjTNhmQoLc,3580
@@ -181,14 +181,14 @@ matrice/deploy/utils/post_processing/usecases/face_emotion.py,sha256=eRfqBdryB0u
 matrice/deploy/utils/post_processing/usecases/face_recognition.py,sha256=T5xAuv6b9OrkmTmoXgZs4LZ5XUsbvp9xCpeLBwdu7eI,40231
 matrice/deploy/utils/post_processing/usecases/fashion_detection.py,sha256=f9gpzMDhIW-gyn46k9jgf8nY7YeoqAnTxGOzksabFbE,40457
 matrice/deploy/utils/post_processing/usecases/field_mapping.py,sha256=JDwYX8pd2W-waDvBh98Y_o_uchJu7wEYbFxOliA4Iq4,39822
-matrice/deploy/utils/post_processing/usecases/fire_detection.py,sha256=M1kKFl_L22U9MVdcnwRWKV-OVk7sNy3ZphxUofPDRxo,42852
+matrice/deploy/utils/post_processing/usecases/fire_detection.py,sha256=RBm23nrtVHAOk49Yjb06d-xF8mGvHO_0yW9hDxQtX6k,44457
 matrice/deploy/utils/post_processing/usecases/flare_analysis.py,sha256=-egmS3Hs_iGOLeCMfapbkfQ04EWtZx97QRuUcDa-jMU,45340
 matrice/deploy/utils/post_processing/usecases/flower_segmentation.py,sha256=4I7qMx9Ztxg_hy9KTVX-3qBhAN-QwDt_Yigf9fFjLus,52017
 matrice/deploy/utils/post_processing/usecases/gender_detection.py,sha256=DEnCTRew6B7DtPcBQVCTtpd_IQMvMusBcu6nadUg2oM,40107
 matrice/deploy/utils/post_processing/usecases/human_activity_recognition.py,sha256=5a-akti7tRR1epuagEycGHrRRG2FTs0r8vesPuCqiJI,94827
 matrice/deploy/utils/post_processing/usecases/leaf.py,sha256=cwgB1ZNxkQFtkk-thSJrkXOGou1ghJr1kqtopb3sLD4,37036
 matrice/deploy/utils/post_processing/usecases/leaf_disease.py,sha256=bkiLccTdf4KUq3he4eCpBlKXb5exr-WBhQ_oWQ7os68,36225
-matrice/deploy/utils/post_processing/usecases/leak_detection.py,sha256=KSrL7PnpAGO_VyBUtCW2boOm5hBkgdm7ONmytcmP8Wo,40531
+matrice/deploy/utils/post_processing/usecases/leak_detection.py,sha256=oOCLLVMuXVeXPHyN8FUrD3U9JYJJwIz-5fcEMgvLdls,40531
 matrice/deploy/utils/post_processing/usecases/license_plate_detection.py,sha256=WmVmtp-GLUSNtBxjZHUtUk_M9lPp_8gA0rdzFXVL1SY,44961
 matrice/deploy/utils/post_processing/usecases/litter_monitoring.py,sha256=XaHAUGRBDJg_iVbu8hRMjTR-5TqrLj6ZNCRkInbzZTY,33255
 matrice/deploy/utils/post_processing/usecases/mask_detection.py,sha256=MNpCcuefOdW7C8g_x_mNuWYA4mbyg8UNwomwBPoKtr0,39684
@@ -239,8 +239,8 @@ matrice/deployment/camera_manager.py,sha256=MEluadz_I3k10GqwFb_w5w_HhuHcEu2vA7oh
 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=90O_SvR4RtBJxR6dy43uHNRTRdgxQE09KzhzHzVqq3E,20939
-matrice-1.0.99215.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-matrice-1.0.99215.dist-info/METADATA,sha256=UWEHNO19E6iKQqq5L0p9elR0JRjDlMXGxNBbSj7Pbi8,14624
-matrice-1.0.99215.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice-1.0.99215.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
-matrice-1.0.99215.dist-info/RECORD,,
+matrice-1.0.99217.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+matrice-1.0.99217.dist-info/METADATA,sha256=R3KMcop9KCXFcD_RCB8SoOjcf6I3WADmxoenM4l5JPo,14624
+matrice-1.0.99217.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice-1.0.99217.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
+matrice-1.0.99217.dist-info/RECORD,,