matrice 1.0.99278__tar.gz → 1.0.99280__tar.gz

{matrice-1.0.99278/src/matrice.egg-info → matrice-1.0.99280}/PKG-INFO

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

{matrice-1.0.99278 → matrice-1.0.99280}/setup.py

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

{matrice-1.0.99278 → matrice-1.0.99280}/src/matrice/deploy/client/streaming_gateway/streaming_gateway_utils.py

@@ -319,7 +319,7 @@ class OutputConfig:
 class _RealTimeJsonEventPicker:
     """Stateful helper that replicates the original logic but works one frame at a time."""
 
-    def __init__(self, consecutive_threshold: int = 7, end_threshold: int = 129):
+    def __init__(self, consecutive_threshold: int = 7, end_threshold: int = 130):
         # Required sequence of severities
         self._base_sequence: List[str] = ["low", "medium", "significant", "critical", "low"]
         self._sequence: deque[str] = deque(self._base_sequence)
@@ -405,7 +405,7 @@ class _RealTimeJsonEventPicker:
             # No detections in this frame
             if len(self._sequence) == 1:  # Waiting for final idle period
                 self._hit_counter += 1
-                if self._hit_counter >= self._end_threshold:
+                if (self._hit_counter >= self._end_threshold) or (incidents.get("human_text")=="Event Over"):
                     event = {
                         "type": "event_end",
                         "frame_id": frame_id,

{matrice-1.0.99278 → matrice-1.0.99280}/src/matrice/deploy/utils/post_processing/usecases/fire_detection.py

@@ -108,6 +108,7 @@ class FireSmokeUseCase(BaseProcessor):
         self.id_hit_list = ["low","medium","significant","critical","low"]
         self.id_hit_counter = 0
         self.latest_stack:str = None
+        self.id_timing_list = []
 
     def process(
             self,
@@ -312,7 +313,7 @@ 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)
+            alert_id = self._get_alert_incident_ids(last_level, stream_info)
             if alert_id not in [1,2,3,4,5]:
                 alert_id = 4
 
@@ -410,6 +411,7 @@ class FireSmokeUseCase(BaseProcessor):
                     
                     #count = summary.get("per_category_count", {})[category]
                     start_timestamp = self._get_start_timestamp_str(stream_info)
+                    
                     if start_timestamp and self.current_incident_end_timestamp=='N/A':
                         self.current_incident_end_timestamp = 'Incident still active'
                     elif start_timestamp and self.current_incident_end_timestamp=='Incident still active':
@@ -477,9 +479,13 @@ 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)
+                    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:
+                        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]
 
                     alert_settings=[]
                     if config.alert_config and hasattr(config.alert_config, 'alert_type'):
@@ -634,8 +640,10 @@ class FireSmokeUseCase(BaseProcessor):
         tracking_stats.append(tracking_stat)
 
         if len(self.id_hit_list)==1:
-            last_ending_id = self._get_alert_incident_ids("")
+            last_ending_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]
             if last_ending_id==5:
                 alerts={
                             "alert_type": getattr(config.alert_config, 'alert_type', ['Default']) if hasattr(config.alert_config, 'alert_type') else ['Default'],
@@ -998,7 +1006,7 @@ class FireSmokeUseCase(BaseProcessor):
 
         return delta.total_seconds()
 
-    def _get_alert_incident_ids(self, sev_level):
+    def _get_alert_incident_ids(self, sev_level, stream_info: Optional[Dict[str, Any]] = None):
 
         if sev_level!="":
             if sev_level==self.id_hit_list[0] and len(self.id_hit_list)>=2:
@@ -1007,6 +1015,7 @@ class FireSmokeUseCase(BaseProcessor):
                     self.latest_stack = self.id_hit_list[0]
                     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))
                 
             elif self.id_hit_counter>0:
@@ -1026,6 +1035,7 @@ class FireSmokeUseCase(BaseProcessor):
                     self.id_hit_list = ["low","medium","significant","critical","low"]
                     self.id_hit_counter = 0
                     self.latest_stack = None
+                    self.id_timing_list.append(self._get_current_timestamp_str(stream_info))
                     return int(5)
                 if sev_level==self.latest_stack:
                     return int(5-len(self.id_hit_list))

{matrice-1.0.99278 → matrice-1.0.99280/src/matrice.egg-info}/PKG-INFO

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