nedo-vision-worker-core 0.3.6__tar.gz → 0.3.7__tar.gz

{nedo_vision_worker_core-0.3.6 → nedo_vision_worker_core-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker-core
-Version: 0.3.6
+Version: 0.3.7
 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.3.6 → nedo_vision_worker_core-0.3.7}/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.3.6"
+__version__ = "0.3.7"
 __all__ = [
     "CoreService", 
     "DetectionType", 

{nedo_vision_worker_core-0.3.6 → nedo_vision_worker_core-0.3.7}/nedo_vision_worker_core/models/worker_source_pipeline.py

@@ -1,4 +1,4 @@
-from sqlalchemy import Column, String
+from sqlalchemy import Column, String, DateTime
 from sqlalchemy.orm import relationship
 from ..database.DatabaseManager import Base
 
@@ -13,6 +13,7 @@ class WorkerSourcePipelineEntity(Base):
     ai_model_id = Column(String, nullable=True)
     pipeline_status_code = Column(String, nullable=False)
     location_name = Column(String, nullable=True)
+    last_preview_request_at = Column(DateTime, nullable=True)
 
     worker_source_pipeline_configs = relationship(
         "WorkerSourcePipelineConfigEntity",

{nedo_vision_worker_core-0.3.6 → nedo_vision_worker_core-0.3.7}/nedo_vision_worker_core/pipeline/PipelineProcessor.py

@@ -8,12 +8,14 @@ from .PipelineConfigManager import PipelineConfigManager
 from .PipelinePrepocessor import PipelinePrepocessor
 from ..repositories.WorkerSourcePipelineDebugRepository import WorkerSourcePipelineDebugRepository
 from ..repositories.WorkerSourcePipelineDetectionRepository import WorkerSourcePipelineDetectionRepository
+from ..repositories.WorkerSourcePipelineRepository import WorkerSourcePipelineRepository
 from ..streams.VideoStreamManager import VideoStreamManager
 from ..ai.VideoDebugger import VideoDebugger
 from ..ai.FrameDrawer import FrameDrawer
 from ..tracker.TrackerManager import TrackerManager
 from ..detection.BaseDetector import BaseDetector
 from ..streams.RTMPStreamer import RTMPStreamer
+from ..util.PipelinePreviewChecker import PipelinePreviewChecker
 
 
 class PipelineProcessor:
@@ -41,6 +43,10 @@ class PipelineProcessor:
         self.worker_source_id = pipeline.worker_source_id
 
         self.rtmp_streamer = None
+        self.rtmp_streaming_active = False
+        self.last_preview_check_time = 0
+        self.preview_check_interval = 5.0  # Check every 5 seconds
+        self.pipeline_repo = WorkerSourcePipelineRepository()
 
         self.detection_processor_codes = [
             PPEDetectionProcessor.code,
@@ -202,26 +208,42 @@ class PipelineProcessor:
                         logging.warning(f"Debug save failed: {e}")
                     self.debug_flag = False
 
-                # Push frame to RTMP stream
-                # RTMPStreamer handles its own restarts internally
-                if self.rtmp_streamer is None:
-                    try:
-                        self.rtmp_streamer = RTMPStreamer(self.pipeline_id)
-                        logging.info(f"🎬 RTMP streamer initialized for pipeline {pipeline_id}")
-                    except Exception as e:
-                        logging.error(f"❌ Failed to initialize RTMP streamer for pipeline {pipeline_id}: {e}")
-                        self.rtmp_streamer = None
+                # Check if RTMP streaming should be active based on preview requests
+                current_time = time.time()
+                if current_time - self.last_preview_check_time >= self.preview_check_interval:
+                    self._check_and_update_rtmp_streaming()
+                    self.last_preview_check_time = current_time
 
-                if self.rtmp_streamer:
-                    try:
-                        self.rtmp_streamer.push_frame(drawn_frame)
-                    except Exception as e:
-                        logging.error(f"❌ RTMP push error for pipeline {pipeline_id}: {e}")
-                        if "initialization_failed" in str(e).lower():
-                            try:
-                                self.rtmp_streamer.stop_stream()
-                            except Exception:
-                                pass
+                # Push frame to RTMP stream if preview is active
+                if self.rtmp_streaming_active:
+                    if self.rtmp_streamer is None:
+                        try:
+                            self.rtmp_streamer = RTMPStreamer(self.pipeline_id)
+                            logging.info(f"🎬 RTMP streamer initialized for pipeline {pipeline_id} (preview requested)")
+                        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:
+                        try:
+                            self.rtmp_streamer.push_frame(drawn_frame)
+                        except Exception as e:
+                            logging.error(f"❌ RTMP push error for pipeline {pipeline_id}: {e}")
+                            if "initialization_failed" in str(e).lower():
+                                try:
+                                    self.rtmp_streamer.stop_stream()
+                                except Exception:
+                                    pass
+                                self.rtmp_streamer = None
+                else:
+                    # Stop RTMP streaming if preview is no longer active
+                    if self.rtmp_streamer is not None:
+                        try:
+                            logging.info(f"🛑 Stopping RTMP streamer for pipeline {pipeline_id} (preview expired)")
+                            self.rtmp_streamer.stop_stream()
+                        except Exception as e:
+                            logging.error(f"❌ Error stopping RTMP streamer: {e}")
+                        finally:
                             self.rtmp_streamer = None
 
                 # feed detection worker with latest-only behavior
@@ -538,6 +560,33 @@ class PipelineProcessor:
         self.consecutive_frame_failures = 0
         self.last_successful_frame_time = time.time()
     
+    def _check_and_update_rtmp_streaming(self):
+        """
+        Check if RTMP streaming should be active based on preview requests.
+        Updates the rtmp_streaming_active flag.
+        """
+        try:
+            # Get fresh pipeline data from database
+            pipeline = self.pipeline_repo.get_worker_source_pipeline(self.pipeline_id)
+            
+            if not pipeline:
+                logging.warning(f"⚠️ Pipeline {self.pipeline_id} not found in database")
+                self.rtmp_streaming_active = False
+                return
+            
+            # Check if preview is active using the utility
+            should_stream = PipelinePreviewChecker.should_stream_rtmp(
+                pipeline.last_preview_request_at,
+                preview_window_seconds=300  # 5 minutes
+            )
+            
+            self.rtmp_streaming_active = should_stream
+            
+        except Exception as e:
+            logging.error(f"❌ Error checking preview status for pipeline {self.pipeline_id}: {e}")
+            # On error, disable streaming to be safe
+            self.rtmp_streaming_active = False
+    
     def reset_frame_failure_counters(self):
         logging.info(f"🔄 Resetting frame failure counters for pipeline {self.pipeline_id}")
         self.consecutive_frame_failures = 0

nedo_vision_worker_core-0.3.7/nedo_vision_worker_core/util/PipelinePreviewChecker.py

@@ -0,0 +1,50 @@
+from datetime import datetime
+
+class PipelinePreviewChecker:
+    """
+    Utility class to check if RTMP streaming should be enabled for a pipeline
+    based on the last preview request timestamp.
+    """
+    
+    @staticmethod
+    def should_stream_rtmp(last_preview_request_at, preview_window_seconds=300):
+        """
+        Check if RTMP streaming should be enabled based on the last preview request.
+        
+        Args:
+            last_preview_request_at: DateTime object or None representing the last preview request
+            preview_window_seconds: Time window in seconds to keep streaming after a request (default: 300 = 5 minutes)
+            
+        Returns:
+            bool: True if streaming should be enabled, False otherwise
+        """
+        if last_preview_request_at is None:
+            return False
+        
+        # Calculate the time difference
+        current_time = datetime.utcnow()
+        time_since_request = current_time - last_preview_request_at
+        
+        # Check if we're within the preview window
+        return time_since_request.total_seconds() <= preview_window_seconds
+    
+    @staticmethod
+    def get_remaining_preview_time(last_preview_request_at, preview_window_seconds=300):
+        """
+        Get the remaining time (in seconds) for the preview window.
+        
+        Args:
+            last_preview_request_at: DateTime object or None representing the last preview request
+            preview_window_seconds: Time window in seconds (default: 300 = 5 minutes)
+            
+        Returns:
+            int: Remaining seconds in the preview window, or 0 if expired/not requested
+        """
+        if last_preview_request_at is None:
+            return 0
+        
+        current_time = datetime.utcnow()
+        time_since_request = current_time - last_preview_request_at
+        remaining = preview_window_seconds - time_since_request.total_seconds()
+        
+        return max(0, int(remaining))

{nedo_vision_worker_core-0.3.6 → nedo_vision_worker_core-0.3.7}/nedo_vision_worker_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker-core
-Version: 0.3.6
+Version: 0.3.7
 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.3.6 → nedo_vision_worker_core-0.3.7}/nedo_vision_worker_core.egg-info/SOURCES.txt

@@ -105,6 +105,7 @@ nedo_vision_worker_core/util/DrawingUtils.py
 nedo_vision_worker_core/util/ModelReadinessChecker.py
 nedo_vision_worker_core/util/PersonAttributeMatcher.py
 nedo_vision_worker_core/util/PersonRestrictedAreaMatcher.py
+nedo_vision_worker_core/util/PipelinePreviewChecker.py
 nedo_vision_worker_core/util/PlatformDetector.py
 nedo_vision_worker_core/util/TablePrinter.py
 nedo_vision_worker_core/util/__init__.py