matrice 1.0.99250__tar.gz → 1.0.99252__tar.gz

{matrice-1.0.99250/src/matrice.egg-info → matrice-1.0.99252}/PKG-INFO

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

{matrice-1.0.99250 → matrice-1.0.99252}/setup.py

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

{matrice-1.0.99250 → matrice-1.0.99252}/src/matrice/deploy/utils/post_processing/usecases/crop_weed_detection.py

@@ -38,14 +38,14 @@ class CropWeedDetectionConfig(BaseConfig):
     smoothing_confidence_range_factor: float = 0.5
 
     # confidence thresholds
-    confidence_threshold: float = 0.6
+    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: ['BroWeed', 'Maize', 'NarWeed']
+        default_factory=lambda: ['plants', 'BroWeed', 'Maize', 'NarWeed']
     )
 
     alert_config: Optional[AlertConfig] = None
@@ -75,7 +75,7 @@ class CropWeedDetectionUseCase(BaseProcessor):
         self.CASE_VERSION: Optional[str] = '1.2'
 
         # List of  categories to track
-        self.target_categories = ['BroWeed', 'Maize', 'NarWeed']
+        self.target_categories = ['plants', 'BroWeed', 'Maize', 'NarWeed']
 
         # Initialize smoothing tracker
         self.smoothing_tracker = None

{matrice-1.0.99250 → matrice-1.0.99252}/src/matrice/deploy/utils/post_processing/usecases/proximity_detection.py

@@ -562,7 +562,7 @@ class ProximityUseCase(BaseProcessor):
                     human_text_lines.append("Alerts: None")
                 human_text = "\n".join(human_text_lines)  
         else:      
-            human_text = self._generate_human_text_for_tracking(total_people, total_unique_count, config, frame_id, alerts, stream_info)
+            human_text = self._generate_human_text_for_tracking(total_people, detections, total_unique_count, config, frame_id, alerts, stream_info)
         
         # Create high precision timestamps for input_timestamp and reset_timestamp
         high_precision_start_timestamp = self._get_current_timestamp_str(stream_info, precision=True, frame_id=frame_id)
@@ -576,7 +576,7 @@ class ProximityUseCase(BaseProcessor):
     
     def _check_proximity(self, detections):
         """Check if any two detections are within proximity threshold."""
-        proximity_threshold = 0.5
+        proximity_threshold = 400
         for i in range(len(detections)):
             for j in range(i + 1, len(detections)):
                 bbox1 = detections[i].get("bounding_box", {})
@@ -589,11 +589,12 @@ class ProximityUseCase(BaseProcessor):
                 center2 = get_bbox_center(bbox2)
                 
                 if center1 and center2:
-                    distance = ((center1[0] - center2[0]) ** 2 + (center1[1] - center2[1]) ** 2) ** 0.5
+                    distance = abs((center1[0] - center2[0]) + (center1[1] - center2[1]))
                     if distance < proximity_threshold:
                         return True
+            return False
     
-    def _generate_human_text_for_tracking(self, total_people: int, total_unique_count: int, config: ProximityConfig, frame_id: str, alerts:Any=[], stream_info: Optional[Dict[str, Any]] = None) -> str:
+    def _generate_human_text_for_tracking(self, total_people: int, detections, total_unique_count: int, config: ProximityConfig, frame_id: str, alerts:Any=[], stream_info: Optional[Dict[str, Any]] = None) -> str:
         """Generate human-readable text for tracking stats in old format."""
         from datetime import datetime, timezone
         
@@ -602,7 +603,9 @@ class ProximityUseCase(BaseProcessor):
         start_timestamp = self._get_start_timestamp_str(stream_info, precision=True)
 
         human_text_lines.append(f"CURRENT FRAME @ {current_timestamp}:")
-        human_text_lines.append(f"\t- People Detected: {total_people}")
+        if self._check_proximity(detections):
+            human_text_lines.append("\t- Proximity Alert: People are within proximity threshold!")
+        # human_text_lines.append(f"\t- People Detected: {total_people}")
 
         human_text_lines.append("")
         if total_unique_count > 0:

{matrice-1.0.99250 → matrice-1.0.99252/src/matrice.egg-info}/PKG-INFO

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