nedo-vision-worker-core 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

nedo_vision_worker_core/streams/VideoStreamManager.py

@@ -1,7 +1,6 @@
 import logging
 import time
 import threading
-import cv2
 from typing import Any, Dict, Optional
 
 from .VideoStream import VideoStream
@@ -18,6 +17,11 @@ class VideoStreamManager:
         self.direct_device_streams: Dict[Any, Dict[str, Any]] = {}
         # Per-direct-device locks: {worker_source_id: threading.Lock}
         self.direct_device_locks: Dict[Any, threading.Lock] = {}
+        
+        # Reference counting for lazy loading: {worker_source_id: set of pipeline_ids}
+        self.stream_references: Dict[Any, set] = {}
+        # Store URLs for streams that aren't started yet: {worker_source_id: url}
+        self.pending_streams: Dict[Any, str] = {}
 
         self.shared_device_manager = SharedVideoDeviceManager()
 
@@ -38,16 +42,71 @@ class VideoStreamManager:
     # -----------------------
     # Public API
     # -----------------------
-    def add_stream(self, worker_source_id, url):
-        """Adds and starts a stream (regular file/RTSP or a shared direct device) if not already present."""
+    def register_stream(self, worker_source_id, url):
+        """Register a stream URL without starting it (lazy loading)."""
         with self._lock:
+            if worker_source_id not in self.pending_streams:
+                self.pending_streams[worker_source_id] = url
+                logging.debug(f"📝 Registered stream {worker_source_id} for lazy loading")
+    
+    def unregister_stream(self, worker_source_id):
+        """Unregister a stream that's no longer available in the database."""
+        with self._lock:
+            # If it's pending, remove it
+            if worker_source_id in self.pending_streams:
+                del self.pending_streams[worker_source_id]
+                logging.debug(f"🗑️ Unregistered pending stream {worker_source_id}")
+            
+            # If it's active and has no references, remove it
+            if worker_source_id in self.stream_references:
+                if len(self.stream_references[worker_source_id]) == 0:
+                    self._stop_stream(worker_source_id)
+    
+    def acquire_stream(self, worker_source_id, pipeline_id):
+        """Request access to a stream for a pipeline. Starts the stream if not already running."""
+        with self._lock:
+            # Initialize reference set if needed
+            if worker_source_id not in self.stream_references:
+                self.stream_references[worker_source_id] = set()
+            
+            # Add pipeline reference
+            self.stream_references[worker_source_id].add(pipeline_id)
+            logging.info(f"🔗 Pipeline {pipeline_id} acquired stream {worker_source_id} (refs: {len(self.stream_references[worker_source_id])})")
+            
+            # If stream is already running, we're done
             if worker_source_id in self.streams or worker_source_id in self.direct_device_streams:
-                logging.warning("⚠️ Stream %s is already active.", worker_source_id)
+                return True
+            
+            # Get URL from pending streams
+            url = self.pending_streams.get(worker_source_id)
+            if not url:
+                logging.error(f"❌ Cannot acquire stream {worker_source_id}: URL not registered")
+                return False
+        
+        # Start the stream (outside lock to avoid blocking)
+        return self._start_stream(worker_source_id, url)
+    
+    def release_stream(self, worker_source_id, pipeline_id):
+        """Release a stream reference from a pipeline. Stops the stream if no more references."""
+        with self._lock:
+            if worker_source_id not in self.stream_references:
                 return
-
+            
+            # Remove pipeline reference
+            self.stream_references[worker_source_id].discard(pipeline_id)
+            ref_count = len(self.stream_references[worker_source_id])
+            logging.info(f"🔓 Pipeline {pipeline_id} released stream {worker_source_id} (refs: {ref_count})")
+            
+            # If no more references, stop the stream
+            if ref_count == 0:
+                logging.info(f"💤 Stream {worker_source_id} has no more references, stopping...")
+                self._stop_stream(worker_source_id)
+    
+    def _start_stream(self, worker_source_id, url):
+        """Internal method to actually start a stream."""
         if self._is_direct_device(url):
             self._add_direct_device_stream(worker_source_id, url)
-            return
+            return True
 
         # Regular stream
         stream = VideoStream(url)
@@ -55,18 +114,19 @@ class VideoStreamManager:
             stream.start()  # start thread
             with self._lock:
                 self.streams[worker_source_id] = stream
-            logging.info("✅ Added and started video stream: %s", worker_source_id)
+            logging.info("✅ Started video stream: %s", worker_source_id)
+            return True
         except Exception as e:
             logging.error("❌ Failed to start regular stream %s: %s", worker_source_id, e)
-
-    def remove_stream(self, worker_source_id):
-        """Stops and removes a stream (regular or direct device)."""
-        if not worker_source_id:
-            return
-
+            return False
+    
+    def _stop_stream(self, worker_source_id):
+        """Internal method to stop a stream."""
         # Direct device?
         with self._lock:
             is_direct = worker_source_id in self.direct_device_streams
+            # Clean up references
+            self.stream_references.pop(worker_source_id, None)
 
         if is_direct:
             self._remove_direct_device_stream(worker_source_id)
@@ -77,20 +137,16 @@ class VideoStreamManager:
             stream = self.streams.pop(worker_source_id, None)
 
         if stream is None:
-            logging.warning("⚠️ Stream %s not found in manager.", worker_source_id)
             return
 
-        logging.info("🛑 Removing video stream: %s", worker_source_id)
+        logging.info("🛑 Stopping video stream: %s", worker_source_id)
         try:
-            # Expectation: VideoStream.stop() should signal and join internally.
             stream.stop()
         except Exception as e:
             logging.error("❌ Error stopping stream %s: %s", worker_source_id, e)
         finally:
             stream = None
 
-        logging.info("✅ Stream %s removed successfully.", worker_source_id)
-
     def start_all(self):
         """Starts all regular streams that are not alive. (Direct devices are publisher-driven.)"""
         logging.info("🔄 Starting all video streams...")
@@ -114,13 +170,13 @@ class VideoStreamManager:
 
         for wid in regular_ids:
             try:
-                self.remove_stream(wid)
+                self._stop_stream(wid)
             except Exception as e:
                 logging.error("Error stopping regular stream %s: %s", wid, e)
 
         for wid in direct_ids:
             try:
-                self.remove_stream(wid)
+                self._stop_stream(wid)
             except Exception as e:
                 logging.error("Error stopping direct device stream %s: %s", wid, e)
 

{nedo_vision_worker_core-0.3.4.dist-info → nedo_vision_worker_core-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker-core
-Version: 0.3.4
+Version: 0.3.6
 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>
@@ -31,7 +31,6 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: alembic>=1.8.0
 Requires-Dist: numpy>=1.21.0
-Requires-Dist: opencv-python>=4.6.0
 Requires-Dist: pillow>=8.0.0
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: scipy>=1.9.0
@@ -41,6 +40,8 @@ Requires-Dist: torch>=1.9.0
 Requires-Dist: torchvision>=0.10.0
 Requires-Dist: ultralytics>=8.0.0
 Requires-Dist: rfdetr<2.0.0,>=1.2.0
+Provides-Extra: opencv
+Requires-Dist: opencv-python>=4.6.0; extra == "opencv"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: black>=22.0.0; extra == "dev"

{nedo_vision_worker_core-0.3.4.dist-info → nedo_vision_worker_core-0.3.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-nedo_vision_worker_core/__init__.py,sha256=0iPoN0eHddv9i7aZ8YJKl2Rn_P_BTsxTJMPggoVd_kc,1924
+nedo_vision_worker_core/__init__.py,sha256=E4gmykhnzrU8ANXRIGP9LQG8TNbk6eAyuWqtAsFdj7Y,1924
 nedo_vision_worker_core/cli.py,sha256=8YuKWsIgICUYXE_QtwyU3WzGhVjTWiAo5uzpFOmjNc8,5766
 nedo_vision_worker_core/core_service.py,sha256=dnHNjbslOeyeWqHDFnk_yKdfTICYzLyRIcuZNwF0Zf4,11323
 nedo_vision_worker_core/doctor.py,sha256=K_-hVV2-mdEefZ4Cfu5hMCiOxBiI1aXY8VtkkpK80Lc,10651
@@ -11,7 +11,7 @@ nedo_vision_worker_core/callbacks/DetectionCallbackTypes.py,sha256=U7Qb0dCMtOHuZ
 nedo_vision_worker_core/callbacks/__init__.py,sha256=JBoYu2FKZd6f_zG4M0gsuXBQEMMvdJgOpzcsg7Lxf5U,499
 nedo_vision_worker_core/config/ConfigurationManager.py,sha256=s-uh2xT2bmot6egvAjVo_4FPurcYoq1W62FzGTExPoo,6870
 nedo_vision_worker_core/config/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker_core/database/DatabaseManager.py,sha256=o2e9jcqBbtf0Zd9TYuyQhXyKj9rjnNYbSShr7CxuAPk,9341
+nedo_vision_worker_core/database/DatabaseManager.py,sha256=EDSz6auDx3i-DofHJBZdcEWyDHXqCwFB54WTBu9ExME,10314
 nedo_vision_worker_core/database/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker_core/detection/BaseDetector.py,sha256=bReQCTy4tEA1itvw3kkjBMQnx3Jn4MjnDkzdtPwmNPQ,757
 nedo_vision_worker_core/detection/RFDETRDetector.py,sha256=3T3zTFZW0pBv9E-pSpY4JP7wI0LOTM4hxzanvrEXMcE,3093
@@ -59,31 +59,32 @@ 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=K7lmVOo-KL7bnWtyafilZs23bzd6loCgfUz7xuAmlVw,6195
 nedo_vision_worker_core/pipeline/PipelineConfigManager.py,sha256=X55i9GyXcW9ylO6cj2UMAZFSxxPViacL4H4DZl60CAY,1157
-nedo_vision_worker_core/pipeline/PipelineManager.py,sha256=dAYLK5AXXUkfO7cyxLEGGa9SCQTP-9iAO_otffRgVsI,5482
+nedo_vision_worker_core/pipeline/PipelineManager.py,sha256=S3QxTcJjDhOY2O8x9c62kYXotgjV4enlCJLcziZEIh8,7589
 nedo_vision_worker_core/pipeline/PipelinePrepocessor.py,sha256=cCiVSHHqsKCtKYURdYoEjHJX2GnT6zd8kQ6ZukjQ3V0,1271
-nedo_vision_worker_core/pipeline/PipelineProcessor.py,sha256=92ef6fRpibY3VXNeydpD1kprRCRH3fye_cpztAEVrLQ,26350
-nedo_vision_worker_core/pipeline/PipelineSyncThread.py,sha256=LX_LXU9MTdD5rP-ElHcYR431_qTXNaKOWcCsE4E9Gd0,8613
+nedo_vision_worker_core/pipeline/PipelineProcessor.py,sha256=KMdFDvQO2yI9NxjNDwRQU07St1Y01QgM97tgNuyelw0,26766
+nedo_vision_worker_core/pipeline/PipelineSyncThread.py,sha256=2tIqheE2BG-DAEqUgq9i4blz0vQWmnYu8MgHPLJkg3g,8704
 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
 nedo_vision_worker_core/preprocessing/Preprocessor.py,sha256=uYIh0Ld4T1zEEHtKVLbUVBcF0kUwj5zCfPXn__bKwwU,477
 nedo_vision_worker_core/preprocessing/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker_core/repositories/AIModelRepository.py,sha256=SzBLwUrjDnc4QayZOA2zL0Jl8YQ-x6S1rde_zCBu6LQ,1591
-nedo_vision_worker_core/repositories/PPEDetectionRepository.py,sha256=C_0QL2sHiSlM9rPmhLmfs6hdZk9FDazy-aVLcznN5w0,6623
-nedo_vision_worker_core/repositories/RestrictedAreaRepository.py,sha256=umZ7IrgoEFqAa9ZZlH7KPUIbmp5yhBc0FSDUOY6UFag,4283
-nedo_vision_worker_core/repositories/WorkerSourcePipelineDebugRepository.py,sha256=_z-UyaYtg1Q5nqSbs_16ngYesyM3aji4VrP1ZBHm6Jk,2987
-nedo_vision_worker_core/repositories/WorkerSourcePipelineDetectionRepository.py,sha256=FxPOKrDjgebr8BqJ8SvbyNMsvHwHNcbFpcQ33QW6Whw,2616
-nedo_vision_worker_core/repositories/WorkerSourcePipelineRepository.py,sha256=8V0eUVG4iOQJUcOkQVuICyVpzT86N9A25vBqNHe4Jq8,3284
-nedo_vision_worker_core/repositories/WorkerSourceRepository.py,sha256=vypj82LrxaPkte16xHI6YKonTzx3o2aGdh_CTZgywMA,617
+nedo_vision_worker_core/repositories/AIModelRepository.py,sha256=97KcDB-oB72NdIU6gNXUGh2rzM5R-TjaBg8F7VY-3OA,1601
+nedo_vision_worker_core/repositories/BaseRepository.py,sha256=FvdcD8I8_4_6TMZa8XrX26XZ6CAD8j0B0nvwZSZ9xLQ,1471
+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/WorkerSourcePipelineRepository.py,sha256=vwwRA1INuK66siOHNZxSBX8CE9uEW8VVcCIA7dmshKo,4714
+nedo_vision_worker_core/repositories/WorkerSourceRepository.py,sha256=-a-UlsopPlJWlY36QUodPEjSZVE3BDoLgsVAioiNOo0,663
 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=Dblfutc1UVHj159KUHFYZ8xFEVhHVknZn_nAqKR6uCs,8695
+nedo_vision_worker_core/streams/RTMPStreamer.py,sha256=0eThAwEyOg1ZuO0zbIvdqOICGQDRoOPxEcOBQtskM7A,17110
 nedo_vision_worker_core/streams/SharedVideoDeviceManager.py,sha256=vSslwxbhKH6FPndR1HcSFIVWtF-iiOQMlSa4VvFa6M4,16265
-nedo_vision_worker_core/streams/StreamSyncThread.py,sha256=WmYAY9wFiFhLlxGdnvKGIjAqLwCBayNKdmAWzkbU0jM,3763
+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/VideoStreamManager.py,sha256=i7uemC3tUdsrAhL8lvoxCYa0fwUh5oAVD6DDaxflXGE,12057
+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
 nedo_vision_worker_core/tracker/TrackerManager.py,sha256=xtDMI657W2s7HM2lMGtwU0x5Hq74BZpLHd-5xk-278I,6152
@@ -96,8 +97,8 @@ nedo_vision_worker_core/util/PersonRestrictedAreaMatcher.py,sha256=iuzCU32BQKaZ3
 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.3.4.dist-info/METADATA,sha256=3_UyMqyQc4m_h1qyECq1k7w3vWnN2Hr-ixnLK_BPEp0,14370
-nedo_vision_worker_core-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nedo_vision_worker_core-0.3.4.dist-info/entry_points.txt,sha256=pIPafsvPnBw-fpBKBmc1NQCQ6PQY3ad8mZ6mn8_p5FI,70
-nedo_vision_worker_core-0.3.4.dist-info/top_level.txt,sha256=y8kusXjVYqtG8MSHYWTrk8bRrvjOrphKXYyzu943TTQ,24
-nedo_vision_worker_core-0.3.4.dist-info/RECORD,,
+nedo_vision_worker_core-0.3.6.dist-info/METADATA,sha256=bGu8iMZGYWUU3zPPN23EwAZenJNJlayPcGzE-AT6sl0,14412
+nedo_vision_worker_core-0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nedo_vision_worker_core-0.3.6.dist-info/entry_points.txt,sha256=pIPafsvPnBw-fpBKBmc1NQCQ6PQY3ad8mZ6mn8_p5FI,70
+nedo_vision_worker_core-0.3.6.dist-info/top_level.txt,sha256=y8kusXjVYqtG8MSHYWTrk8bRrvjOrphKXYyzu943TTQ,24
+nedo_vision_worker_core-0.3.6.dist-info/RECORD,,