nedo-vision-worker 1.2.8__py3-none-any.whl → 1.2.9__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.2.8"
+__version__ = "1.2.9"
 __all__ = ["WorkerService"] 

nedo_vision_worker/repositories/PPEDetectionRepository.py

@@ -77,6 +77,10 @@ class PPEDetectionRepository:
         Args:
             detection_data (list): List of dictionaries containing the detection data.
         """
+        if not detection_data:
+            logging.info("No detection data provided for deletion.")
+            return
+            
         try:
             # Extract person_id from detection data to delete the corresponding records
             person_ids_to_delete = [data['person_id'] for data in detection_data]
@@ -97,10 +101,25 @@ class PPEDetectionRepository:
                 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}")
+                    try:
+                        os.remove(image_path)
+                        logging.info(f"Deleted image file: {image_path}")
+                    except OSError as e:
+                        logging.warning(f"Failed to delete image file {image_path}: {e}")
                 else:
                     logging.warning(f"Image file not found for detection {detection.id}: {image_path}")
+                
+                # Delete the image tile file if it exists
+                image_tile_path = detection.image_tile_path
+                if image_tile_path:
+                    if not os.path.isabs(image_tile_path):
+                        image_tile_path = str(get_storage_path("files") / Path(image_tile_path).relative_to("data/files"))
+                    if os.path.exists(image_tile_path):
+                        try:
+                            os.remove(image_tile_path)
+                            logging.info(f"Deleted image tile file: {image_tile_path}")
+                        except OSError as e:
+                            logging.warning(f"Failed to delete image tile file {image_tile_path}: {e}")
 
                 # Delete the detection record
                 self.session.delete(detection)

nedo_vision_worker/repositories/RestrictedAreaRepository.py

@@ -61,6 +61,10 @@ class RestrictedAreaRepository:
         Args:
             violation_data (list): List of dictionaries containing the violation data.
         """
+        if not violation_data:
+            logging.info("No violation data provided for deletion.")
+            return
+            
         try:
             person_ids_to_delete = [data['person_id'] for data in violation_data]
 
@@ -75,11 +79,26 @@ class RestrictedAreaRepository:
                 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}")
+                    try:
+                        os.remove(image_path)
+                        logging.info(f"Deleted image file: {image_path}")
+                    except OSError as e:
+                        logging.warning(f"Failed to delete image file {image_path}: {e}")
                 else:
                     logging.warning(f"Image file not found for violation {violation.id}: {image_path}")
 
+                # Delete the image tile file if it exists
+                image_tile_path = violation.image_tile_path
+                if image_tile_path:
+                    if not os.path.isabs(image_tile_path):
+                        image_tile_path = str(get_storage_path("restricted_violations") / Path(image_tile_path).relative_to("data/restricted_violations"))
+                    if os.path.exists(image_tile_path):
+                        try:
+                            os.remove(image_tile_path)
+                            logging.info(f"Deleted image tile file: {image_tile_path}")
+                        except OSError as e:
+                            logging.warning(f"Failed to delete image tile file {image_tile_path}: {e}")
+
                 self.session.delete(violation)
 
             self.session.commit()

nedo_vision_worker/services/PPEDetectionClient.py

@@ -1,4 +1,5 @@
 import logging
+import os
 from .GrpcClientBase import GrpcClientBase
 from ..protos.PPEDetectionService_pb2_grpc import PPEDetectionGRPCServiceStub
 from ..protos.PPEDetectionService_pb2 import UpsertPPEDetectionBatchRequest, UpsertPPEDetectionRequest, PPEDetectionLabelRequest
@@ -56,11 +57,23 @@ class PPEDetectionClient(GrpcClientBase):
             return {"success": False, "message": "gRPC connection is not established."}
 
         try:
-            # Prepare the list of UpsertPPEDetectionRequest messages
             ppe_detection_requests = []
+            valid_records = []
+            invalid_records = []
+            
             for data in detection_data:
-                image_binary = self.read_image_as_binary(data['image'])
-                image_tile_binary = self.read_image_as_binary(data['image_tile'])
+                if not os.path.exists(data['image']) or not os.path.exists(data['image_tile']):
+                    logger.warning(f"⚠️ Missing image files for person_id {data.get('person_id')}")
+                    invalid_records.append(data)
+                    continue
+                
+                try:
+                    image_binary = self.read_image_as_binary(data['image'])
+                    image_tile_binary = self.read_image_as_binary(data['image_tile'])
+                except Exception as e:
+                    logger.error(f"❌ Error reading images for person_id {data.get('person_id')}: {e}")
+                    invalid_records.append(data)
+                    continue
 
                 ppe_detection_labels = [
                     PPEDetectionLabelRequest(
@@ -73,11 +86,11 @@ class PPEDetectionClient(GrpcClientBase):
                     )
                     for label in data['ppe_detection_labels']
                 ]
-                source = data['worker_source_id']
+                
                 request = UpsertPPEDetectionRequest(
                     person_id=data['person_id'],
                     worker_id=worker_id,
-                    worker_source_id=source,
+                    worker_source_id=data['worker_source_id'],
                     image=image_binary,
                     image_tile=image_tile_binary,
                     worker_timestamp=data['worker_timestamp'],
@@ -85,18 +98,24 @@ class PPEDetectionClient(GrpcClientBase):
                     token=token
                 )
                 ppe_detection_requests.append(request)
+                valid_records.append(data)
+
+            if invalid_records:
+                logger.info(f"🧹 Deleting {len(invalid_records)} invalid PPE detection records")
+                self.repository.delete_records_from_db(invalid_records)
+
+            if not ppe_detection_requests:
+                return {"success": True, "message": "No valid detections to send"}
 
-            # Create the UpsertPPEDetectionBatchRequest
             batch_request = UpsertPPEDetectionBatchRequest(
                 ppe_detection_requests=ppe_detection_requests,
                 token=token
             )
 
-            # Call the UpsertBatch RPC
             response = self.handle_rpc(self.stub.UpsertBatch, batch_request)
             
             if response and response.success:
-                self.repository.delete_records_from_db(detection_data)
+                self.repository.delete_records_from_db(valid_records)
                 return {"success": True, "message": response.message}
 
             return {"success": False, "message": response.message if response else "Unknown error"}

nedo_vision_worker/services/RestrictedAreaClient.py

@@ -1,4 +1,5 @@
 import logging
+import os
 from ..repositories.RestrictedAreaRepository import RestrictedAreaRepository
 from .GrpcClientBase import GrpcClientBase
 from ..protos.HumanDetectionService_pb2_grpc import HumanDetectionGRPCServiceStub
@@ -60,10 +61,22 @@ class RestrictedAreaClient(GrpcClientBase):
 
         try:
             human_detection_requests = []
+            valid_records = []
+            invalid_records = []
 
             for data in violation_data:
-                image_binary = self.read_image_as_binary(data['image'])
-                image_tile_binary = self.read_image_as_binary(data['image_tile'])
+                if not os.path.exists(data['image']) or not os.path.exists(data['image_tile']):
+                    logger.warning(f"⚠️ Missing image files for person_id {data.get('person_id')}")
+                    invalid_records.append(data)
+                    continue
+                
+                try:
+                    image_binary = self.read_image_as_binary(data['image'])
+                    image_tile_binary = self.read_image_as_binary(data['image_tile'])
+                except Exception as e:
+                    logger.error(f"❌ Error reading images for person_id {data.get('person_id')}: {e}")
+                    invalid_records.append(data)
+                    continue
 
                 request = UpsertHumanDetectionRequest(
                     person_id=data['person_id'],
@@ -81,6 +94,14 @@ class RestrictedAreaClient(GrpcClientBase):
                 )
 
                 human_detection_requests.append(request)
+                valid_records.append(data)
+
+            if invalid_records:
+                logger.info(f"🧹 Deleting {len(invalid_records)} invalid violation records")
+                self.repository.delete_records_from_db(invalid_records)
+
+            if not human_detection_requests:
+                return {"success": True, "message": "No valid violations to send"}
 
             batch_request = UpsertHumanDetectionBatchRequest(
                 human_detection_requests=human_detection_requests,
@@ -90,7 +111,7 @@ class RestrictedAreaClient(GrpcClientBase):
             response = self.handle_rpc(self.stub.UpsertBatch, batch_request)
 
             if response and response.success:
-                self.repository.delete_records_from_db(violation_data)
+                self.repository.delete_records_from_db(valid_records)
                 return {"success": True, "message": response.message}
 
             return {"success": False, "message": response.message if response else "Unknown error"}

{nedo_vision_worker-1.2.8.dist-info → nedo_vision_worker-1.2.9.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-nedo_vision_worker/__init__.py,sha256=RU8uEjcEodK2R_F4Fg2qBYmhhJpvf-vQBA-Cjo9Dvf8,203
+nedo_vision_worker/__init__.py,sha256=oLzUhGDH-bezYa_Smc3pWfjWYzwQGUZ0LiTwVuu5AYA,203
 nedo_vision_worker/cli.py,sha256=ddWspJmSgVkcUYvRdkvTtMNuMTDvNCqLLuMVU9KE3Ik,7457
 nedo_vision_worker/doctor.py,sha256=wNkpe8gLVd76Y_ViyK2h1ZFdqeSl37MnzZN5frWKu30,48410
 nedo_vision_worker/worker_service.py,sha256=9zz8hKwDwqwpfS0KPQfftGJtRci0uj_wiwcr_TGf-E0,11039
@@ -40,8 +40,8 @@ nedo_vision_worker/protos/WorkerSourceService_pb2_grpc.py,sha256=23Zj3WSogfhmp_Y
 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=oyQjIRyfa0pA-ErVtrKkCLMY521QIbz9ZqSXotC8nqY,4766
-nedo_vision_worker/repositories/RestrictedAreaRepository.py,sha256=y3n2ZfQbth1I_IjVYaT38qpRINQQC_dKeTf0yHPFNjw,3724
+nedo_vision_worker/repositories/PPEDetectionRepository.py,sha256=s4iCaTNYoJJgGr9ojWgoj6wtUQYFbloxSpnuntX26yw,5792
+nedo_vision_worker/repositories/RestrictedAreaRepository.py,sha256=XudFBscLCXCheUTAPC_CbwBkJMn2uIx2HCnU0NH4riE,4766
 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
@@ -56,9 +56,9 @@ nedo_vision_worker/services/GrpcClientBase.py,sha256=hPyxOGw3aGSW1FhmY3wp3Iq8U1M
 nedo_vision_worker/services/GrpcClientManager.py,sha256=DLXekmxlQogLo8V9-TNDXtyHT_UG-BaggqwsIups55k,5568
 nedo_vision_worker/services/GrpcConnection.py,sha256=UNjaUC4ZcXuteHQx8AAAL5ymYkT1OpoIvyCYPUc3tCI,4915
 nedo_vision_worker/services/ImageUploadClient.py,sha256=T353YsRfm74G7Mh-eWr5nvdQHXTfpKwHJFmNW8HyjT8,3019
-nedo_vision_worker/services/PPEDetectionClient.py,sha256=CC-b0LRAgrftfIKp6TFKpeBkTYefe-C6Z1oz_X3HArQ,4345
+nedo_vision_worker/services/PPEDetectionClient.py,sha256=3oE_Y0Avw_kcWKgTA7qmChq32woW7JerWefrCxllUYU,5172
 nedo_vision_worker/services/RTSPtoRTMPStreamer.py,sha256=LtfrWDHNcm-Ky6nZLnFCF8xgqIm7VQmsWIenK2yKNfo,3804
-nedo_vision_worker/services/RestrictedAreaClient.py,sha256=AE9SOcVQca4zn5V96boho56EgN5BCIpV-8grvFBBnGo,3853
+nedo_vision_worker/services/RestrictedAreaClient.py,sha256=TD2Y5UJ0NjXgNFNgwS5ze4P-5jWwgrP0j0Nlyyd7-6Q,4844
 nedo_vision_worker/services/SharedDirectDeviceClient.py,sha256=dylMhqpMsfK_UKLWIVL-ApJRP4g-NCP_55xvlGYBiwo,10760
 nedo_vision_worker/services/SharedVideoStreamServer.py,sha256=WMKVxkzMoyfbgYiJ0fQOT-Ujz9btz6FLlaDP738yfoY,11601
 nedo_vision_worker/services/SystemUsageClient.py,sha256=Yf77dooQeNh6CDL5FkWVrX9543OVz1wc3exCAg6GlWw,3273
@@ -94,8 +94,8 @@ nedo_vision_worker/worker/SystemUsageManager.py,sha256=mkh4sT-HkIEY1CJHMEG6LP9AT
 nedo_vision_worker/worker/VideoStreamWorker.py,sha256=5n6v1PNO7IB-jj_McALLkUP-cBjJoIEw4UiSAs3vTb0,7606
 nedo_vision_worker/worker/WorkerManager.py,sha256=2bxXi19fp3p1qjYBStYRdVVgko8dnevXx1_M_sqH5og,5521
 nedo_vision_worker/worker/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker-1.2.8.dist-info/METADATA,sha256=7MmzgVArAQxzCvxpcCr-LzPrFa0prCfOkaYCPLkmH_0,14728
-nedo_vision_worker-1.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nedo_vision_worker-1.2.8.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
-nedo_vision_worker-1.2.8.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
-nedo_vision_worker-1.2.8.dist-info/RECORD,,
+nedo_vision_worker-1.2.9.dist-info/METADATA,sha256=ySyI3I8lzUmhonotTgOrhH2Tt-AxL_l9oYifd_qaHcU,14728
+nedo_vision_worker-1.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nedo_vision_worker-1.2.9.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
+nedo_vision_worker-1.2.9.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
+nedo_vision_worker-1.2.9.dist-info/RECORD,,