camera-ui-ml 1.2.2__tar.gz → 1.2.3__tar.gz

{camera_ui_ml-1.2.2 → camera_ui_ml-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camera-ui-ml
-Version: 1.2.2
+Version: 1.2.3
 Summary: Shared ML inference framework for camera.ui detection plugins (onnx, openvino, coreml, ncnn)
 Author-email: seydx <hi@seydx.dev>
 Maintainer-email: seydx <hi@seydx.dev>

{camera_ui_ml-1.2.2 → camera_ui_ml-1.2.3}/camera_ui_ml/detectors/base.py

@@ -38,6 +38,7 @@ class BaseDetector:
 
     async def _do_initialize(self, model_name: str) -> None:
         try:
+            self.logger.log(f"Loading {self.name}: {model_name}...")
             self.backend = await self.manager.ensure_backend(model_name)
             if self.closed:
                 return
@@ -46,6 +47,7 @@ class BaseDetector:
             self.logger.success(f"Loaded {self.name}: {model_name}")
         except Exception as error:
             self.logger.error(f"Failed to initialize {self.name}: {error}")
+            raise
         finally:
             self._init_task = None
 

{camera_ui_ml-1.2.2 → camera_ui_ml-1.2.3}/camera_ui_ml/detectors/clip.py

@@ -38,9 +38,7 @@ class ClipEncoder:
         if self.initialized:
             return
         if self._init_task is None:
-            self._init_task = asyncio.create_task(
-                self._do_initialize(vision_model, text_model)
-            )
+            self._init_task = asyncio.create_task(self._do_initialize(vision_model, text_model))
         await self._init_task
 
     async def close(self) -> None:
@@ -83,10 +81,7 @@ class ClipEncoder:
     async def embed_frames(self, frames: list[VideoFrameData]) -> list[list[float]]:
         if not self._ready():
             return [[] for _ in frames]
-        return [
-            await self.embed_frame(frame["width"], frame["height"], frame["data"])
-            for frame in frames
-        ]
+        return [await self.embed_frame(frame["width"], frame["height"], frame["data"]) for frame in frames]
 
     def _ready(self) -> bool:
         return (
@@ -98,35 +93,29 @@ class ClipEncoder:
 
     async def _do_initialize(self, vision_model: str, text_model: str) -> None:
         try:
+            self.logger.log(f"Loading CLIP: {vision_model} + {text_model}...")
             self.vision = await self.manager.ensure_backend(vision_model)
             self.text = await self.manager.ensure_backend(text_model)
             processor_dir = await self.manager.ensure_clip_processor()
             if processor_dir is None:
-                raise RuntimeError(
-                    "CLIP processor files are not bundled (clip_processor_files is empty)"
-                )
-            self.processor = await asyncio.to_thread(
-                CLIPProcessor.from_pretrained, processor_dir
-            )
+                raise RuntimeError("CLIP processor files are not bundled (clip_processor_files is empty)")
+            self.processor = await asyncio.to_thread(CLIPProcessor.from_pretrained, processor_dir)
             if self.closed:
                 return
             self.initialized = True
             self.logger.success(f"Loaded CLIP: {vision_model} + {text_model}")
         except Exception as error:
             self.logger.error(f"Failed to initialize CLIP encoder: {error}")
+            raise
         finally:
             self._init_task = None
 
     def _vision_input(self, pil: Any) -> NDArray:
-        inputs = self.processor(
-            images=pil, return_tensors="np", padding="max_length", truncation=True
-        )
+        inputs = self.processor(images=pil, return_tensors="np", padding="max_length", truncation=True)
         return np.asarray(inputs["pixel_values"], dtype=np.float32)
 
     def _text_input(self, text: str) -> tuple[NDArray, NDArray]:
-        inputs = self.processor(
-            text=text, return_tensors="np", padding="max_length", truncation=True
-        )
+        inputs = self.processor(text=text, return_tensors="np", padding="max_length", truncation=True)
         return (
             np.asarray(inputs["input_ids"], dtype=np.int64),
             np.asarray(inputs["attention_mask"], dtype=np.int64),

{camera_ui_ml-1.2.2 → camera_ui_ml-1.2.3}/camera_ui_ml/model_manager.py

@@ -27,13 +27,19 @@ class BaseModelManager(ABC):
         self.logger = logger
         self.model_path = os.path.join(storage_path, "models", version)
         self._load_tasks: dict[str, asyncio.Task[InferenceBackend]] = {}
+        self._build_lock = asyncio.Lock()
 
     async def ensure_backend(self, model_name: str) -> InferenceBackend:
         task = self._load_tasks.get(model_name)
         if task is None:
             task = asyncio.create_task(self._load(model_name))
             self._load_tasks[model_name] = task
-        return await task
+        try:
+            return await task
+        except Exception:
+            if self._load_tasks.get(model_name) is task:
+                del self._load_tasks[model_name]
+            raise
 
     def reset(self) -> None:
         self._load_tasks.clear()
@@ -57,9 +63,7 @@ class BaseModelManager(ABC):
         """Map of file key → (download_url, path relative to ``model_path``)."""
 
     @abstractmethod
-    async def build_backend(
-        self, model_name: str, paths: Mapping[str, str]
-    ) -> InferenceBackend:
+    async def build_backend(self, model_name: str, paths: Mapping[str, str]) -> InferenceBackend:
         """Build the runtime backend from the (already downloaded) local paths."""
 
     async def _load(self, model_name: str) -> InferenceBackend:
@@ -67,11 +71,9 @@ class BaseModelManager(ABC):
         for url, rel in files.values():
             await self._download(url, rel)
 
-        paths = {
-            key: os.path.join(self.model_path, rel)
-            for key, (_url, rel) in files.items()
-        }
-        return await self.build_backend(model_name, paths)
+        paths = {key: os.path.join(self.model_path, rel) for key, (_url, rel) in files.items()}
+        async with self._build_lock:
+            return await self.build_backend(model_name, paths)
 
     async def _download(self, url: str, rel: str) -> None:
         full_path = os.path.join(self.model_path, rel)

{camera_ui_ml-1.2.2 → camera_ui_ml-1.2.3}/camera_ui_ml.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camera-ui-ml
-Version: 1.2.2
+Version: 1.2.3
 Summary: Shared ML inference framework for camera.ui detection plugins (onnx, openvino, coreml, ncnn)
 Author-email: seydx <hi@seydx.dev>
 Maintainer-email: seydx <hi@seydx.dev>

{camera_ui_ml-1.2.2 → camera_ui_ml-1.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "camera-ui-ml"
-version = "1.2.2"
+version = "1.2.3"
 description = "Shared ML inference framework for camera.ui detection plugins (onnx, openvino, coreml, ncnn)"
 keywords = ["camera.ui", "python", "ml", "inference", "detection"]
 readme = "README.md"