nedo-vision-worker 1.3.11__tar.gz → 1.3.13__tar.gz

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/PKG-INFO

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

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker/bootstrap.py

@@ -2,6 +2,7 @@ import logging
 from nedo_vision_worker.config.ConfigurationManager import ConfigurationManager
 from nedo_vision_worker.database.DatabaseManager import set_storage_path, DatabaseManager
 from nedo_vision_worker.worker_service import WorkerService
+from nedo_vision_worker.util.RTMPUrl import RTMPUrl
 
 
 def start_worker(
@@ -13,6 +14,7 @@ def start_worker(
     rtmp_server: str,
     storage_path: str,
     log_level: str = "INFO",
+    rtmp_publish_query_strings: str = ""
 ) -> WorkerService:
     # Logging (only once, force allowed)
     logging.basicConfig(
@@ -36,6 +38,13 @@ def start_worker(
         logger=logging.getLogger("configuration_manager"),
     )
 
+    RTMPUrl.configure(
+        rtmp_server_url=rtmp_server,
+        rtmp_publish_query_strings=rtmp_publish_query_strings
+    )
+
+    print(f"Got URL {RTMPUrl.get_publish_url("testtt")}")
+
     service = WorkerService(
         configuration_manager=configuration_manager,
         server_host=server_host,

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker/cli.py

@@ -7,6 +7,11 @@ from typing import NoReturn
 from nedo_vision_worker.bootstrap import start_worker
 from nedo_vision_worker import __version__
 
+import faulthandler
+
+# Enable fault handler to get a traceback
+faulthandler.enable()
+
 class NedoWorkerCLI:
     def __init__(self):
         self.logger = logging.getLogger(__name__)
@@ -38,6 +43,7 @@ class NedoWorkerCLI:
         run.add_argument("--server-host", default="be.vision.sindika.co.id")
         run.add_argument("--server-port", type=int, default=50051)
         run.add_argument("--rtmp-server", default="rtmp://live.vision.sindika.co.id:1935/live")
+        run.add_argument("--rtmp-publish-query-strings", default="")
         run.add_argument("--storage-path", default="data")
         run.add_argument("--system-usage-interval", type=int, default=30)
         run.add_argument("--log-level", default="INFO")
@@ -61,6 +67,7 @@ class NedoWorkerCLI:
                 rtmp_server=args.rtmp_server,
                 storage_path=args.storage_path,
                 log_level=args.log_level,
+                rtmp_publish_query_strings=args.rtmp_publish_query_strings
             )
             signal.pause()  # wait for signal
 

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker/config/ConfigurationManager.py

@@ -13,13 +13,22 @@ class ConfigurationManager(ConfigurationManagerInterface):
     A class to manage local and remote configuration stored in the 'config' database.
     """
 
-    def __init__(self, worker_token: str, server_host: str, server_port: int, rtmp_server_url: str, logger: logging.Logger):
+    def __init__(
+            self,
+            worker_token: str,
+            server_host: str,
+            server_port: int,
+            rtmp_server_url: str,
+            logger: logging.Logger,
+            rtmp_publish_query_strings: str = "",
+        ):
         try:
             self._logger = logger
             self._worker_token = worker_token
             self._server_host = server_host
             self._server_port = server_port
             self._rtmp_server_url = rtmp_server_url
+            self._rtmp_publish_query_strings = rtmp_publish_query_strings
 
             self._initialize_remote_configuration()
 

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker/config/DummyConfigurationManager.py

@@ -15,6 +15,7 @@ class DummyConfigurationManager(ConfigurationManagerInterface):
         server_host: str,
         server_port: str,
         rtmp_server_url: str,
+        rtmp_publish_query_strings: str,
         rabbitmq_host: str,
         rabbitmq_port: str,
         rabbitmq_username: str,
@@ -27,6 +28,7 @@ class DummyConfigurationManager(ConfigurationManagerInterface):
         self._server_host = server_host
         self._server_port = server_port
         self._rtmp_server_url = rtmp_server_url
+        self._rtmp_publish_query_strings = rtmp_publish_query_strings
         self._rabbitmq_host = rabbitmq_host
         self._rabbitmq_port = rabbitmq_port
         self._rabbitmq_username = rabbitmq_username
@@ -38,6 +40,7 @@ class DummyConfigurationManager(ConfigurationManagerInterface):
             "server_host": self._server_host,
             "server_port": str(self._server_port),
             "rtmp_server": self._rtmp_server_url,
+            "rtmp_publish_query_strings": self._rtmp_publish_query_strings,
             "rabbitmq_host": self._rabbitmq_host,
             "rabbitmq_port": self._rabbitmq_port,
             "rabbitmq_username": self._rabbitmq_username,

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker/services/ConnectionInfoClient.py

@@ -31,7 +31,7 @@ class ConnectionInfoClient(GrpcClientBase):
         try:
             if not self.stub:
                 raise Exception("Not connected to manager")
-            
+
             # Prepare the request
             request = GetWorkerConnectionInfoRequest(token=self.token)
 

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker/services/DirectDeviceToRTMPStreamer.py

@@ -9,10 +9,11 @@ import os
 from .VideoSharingDaemon import VideoSharingClient
 from ..database.DatabaseManager import get_storage_path
 from ..util.EncoderSelector import EncoderSelector
+from ..util.RTMPUrl import RTMPUrl
 
 
 class DirectDeviceToRTMPStreamer:
-    def __init__(self, device_url: str, rtmp_server: str, stream_key: str, stream_duration: int):
+    def __init__(self, device_url: str, stream_key: str, stream_duration: int):
         """
         Initialize the DirectDeviceToRTMPStreamer.
         
@@ -23,7 +24,6 @@ class DirectDeviceToRTMPStreamer:
             stream_duration: Duration in seconds
         """
         self.device_url = device_url
-        self.rtmp_server = rtmp_server
         self.stream_key = stream_key
         self.duration = stream_duration
         
@@ -32,7 +32,7 @@ class DirectDeviceToRTMPStreamer:
             raise ValueError(f"Invalid device URL: {device_url}")
         
         self.device_index = device_index
-        self.rtmp_url = f"{rtmp_server}/{stream_key}"
+        self.rtmp_url = RTMPUrl.get_publish_url(stream_key)
         
         self.ffmpeg_process = None
         self.active = False

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker/services/FileToRTMPServer.py

@@ -2,9 +2,10 @@ import subprocess
 import logging
 import os
 from ..util.EncoderSelector import EncoderSelector
+from ..util.RTMPUrl import RTMPUrl
 
 class FileToRTMPStreamer:
-    def __init__(self, video_path, rtmp_url, stream_key, fps=30, resolution="1280x720", loop=False):
+    def __init__(self, video_path, stream_key, fps=30, resolution="1280x720", loop=False):
         """
         Initialize the file streamer.
 
@@ -17,7 +18,7 @@ class FileToRTMPStreamer:
             loop (bool): Loop the video until manually stopped.
         """
         self.video_path = video_path
-        self.rtmp_url = f"{rtmp_url}/{stream_key}"
+        self.rtmp_url = RTMPUrl.get_publish_url(stream_key)
         self.fps = fps
         self.resolution = resolution
         self.loop = loop

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker/services/RTSPtoRTMPStreamer.py

@@ -2,11 +2,15 @@ import subprocess
 import logging
 import time
 import os
+import threading
 from urllib.parse import urlparse
 from ..util.EncoderSelector import EncoderSelector
+from ..util.RTMPUrl import RTMPUrl
+
+logger = logging.getLogger(__name__)
 
 class RTSPtoRTMPStreamer:
-    def __init__(self, rtsp_url, rtmp_url, stream_key, fps=30, resolution="1280x720", duration=120):
+    def __init__(self, rtsp_url, stream_key, fps=30, resolution="1280x720", duration=120):
         """
         Initialize the streamer.
 
@@ -19,7 +23,7 @@ class RTSPtoRTMPStreamer:
             duration (int): Duration in seconds to stream.
         """
         self.rtsp_url = rtsp_url
-        self.rtmp_url = f"{rtmp_url}/{stream_key}"
+        self.rtmp_url = RTMPUrl.get_publish_url(stream_key)
         self.fps = fps
         self.resolution = resolution
         self.duration = duration
@@ -34,14 +38,14 @@ class RTSPtoRTMPStreamer:
     def start_stream(self):
         """Start streaming RTSP to RTMP using FFmpeg without logs."""
         if self._detect_stream_type(self.rtsp_url) == "unknown":
-            logging.error(f"❌ [APP] Invalid RTSP URL: {self.rtsp_url}")
+            logger.error(f"❌ [APP] Invalid RTSP URL: {self.rtsp_url}")
             return
 
-        logging.info(f"📡 [APP] Starting RTSP to RTMP stream: {self.rtsp_url} → {self.rtmp_url} for {self.duration} seconds")
+        logger.info(f"📡 [APP] Starting RTSP to RTMP stream: {self.rtsp_url} → {self.rtmp_url} for {self.duration} seconds")
 
         # Get optimal encoder for hardware
         encoder_args, encoder_name = EncoderSelector.get_encoder_args()
-        logging.info(f"🎬 [APP] Using encoder: {encoder_name}")
+        logger.info(f"🎬 [APP] Using encoder: {encoder_name}")
 
         # FFmpeg command
         ffmpeg_command = [
@@ -61,6 +65,8 @@ class RTSPtoRTMPStreamer:
             "-g", "25",  # ✅ Reduce GOP size for faster keyframes
             "-vf", "scale='min(1024,iw)':-2",  # ✅ Resize width to max 1024px
 
+            "-loglevel", "error",
+
             # ❌ Disable Audio (Avoid unnecessary encoding overhead)
             "-an",
 
@@ -73,23 +79,30 @@ class RTSPtoRTMPStreamer:
             with open(os.devnull, "w") as devnull:
                 self.process = subprocess.Popen(
                     ffmpeg_command,
-                    stdout=devnull,  # Redirect stdout to null
-                    stderr=devnull,  # Redirect stderr to null
-                    text=True
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                    bufsize=1
                 )
 
-            logging.info("✅ [APP] FFmpeg process started successfully.")
+                threading.Thread(
+                    target=self._monitor_ffmpeg_errors,
+                    daemon=True
+                ).start()
+
+
+            logger.info("✅ [APP] FFmpeg process started successfully.")
 
             start_time = time.time()
             while self.process.poll() is None:
                 if time.time() - start_time > self.duration:
-                    logging.info(f"⏳ [APP] Streaming duration {self.duration}s reached. Stopping stream...")
+                    logger.info(f"⏳ [APP] Streaming duration {self.duration}s reached. Stopping stream...")
                     self.stop_stream()
                     break
                 time.sleep(1)
 
         except Exception as e:
-            logging.error(f"🚨 [APP] Failed to start FFmpeg: {e}")
+            logger.error(f"🚨 [APP] Failed to start FFmpeg: {e}")
             self.stop_stream()
     
     def stop_stream(self):
@@ -97,4 +110,39 @@ class RTSPtoRTMPStreamer:
         if self.process:
             self.process.terminate()
             self.process.wait()
-            logging.info("FFmpeg process terminated.")
+            logger.info("FFmpeg process terminated.")
+
+
+    def _monitor_ffmpeg_errors(self):
+        for line in iter(self.process.stderr.readline, ''):
+            if not line:
+                break
+
+            msg = line.strip()
+            if not msg:
+                continue
+
+            error_type = self._classify_ffmpeg_error(msg)
+
+            logger.error(f"🔥 [FFMPEG][{error_type}] {msg}")
+
+            if error_type != "UNKNOWN_ERROR":
+                logger.error("🛑 [APP] Critical streaming error, stopping FFmpeg.")
+                self.stop_stream()
+                break
+
+
+    def _classify_ffmpeg_error(self, msg: str):
+        if "rtsp" in msg.lower() and "connection" in msg.lower():
+            return "RTSP_CONNECTION_ERROR"
+
+        if "server returned" in msg.lower():
+            return "RTMP_SERVER_ERROR"
+
+        if "encoder" in msg.lower() or "nvenc" in msg.lower():
+            return "ENCODER_ERROR"
+
+        if "broken pipe" in msg.lower():
+            return "PIPE_BROKEN"
+
+        return "UNKNOWN_ERROR"

nedo_vision_worker-1.3.13/nedo_vision_worker/util/RTMPUrl.py

@@ -0,0 +1,24 @@
+class RTMPUrl:
+    """
+    Call `configure()` static method first.
+    """
+    _rtmp_server_url = ""
+    _rtmp_publish_query_strings = ""
+
+    @staticmethod
+    def configure(rtmp_server_url: str, rtmp_publish_query_strings: str = ""):
+        """
+        Example:
+        - `rtmp_server_url` = rtmp://live.sindika.co.id:8554/live
+        - `rtmp_publish_query_strings` = username=my-username&pass=mantap-jiwa
+        """
+        RTMPUrl._rtmp_server_url = rtmp_server_url
+        RTMPUrl._rtmp_publish_query_strings = rtmp_publish_query_strings
+        
+    @staticmethod
+    def get_publish_url(stream_key: str) -> str:
+        url = f"{RTMPUrl._rtmp_server_url}/{stream_key}"
+        if RTMPUrl._rtmp_publish_query_strings:
+            url = f"{RTMPUrl._rtmp_server_url}/{stream_key}?{RTMPUrl._rtmp_publish_query_strings}"
+
+        return url

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker/worker/VideoStreamWorker.py

@@ -157,12 +157,12 @@ class VideoStreamWorker:
             logger.info(f"🎥 [APP] Starting RTMP stream (Worker: {worker_id})")
             
             if url.startswith("worker-source/"):
-                streamer = FileToRTMPStreamer(self.source_file_path / os.path.basename(url), rtmp_server, stream_key, stream_duration)
+                streamer = FileToRTMPStreamer(self.source_file_path / os.path.basename(url), stream_key, stream_duration)
             elif self._is_direct_device(url):
-                streamer = DirectDeviceToRTMPStreamer(url, rtmp_server, stream_key, stream_duration)
+                streamer = DirectDeviceToRTMPStreamer(url, stream_key, stream_duration)
             else:
                 # Assume RTSP or other supported protocols
-                streamer = RTSPtoRTMPStreamer(url, rtmp_server, stream_key, stream_duration)
+                streamer = RTSPtoRTMPStreamer(url, stream_key, stream_duration)
 
             streamer.start_stream()
 

{nedo_vision_worker-1.3.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker
-Version: 1.3.11
+Version: 1.3.13
 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.11 → nedo_vision_worker-1.3.13}/nedo_vision_worker.egg-info/SOURCES.txt

@@ -87,6 +87,7 @@ nedo_vision_worker/util/HardwareID.py
 nedo_vision_worker/util/ImageUploader.py
 nedo_vision_worker/util/Networking.py
 nedo_vision_worker/util/PlatformDetector.py
+nedo_vision_worker/util/RTMPUrl.py
 nedo_vision_worker/util/SystemMonitor.py
 nedo_vision_worker/util/VideoProbeUtil.py
 nedo_vision_worker/util/__init__.py