matrice 1.0.99290__py3-none-any.whl → 1.0.99292__py3-none-any.whl

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/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.dist-info → matrice-1.0.99292.dist-info}/METADATA

@@ -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.dist-info → matrice-1.0.99292.dist-info}/RECORD

@@ -173,7 +173,7 @@ matrice/deploy/utils/post_processing/usecases/child_monitoring.py,sha256=z3oymoq
 matrice/deploy/utils/post_processing/usecases/color_detection.py,sha256=Z8-akjy8a7f8YyiOzXu_Zi1Km30v-TRrymDqQOPpJ_8,43277
 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=-K2d1YWrDsHIi0mk3fWvw5sVhqvS6zojsJCd3C2S2W4,35694
+matrice/deploy/utils/post_processing/usecases/crop_weed_detection.py,sha256=Ao1k5fJDYU_f6yZ8VO-jW8-esECV0-zY5Q570c_fako,35674
 matrice/deploy/utils/post_processing/usecases/customer_service.py,sha256=UWS83qxguyAyhh8a0JF5QH9DtKxO8I-gI2BPOjLPxBw,44642
 matrice/deploy/utils/post_processing/usecases/defect_detection_products.py,sha256=blvo4wmak-wlvPSZOcmRsV1FoZSeGX_dUAX5A1WheBE,45949
 matrice/deploy/utils/post_processing/usecases/distracted_driver_detection.py,sha256=rkyYHbmcYUAfKbmmKyKxHlk47vJ_fogHWKhQjrERsok,40316
@@ -183,7 +183,7 @@ 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=PDmpU9Rmd4b5f4umot2CmqLjGWVuFWhTDf7d9l_RDxY,50144
+matrice/deploy/utils/post_processing/usecases/fire_detection.py,sha256=5RVeBY6Q-FrHIUkmnH66L6hCAobHcE3D_sXRwUdtNxk,50582
 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/gas_leak_detection.py,sha256=KL2ft7fXvjTas-65-QgcJm3W8KBsrwF44qibSXjfaLc,40557
@@ -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.99290.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-matrice-1.0.99290.dist-info/METADATA,sha256=Dh1rggztX-z8dOmPfxPM-QubxINQJWpKOAefOU_4vD0,14624
-matrice-1.0.99290.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice-1.0.99290.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
-matrice-1.0.99290.dist-info/RECORD,,
+matrice-1.0.99292.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+matrice-1.0.99292.dist-info/METADATA,sha256=_ZwbZhnZCCqICQ2Yi3RwzfhX4H4S6P6WNTPuOpAggdk,14624
+matrice-1.0.99292.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice-1.0.99292.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
+matrice-1.0.99292.dist-info/RECORD,,