nedo-vision-worker 1.3.3__py3-none-any.whl → 1.3.6__py3-none-any.whl

nedo_vision_worker/__init__.py

@@ -6,5 +6,5 @@ A library for running worker agents in the Nedo Vision platform.
 
 from .worker_service import WorkerService
 
-__version__ = "1.3.3"
+__version__ = "1.3.6"
 __all__ = ["WorkerService"] 

nedo_vision_worker/repositories/PPEDetectionRepository.py

@@ -2,7 +2,7 @@ import os
 import logging
 from pathlib import Path
 from sqlalchemy.orm import Session, joinedload
-from sqlalchemy import asc
+from sqlalchemy import desc
 from sqlalchemy.exc import SQLAlchemyError
 from ..database.DatabaseManager import DatabaseManager, get_storage_path
 from ..models.ppe_detection import PPEDetectionEntity
@@ -33,7 +33,7 @@ class PPEDetectionRepository:
             latest_detections = (
                 self.session.query(PPEDetectionEntity)
                 .options(joinedload(PPEDetectionEntity.ppe_labels)) 
-                .order_by(asc(PPEDetectionEntity.created_at))
+                .order_by(desc(PPEDetectionEntity.created_at))
                 .limit(limit)
                 .all()
             )

nedo_vision_worker/repositories/RestrictedAreaRepository.py

@@ -2,7 +2,7 @@ import os
 import logging
 from pathlib import Path
 from sqlalchemy.orm import Session
-from sqlalchemy import asc
+from sqlalchemy import desc
 from sqlalchemy.exc import SQLAlchemyError
 from ..database.DatabaseManager import DatabaseManager, get_storage_path
 from ..models.restricted_area_violation import RestrictedAreaViolationEntity
@@ -29,7 +29,7 @@ class RestrictedAreaRepository:
         try:
             latest_violations = (
                 self.session.query(RestrictedAreaViolationEntity)
-                .order_by(asc(RestrictedAreaViolationEntity.created_at))
+                .order_by(desc(RestrictedAreaViolationEntity.created_at))
                 .limit(limit)
                 .all()
             )

nedo_vision_worker/worker/DataSenderWorker.py

@@ -152,28 +152,17 @@ class DataSenderWorker:
 
     def _calculate_sleep_interval(self, ppe_pending: int, violation_pending: int) -> float:
         """
-        Calculate optimal sleep interval based on pending data.
-        Conservative approach to prevent server overload.
+        Returns fixed sleep interval to prevent storage rate limits.
         
         Args:
             ppe_pending: Number of pending PPE detections
             violation_pending: Number of pending violations
             
         Returns:
-            float: Sleep interval in seconds
+            float: Sleep interval in seconds (fixed at 5s)
         """
-        total_pending = ppe_pending + violation_pending
-        
-        if total_pending == 0:
-            return self.send_interval
-        elif total_pending < 50:
-            return self.send_interval
-        elif total_pending < 200:
-            return 3.0
-        elif total_pending < 500:
-            return 2.0
-        else:
-            return 1.5
+        # Fixed 5 second interval to respect storage rate limits
+        return self.send_interval
 
     def _run_worker_source_updater(self):
         """Dedicated loop for updating worker sources at a different interval."""

nedo_vision_worker/worker/PPEDetectionManager.py

@@ -51,25 +51,6 @@ class PPEDetectionManager:
 
         logger.info("📡 [APP] PPE detection monitoring started.")
 
-    def _calculate_fetch_size(self, pending_count: int) -> int:
-        """
-        Dynamically calculates how many records to fetch based on pending count.
-        
-        Args:
-            pending_count (int): Number of pending detections
-            
-        Returns:
-            int: Number of records to fetch
-        """
-        if pending_count <= 50:
-            return min(pending_count, 10)
-        elif pending_count <= 200:
-            return min(pending_count, 30)
-        elif pending_count <= 1000:
-            return min(pending_count, 50)
-        else:
-            return min(pending_count, 100)
-
     def _calculate_batch_by_size(self, all_detections: list, max_size_mb: int = 40) -> list:
         """
         Calculates batch based on actual image file sizes to stay within gRPC limit.
@@ -110,15 +91,15 @@ class PPEDetectionManager:
         return batch
 
     def send_ppe_detection_batch(self):
-        """Sends a batch of collected PPE detection data to the server with dynamic size-based batching."""
+        """Sends a batch of collected PPE detection data to the server with fixed 5 detection batch size."""
         try:
             pending_count = self.ppe_detection_repo.get_total_pending_count()
             
             if pending_count == 0:
                 return
             
-            fetch_size = self._calculate_fetch_size(pending_count)
-            all_detections = self.ppe_detection_repo.get_latest_detections(fetch_size)
+            # Fixed batch size of 5 to prevent storage rate limits
+            all_detections = self.ppe_detection_repo.get_latest_detections(5)
             
             if not all_detections:
                 return

nedo_vision_worker/worker/RestrictedAreaManager.py

@@ -51,25 +51,6 @@ class RestrictedAreaManager:
 
         logger.info("📡 [APP] Restricted area violation monitoring started.")
 
-    def _calculate_fetch_size(self, pending_count: int) -> int:
-        """
-        Dynamically calculates how many records to fetch based on pending count.
-        
-        Args:
-            pending_count (int): Number of pending violations
-            
-        Returns:
-            int: Number of records to fetch
-        """
-        if pending_count <= 50:
-            return min(pending_count, 10)
-        elif pending_count <= 200:
-            return min(pending_count, 30)
-        elif pending_count <= 1000:
-            return min(pending_count, 50)
-        else:
-            return min(pending_count, 100)
-
     def _calculate_batch_by_size(self, all_violations: list, max_size_mb: int = 40) -> list:
         """
         Calculates batch based on actual image file sizes to stay within gRPC limit.
@@ -108,15 +89,15 @@ class RestrictedAreaManager:
         return batch
 
     def send_violation_batch(self):
-        """Sends a batch of collected violation data to the server with dynamic size-based batching."""
+        """Sends a batch of collected violation data to the server with fixed 5 violation batch size."""
         try:
             pending_count = self.repo.get_total_pending_count()
             
             if pending_count == 0:
                 return
             
-            fetch_size = self._calculate_fetch_size(pending_count)
-            all_violations = self.repo.get_latest_violations(fetch_size)
+            # Fixed batch size of 5 to prevent storage rate limits
+            all_violations = self.repo.get_latest_violations(5)
             
             if not all_violations:
                 return

{nedo_vision_worker-1.3.3.dist-info → nedo_vision_worker-1.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker
-Version: 1.3.3
+Version: 1.3.6
 Summary: Nedo Vision Worker Service Library for AI Vision Processing
 Author-email: Willy Achmat Fauzi <willy.achmat@gmail.com>
 Maintainer-email: Willy Achmat Fauzi <willy.achmat@gmail.com>

{nedo_vision_worker-1.3.3.dist-info → nedo_vision_worker-1.3.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-nedo_vision_worker/__init__.py,sha256=mruTFM9bN3wUaU6J78iDRbVibwSTdSYqqoPcPYr4094,203
+nedo_vision_worker/__init__.py,sha256=_g6zmNHn0tjdnmSRMJzHoj7sw2hYWxnkRUYNQz3AO4E,203
 nedo_vision_worker/cli.py,sha256=ddWspJmSgVkcUYvRdkvTtMNuMTDvNCqLLuMVU9KE3Ik,7457
 nedo_vision_worker/doctor.py,sha256=wNkpe8gLVd76Y_ViyK2h1ZFdqeSl37MnzZN5frWKu30,48410
 nedo_vision_worker/worker_service.py,sha256=9zz8hKwDwqwpfS0KPQfftGJtRci0uj_wiwcr_TGf-E0,11039
@@ -40,8 +40,8 @@ nedo_vision_worker/protos/WorkerSourceService_pb2_grpc.py,sha256=23Zj3WSogfhmp_Y
 nedo_vision_worker/protos/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker/repositories/AIModelRepository.py,sha256=35cQ2EnJvMdArewumPrVIaiwueGy6cXU_g5J1Qcj6_Y,1415
 nedo_vision_worker/repositories/DatasetSourceRepository.py,sha256=MOUbXY1-7WUPhY15aMpdXl6rl0afSvu3Cq8jNtp9nzM,8595
-nedo_vision_worker/repositories/PPEDetectionRepository.py,sha256=WYPrmMs3wSsaALR4ixsgMNOUbHbmYDGPbjMQdjSnIE4,6161
-nedo_vision_worker/repositories/RestrictedAreaRepository.py,sha256=nk8DV5dkBfAm2AT8wY9la6yv6Q7pFi00YXLbvofqNkc,5158
+nedo_vision_worker/repositories/PPEDetectionRepository.py,sha256=Vsj0H6Ztw1LXqQq-i5O_CSRXTAlz6oRlfPkHIJFel4w,6163
+nedo_vision_worker/repositories/RestrictedAreaRepository.py,sha256=SoXX5MmoNM0o34YUnjLCjnwOH9olsuDQRcDeZk1nn6E,5160
 nedo_vision_worker/repositories/WorkerSourcePipelineDebugRepository.py,sha256=kOlVEnPOoDRZdZIm8uWXlc89GMvBPI-36QyKecX7ucE,3350
 nedo_vision_worker/repositories/WorkerSourcePipelineDetectionRepository.py,sha256=cbgg_7p0eNUIgCHoPDZBaRZ1b2Y68p_dfSxpvuGMtRE,1773
 nedo_vision_worker/repositories/WorkerSourcePipelineRepository.py,sha256=xfmEvgnyt-DdfSApGyFfy0H0dXjFFkjeo4LMr0fVFXU,10053
@@ -80,22 +80,22 @@ nedo_vision_worker/util/SystemMonitor.py,sha256=2kkqj9mOlywAS2fHdN1TaIXSXvCApcIH
 nedo_vision_worker/util/VideoProbeUtil.py,sha256=cF-vJ7hIDlXfEJby2a0s9tqwkPGVz_6B3Vv4D5pMmIw,12876
 nedo_vision_worker/util/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker/worker/CoreActionWorker.py,sha256=lb7zPY3yui6I3F4rX4Ii7JwpWZahLEO72rh3iWOgFmg,5441
-nedo_vision_worker/worker/DataSenderWorker.py,sha256=BNA5mL2guBVp0O5MKULEWd78dY32YjiyWZX7ECFjVFc,9089
+nedo_vision_worker/worker/DataSenderWorker.py,sha256=Z1jJKqA5Z1gpLkqttnMOh81JyMD1zTG_EbdsCUJVKI0,8793
 nedo_vision_worker/worker/DataSyncWorker.py,sha256=LmDPt2J1frmXwuR46L6b0MjlFOHfgG-4_0MGQa78zF4,6288
 nedo_vision_worker/worker/DatasetFrameSender.py,sha256=1SFYj8LJFNi-anBTapsbq8U_NGMM7mnoMKg9NeFAHys,8087
 nedo_vision_worker/worker/DatasetFrameWorker.py,sha256=Hh_wZuMjwovxsEKFqXSuTRin9eYRBZCbcFKm3CKLMbE,19335
-nedo_vision_worker/worker/PPEDetectionManager.py,sha256=7KwAsI1_dwUDBCdDeSDRrr5hS0002dK0vVyLclkphDk,6686
+nedo_vision_worker/worker/PPEDetectionManager.py,sha256=sXeOjvhCzi4oUhDZwH5-8DSxI9b__Jp0de8QksgaYGw,6063
 nedo_vision_worker/worker/PipelineActionWorker.py,sha256=xgvryjKtEsMj4BKqWzDIaK_lFny-DfMCj5Y2DxHnWww,5651
 nedo_vision_worker/worker/PipelineImageWorker.py,sha256=J8VBUG0cwcH3qOJp2zTl30B-XhmPFyvJLjxitKJYq0E,5642
 nedo_vision_worker/worker/PipelinePreviewWorker.py,sha256=owFiBbktcOZkdImQeykZSeBIR2-mpt6HNkmYIkLRKzE,6397
 nedo_vision_worker/worker/RabbitMQListener.py,sha256=9gR49MDplgpyb-D5HOH0K77-DJQFvhS2E7biL92SjSU,6950
-nedo_vision_worker/worker/RestrictedAreaManager.py,sha256=_OALBwum09tHjrh14qDK7AQ-9l0xJoGolYAemH5tryM,6550
+nedo_vision_worker/worker/RestrictedAreaManager.py,sha256=Pz2M9KPSMa1QPXZeYhyN9ih4eX6wmkNS_ZPu5KrvNxY,5927
 nedo_vision_worker/worker/SystemUsageManager.py,sha256=mkh4sT-HkIEY1CJHMEG6LP9ATu39YXvLRLyf995OkoQ,5315
 nedo_vision_worker/worker/VideoStreamWorker.py,sha256=5n6v1PNO7IB-jj_McALLkUP-cBjJoIEw4UiSAs3vTb0,7606
 nedo_vision_worker/worker/WorkerManager.py,sha256=2bxXi19fp3p1qjYBStYRdVVgko8dnevXx1_M_sqH5og,5521
 nedo_vision_worker/worker/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker-1.3.3.dist-info/METADATA,sha256=kZDc0x5Wbvi4MzF12blE6-jzr_WEl-k75tjwORMQTDY,14728
-nedo_vision_worker-1.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nedo_vision_worker-1.3.3.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
-nedo_vision_worker-1.3.3.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
-nedo_vision_worker-1.3.3.dist-info/RECORD,,
+nedo_vision_worker-1.3.6.dist-info/METADATA,sha256=vcU6h0ZLPZD45KaGWde06KJ-YsUO39Ar2bXb_iq1Ups,14728
+nedo_vision_worker-1.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nedo_vision_worker-1.3.6.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
+nedo_vision_worker-1.3.6.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
+nedo_vision_worker-1.3.6.dist-info/RECORD,,