matrice 1.0.99287__tar.gz → 1.0.99288__tar.gz

{matrice-1.0.99287/src/matrice.egg-info → matrice-1.0.99288}/PKG-INFO

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

{matrice-1.0.99287 → matrice-1.0.99288}/setup.py

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

{matrice-1.0.99287 → matrice-1.0.99288}/src/matrice/deploy/utils/post_processing/usecases/fire_detection.py

@@ -109,6 +109,7 @@ class FireSmokeUseCase(BaseProcessor):
         self.id_hit_counter = 0
         self.latest_stack:str = None
         self.id_timing_list = []
+        self.return_id_counter = 1
 
     def process(
             self,
@@ -244,11 +245,11 @@ class FireSmokeUseCase(BaseProcessor):
                 print('FRAME_NUMBER',str(frame_number))
                 print("-----------------------------------------------------########-------------")
 
-            business_analytics = business_analytics_list[0] if business_analytics_list else {}
+            business_analytics = business_analytics_list[0] if business_analytics_list else []
             summary = summary_list[0] if summary_list else {}
             agg_summary = {str(frame_number): {
-                            "incidents": incidents,
-                            "tracking_stats": tracking_stats,
+                            "incidents": [incidents],
+                            "tracking_stats": [tracking_stats],
                             "business_analytics": business_analytics,
                             "alerts": alerts,
                             "human_text": summary}
@@ -313,21 +314,22 @@ class FireSmokeUseCase(BaseProcessor):
         if hasattr(config.alert_config, 'count_thresholds') and config.alert_config.count_thresholds:
             # Safely fetch the last recorded severity level as a **string** (empty if no history yet)
             last_level = self._ascending_alert_list[-1] if self._ascending_alert_list else "low"
-            alert_id = self._get_alert_incident_ids(last_level, stream_info)
-            if alert_id not in [1,2,3,4,5]:
-                alert_id = 4
+            rank_ids, alert_id = self._get_alert_incident_ids(last_level, stream_info)
+            if rank_ids not in [1,2,3,4,5]:
+                alert_id = 1
 
             count_thresholds = {}
             if config.alert_config and hasattr(config.alert_config, "count_thresholds"):
                 count_thresholds = config.alert_config.count_thresholds or {}
 
             for category, threshold in count_thresholds.items():
-                alert_id = 1
+                alert_serial = getattr(config.alert_config, 'alert_type', ['Default']) if hasattr(config.alert_config, 'alert_type') else ['Default']
+                alert_serial = alert_serial[0]
                 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+'_'+str(alert_id),
+                        "alert_id": "alert_"+category+'_'+alert_serial+'_'+str(alert_id),
                         "incident_category": self.CASE_TYPE,
                         "threshold_level": threshold,
                         "ascending": get_trend(self._ascending_alert_list, lookback=23, prior=14),
@@ -480,14 +482,14 @@ class FireSmokeUseCase(BaseProcessor):
 
                     # Pass the last severity level **value** instead of a single-element list
                     last_level = level if level else self._ascending_alert_list[-1]
-                    incident_id = self._get_alert_incident_ids(last_level, stream_info)
-                    if incident_id not in [1,2,3,4,5]:
-                        incident_id = 4
-                    if len(self.id_timing_list)>0 and len(self.id_timing_list)==incident_id:
+                    rank_ids, incident_id = self._get_alert_incident_ids(last_level, stream_info)
+                    if rank_ids not in [1,2,3,4,5]:
+                        incident_id = 1
+                    if len(self.id_timing_list)>0 and len(self.id_timing_list)==rank_ids:
                         start_timestamp = self.id_timing_list[-1]
                     if len(self.id_timing_list)>0 and len(self.id_timing_list)>4 and level=='critical':
                         start_timestamp = self.id_timing_list[-1]
-                    incident_id = 1
+
                     alert_settings=[]
                     if config.alert_config and hasattr(config.alert_config, 'alert_type'):
                         alert_settings.append({
@@ -500,7 +502,7 @@ class FireSmokeUseCase(BaseProcessor):
                                         }
                         })
                 
-                    event= self.create_incident(incident_id=self.CASE_TYPE+'_'+str(incident_id), incident_type=self.CASE_TYPE,
+                    event= self.create_incident(incident_id='incident_'+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})
@@ -641,7 +643,7 @@ class FireSmokeUseCase(BaseProcessor):
         tracking_stats.append(tracking_stat)
 
         if len(self.id_hit_list)==1:
-            last_ending_id = self._get_alert_incident_ids("",stream_info)
+            last_ending_id, incident_id = self._get_alert_incident_ids("",stream_info)
             print('last_ending_id',last_ending_id)
             if len(self.id_timing_list)>0 and len(self.id_timing_list)>=5:
                     start_timestamp = self.id_timing_list[-1]
@@ -657,7 +659,7 @@ class FireSmokeUseCase(BaseProcessor):
                                     }       
                         }]
                 tracking_stats.append(alerts)
-                tracking_stats.append(self.create_incident(incident_id=self.CASE_TYPE+'_'+str(1), incident_type=self.CASE_TYPE,
+                tracking_stats.append(self.create_incident(incident_id=self.CASE_TYPE+'_'+str(incident_id), incident_type=self.CASE_TYPE,
                             severity_level='info', human_text='Event Over', camera_info=camera_info, alerts=alerts, alert_settings=alert_settings,
                             start_time=start_timestamp, end_time='Incident still active',
                             level_settings= {"low": 3, "medium": 5, "significant":15, "critical": 30}))
@@ -671,20 +673,20 @@ class FireSmokeUseCase(BaseProcessor):
         """
         Generate a human_text string for the tracking_stat, incident, business analytics and alerts.
         """
-        lines = {}
-        lines["Application Name"] = self.CASE_TYPE
-        lines["Application Version"] = self.CASE_VERSION
+        lines = []
+        lines.append("Application Name: "+self.CASE_TYPE)
+        lines.append("Application Version: "+self.CASE_VERSION)
         if len(incidents) > 0:
-            lines["Incidents:"]=f"\n\t{incidents[0].get('human_text', 'No incidents detected')}\n"
+            lines.append("Incidents: "+f"\n\t{incidents[0].get('human_text', 'No incidents detected')}")
         if len(tracking_stats) > 0:
-            lines["Tracking Statistics:"]=f"\t{tracking_stats[0].get('human_text', 'No tracking statistics detected')}\n"
+            lines.append("Tracking Statistics: "+f"\t{tracking_stats[0].get('human_text', 'No tracking statistics detected')}")
         if len(business_analytics) > 0:
-            lines["Business Analytics:"]=f"\t{business_analytics[0].get('human_text', 'No business analytics detected')}\n"
+            lines.append("Business Analytics: "+f"\t{business_analytics[0].get('human_text', 'No business analytics detected')}")
 
         if len(incidents) == 0 and len(tracking_stats) == 0 and len(business_analytics) == 0:
-            lines["Summary"] = "No Summary Data"
+            lines.append("Summary: "+"No Summary Data")
 
-        return [lines]
+        return ["\n".join(lines)]
 
     def _calculate_fire_smoke_summary(
             self, data: Any, config: FireSmokeConfig
@@ -1017,7 +1019,7 @@ class FireSmokeUseCase(BaseProcessor):
                     self.id_hit_list.pop(0)
                     self.id_hit_counter=0
                     self.id_timing_list.append(self._get_current_timestamp_str(stream_info))
-                    return int(5-len(self.id_hit_list))
+                    return (5-len(self.id_hit_list),self.return_id_counter)
                 
             elif self.id_hit_counter>0:
                 self.id_hit_counter-=1
@@ -1026,27 +1028,28 @@ class FireSmokeUseCase(BaseProcessor):
 
             if len(self.id_hit_list) > 1:
                 if sev_level==self.latest_stack:
-                    return int(5-len(self.id_hit_list))
+                    return (5-len(self.id_hit_list),self.return_id_counter)
                 else:
-                    return 0
+                    return (0,0)
         else:
             if len(self.id_hit_list)==1:
                 self.id_hit_counter+=1
                 if self.id_hit_counter>130:
                     self.id_hit_list = ["low","medium","significant","critical","low"]
+                    self.return_id_counter+=1
                     self.id_hit_counter = 0
                     self.latest_stack = None
                     self.id_timing_list.append(self._get_current_timestamp_str(stream_info))
-                    return int(5)
+                    return (int(5),self.return_id_counter-1)
                 if sev_level==self.latest_stack:
-                    return int(5-len(self.id_hit_list))
+                    return (5-len(self.id_hit_list),self.return_id_counter)
                 else:
-                    return 0
+                    return (0,0)
             elif self.id_hit_counter>0:
                 self.id_hit_counter-=1
             elif self.id_hit_counter<0:
                 self.id_hit_counter=0
-        return ""
+        return (1,1)
 
 
 

{matrice-1.0.99287 → matrice-1.0.99288/src/matrice.egg-info}/PKG-INFO

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