matrice 1.0.99263__py3-none-any.whl → 1.0.99265__py3-none-any.whl

matrice/deploy/client/streaming_gateway/streaming_gateway_utils.py

@@ -372,7 +372,8 @@ class _RealTimeJsonEventPicker:
             A dictionary describing the detected event or ``None`` if no event
             boundary was reached for the supplied frame.
         """
-        incidents = frame_json.get("result").get("value").get("agg_summary")[str(frame_id)].get("incidents") or []
+        #incidents = frame_json.get("result").get("value").get("agg_summary")[str(frame_id)].get("incidents") or []
+        incidents = frame_json.get("result").get("value").get("agg_apps")[0].get("agg_summary")[str(frame_id)].get("incidents") or []
         has_alerts = bool(incidents and incidents.get("alerts")[0])
        
         if has_alerts:

matrice/deploy/client/streaming_gateway/streaming_results_handler.py

@@ -317,7 +317,8 @@ class StreamingResultsHandler:
             raise
     def _send_file_to_api_(self, frame_json):
         """Send file to API."""
-        frame_id = list(frame_json.get("result").get("value").get("agg_summary").keys())[0]
+        # frame_id = list(frame_json.get("result").get("value").get("agg_summary").keys())[0]
+        frame_id = list(frame_json.get("result").get("value").get("agg_apps")[0].get("agg_summary").keys())[0]
         return self.json_event_picker.process(int(frame_id), frame_json)
     def _cleanup_old_files(self):
         """Remove old result files if exceeding max_files limit."""

matrice/deploy/utils/post_processing/usecases/intrusion_detection.py

@@ -422,7 +422,7 @@ class IntrusionUseCase(BaseProcessor):
                         self._ascending_alert_list.append(0)
 
                     human_text_lines.append(f"\t\t- Zone name: {zone_name}")
-                    human_text_lines.append(f"\t\t\t- Total count in Prohibited Boarding Gate: {zone_total-1}")
+                    human_text_lines.append(f"\t\t\t- Total count in Prohibited Boarding Gate: {zone_total}")
                     # Main people counting incident
                     human_text = "\n".join(human_text_lines)
                     event = self.create_incident(incident_id=self.CASE_TYPE+'_'+'zone_'+zone_name+str(frame_id), incident_type=self.CASE_TYPE,

matrice/deploy/utils/post_processing/usecases/proximity_detection.py

@@ -62,6 +62,10 @@ class ProximityUseCase(BaseProcessor):
 
         # Track start time for "TOTAL SINCE" calculation
         self._tracking_start_time = None
+        
+        # Proximity counting
+        self._total_proximity_count = 0  # Total proximity events across all calls
+        
 
         # --------------------------------------------------------------------- #
         # Tracking aliasing structures to merge fragmented IDs                   #
@@ -276,7 +280,12 @@ class ProximityUseCase(BaseProcessor):
         # Count by category
         for detection in frame_detections:
             category = detection.get("category", "unknown")
-            counting_summary["categories"][category] = counting_summary["categories"].get(category, 0) + 1
+            current_count = counting_summary["categories"].get(category, 0)
+            counting_summary["categories"][category] = current_count + 1
+
+        proximity_count = self._count_proximity_events(frame_detections)
+        counting_summary["proximity_events"] = proximity_count
+        counting_summary["total_proximity_count"] = self._total_proximity_count + proximity_count
         
         # Step 5: Zone analysis for this frame
         zone_analysis = {}
@@ -574,43 +583,59 @@ class ProximityUseCase(BaseProcessor):
         print(tracking_stat)
         return [tracking_stat]
     
-    def _check_proximity(self, detections):
-        """Check if any two detections are within proximity threshold."""
-        proximity_threshold = 400
-        for i in range(len(detections)):
-            for j in range(i + 1, len(detections)):
-                bbox1 = detections[i].get("bounding_box", {})
-                bbox2 = detections[j].get("bounding_box", {})
-                
+    def _count_proximity_events(self, detections):
+        """Count proximity events between detections."""
+        proximity_threshold = 400  # pixels
+        proximity_count = 0
+            
+        for i, detection1 in enumerate(detections):
+            for j, detection2 in enumerate(detections[i+1:], i+1):
+                bbox1 = detection1.get("bounding_box", {})
+                bbox2 = detection2.get("bounding_box", {})
+                    
                 if not bbox1 or not bbox2:
                     continue
-                
+                    
                 center1 = get_bbox_center(bbox1)
                 center2 = get_bbox_center(bbox2)
-                
+                    
                 if center1 and center2:
                     distance = abs((center1[0] - center2[0]) + (center1[1] - center2[1]))
                     if distance < proximity_threshold:
-                        return True
-            return False
+                        proximity_count += 1
+            
+        return proximity_count
     
-    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:
+    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
         
         human_text_lines=[]
         current_timestamp = self._get_current_timestamp_str(stream_info, precision=True, frame_id=frame_id)
         start_timestamp = self._get_start_timestamp_str(stream_info, precision=True)
-
+        
         human_text_lines.append(f"CURRENT FRAME @ {current_timestamp}:")
-        if self._check_proximity(detections):
-            human_text_lines.append("\t- Proximity Alert: People are within proximity threshold!")
+        
+        # Add proximity count to human text
+        proximity_count = self._count_proximity_events(detections)
+        if proximity_count > 0:
+            human_text_lines.append(f"\t- Proximity Events Detected: {proximity_count}")
+        else:
+            human_text_lines.append("\t- No Proximity Events Detected")
         # human_text_lines.append(f"\t- People Detected: {total_people}")
 
         human_text_lines.append("")
-        if total_unique_count > 0:
+        if proximity_count > 0:
             human_text_lines.append(f"TOTAL SINCE @ {start_timestamp}:")
-            human_text_lines.append(f"\t- Total unique people count: {total_unique_count}")
+            human_text_lines.append(f"\t- Total Proximity Count: {self._total_proximity_count + proximity_count}")
 
         if alerts:
             for alert in alerts:

{matrice-1.0.99263.dist-info → matrice-1.0.99265.dist-info}/METADATA

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

{matrice-1.0.99263.dist-info → matrice-1.0.99265.dist-info}/RECORD

@@ -108,8 +108,8 @@ matrice/deploy/client/auto_streaming/auto_streaming.py,sha256=VRfy_EBFvhspN-hoN3
 matrice/deploy/client/auto_streaming/auto_streaming_utils.py,sha256=BuRUokLp3t43yzRF8YSX9p_RHQD94RoBwNEoldXFDQo,14995
 matrice/deploy/client/streaming_gateway/__init__.py,sha256=hkYC0qszaXZThquMuuI20Qkt_AHCB3pdy7jlJVeqPN4,1203
 matrice/deploy/client/streaming_gateway/streaming_gateway.py,sha256=r8Z5AXBom89n-8W5RTlB-nOeUaprxK-QBDsAb-E9gl8,19605
-matrice/deploy/client/streaming_gateway/streaming_gateway_utils.py,sha256=_hPwoCn_l_OTdB0VXvpAV2NkA0UksYHUEZJsq6ugAe8,42009
-matrice/deploy/client/streaming_gateway/streaming_results_handler.py,sha256=KTT-AADM0vw1QW1-mkYwLtZOAfC6KT68k3y6ot5dbOU,15700
+matrice/deploy/client/streaming_gateway/streaming_gateway_utils.py,sha256=znNZkzG9W7VeZPKUxzgxHiW1GqvD-oA-McZSnMiBm1E,42144
+matrice/deploy/client/streaming_gateway/streaming_results_handler.py,sha256=OpHkdbnuqVN28tQm9CYwrfgAth3Qz40Uaq5Tg4bbxyo,15813
 matrice/deploy/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matrice/deploy/server/server.py,sha256=duki4KUU1tvW3Y7wkrlMRVvt7bAP2QqSIsrSogLxC4o,36799
 matrice/deploy/server/stream_worker.py,sha256=KDNlYep4Bg1xhHwDrwY9kfxsJfFtATydiYbzVDt58vs,20481
@@ -188,7 +188,7 @@ matrice/deploy/utils/post_processing/usecases/flower_segmentation.py,sha256=4I7q
 matrice/deploy/utils/post_processing/usecases/gas_leak_detection.py,sha256=KL2ft7fXvjTas-65-QgcJm3W8KBsrwF44qibSXjfaLc,40557
 matrice/deploy/utils/post_processing/usecases/gender_detection.py,sha256=DEnCTRew6B7DtPcBQVCTtpd_IQMvMusBcu6nadUg2oM,40107
 matrice/deploy/utils/post_processing/usecases/human_activity_recognition.py,sha256=SLyvbw1y_nEQ0AlT-ErpeSydjA8U5yfRPrjMx1t3Yz0,42226
-matrice/deploy/utils/post_processing/usecases/intrusion_detection.py,sha256=_n9K1RKFWTm9hBqtu1VfXlW_CV7M2rNhoj3ZRH9o7CY,77441
+matrice/deploy/utils/post_processing/usecases/intrusion_detection.py,sha256=Aa2wX-rq_S5aC5JDh7O_hCFPyHGPxWRDG2LIvOKZeHY,77439
 matrice/deploy/utils/post_processing/usecases/leaf.py,sha256=cwgB1ZNxkQFtkk-thSJrkXOGou1ghJr1kqtopb3sLD4,37036
 matrice/deploy/utils/post_processing/usecases/leaf_disease.py,sha256=bkiLccTdf4KUq3he4eCpBlKXb5exr-WBhQ_oWQ7os68,36225
 matrice/deploy/utils/post_processing/usecases/leak_detection.py,sha256=oOCLLVMuXVeXPHyN8FUrD3U9JYJJwIz-5fcEMgvLdls,40531
@@ -204,7 +204,7 @@ matrice/deploy/utils/post_processing/usecases/plaque_segmentation_img.py,sha256=
 matrice/deploy/utils/post_processing/usecases/pothole_segmentation.py,sha256=jXTb8ZqInp5xJ-O3Zp3zQBiryFVD0-WBbhW6Kux_NDo,44905
 matrice/deploy/utils/post_processing/usecases/ppe_compliance.py,sha256=G9P9j9E9nfNJInHJxmK1Lb4daFBlG5hq0aqotTLvFFE,30146
 matrice/deploy/utils/post_processing/usecases/price_tag_detection.py,sha256=09Tp6MGAHh95s-NSAp-4WC9iCc20sajWApuUBAvgXiQ,39880
-matrice/deploy/utils/post_processing/usecases/proximity_detection.py,sha256=yOIDAP8B484cvHIiLUNqwDBDsu3eZIV_61FAMD2opAo,77640
+matrice/deploy/utils/post_processing/usecases/proximity_detection.py,sha256=YySgDaIFY-CEqaRkPJoI8HXTNxwe-XGFYmemPoaenJ8,78430
 matrice/deploy/utils/post_processing/usecases/road_lane_detection.py,sha256=V_KxwBtAHSNkyoH8sXw-U-P3J8ToXtX3ncc69gn6Tds,31591
 matrice/deploy/utils/post_processing/usecases/road_traffic_density.py,sha256=YiHQ0kKhXglagHPvygywxMqZAw8s0WharrBQqLQj2q4,40311
 matrice/deploy/utils/post_processing/usecases/road_view_segmentation.py,sha256=BcBbOOg5622KuvzKrzs9cJW1wkRoIIcOab0N7BONQKQ,44986
@@ -243,8 +243,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.99263.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-matrice-1.0.99263.dist-info/METADATA,sha256=6Q8MwVSw6nCPXg1p_PLd1B-zFdBk5tFbVEH-XApMYhE,14624
-matrice-1.0.99263.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice-1.0.99263.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
-matrice-1.0.99263.dist-info/RECORD,,
+matrice-1.0.99265.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+matrice-1.0.99265.dist-info/METADATA,sha256=HfDECYWS5i_0EPFnpwUuQbCJkjtgFfmJkHrq-MMpo-M,14624
+matrice-1.0.99265.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice-1.0.99265.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
+matrice-1.0.99265.dist-info/RECORD,,