nedo-vision-worker-core 0.3.8__tar.gz → 0.3.9__tar.gz

{nedo_vision_worker_core-0.3.8 → nedo_vision_worker_core-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker-core
-Version: 0.3.8
+Version: 0.3.9
 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>
@@ -30,7 +30,7 @@ Classifier: Environment :: No Input/Output (Daemon)
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: alembic>=1.8.0
-Requires-Dist: numpy>=1.21.0
+Requires-Dist: numpy<2.0.0,>=1.21.0
 Requires-Dist: pillow>=8.0.0
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: scipy>=1.9.0
@@ -40,8 +40,6 @@ 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"
@@ -49,6 +47,8 @@ Requires-Dist: isort>=5.10.0; extra == "dev"
 Requires-Dist: mypy>=0.950; extra == "dev"
 Requires-Dist: flake8>=4.0.0; extra == "dev"
 Requires-Dist: pre-commit>=2.17.0; extra == "dev"
+Provides-Extra: opencv
+Requires-Dist: opencv-python<5.0.0,>=4.6.0; extra == "opencv"
 
 # Nedo Vision Worker Core
 

{nedo_vision_worker_core-0.3.8 → nedo_vision_worker_core-0.3.9}/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.8"
+__version__ = "0.3.9"
 __all__ = [
     "CoreService", 
     "DetectionType", 

{nedo_vision_worker_core-0.3.8 → nedo_vision_worker_core-0.3.9}/nedo_vision_worker_core/ai/VideoDebugger.py

@@ -59,6 +59,15 @@ class VideoDebugger:
                     except Exception as e:
                         logging.error(f"Error closing window {window_name}: {e}")
                 del self.windows[window_name]
+    
+    def is_window_open(self, pipeline_id):
+        """Check if a window is open for a given pipeline."""
+        with self.lock:
+            # Check if any window exists for this pipeline
+            for window_name in self.windows.keys():
+                if f"Pipeline {pipeline_id}" in window_name:
+                    return True
+            return False
 
     def close_all(self):
         """Close all windows."""

{nedo_vision_worker_core-0.3.8 → nedo_vision_worker_core-0.3.9}/nedo_vision_worker_core/pipeline/PipelineProcessor.py

@@ -45,7 +45,7 @@ class PipelineProcessor:
         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.preview_check_interval = 10.0  # Check every 10 seconds (reduced from 5s to save CPU)
         self.pipeline_repo = WorkerSourcePipelineRepository()
 
         self.detection_processor_codes = [
@@ -174,14 +174,20 @@ class PipelineProcessor:
         )
         self.detection_thread.start()
 
+        target_render_fps = 25.0
+        target_frame_time = 1.0 / target_render_fps
+
         try:
             while self.running:
+                loop_start = time.time()
+                
                 frame = video_manager.get_frame(worker_source_id)
 
                 if frame is None:
                     if not self._handle_frame_failure(video_manager, worker_source_id):
                         break
                     # no frame this tick—just continue (the streamer will repeat last good frame)
+                    time.sleep(0.04)
                     continue
                     
                 # successful frame
@@ -189,18 +195,23 @@ class PipelineProcessor:
                 self.last_successful_frame_time = time.time()
                 self.frame_counter += 1
 
-                # draw annotations
-                try:
-                    self.frame_drawer.draw_polygons(frame)
-                    frame_to_draw = frame.copy() if self.debug_flag else frame
-                    drawn_frame = self.frame_drawer.draw_frame(
-                        frame_to_draw,
-                        self.tracked_objects_render,
-                        with_trails=True,
-                        trail_length=int(max(1, 2 / self.detection_interval))
-                    )
-                except Exception as e:
-                    logging.error(f"❌ Draw failed, using raw frame: {e}")
+                should_draw = self.rtmp_streaming_active or self.debug_flag or self.video_debugger.is_window_open(pipeline_id)
+                
+                if should_draw:
+                    # draw annotations
+                    try:
+                        self.frame_drawer.draw_polygons(frame)
+                        frame_to_draw = frame.copy() if self.debug_flag else frame
+                        drawn_frame = self.frame_drawer.draw_frame(
+                            frame_to_draw,
+                            self.tracked_objects_render,
+                            with_trails=True,
+                            trail_length=int(max(1, 2 / self.detection_interval))
+                        )
+                    except Exception as e:
+                        logging.error(f"❌ Draw failed, using raw frame: {e}")
+                        drawn_frame = frame
+                else:
                     drawn_frame = frame
 
                 # debug snapshot if requested
@@ -268,14 +279,13 @@ class PipelineProcessor:
                         except queue.Full:
                             pass
 
-                # visualize
                 try:
                     self.video_debugger.show_frame(pipeline_id, worker_source_id, drawn_frame)
                 except Exception as e:
                     logging.error(f"⚠️ Failed to render frame for pipeline {pipeline_id}: {e}")
                 
-                # Dynamic sleep based on detection interval to reduce CPU
-                sleep_time = min(0.01, self.detection_interval / 10)
+                loop_elapsed = time.time() - loop_start
+                sleep_time = max(0.001, target_frame_time - loop_elapsed)
                 time.sleep(sleep_time)
 
         except Exception as e:

{nedo_vision_worker_core-0.3.8 → nedo_vision_worker_core-0.3.9}/nedo_vision_worker_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker-core
-Version: 0.3.8
+Version: 0.3.9
 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>
@@ -30,7 +30,7 @@ Classifier: Environment :: No Input/Output (Daemon)
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: alembic>=1.8.0
-Requires-Dist: numpy>=1.21.0
+Requires-Dist: numpy<2.0.0,>=1.21.0
 Requires-Dist: pillow>=8.0.0
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: scipy>=1.9.0
@@ -40,8 +40,6 @@ 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"
@@ -49,6 +47,8 @@ Requires-Dist: isort>=5.10.0; extra == "dev"
 Requires-Dist: mypy>=0.950; extra == "dev"
 Requires-Dist: flake8>=4.0.0; extra == "dev"
 Requires-Dist: pre-commit>=2.17.0; extra == "dev"
+Provides-Extra: opencv
+Requires-Dist: opencv-python<5.0.0,>=4.6.0; extra == "opencv"
 
 # Nedo Vision Worker Core
 

{nedo_vision_worker_core-0.3.8 → nedo_vision_worker_core-0.3.9}/nedo_vision_worker_core.egg-info/requires.txt

@@ -1,5 +1,5 @@
 alembic>=1.8.0
-numpy>=1.21.0
+numpy<2.0.0,>=1.21.0
 pillow>=8.0.0
 psutil>=5.9.0
 scipy>=1.9.0
@@ -19,4 +19,4 @@ flake8>=4.0.0
 pre-commit>=2.17.0
 
 [opencv]
-opencv-python>=4.6.0
+opencv-python<5.0.0,>=4.6.0

{nedo_vision_worker_core-0.3.8 → nedo_vision_worker_core-0.3.9}/pyproject.toml

@@ -48,7 +48,7 @@ classifiers = [
 requires-python = ">=3.8"
 dependencies = [
     "alembic>=1.8.0",
-    "numpy>=1.21.0", 
+    "numpy>=1.21.0,<2.0.0",
     "pillow>=8.0.0",
     "psutil>=5.9.0",
     "scipy>=1.9.0",
@@ -61,10 +61,6 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-# OpenCV dependencies - use this if not using system packages or custom build
-opencv = [
-    "opencv-python>=4.6.0",
-]
 dev = [
     "pytest>=7.0.0",
     "black>=22.0.0",
@@ -73,6 +69,9 @@ dev = [
     "flake8>=4.0.0",
     "pre-commit>=2.17.0",
 ]
+opencv = [
+    "opencv-python>=4.6.0,<5.0.0",
+]
 
 [project.urls]
 Homepage = "https://gitlab.com/sindika/research/nedo-vision/nedo-vision-worker-core-v2"

{nedo_vision_worker_core-0.3.8 → nedo_vision_worker_core-0.3.9}/requirements.txt

@@ -1,6 +1,5 @@
 alembic>=1.8.0
 numpy>=1.21.0
-opencv-python>=4.6.0
 pillow>=8.0.0
 psutil>=5.9.0
 scipy>=1.9.0