nedo-vision-worker 1.2.4__py3-none-any.whl → 1.2.6__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.4"
+__version__ = "1.2.6"
 __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, DownloadState.CANCELLED.value, "Download cancelled")
+        self._update_model_status(model_id, "cancelled", "Download cancelled")
         logging.info(f"🛑 Cancelled download for {download_info.model_name}")
         return True
 
@@ -160,11 +160,8 @@ class AIModelClient(GrpcClientBase):
 
     def _handle_existing_model(self, server_model, local_model, updated_models: List):
         if not self._model_file_exists(local_model.file):
-            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")
+            logging.warning(f"⚠️ Model file missing for {local_model.name}. Re-downloading...")
+            self._schedule_download(server_model)
             return
 
         needs_update, changes = self._check_model_changes(server_model, local_model)
@@ -196,6 +193,7 @@ 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:
@@ -248,22 +246,16 @@ 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._set_download_info(model.id, download_info)
-        self._update_model_status(model.id, DownloadState.PENDING.value)
+        self._update_model_status(model.id, "pending")
         
         download_info.thread = threading.Thread(
             target=self._download_worker,
@@ -272,11 +264,12 @@ 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, DownloadState.DOWNLOADING.value)
+            self._update_model_status(model.id, "downloading")
             logging.info(f"📥 Downloading {model.name}...")
             
             success = self._download_model_file(model, download_info)
@@ -285,7 +278,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, DownloadState.COMPLETED.value)
+                self._update_model_status(model.id, "completed")
                 logging.info(f"✅ Downloaded {model.name} in {duration:.1f}s")
             else:
                 self._handle_download_failure(download_info, "Download failed")
@@ -298,7 +291,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, DownloadState.FAILED.value, error)
+        self._update_model_status(download_info.model_id, "failed", 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/services/WorkerSourceUpdater.py

@@ -36,12 +36,25 @@ class WorkerSourceUpdater:
             url = source.file_path
             
         if not url:
+            logger.debug(f"[WorkerSource {source.id}] No URL available for metadata probe")
             return None
         
         if source.type_code == "file":
             url = self.source_file_path / os.path.basename(url)
         
-        return VideoProbeUtil.get_video_metadata(url)
+        try:
+            metadata = VideoProbeUtil.get_video_metadata(url)
+            if metadata:
+                logger.debug(
+                    f"[WorkerSource {source.id}] Metadata retrieved: "
+                    f"resolution={metadata.get('resolution')}, frame_rate={metadata.get('frame_rate')}"
+                )
+            else:
+                logger.warning(f"[WorkerSource {source.id}] Metadata probe returned None for URL: {url}")
+            return metadata
+        except Exception as e:
+            logger.error(f"[WorkerSource {source.id}] Error getting metadata: {e}")
+            return None
 
     def update_worker_sources(self):
         """Fetch local worker sources, probe video URLs, and update if different from the local DB.
@@ -57,34 +70,40 @@ class WorkerSourceUpdater:
                     metadata = self._get_source_metadata(source)
                     if not metadata:
                         logger.warning(f"⚠️ [APP] Failed to probe video for Worker Source ID {source.id} (type: {source.type_code}, url: {source.url if hasattr(source, 'url') else 'N/A'})")
-                        # Set disconnected status for failed probes
-                        if source.status_code != "disconnected":
+                        # Only set disconnected if currently connected (avoid flip-flopping)
+                        if source.status_code == "connected":
                             source.status_code = "disconnected"
-                            source.resolution = None
-                            source.frame_rate = None
                             updated_records.append(source)
                             
                             # Send gRPC update for disconnected status
+                            # Keep existing resolution and frame_rate - don't overwrite with None
                             worker_timestamp = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
                             response = self.client.update_worker_source(
                                 worker_source_id=source.id,
-                                resolution=None,
+                                resolution=source.resolution,
                                 status_code="disconnected",
-                                frame_rate=None,
+                                frame_rate=source.frame_rate,
                                 worker_timestamp=worker_timestamp,
                                 token=self.token,
                             )
                             
                             if response.get("success"):
-                                logger.info(f"✅ [APP] Updated Worker Source ID {source.id} to disconnected")
+                                logger.info(f"✅ [APP] Updated Worker Source ID {source.id} to disconnected (kept existing resolution/framerate)")
                             else:
                                 logger.error(f"🚨 [APP] Failed to update Worker Source ID {source.id} to disconnected: {response.get('message')}")
                         continue
 
                     # Extract details
                     resolution = metadata.get("resolution")
-                    frame_rate = round(metadata.get("frame_rate"), 0) if metadata.get("frame_rate") else None
+                    frame_rate = int(round(metadata.get("frame_rate"), 0)) if metadata.get("frame_rate") else None
                     status_code = "connected" if resolution else "disconnected"
+                    
+                    if resolution is None and source.resolution is not None:
+                        resolution = source.resolution
+                    
+                    if frame_rate is None and source.frame_rate is not None:
+                        frame_rate = source.frame_rate
+                    
                     # .NET Compatible time
                     worker_timestamp = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
 
@@ -94,7 +113,12 @@ class WorkerSourceUpdater:
                         source.frame_rate != frame_rate or
                         source.status_code != status_code
                     ):
-                        logger.info(f"🔄 [APP] Detected changes in Worker Source ID {source.id}, updating...")
+                        logger.info(
+                            f"🔄 [APP] Detected changes in Worker Source ID {source.id}, updating... "
+                            f"[resolution: {source.resolution} -> {resolution}, "
+                            f"frame_rate: {source.frame_rate} -> {frame_rate}, "
+                            f"status: {source.status_code} -> {status_code}]"
+                        )
 
                         # Update local database
                         source.resolution = resolution

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

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

@@ -1,4 +1,4 @@
-nedo_vision_worker/__init__.py,sha256=a-NxvsF-pe7DHXveR0Yl8pRtnvvBPSNTgQn4SbPpDi4,203
+nedo_vision_worker/__init__.py,sha256=3uSTVntcW747CFtMZ_qyKrptoNgHDvLNjg0pdgb4otM,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=P1vgavdnmqnxQaRzULqH9A3XC39iub8LlteTjcN8hPg,15840
+nedo_vision_worker/services/AIModelClient.py,sha256=lxRNax6FR-pV0G1NpJnlaqjbQeu3kRolIUNSw1RkoZA,15406
 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
@@ -66,7 +66,7 @@ nedo_vision_worker/services/VideoSharingDaemon.py,sha256=hYMjUIKNUVT1qSxuUuHN-7B
 nedo_vision_worker/services/VideoStreamClient.py,sha256=QSgUV3LijYrNdnBG1ylABOdUaSatQamfXaqJhAiol9M,7260
 nedo_vision_worker/services/WorkerSourceClient.py,sha256=vDZeCuHL5QQ2-knZ4TOSA59jzmbbThGIwFKKLEZ72Ws,9198
 nedo_vision_worker/services/WorkerSourcePipelineClient.py,sha256=qaBx9T2gWMzpqZaeQdbIeklsXNwzWD5kqgB41rrSkBI,17135
-nedo_vision_worker/services/WorkerSourceUpdater.py,sha256=r_pCL1NiUlgPUFrntE1DWFG-KJygZPK51lAUGPwlzxo,7758
+nedo_vision_worker/services/WorkerSourceUpdater.py,sha256=4t_CEHBLGDRvvuQS6eEPMivTI11ZuzusKKto6t9tPIk,9115
 nedo_vision_worker/services/WorkerStatusClient.py,sha256=7kC5EZjEBwWtHOE6UQ29OPCpYnv_6HSuH7Tc0alK_2Q,2531
 nedo_vision_worker/services/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker/util/FFmpegUtil.py,sha256=QnQrzurmllzGb7SlAAYCrzKBUblweoFU-0h-X-32IYg,1829
@@ -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.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,,
+nedo_vision_worker-1.2.6.dist-info/METADATA,sha256=irbHs4_-uj182kff6PpW0YND59Q_UwhsPVLb5wI5NNQ,14661
+nedo_vision_worker-1.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nedo_vision_worker-1.2.6.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
+nedo_vision_worker-1.2.6.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
+nedo_vision_worker-1.2.6.dist-info/RECORD,,