nedo-vision-worker 1.0.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

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.0.0"
+__version__ = "1.1.1"
 __all__ = ["WorkerService"] 

nedo_vision_worker/cli.py

@@ -115,7 +115,7 @@ Examples:
     parser.add_argument(
         "--version",
         action="version",
-        version="nedo-vision-worker 1.0.0"
+        version="nedo-vision-worker 1.1.1"
     )
     
     parser.add_argument(

nedo_vision_worker/repositories/PPEDetectionRepository.py

@@ -94,6 +94,8 @@ class PPEDetectionRepository:
 
                 # Delete the image file associated with the detection if it exists
                 image_path = detection.image_path
+                if not os.path.isabs(image_path):
+                    image_path = str(get_storage_path("files") / Path(image_path).relative_to("data/files"))
                 if os.path.exists(image_path):
                     os.remove(image_path)
                     logging.info(f"Deleted image file: {image_path}")

nedo_vision_worker/repositories/RestrictedAreaRepository.py

@@ -72,6 +72,8 @@ class RestrictedAreaRepository:
 
             for violation in violations_to_delete:
                 image_path = violation.image_path
+                if not os.path.isabs(image_path):
+                    image_path = str(get_storage_path("restricted_violations") / Path(image_path).relative_to("data/restricted_violations"))
                 if os.path.exists(image_path):
                     os.remove(image_path)
                     logging.info(f"Deleted image file: {image_path}")

nedo_vision_worker/services/PPEDetectionClient.py

@@ -38,6 +38,11 @@ class PPEDetectionClient(GrpcClientBase):
         Returns:
             bytes: Binary content of the image.
         """
+        from ..database.DatabaseManager import get_storage_path
+        from pathlib import Path
+        import os
+        if not os.path.isabs(image_path):
+            image_path = str(get_storage_path("files") / Path(image_path).relative_to("data/files"))
         with open(image_path, 'rb') as image_file:
             return image_file.read()
 

nedo_vision_worker/services/RestrictedAreaClient.py

@@ -39,6 +39,11 @@ class RestrictedAreaClient(GrpcClientBase):
         Returns:
             bytes: Binary content of the image.
         """
+        from ..database.DatabaseManager import get_storage_path
+        from pathlib import Path
+        import os
+        if not os.path.isabs(image_path):
+            image_path = str(get_storage_path("restricted_violations") / Path(image_path).relative_to("data/restricted_violations"))
         with open(image_path, 'rb') as image_file:
             return image_file.read()
 

nedo_vision_worker/worker/CoreActionWorker.py

@@ -72,12 +72,23 @@ class CoreActionWorker:
         """Main loop to manage RabbitMQ listener."""
         try:
             while not self.stop_event.is_set():
-                logger.info("📡 [APP] Waiting for core action messages...")
+                logger.info("📡 [APP] Starting core action message listener...")
                 self.listener.start_listening(
                     exchange_name="nedo.worker.core.action", 
                     queue_name=f"nedo.worker.core.{self.worker_id}"
                 )
-                safe_join_thread(self.listener.listener_thread)
+                
+                # Wait for the listener thread to finish (connection lost or stop requested)
+                while not self.stop_event.is_set() and self.listener.listener_thread and self.listener.listener_thread.is_alive():
+                    self.listener.listener_thread.join(timeout=5)  # Check every 5 seconds
+                
+                if not self.stop_event.is_set():
+                    logger.warning("⚠️ [APP] Core action listener disconnected. Attempting to reconnect in 10 seconds...")
+                    self.stop_event.wait(10)  # Wait 10 seconds before reconnecting
+                else:
+                    logger.info("📡 [APP] Core action listener stopped.")
+                    break
+                    
         except Exception as e:
             logger.error("🚨 [APP] Unexpected error in Core Action Worker loop.", exc_info=True)
 

nedo_vision_worker/worker/PipelineActionWorker.py

@@ -73,12 +73,23 @@ class PipelineActionWorker:
         """Main loop to manage RabbitMQ listener."""
         try:
             while not self.stop_event.is_set():
-                logger.info("📡 [APP] Waiting for Pipeline action messages...")
+                logger.info("📡 [APP] Starting pipeline action message listener...")
                 self.listener.start_listening(
                     exchange_name="nedo.worker.pipeline.action", 
                     queue_name=f"nedo.worker.pipeline.{self.worker_id}"
                 )
-                safe_join_thread(self.listener.listener_thread)
+                
+                # Wait for the listener thread to finish (connection lost or stop requested)
+                while not self.stop_event.is_set() and self.listener.listener_thread and self.listener.listener_thread.is_alive():
+                    self.listener.listener_thread.join(timeout=5)  # Check every 5 seconds
+                
+                if not self.stop_event.is_set():
+                    logger.warning("⚠️ [APP] Pipeline action listener disconnected. Attempting to reconnect in 10 seconds...")
+                    self.stop_event.wait(10)  # Wait 10 seconds before reconnecting
+                else:
+                    logger.info("📡 [APP] Pipeline action listener stopped.")
+                    break
+                    
         except Exception as e:
             logger.error("🚨 [APP] Unexpected error in Pipeline Action Worker loop.", exc_info=True)
 

nedo_vision_worker/worker/PipelineImageWorker.py

@@ -78,9 +78,20 @@ class PipelineImageWorker:
         """Main loop to manage RabbitMQ listener."""
         try:
             while not self.stop_event.is_set():
-                logger.info("📡 [APP] Waiting for image request messages...")
+                logger.info("📡 [APP] Starting image request message listener...")
                 self.listener.start_listening(exchange_name="nedo.pipeline.image.request", queue_name=f"nedo.pipeline.request.{self.worker_id}")
-                safe_join_thread(self.listener.listener_thread)
+                
+                # Wait for the listener thread to finish (connection lost or stop requested)
+                while not self.stop_event.is_set() and self.listener.listener_thread and self.listener.listener_thread.is_alive():
+                    self.listener.listener_thread.join(timeout=5)  # Check every 5 seconds
+                
+                if not self.stop_event.is_set():
+                    logger.warning("⚠️ [APP] Image request listener disconnected. Attempting to reconnect in 10 seconds...")
+                    self.stop_event.wait(10)  # Wait 10 seconds before reconnecting
+                else:
+                    logger.info("📡 [APP] Image request listener stopped.")
+                    break
+                    
         except Exception as e:
             logger.error("🚨 [APP] Unexpected error in Pipeline Image Worker loop.", exc_info=True)
 

nedo_vision_worker/worker/RabbitMQListener.py

@@ -91,6 +91,10 @@ class RabbitMQListener:
         if self.listener_thread and self.listener_thread.is_alive():
             logger.warning("⚠️ [APP] RabbitMQ listener is already running.")
             return
+            
+        # Clean up any dead thread reference
+        if self.listener_thread and not self.listener_thread.is_alive():
+            self.listener_thread = None
 
         def run():
             while not self.stop_event.is_set():
@@ -137,6 +141,13 @@ class RabbitMQListener:
             logger.error(f"🚨 [APP] Error during RabbitMQ shutdown: {e}")
 
         self._cleanup_connection()
+        
+        # Clean up the listener thread reference
+        if self.listener_thread:
+            if self.listener_thread.is_alive():
+                self.listener_thread.join(timeout=5)  # Wait up to 5 seconds for thread to finish
+            self.listener_thread = None
+            
         logger.info("🔌 [APP] RabbitMQ listener stopped.")
 
     def _cleanup_connection(self):

nedo_vision_worker/worker/VideoStreamWorker.py

@@ -80,9 +80,20 @@ class VideoStreamWorker:
         """Main loop to manage RabbitMQ listener."""
         try:
             while not self.stop_event.is_set():
-                logger.info("📡 [APP] Waiting for video stream messages...")
+                logger.info("📡 [APP] Starting video stream message listener...")
                 self.listener.start_listening(exchange_name="nedo.worker.stream.preview", queue_name=f"nedo.worker.preview.{self.worker_id}")
-                safe_join_thread(self.listener.listener_thread)
+                
+                # Wait for the listener thread to finish (connection lost or stop requested)
+                while not self.stop_event.is_set() and self.listener.listener_thread and self.listener.listener_thread.is_alive():
+                    self.listener.listener_thread.join(timeout=5)  # Check every 5 seconds
+                
+                if not self.stop_event.is_set():
+                    logger.warning("⚠️ [APP] Video stream listener disconnected. Attempting to reconnect in 10 seconds...")
+                    self.stop_event.wait(10)  # Wait 10 seconds before reconnecting
+                else:
+                    logger.info("📡 [APP] Video stream listener stopped.")
+                    break
+                    
         except Exception as e:
             logger.error("🚨 [APP] Unexpected error in Stream Worker loop.", exc_info=True)
 

{nedo_vision_worker-1.0.0.dist-info → nedo_vision_worker-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker
-Version: 1.0.0
+Version: 1.1.1
 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.0.0.dist-info → nedo_vision_worker-1.1.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-nedo_vision_worker/__init__.py,sha256=2AhlsGmIh5Kv9ffxD5vwAW0oj6mHQvUKM0pcvPOd8Ow,203
-nedo_vision_worker/cli.py,sha256=LzdNu6Gv9aacxkY8z_hSvtZ5uPPi1S7mNiRwJAQ-zR8,6227
+nedo_vision_worker/__init__.py,sha256=mgPDe2FHxWQLXYxpyKnft8nCtd1Jkbwb2x1oSn8wV9o,203
+nedo_vision_worker/cli.py,sha256=9NgdpolGqMMkDtg79OxzRgd25jn5iW-nuGL2TI14GB0,6227
 nedo_vision_worker/doctor.py,sha256=dO3eOOauAFrCwj1UX1A-1jj_zsE2Y0UycGqPXaEOKjg,16152
 nedo_vision_worker/worker_service.py,sha256=XLzaN-n8f4ysPcOmJpO51I9_MWuVTnFMJF08sVHT7IA,9882
 nedo_vision_worker/config/ConfigurationManager.py,sha256=QrQaQ9Cdjpkcr2JE_miyrWJIZmMgZwJYBz-wE45Zzes,8011
@@ -40,8 +40,8 @@ nedo_vision_worker/protos/WorkerSourceService_pb2_grpc.py,sha256=fTxFjgr9gZjx2rI
 nedo_vision_worker/protos/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker/repositories/AIModelRepository.py,sha256=35cQ2EnJvMdArewumPrVIaiwueGy6cXU_g5J1Qcj6_Y,1415
 nedo_vision_worker/repositories/DatasetSourceRepository.py,sha256=MOUbXY1-7WUPhY15aMpdXl6rl0afSvu3Cq8jNtp9nzM,8595
-nedo_vision_worker/repositories/PPEDetectionRepository.py,sha256=l3VTveoAXdHLJwruIKYlDXbU3A3MPrCWPFbGZOdYkBY,4607
-nedo_vision_worker/repositories/RestrictedAreaRepository.py,sha256=RWXRmnDMGgV6jPCqrwETfYP7PXszJNHERmCoAAlf1xU,3533
+nedo_vision_worker/repositories/PPEDetectionRepository.py,sha256=oyQjIRyfa0pA-ErVtrKkCLMY521QIbz9ZqSXotC8nqY,4766
+nedo_vision_worker/repositories/RestrictedAreaRepository.py,sha256=y3n2ZfQbth1I_IjVYaT38qpRINQQC_dKeTf0yHPFNjw,3724
 nedo_vision_worker/repositories/WorkerSourcePipelineDebugRepository.py,sha256=kOlVEnPOoDRZdZIm8uWXlc89GMvBPI-36QyKecX7ucE,3350
 nedo_vision_worker/repositories/WorkerSourcePipelineDetectionRepository.py,sha256=cbgg_7p0eNUIgCHoPDZBaRZ1b2Y68p_dfSxpvuGMtRE,1773
 nedo_vision_worker/repositories/WorkerSourcePipelineRepository.py,sha256=xfmEvgnyt-DdfSApGyFfy0H0dXjFFkjeo4LMr0fVFXU,10053
@@ -54,9 +54,9 @@ nedo_vision_worker/services/FileToRTMPServer.py,sha256=yUJxrouoTLSq9XZ88dhDYhP-p
 nedo_vision_worker/services/GrpcClientBase.py,sha256=zEqDglS48HmcLw77LWc7l6nLYeVy_w_6y2O5pB9C88A,6344
 nedo_vision_worker/services/GrpcClientManager.py,sha256=DLXekmxlQogLo8V9-TNDXtyHT_UG-BaggqwsIups55k,5568
 nedo_vision_worker/services/ImageUploadClient.py,sha256=T353YsRfm74G7Mh-eWr5nvdQHXTfpKwHJFmNW8HyjT8,3019
-nedo_vision_worker/services/PPEDetectionClient.py,sha256=KqC391gm6dFQk7rMsswD2SlO9mKeKjfMRKFzHoc_tLY,4367
+nedo_vision_worker/services/PPEDetectionClient.py,sha256=gX2EC4NBkKX5EvqQ8r7pAsaFTiKrl9x6hXA5OVrumt4,4625
 nedo_vision_worker/services/RTSPtoRTMPStreamer.py,sha256=hkPRX6iGxUtivsOA36JWBopHEd1RlmgIP8SLqN4d2TU,3863
-nedo_vision_worker/services/RestrictedAreaClient.py,sha256=AE9SOcVQca4zn5V96boho56EgN5BCIpV-8grvFBBnGo,3853
+nedo_vision_worker/services/RestrictedAreaClient.py,sha256=-E1Ao_Pxi1DKFWDTotvyXPDgyvxbGox3wwWxKcVaXA8,4143
 nedo_vision_worker/services/SystemUsageClient.py,sha256=PbRuwDWKnMarcnkGtOKfYB5nA-3DeKv7V5_hZr8EDEo,3200
 nedo_vision_worker/services/VideoStreamClient.py,sha256=0PImMGwbPsX0Wfb4wsA42-Qbo8it0aWI-FpQSEV3f_A,6322
 nedo_vision_worker/services/WorkerSourceClient.py,sha256=pSbcPLNlnUERtHE9HyKoYtiptulcQ_DPkygKq-9Qm0M,9186
@@ -71,22 +71,22 @@ nedo_vision_worker/util/PlatformDetector.py,sha256=-iLPrKs7hp_oltkCI3hESJQkC2uRy
 nedo_vision_worker/util/SystemMonitor.py,sha256=2MWYaEXoL91UANT_-SuDWrFMq1ajPorh8co6Py9PV_c,11300
 nedo_vision_worker/util/VideoProbeUtil.py,sha256=r5P6-ecyrSlzJ7W05LrcfdMHlFKb6vg7asowNh1CJrE,4313
 nedo_vision_worker/util/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker/worker/CoreActionWorker.py,sha256=AVcHNBcNOye9ASICQIC7XftotKTVbyTybHyJlEMhAZw,4746
+nedo_vision_worker/worker/CoreActionWorker.py,sha256=lb7zPY3yui6I3F4rX4Ii7JwpWZahLEO72rh3iWOgFmg,5441
 nedo_vision_worker/worker/DataSenderWorker.py,sha256=o32MT28EqYwAPmd9NKhX3rfNlDKekNOI2n8mZ6s8CpU,7162
 nedo_vision_worker/worker/DataSyncWorker.py,sha256=2qkwef5cFfAZZa2lB5YZLkFVPselR3zdaaLXIBT7NEQ,6216
 nedo_vision_worker/worker/DatasetFrameSender.py,sha256=1SFYj8LJFNi-anBTapsbq8U_NGMM7mnoMKg9NeFAHys,8087
 nedo_vision_worker/worker/DatasetFrameWorker.py,sha256=Ni5gPeDPk9Rz4_cbg63u7Y6LVw_-Bz24OvfeY-6Yp44,19320
 nedo_vision_worker/worker/PPEDetectionManager.py,sha256=fAolWlrsY5SQAWygvjNBNU56IlC0HLlhPgpz7shL-gk,3588
-nedo_vision_worker/worker/PipelineActionWorker.py,sha256=OkP8pWicD2nezSSHOU4-LcKv8aJRIl-n5a0wNzKcJB4,4948
-nedo_vision_worker/worker/PipelineImageWorker.py,sha256=-d6Gzs9KQJegtvEItlGxoO_mLY2s9bBcYeGiDBz9rug,4916
-nedo_vision_worker/worker/RabbitMQListener.py,sha256=BGWqt_3VSGbYRPP6QW87A46FE0ZG9JJPEXnHl4qyo70,6489
+nedo_vision_worker/worker/PipelineActionWorker.py,sha256=xgvryjKtEsMj4BKqWzDIaK_lFny-DfMCj5Y2DxHnWww,5651
+nedo_vision_worker/worker/PipelineImageWorker.py,sha256=TN3r8WpgXg7K8knWf9y-3g1q1h-O-zDtxsxr0n2XVzI,5615
+nedo_vision_worker/worker/RabbitMQListener.py,sha256=9gR49MDplgpyb-D5HOH0K77-DJQFvhS2E7biL92SjSU,6950
 nedo_vision_worker/worker/RestrictedAreaManager.py,sha256=3yoXgQ459tV1bOa5choEzR9gE6LklrtHR_e0472U3L0,3521
 nedo_vision_worker/worker/SystemUsageManager.py,sha256=StutV4UyLUfduYfK20de4SbPd7wqkR7io0gsOajxWSU,4509
-nedo_vision_worker/worker/VideoStreamWorker.py,sha256=kLm_ke8UtRyzndxCB3MFa-mP4pXQ5d84vBFC2rdj9K0,5817
+nedo_vision_worker/worker/VideoStreamWorker.py,sha256=TxoMYoaU6IcwJDLILC71WUkYahqVAnNX05_5qPbeS_8,6514
 nedo_vision_worker/worker/WorkerManager.py,sha256=7G8ORHpcVAb73UbTUi2WhcQJ-A1XFSq9d_9dLxABHac,6357
 nedo_vision_worker/worker/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker-1.0.0.dist-info/METADATA,sha256=NBnVN1QJRmTzq0dX2mvuJ3Ww8GT3dEho9G-k_d_clAk,14642
-nedo_vision_worker-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nedo_vision_worker-1.0.0.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
-nedo_vision_worker-1.0.0.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
-nedo_vision_worker-1.0.0.dist-info/RECORD,,
+nedo_vision_worker-1.1.1.dist-info/METADATA,sha256=NsS4IUwJP_PRvuEMzT8o2EQRny_tGAEoYxOXn0iiz2k,14642
+nedo_vision_worker-1.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nedo_vision_worker-1.1.1.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
+nedo_vision_worker-1.1.1.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
+nedo_vision_worker-1.1.1.dist-info/RECORD,,