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

nedo_vision_worker/services/AIModelClient.py

@@ -98,7 +98,7 @@ class AIModelClient(GrpcClientBase):
         if download_info.thread and download_info.thread.is_alive():
             download_info.thread.join(timeout=5)
         
-        self._update_model_status(model_id, "cancelled", "Download cancelled")
+        self._update_model_status(model_id, DownloadState.CANCELLED.value, "Download cancelled")
         logging.info(f"🛑 Cancelled download for {download_info.model_name}")
         return True
 
@@ -160,8 +160,11 @@ class AIModelClient(GrpcClientBase):
 
     def _handle_existing_model(self, server_model, local_model, updated_models: List):
         if not self._model_file_exists(local_model.file):
-            logging.warning(f"⚠️ Model file missing for {local_model.name}. Re-downloading...")
-            self._schedule_download(server_model)
+            if not self._is_downloading(server_model.id):
+                logging.warning(f"⚠️ Model file missing for {local_model.name}. Re-downloading...")
+                self._schedule_download(server_model)
+            else:
+                logging.info(f"⏳ Model {local_model.name} is already being downloaded, skipping reschedule")
             return
 
         needs_update, changes = self._check_model_changes(server_model, local_model)
@@ -193,7 +196,6 @@ class AIModelClient(GrpcClientBase):
         self._schedule_download(server_model)
 
     def _check_model_changes(self, server_model, local_model) -> tuple[bool, List[str]]:
-        """Check if model needs update and return list of changes"""
         changes = []
         
         if server_model.version != local_model.version:
@@ -246,16 +248,22 @@ class AIModelClient(GrpcClientBase):
         local_model.set_main_class(server_model.main_class)
 
     def _schedule_download(self, model):
+        if self._is_downloading(model.id):
+            logging.info(f"⏳ Model {model.name} download already in progress, skipping reschedule")
+            return
+            
         self._cancel_download(model.id)
         
         download_info = DownloadInfo(
             model_id=model.id,
             model_name=model.name,
             version=model.version,
+            state=DownloadState.PENDING,
             start_time=time.time()
         )
         
-        self._update_model_status(model.id, "pending")
+        self._set_download_info(model.id, download_info)
+        self._update_model_status(model.id, DownloadState.PENDING.value)
         
         download_info.thread = threading.Thread(
             target=self._download_worker,
@@ -264,12 +272,11 @@ class AIModelClient(GrpcClientBase):
             name=f"ModelDownload-{model.id[:8]}"
         )
         download_info.thread.start()
-        self._set_download_info(model.id, download_info)
 
     def _download_worker(self, model, download_info: DownloadInfo):
         try:
             download_info.state = DownloadState.DOWNLOADING
-            self._update_model_status(model.id, "downloading")
+            self._update_model_status(model.id, DownloadState.DOWNLOADING.value)
             logging.info(f"📥 Downloading {model.name}...")
             
             success = self._download_model_file(model, download_info)
@@ -278,7 +285,7 @@ class AIModelClient(GrpcClientBase):
                 download_info.state = DownloadState.COMPLETED
                 download_info.end_time = time.time()
                 duration = download_info.end_time - download_info.start_time
-                self._update_model_status(model.id, "completed")
+                self._update_model_status(model.id, DownloadState.COMPLETED.value)
                 logging.info(f"✅ Downloaded {model.name} in {duration:.1f}s")
             else:
                 self._handle_download_failure(download_info, "Download failed")
@@ -291,7 +298,7 @@ class AIModelClient(GrpcClientBase):
     def _handle_download_failure(self, download_info: DownloadInfo, error: str):
         download_info.state = DownloadState.FAILED
         download_info.error_message = error
-        self._update_model_status(download_info.model_id, "failed", error)
+        self._update_model_status(download_info.model_id, DownloadState.FAILED.value, error)
         logging.error(f"❌ Failed to download {download_info.model_name}: {error}")
 
     def _save_changes(self, new_models: List, updated_models: List, models_to_delete: List):

{nedo_vision_worker-1.2.2.dist-info → nedo_vision_worker-1.2.4.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-nedo_vision_worker/__init__.py,sha256=c7rG8vVkrVGLJAt4kkrLAadY2NQ_SG_t161AE3BwGRA,203
+nedo_vision_worker/__init__.py,sha256=a-NxvsF-pe7DHXveR0Yl8pRtnvvBPSNTgQn4SbPpDi4,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=rXUVmyxcJPGhQEZ4UQvjQS5UqlnLBYudHQZCj0dQDxo,10421
@@ -47,7 +47,7 @@ nedo_vision_worker/repositories/WorkerSourcePipelineDetectionRepository.py,sha25
 nedo_vision_worker/repositories/WorkerSourcePipelineRepository.py,sha256=xfmEvgnyt-DdfSApGyFfy0H0dXjFFkjeo4LMr0fVFXU,10053
 nedo_vision_worker/repositories/WorkerSourceRepository.py,sha256=AhAJLAacMFdsOgtQNiu7Pahl1DAGI0T1THHeUlKwQJc,2385
 nedo_vision_worker/repositories/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker/services/AIModelClient.py,sha256=lxRNax6FR-pV0G1NpJnlaqjbQeu3kRolIUNSw1RkoZA,15406
+nedo_vision_worker/services/AIModelClient.py,sha256=P1vgavdnmqnxQaRzULqH9A3XC39iub8LlteTjcN8hPg,15840
 nedo_vision_worker/services/ConnectionInfoClient.py,sha256=toC9zuY2Hrx1Cwq8Gycy_iFlaG1DvFT4qewlLlitpEQ,2214
 nedo_vision_worker/services/DatasetSourceClient.py,sha256=O5a7onxFl0z47zXaMXWxHAMPuuc-i_vzkd2w5fwrukc,3319
 nedo_vision_worker/services/DirectDeviceToRTMPStreamer.py,sha256=M5ei0cd3_KDhHZp6EkrOowhAY-hAHfAQh9YDVjQtbQI,22278
@@ -91,8 +91,8 @@ nedo_vision_worker/worker/SystemUsageManager.py,sha256=StutV4UyLUfduYfK20de4SbPd
 nedo_vision_worker/worker/VideoStreamWorker.py,sha256=5n6v1PNO7IB-jj_McALLkUP-cBjJoIEw4UiSAs3vTb0,7606
 nedo_vision_worker/worker/WorkerManager.py,sha256=T0vMfhOd7YesgQ9o2w6soeJ6n9chUAcuwcGe7p31xr0,5298
 nedo_vision_worker/worker/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker-1.2.2.dist-info/METADATA,sha256=w8bht7PkcQq3kajb3eqOK4_c8bBqZTM_QG_ZI2ZnQw8,14661
-nedo_vision_worker-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nedo_vision_worker-1.2.2.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
-nedo_vision_worker-1.2.2.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
-nedo_vision_worker-1.2.2.dist-info/RECORD,,
+nedo_vision_worker-1.2.4.dist-info/METADATA,sha256=fc_VtfHAkfNgM0tOaipzU6x2LZgrtmlA8Q5JtHfRdd4,14661
+nedo_vision_worker-1.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nedo_vision_worker-1.2.4.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
+nedo_vision_worker-1.2.4.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
+nedo_vision_worker-1.2.4.dist-info/RECORD,,