nedo-vision-worker-core 0.4.1__py3-none-any.whl → 0.4.4__py3-none-any.whl

nedo_vision_worker_core/__init__.py

@@ -7,7 +7,7 @@ A library for running AI vision processing and detection in the Nedo Vision plat
 from .core_service import CoreService
 from .callbacks import DetectionType, CallbackTrigger, DetectionData, IntervalMetadata
 
-__version__ = "0.4.1"
+__version__ = "0.4.4"
 __all__ = [
     "CoreService", 
     "DetectionType",

nedo_vision_worker_core/pipeline/PipelineManager.py

@@ -31,6 +31,11 @@ class PipelineManager:
         self._stop_lock = threading.Lock()
         self.on_pipeline_stopped = on_pipeline_stopped
         
+        # Stagger pipeline startup to reduce CPU spikes
+        self._last_pipeline_start = 0
+        self._pipeline_start_delay = 1.0  # 1 second between pipeline starts
+        self._start_lock = threading.Lock()
+        
         logging.info(f"🚀 PipelineManager initialized with {max_workers} worker threads")
 
     def start_pipeline(self, pipeline, detector):
@@ -46,6 +51,15 @@ class PipelineManager:
             logging.warning(f"⚠️ Pipeline {pipeline_id} is already running.")
             return
 
+        # Stagger pipeline starts to reduce CPU spikes
+        with self._start_lock:
+            time_since_last_start = time.time() - self._last_pipeline_start
+            if time_since_last_start < self._pipeline_start_delay:
+                delay = self._pipeline_start_delay - time_since_last_start
+                logging.info(f"⏳ Staggering pipeline {pipeline_id} start by {delay:.2f}s to reduce CPU spike")
+                time.sleep(delay)
+            self._last_pipeline_start = time.time()
+
         logging.info(f"🚀 Starting Pipeline processing for pipeline: {pipeline_id} | Source: {worker_source_id} ({pipeline.name})")
 
         # Acquire video stream

nedo_vision_worker_core/pipeline/PipelineProcessor.py

@@ -47,6 +47,10 @@ class PipelineProcessor:
         self.last_preview_check_time = 0
         self.preview_check_interval = 10.0  # Check every 10 seconds (reduced from 5s to save CPU)
         self.pipeline_repo = WorkerSourcePipelineRepository()
+        
+        # RTMP frame rate limiting to reduce CPU
+        self.last_rtmp_frame_time = 0
+        self.rtmp_frame_interval = 1.0 / 25.0  # 25 FPS for RTMP (matching render FPS)
 
         self.detection_processor_codes = [
             PPEDetectionProcessor.code,
@@ -198,10 +202,15 @@ class PipelineProcessor:
                 if loop_start - last_preview_check >= self.preview_check_interval:
                     self._check_and_update_rtmp_streaming()
                     last_preview_check = loop_start
-
-                should_draw = self.rtmp_streaming_active or self.debug_flag
                 
-                if should_draw:
+                # For RTMP, also check if it's time to send a frame (rate limiting)
+                should_draw_for_rtmp = (
+                    self.rtmp_streaming_active and 
+                    self.rtmp_streamer is not None and
+                    (loop_start - self.last_rtmp_frame_time >= self.rtmp_frame_interval)
+                )
+                
+                if should_draw_for_rtmp or self.debug_flag:
                     try:
                         frame_to_draw = frame.copy()
                         self.frame_drawer.draw_polygons(frame_to_draw)
@@ -215,7 +224,7 @@ class PipelineProcessor:
                         logging.error(f"❌ Draw failed, using raw frame: {e}")
                         drawn_frame = frame
                 else:
-                    drawn_frame = frame
+                    drawn_frame = None  # Don't waste CPU drawing if not needed
 
                 if self.debug_flag:
                     tracked_objects_render = self._process_frame(frame)
@@ -235,13 +244,16 @@ class PipelineProcessor:
                         try:
                             self.rtmp_streamer = RTMPStreamer(self.pipeline_id)
                             logging.info(f"🎬 RTMP streamer initialized for pipeline {pipeline_id} (preview requested)")
+                            self.last_rtmp_frame_time = 0  # Reset frame time on new stream
                         except Exception as e:
                             logging.error(f"❌ Failed to initialize RTMP streamer for pipeline {pipeline_id}: {e}")
                             self.rtmp_streamer = None
 
-                    if self.rtmp_streamer:
+                    if self.rtmp_streamer and drawn_frame is not None:
+                        # Frame already rate-limited by drawing logic above
                         try:
                             self.rtmp_streamer.push_frame(drawn_frame)
+                            self.last_rtmp_frame_time = loop_start
                         except Exception as e:
                             logging.error(f"❌ RTMP push error for pipeline {pipeline_id}: {e}")
                             if "initialization_failed" in str(e).lower():

nedo_vision_worker_core/pipeline/PipelineSyncThread.py

@@ -5,6 +5,7 @@ import threading
 from typing import Dict, Set, Optional
 from ..repositories.WorkerSourcePipelineDebugRepository import WorkerSourcePipelineDebugRepository
 from ..repositories.WorkerSourcePipelineRepository import WorkerSourcePipelineRepository
+from ..repositories.WorkerSourceRepository import WorkerSourceRepository
 from .PipelineManager import PipelineManager
 from .ModelManager import ModelManager
 from ..streams.VideoStreamManager import VideoStreamManager
@@ -19,6 +20,7 @@ class PipelineSyncThread(threading.Thread):
         self.polling_interval = polling_interval
         self.pipeline_repo = WorkerSourcePipelineRepository()
         self.debug_repo = WorkerSourcePipelineDebugRepository()
+        self.source_repo = WorkerSourceRepository()
         self.model_manager = ModelManager()
         self.running = True
         self.pipeline_manager = PipelineManager(video_manager, self.on_pipeline_stopped, max_workers)
@@ -82,6 +84,11 @@ class PipelineSyncThread(threading.Thread):
                 pipeline.pipeline_status_code = 'run'
 
             if pipeline.pipeline_status_code == 'run':
+                # Check if source is connected before starting pipeline
+                if not self.source_repo.is_source_connected(pipeline.worker_source_id):
+                    logging.warning(f"⚠️ Skipping pipeline {pid} ({pipeline.name}): Source {pipeline.worker_source_id} is disconnected")
+                    continue
+                
                 detector = self.model_manager.get_detector(pipeline.ai_model_id)
                 
                 if not detector and pipeline.ai_model_id:
@@ -144,8 +151,15 @@ class PipelineSyncThread(threading.Thread):
         ])
 
         if requires_restart:
+            # Check if source is connected before restarting
+            if not self.source_repo.is_source_connected(db_pipeline.worker_source_id):
+                logging.warning(f"⚠️ Cannot restart pipeline {pid}: Source {db_pipeline.worker_source_id} is disconnected")
+                return
+            
             logging.info(f"🔄 Restarting pipeline due to significant changes: {pid}")
             self.pipeline_manager.stop_pipeline(pid)
+            
+            
             self.pipeline_manager.start_pipeline(db_pipeline, db_detector)
         else:
             # Update config for minor changes that don't require restart

nedo_vision_worker_core/repositories/WorkerSourcePipelineDetectionRepository.py

@@ -18,12 +18,14 @@ class WorkerSourcePipelineDetectionRepository(BaseRepository):
     def save_detection(self, pipeline_id: int, frame, tracked_objects, frame_drawer: FrameDrawer):
         """
         Save detection data that need to be sent to database.
+        Only saves if there are violations detected.
         """
         now = datetime.now(timezone.utc)
         current_datetime = now.strftime("%Y%m%d_%H%M%S")
 
         frame_drawer.draw_polygons(frame)
         filtered_objects = []
+        has_violations = False
 
         for tracked_obj in tracked_objects:
             attributes = tracked_obj["attributes"]
@@ -34,9 +36,17 @@ class WorkerSourcePipelineDetectionRepository(BaseRepository):
             obj = tracked_obj.copy()
             obj["attributes"] = [attr for attr in attributes if attr.get("count", 0) >= 5]
 
+            # Check if any attribute is a violation
+            for attr in obj["attributes"]:
+                attr_label = attr.get("label", "")
+                if attr_label in frame_drawer.violation_labels:
+                    has_violations = True
+                    break
+
             filtered_objects.append(obj)
 
-        if not filtered_objects:
+        # Only save and trigger webhook/MQTT if there are actual violations
+        if not filtered_objects or not has_violations:
             return
 
         drawn_frame = frame_drawer.draw_frame(frame.copy(), filtered_objects)
@@ -64,7 +74,5 @@ class WorkerSourcePipelineDetectionRepository(BaseRepository):
                 )
                 session.add(new_detection)
                 session.flush()
-                # Commit happens automatically via context manager
-                print(f"✅ Inserted detection data for pipeline {pipeline_id}")
         except Exception as e:
             print(f"❌ Database error while saving detection: {e}")

nedo_vision_worker_core/repositories/WorkerSourceRepository.py

@@ -19,3 +19,38 @@ class WorkerSourceRepository(BaseRepository):
             for source in sources:
                 session.expunge(source)
             return sources
+    
+    def get_worker_source(self, source_id: str):
+        """
+        Fetch a single worker source by ID.
+        
+        Args:
+            source_id (str): The worker source ID
+            
+        Returns:
+            WorkerSourceEntity: The worker source entity or None if not found
+        """
+        with self._get_session() as session:
+            session.expire_all()
+            source = session.query(WorkerSourceEntity).filter(
+                WorkerSourceEntity.id == source_id
+            ).first()
+            if source:
+                session.expunge(source)
+            return source
+    
+    def is_source_connected(self, source_id: str) -> bool:
+        """
+        Check if a worker source is connected.
+        
+        Args:
+            source_id (str): The worker source ID
+            
+        Returns:
+            bool: True if source is connected, False otherwise
+        """
+        source = self.get_worker_source(source_id)
+        if not source:
+            return False
+        
+        return source.status_code == "connected" if source.status_code else False

nedo_vision_worker_core/streams/RTMPStreamer.py

@@ -25,7 +25,7 @@ class RTMPStreamer:
     # Class-level lock to stagger stream initialization across all instances
     _initialization_lock = threading.Lock()
     _last_initialization_time = 0
-    _min_initialization_delay = 0.5  # 500ms between stream starts
+    _min_initialization_delay = 1.5  # 1.5 seconds between stream starts (increased from 0.5s)
 
     def __init__(self, pipeline_id: str, fps: int = 25, bitrate: str = "1500k"):
         self.pipeline_id = pipeline_id

nedo_vision_worker_core/streams/VideoStream.py

@@ -237,6 +237,8 @@ class VideoStream(threading.Thread):
     def run(self) -> None:
         """Main capture loop."""
         failures = 0
+        last_frame_time = time.perf_counter()
+        
         while self.running:
             try:
                 if not self.capture or not self.capture.isOpened():
@@ -247,6 +249,18 @@ class VideoStream(threading.Thread):
                     failures = 0
                     self._reconnect_attempts = 0
                     self._current_interval = self.reconnect_interval
+                    last_frame_time = time.perf_counter()
+
+                # For video files, respect the FPS to avoid playing too fast
+                if self.is_file:
+                    target_fps = self.target_fps if self.target_fps else self.fps
+                    if target_fps > 0:
+                        frame_interval = 1.0 / target_fps
+                        elapsed = time.perf_counter() - last_frame_time
+                        if elapsed < frame_interval:
+                            sleep_time = frame_interval - elapsed
+                            time.sleep(sleep_time)
+                    last_frame_time = time.perf_counter()
 
                 ret, frame = self.capture.read()
 

{nedo_vision_worker_core-0.4.1.dist-info → nedo_vision_worker_core-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker-core
-Version: 0.4.1
+Version: 0.4.4
 Summary: Nedo Vision Worker Core 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_core-0.4.1.dist-info → nedo_vision_worker_core-0.4.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-nedo_vision_worker_core/__init__.py,sha256=PMh9hXyCQ2JPaLxq5mFDqRZonzYLfZnwwtGukl0GVBM,1923
+nedo_vision_worker_core/__init__.py,sha256=ZlpHZZ54eVsepVdpBxhuJHhyEpKF8OqZAP9UvfFjMa4,1923
 nedo_vision_worker_core/cli.py,sha256=8YuKWsIgICUYXE_QtwyU3WzGhVjTWiAo5uzpFOmjNc8,5766
 nedo_vision_worker_core/core_service.py,sha256=q8-GuGW_l5l6wTWQDqc7BDdhM7zKC-mMLZ5wIHu9xV0,11628
 nedo_vision_worker_core/doctor.py,sha256=K_-hVV2-mdEefZ4Cfu5hMCiOxBiI1aXY8VtkkpK80Lc,10651
@@ -59,10 +59,10 @@ nedo_vision_worker_core/models/worker_source_pipeline_debug.py,sha256=6S7TkN37Fr
 nedo_vision_worker_core/models/worker_source_pipeline_detection.py,sha256=p6CJsiVCKprTYrNxJsiTB8njXdHkjZKVEyBceRVE6fY,560
 nedo_vision_worker_core/pipeline/ModelManager.py,sha256=2DoQiIdF-PAqU7nT_u6bj-DY0aT2FHb8kt24okGGCRc,7449
 nedo_vision_worker_core/pipeline/PipelineConfigManager.py,sha256=X55i9GyXcW9ylO6cj2UMAZFSxxPViacL4H4DZl60CAY,1157
-nedo_vision_worker_core/pipeline/PipelineManager.py,sha256=3I9UBJu_rRfTEctwj8i4hO4MHjpBtYpfh-rIi64qgEw,7638
+nedo_vision_worker_core/pipeline/PipelineManager.py,sha256=AlDwBYYRPeAeh2ilmC8n-A_2gYPqAzeSSVpR1Tc0ipE,8366
 nedo_vision_worker_core/pipeline/PipelinePrepocessor.py,sha256=cCiVSHHqsKCtKYURdYoEjHJX2GnT6zd8kQ6ZukjQ3V0,1271
-nedo_vision_worker_core/pipeline/PipelineProcessor.py,sha256=qjAviYziFX9zJbRDIx7me94ZEccA1r53bunuDySTPhQ,34356
-nedo_vision_worker_core/pipeline/PipelineSyncThread.py,sha256=HkW6wj0eDr6M1K3Y25IlB2V6tpIZsKA34AM49AXvcQk,8707
+nedo_vision_worker_core/pipeline/PipelineProcessor.py,sha256=5j0FvGwBw5hgJ-FzI493cLpZomfYiG-bmUZZyklmahI,35149
+nedo_vision_worker_core/pipeline/PipelineSyncThread.py,sha256=8HOVdeWO0dAXY9rMAk4VlX-bIhWrkhSzyJwlJobUnvw,9517
 nedo_vision_worker_core/pipeline/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker_core/preprocessing/ImageResizer.py,sha256=RvOazxe6dJQuiy0ZH4lIGbdFfiu0FLUVCHoMvxkDNT4,1324
 nedo_vision_worker_core/preprocessing/ImageRoi.py,sha256=iO7oQ-SdUSA_kTIVBuq_mdycXsiJNfiFD3J7-VTxiQ4,2141
@@ -73,17 +73,17 @@ nedo_vision_worker_core/repositories/BaseRepository.py,sha256=FvdcD8I8_4_6TMZa8X
 nedo_vision_worker_core/repositories/PPEDetectionRepository.py,sha256=dIOPUU7xOCJ8A5v6AnBVKwtKPVlc5M5cUhLCWumTXyo,6882
 nedo_vision_worker_core/repositories/RestrictedAreaRepository.py,sha256=a5Vc8WLTtAa6Tn-ZSKkBEw4-cM29VW8WUwhbH7YfM9E,4416
 nedo_vision_worker_core/repositories/WorkerSourcePipelineDebugRepository.py,sha256=lN_yip6woya9YUA5sYKbTyDQz2qSfgqkr3YP2hSd9ws,3211
-nedo_vision_worker_core/repositories/WorkerSourcePipelineDetectionRepository.py,sha256=5m4lvmIETJSGDH1T1EHuUDWC-13t5I860UbN_uzEj9A,2641
+nedo_vision_worker_core/repositories/WorkerSourcePipelineDetectionRepository.py,sha256=AVmrpeu6YziX2255_ZhK-5X5snxVMlr8xzb4ymAe5SA,2954
 nedo_vision_worker_core/repositories/WorkerSourcePipelineRepository.py,sha256=vwwRA1INuK66siOHNZxSBX8CE9uEW8VVcCIA7dmshKo,4714
-nedo_vision_worker_core/repositories/WorkerSourceRepository.py,sha256=-a-UlsopPlJWlY36QUodPEjSZVE3BDoLgsVAioiNOo0,663
+nedo_vision_worker_core/repositories/WorkerSourceRepository.py,sha256=YFevfYhAsYd7Eho1iagzjk67tKAQfqmoIExyxvR2Bzc,1760
 nedo_vision_worker_core/repositories/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker_core/services/SharedVideoStreamServer.py,sha256=rhCineMKPG3GQbrMHlSHP4xhXaGZ6Rn1oqIajW5xpaY,9827
 nedo_vision_worker_core/services/VideoSharingDaemon.py,sha256=iY6afEKTOsphfHvmZTL0grezka2DS9DDq-1EIpVMy0Y,28524
 nedo_vision_worker_core/services/VideoSharingDaemonManager.py,sha256=sc8VZo5iwoOdR8uTiel5BKz6-eZ7wwLy3IwV_3tsAu0,10340
-nedo_vision_worker_core/streams/RTMPStreamer.py,sha256=X6QL84VdjKd995BwpcvD99sCBJGxj4MXWI0q9zo5Izw,18761
+nedo_vision_worker_core/streams/RTMPStreamer.py,sha256=7vg2as_TtmZavLnzhEUOv6HhjoGH5X3JO9HUI74meNs,18789
 nedo_vision_worker_core/streams/SharedVideoDeviceManager.py,sha256=vSslwxbhKH6FPndR1HcSFIVWtF-iiOQMlSa4VvFa6M4,16265
 nedo_vision_worker_core/streams/StreamSyncThread.py,sha256=ETT0N_P90ksn6Q5pb7NvMadqCuoicz_g52lcDkHIp88,5382
-nedo_vision_worker_core/streams/VideoStream.py,sha256=nGtJ4FAZ1Ek-8hVRopEt0bLWLpa10OtyUwdDEuXLObQ,13343
+nedo_vision_worker_core/streams/VideoStream.py,sha256=Xg3gxa9JZfCkwqD5OnvNmvf_iKmlEpjTlk4_YS2f2xU,14046
 nedo_vision_worker_core/streams/VideoStreamManager.py,sha256=g5cz-YXPewSubBXxCg4mfzsuGKoOHXu-SrMxaGjYPHw,14956
 nedo_vision_worker_core/streams/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker_core/tracker/SFSORT.py,sha256=0kggw0l4yPZ55AKHdqVX6mu9ehHmJed7jcJ3JQoC4sk,14061
@@ -98,8 +98,8 @@ nedo_vision_worker_core/util/PipelinePreviewChecker.py,sha256=XxlSMlrDlRrzfV8_Y-
 nedo_vision_worker_core/util/PlatformDetector.py,sha256=GGL8UfeMQITR22EMYIRWnuOEnSqo7Dr5mb0PaFrl8AM,3006
 nedo_vision_worker_core/util/TablePrinter.py,sha256=wzLGgb1GFMeIbAP6HmKcZD33j4D-IlyqlyeR7C5yD7w,1137
 nedo_vision_worker_core/util/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker_core-0.4.1.dist-info/METADATA,sha256=eVzhZ0Gwb-Rd1lIasDKRUrGAfrDzqPgiTfR54rg6Vl8,14426
-nedo_vision_worker_core-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nedo_vision_worker_core-0.4.1.dist-info/entry_points.txt,sha256=pIPafsvPnBw-fpBKBmc1NQCQ6PQY3ad8mZ6mn8_p5FI,70
-nedo_vision_worker_core-0.4.1.dist-info/top_level.txt,sha256=y8kusXjVYqtG8MSHYWTrk8bRrvjOrphKXYyzu943TTQ,24
-nedo_vision_worker_core-0.4.1.dist-info/RECORD,,
+nedo_vision_worker_core-0.4.4.dist-info/METADATA,sha256=NeX_eRQ8lbk8z9HYN0ERFouzwjnbdc_xLXytxzvrQtw,14426
+nedo_vision_worker_core-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nedo_vision_worker_core-0.4.4.dist-info/entry_points.txt,sha256=pIPafsvPnBw-fpBKBmc1NQCQ6PQY3ad8mZ6mn8_p5FI,70
+nedo_vision_worker_core-0.4.4.dist-info/top_level.txt,sha256=y8kusXjVYqtG8MSHYWTrk8bRrvjOrphKXYyzu943TTQ,24
+nedo_vision_worker_core-0.4.4.dist-info/RECORD,,