nedo-vision-worker 1.3.5__tar.gz → 1.3.6__tar.gz

{nedo_vision_worker-1.3.5 → nedo_vision_worker-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker
-Version: 1.3.5
+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.5 → nedo_vision_worker-1.3.6}/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.5"
+__version__ = "1.3.6"
 __all__ = ["WorkerService"] 

{nedo_vision_worker-1.3.5 → nedo_vision_worker-1.3.6}/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-1.3.5 → nedo_vision_worker-1.3.6}/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-1.3.5 → nedo_vision_worker-1.3.6}/nedo_vision_worker/worker/DataSenderWorker.py

@@ -152,30 +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 and storage rate limits.
+        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 4.0
-        elif total_pending < 500:
-            return 3.0
-        elif total_pending < 1000:
-            return 2.5
-        else:
-            return 2.0
+        # 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-1.3.5 → nedo_vision_worker-1.3.6}/nedo_vision_worker/worker/PPEDetectionManager.py

@@ -51,26 +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.
-        Reduced to prevent storage rate limits (each detection = 2 images = 2 dir checks).
-        
-        Args:
-            pending_count (int): Number of pending detections
-            
-        Returns:
-            int: Number of records to fetch
-        """
-        if pending_count <= 50:
-            return min(pending_count, 5)
-        elif pending_count <= 200:
-            return min(pending_count, 10)
-        elif pending_count <= 1000:
-            return min(pending_count, 15)
-        else:
-            return min(pending_count, 20)
-
     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.
@@ -111,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-1.3.5 → nedo_vision_worker-1.3.6}/nedo_vision_worker/worker/RestrictedAreaManager.py

@@ -51,26 +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.
-        Reduced to prevent storage rate limits (each violation = 2 images = 2 dir checks).
-        
-        Args:
-            pending_count (int): Number of pending violations
-            
-        Returns:
-            int: Number of records to fetch
-        """
-        if pending_count <= 50:
-            return min(pending_count, 5)
-        elif pending_count <= 200:
-            return min(pending_count, 10)
-        elif pending_count <= 1000:
-            return min(pending_count, 15)
-        else:
-            return min(pending_count, 20)
-
     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.
@@ -109,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.5 → nedo_vision_worker-1.3.6}/nedo_vision_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker
-Version: 1.3.5
+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>