matrice-streaming 0.1.14__py3-none-any.whl → 0.1.65__py3-none-any.whl

matrice_streaming/streaming_gateway/streaming_action.py

@@ -15,6 +15,7 @@ from matrice_common.rpc import RPC
 from .streaming_gateway import StreamingGateway
 from .streaming_gateway_utils import StreamingGatewayUtil
 from .metrics_reporter import MetricsManager, MetricsConfig
+from .streaming_status_listener import StreamingStatusListener
 
 
 class StreamingAction:
@@ -56,11 +57,12 @@ class StreamingAction:
         session: Session,
         action_id: str,
         enable_intelligent_transmission: bool = True,
-        monitoring_interval: float = 30.0,
+        monitoring_interval: float = 30.0,  # Heartbeat sent every monitoring_interval seconds
         auto_restart: bool = True,
         max_restart_attempts: int = 3,
-        action_id_check_interval: float = 60.0,
+        action_id_check_interval: float = 600.0,  # 10 minutes (was 60 seconds)
         enable_event_listening: bool = True,
+        allow_empty_start: bool = True,  # Allow starting with zero cameras
     ):
         """Initialize StreamingAction.
 
@@ -68,11 +70,12 @@ class StreamingAction:
             session: Session object for authentication
             action_id: ID of the action to manage
             enable_intelligent_transmission: Whether to enable intelligent frame transmission
-            monitoring_interval: Interval in seconds between health checks
+            monitoring_interval: Interval in seconds between health checks and heartbeats (default: 30 seconds)
             auto_restart: Whether to automatically restart on failures
             max_restart_attempts: Maximum number of restart attempts before giving up
             action_id_check_interval: Interval in seconds between checks to verify action ID matches streaming gateway
             enable_event_listening: Enable dynamic event listening for configuration updates
+            allow_empty_start: Allow starting with zero cameras (default True). Cameras can be added dynamically.
         """
         if not session:
             raise ValueError("Session is required")
@@ -141,10 +144,11 @@ class StreamingAction:
         self.max_restart_attempts = max_restart_attempts
         self.action_id_check_interval = action_id_check_interval
         self.enable_event_listening = enable_event_listening
+        self.allow_empty_start = allow_empty_start
 
         # Initialize utility and gateway objects
         self.gateway_util = StreamingGatewayUtil(
-            session, self.streaming_gateway_id, self.server_id
+            session, self.streaming_gateway_id, self.server_id, action_id=self.action_id
         )
         self.streaming_gateway: Optional[StreamingGateway] = None
 
@@ -174,6 +178,9 @@ class StreamingAction:
         # Initialize metrics manager
         self.metrics_manager: Optional[MetricsManager] = None
 
+        # Initialize status listener for stop commands
+        self.status_listener: Optional[StreamingStatusListener] = None
+
         logging.info(
             "StreamingAction initialized successfully for gateway: %s",
             self.streaming_gateway_id,
@@ -242,11 +249,18 @@ class StreamingAction:
             input_streams = self.gateway_util.get_input_streams()
 
             if not input_streams:
-                raise RuntimeError(
-                    "No input streams configured for this streaming gateway"
-                )
-
-            logging.info("Found %d input streams configured", len(input_streams))
+                if self.allow_empty_start:
+                    logging.warning(
+                        "No input streams configured - starting with zero cameras. "
+                        "Cameras can be added dynamically via event listener."
+                    )
+                    input_streams = []
+                else:
+                    raise RuntimeError(
+                        "No input streams configured for this streaming gateway"
+                    )
+            else:
+                logging.info("Found %d input streams configured", len(input_streams))
 
             # Create StreamingGateway with fetched configuration
             logging.info("Creating StreamingGateway instance...")
@@ -259,6 +273,8 @@ class StreamingAction:
                 video_codec=self.video_codec,  # Pass video codec setting
                 force_restart=True,  # Always force restart for orchestrator
                 enable_event_listening=self.enable_event_listening,  # Enable dynamic event updates
+                action_id=self.action_id,  # Pass action_id for API requests
+                allow_empty_start=self.allow_empty_start,  # Allow starting with zero cameras
             )
 
             # Start streaming
@@ -271,7 +287,7 @@ class StreamingAction:
                 logging.info("Initializing metrics manager...")
                 metrics_config = MetricsConfig(
                     collection_interval=1.0,  # Collect every second
-                    reporting_interval=60.0,  # Report every 60 seconds
+                    reporting_interval=30.0,  # Report every 30 seconds
                 )
                 self.metrics_manager = MetricsManager(
                     streaming_gateway=self.streaming_gateway,
@@ -296,8 +312,26 @@ class StreamingAction:
             # Start health monitoring thread
             self._start_monitoring()
 
-            # Update status to running
-            # self.update_status("STG_RUNNING", "SUCCESS", "Streaming gateway started successfully")
+            # Initialize and start status listener for stop commands
+            try:
+                self.status_listener = StreamingStatusListener(
+                    session=self.session,
+                    streaming_gateway_id=self.streaming_gateway_id,
+                    action_id=self.action_id,
+                    on_stop_callback=self.stop
+                )
+                self.status_listener.start()
+                logging.info("Status listener started for stop commands")
+            except Exception as exc:
+                logging.warning(f"Failed to initialize status listener: {exc}", exc_info=True)
+                self.status_listener = None
+
+            # Update gateway status to running
+            try:
+                self.gateway_util.update_status("running")
+                logging.info("Gateway status updated to 'running'")
+            except Exception as exc:
+                logging.warning(f"Failed to update gateway status to running: {exc}")
 
             logging.info("StreamingAction started successfully")
 
@@ -350,6 +384,14 @@ class StreamingAction:
                 if self._monitor_thread.is_alive():
                     logging.warning("Monitor thread did not stop gracefully")
 
+            # Stop status listener
+            if self.status_listener:
+                try:
+                    logging.info("Stopping status listener...")
+                    self.status_listener.stop()
+                except Exception as exc:
+                    logging.warning(f"Error stopping status listener: {exc}")
+
             # Stop metrics manager
             if self.metrics_manager:
                 try:
@@ -467,8 +509,13 @@ class StreamingAction:
         """
         Check if the current action ID matches the streaming gateway's actionRecordID.
 
+        Handles transient errors gracefully:
+        - 502 Bad Gateway: Skip check, continue streaming (server temporarily unavailable)
+        - 404 Not Found: Stop streaming (gateway may be deleted)
+        - Other API errors: Skip check, continue streaming (don't stop on transient issues)
+
         Returns:
-            bool: True if action ID matches, False otherwise
+            bool: True if action ID matches or check should be skipped, False if mismatch or gateway deleted
         """
         try:
             self.stats["action_id_checks"] += 1
@@ -476,12 +523,13 @@ class StreamingAction:
             # Fetch current streaming gateway details
             gateway_details = self.gateway_util.get_streaming_gateway_by_id()
 
-            if not gateway_details:
+            # Handle API failures gracefully - don't stop streaming on transient errors
+            if gateway_details is None:
                 logging.warning(
-                    "Failed to fetch streaming gateway details for action ID check"
+                    "Action ID check: Failed to fetch gateway details (API returned None), skipping check"
                 )
-                self.stats["action_id_check_failures"] += 1
-                return False
+                # Don't increment failure counter - this is expected during transient issues
+                return True  # Continue streaming, don't stop on API errors
 
             gateway_action_id = gateway_details.get("actionRecordID", "")
 
@@ -502,9 +550,12 @@ class StreamingAction:
             return True
 
         except Exception as exc:
-            self.stats["action_id_check_failures"] += 1
-            logging.error("Error checking action ID match: %s", str(exc), exc_info=True)
-            return False
+            # Unknown error - don't stop streaming on unexpected issues
+            logging.warning(
+                "Action ID check: Unexpected error '%s', skipping check to avoid false shutdown",
+                str(exc)
+            )
+            return True  # Continue streaming, be conservative
 
     def _start_monitoring(self):
         """Start the health monitoring thread."""