matrice 1.0.99290__tar.gz → 1.0.99292__tar.gz

{matrice-1.0.99290/src/matrice.egg-info → matrice-1.0.99292}/PKG-INFO

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

{matrice-1.0.99290 → matrice-1.0.99292}/setup.py

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

{matrice-1.0.99290 → matrice-1.0.99292}/src/matrice/deploy/utils/post_processing/usecases/crop_weed_detection.py

@@ -31,14 +31,14 @@ class CropWeedDetectionConfig(BaseConfig):
     smoothing_confidence_range_factor: float = 0.5
 
     # confidence thresholds
-    confidence_threshold: float = 0.4
+    confidence_threshold: float = 0.5
 
     usecase_categories: List[str] = field(
         default_factory=lambda: ['plants', 'BroWeed', 'Maize', 'NarWeed']
     )
 
     target_categories: List[str] = field(
-        default_factory=lambda: ['plants', 'BroWeed', 'Maize', 'NarWeed']
+        default_factory=lambda: ['BroWeed', 'Maize', 'NarWeed']
     )
 
     alert_config: Optional[AlertConfig] = None
@@ -67,7 +67,7 @@ class CropWeedDetectionUseCase(BaseProcessor):
         self.category = "agriculture"
         self.CASE_TYPE: Optional[str] = 'crop_weed_detection'
         self.CASE_VERSION: Optional[str] = '1.2'
-        self.target_categories = ['plants', 'BroWeed', 'Maize', 'NarWeed']
+        self.target_categories = ['BroWeed', 'Maize', 'NarWeed']
         self.smoothing_tracker = None
         self.tracker = None
         self._total_frame_counter = 0

{matrice-1.0.99290 → matrice-1.0.99292}/src/matrice/deploy/utils/post_processing/usecases/fire_detection.py

@@ -343,7 +343,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+'_'+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),
@@ -644,13 +644,17 @@ class FireSmokeUseCase(BaseProcessor):
 
         if len(self.id_hit_list)==1:
             last_ending_id, incident_id = self._get_alert_incident_ids("",stream_info)
-            print('last_ending_id',last_ending_id)
+            print('last_ending_id',last_ending_id, incident_id, self.return_id_counter)
             if len(self.id_timing_list)>0 and len(self.id_timing_list)>=5:
                     start_timestamp = self.id_timing_list[-1]
+            if incident_id==self.return_id_counter:
+                incident_id = incident_id-1 
             if last_ending_id==5:
+                alert_serial = getattr(config.alert_config, 'alert_type', ['Default']) if hasattr(config.alert_config, 'alert_type') else ['Default']
+                alert_serial = alert_serial[0]
                 alerts=[{
                             "alert_type": getattr(config.alert_config, 'alert_type', ['Default']) if hasattr(config.alert_config, 'alert_type') else ['Default'],
-                            "alert_id": "alert_"+'Event_Ended'+'_'+str(1),
+                            "alert_id": "alert_"+'Event_Ended'+'_'+alert_serial+'_'+str(incident_id),
                             "incident_category": self.CASE_TYPE,
                             "threshold_level": 0,
                             "ascending": False,
@@ -659,7 +663,8 @@ class FireSmokeUseCase(BaseProcessor):
                                     }       
                         }]
                 tracking_stats.append(alerts)
-                tracking_stats.append(self.create_incident(incident_id=self.CASE_TYPE+'_'+str(incident_id), incident_type=self.CASE_TYPE,
+                tracking_stats[0]['alerts']=alerts
+                tracking_stats.append(self.create_incident(incident_id='incident_'+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}))

{matrice-1.0.99290 → matrice-1.0.99292/src/matrice.egg-info}/PKG-INFO

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