@camera.ui/camera-ui-opencv 0.0.2 → 0.0.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "OpenCV",
   "name": "@camera.ui/camera-ui-opencv",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "camera.ui opencv plugin",
   "author": "seydx (https://github.com/seydx/camera.ui)",
   "main": "./src/main.py",
@@ -15,7 +15,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "updates": "^16.3.7"
+    "updates": "^16.4.0"
   },
   "bugs": {
     "url": "https://github.com/seydx/camera.ui/issues"

package/requirements.txt

@@ -1,3 +1,3 @@
 numpy==1.26.4
-opencv-python==4.10.0.84
-camera-ui-python-types==0.1.76
+opencv-python-headless==4.10.0.84
+camera-ui-python-types==0.1.78

package/src/camera_detector.py

@@ -14,22 +14,20 @@ from camera_ui_python_types import (
 )
 from opencv_utils import get_detections, get_detections_bs, get_detections_fd
 
-background_tasks = set[asyncio.Task[Any]]()
-
-
-defaultArea = 250
-defaultAreaFd = 500
-defaultAreaBs = 500
-
-defaultThreshold = 50
-defaultThresholdBs = 200
-
-defaultBlur = 9
-defaultDilt = 3
-
-defaultReferenceFrameFrequency = 5
+from .defaults import (
+    available_models,
+    defaultArea,
+    defaultAreaBs,
+    defaultAreaFd,
+    defaultBlur,
+    defaultDilt,
+    defaultReferenceFrameFrequency,
+    defaultThreshold,
+    defaultThresholdBs,
+)
+from .plugin_typings import CameraStorageValues
 
-available_models = ["Frame Difference", "Background Substraction", "Default"]
+background_tasks = set[asyncio.Task[Any]]()
 
 
 class CameraDetector:
@@ -45,7 +43,7 @@ class CameraDetector:
         self.frame_generation_task = None
         self.executor = None
 
-        self.camera_storage = self.__create_camera_storage()
+        self.camera_storage: CameraStorage[CameraStorageValues] = self.__create_camera_storage()
         self.camera.on_connected.subscribe(lambda connected: self.start() if connected else self.close())
 
     def start(self) -> None:
@@ -201,8 +199,10 @@ class CameraDetector:
     def __detector_model(self) -> Literal["Frame Difference", "Background Substraction", "Default"]:
         return self.camera_storage.values["motion_detector"]
 
-    def __create_camera_storage(self) -> CameraStorage:
-        camera_storage = self.api.storage_controller.get_camera_storage(self.camera.id)
+    def __create_camera_storage(self) -> CameraStorage[CameraStorageValues]:
+        camera_storage: Optional[CameraStorage[CameraStorageValues]] = (
+            self.api.storage_controller.get_camera_storage(self.camera.id)
+        )
 
         if camera_storage is not None:
             return camera_storage
@@ -402,11 +402,11 @@ class CameraDetector:
         current_model_schema = None
 
         if current_model == "Default":
-            current_model_schema = camera_storage.get_schema("default")
+            current_model_schema = camera_storage.getSchema("default")
         elif current_model == "Background Substraction":
-            current_model_schema = camera_storage.get_schema("background_substraction")
+            current_model_schema = camera_storage.getSchema("background_substraction")
         elif current_model == "Frame Difference":
-            current_model_schema = camera_storage.get_schema("frame_difference")
+            current_model_schema = camera_storage.getSchema("frame_difference")
 
         if current_model_schema:
             current_model_schema["hidden"] = False
@@ -420,18 +420,18 @@ class CameraDetector:
         new_schema = None
 
         if old_model == "Default":
-            old_schema = self.camera_storage.get_schema("default")
+            old_schema = self.camera_storage.getSchema("default")
         elif old_model == "Background Substraction":
-            old_schema = self.camera_storage.get_schema("background_substraction")
+            old_schema = self.camera_storage.getSchema("background_substraction")
         elif old_model == "Frame Difference":
-            old_schema = self.camera_storage.get_schema("frame_difference")
+            old_schema = self.camera_storage.getSchema("frame_difference")
 
         if new_model == "Default":
-            new_schema = self.camera_storage.get_schema("default")
+            new_schema = self.camera_storage.getSchema("default")
         elif new_model == "Background Substraction":
-            new_schema = self.camera_storage.get_schema("background_substraction")
+            new_schema = self.camera_storage.getSchema("background_substraction")
         elif new_model == "Frame Difference":
-            new_schema = self.camera_storage.get_schema("frame_difference")
+            new_schema = self.camera_storage.getSchema("frame_difference")
 
         if old_schema:
             old_schema["hidden"] = True

package/src/defaults.py

@@ -0,0 +1,13 @@
+defaultArea = 250
+defaultAreaFd = 500
+defaultAreaBs = 500
+
+defaultThreshold = 50
+defaultThresholdBs = 200
+
+defaultBlur = 9
+defaultDilt = 3
+
+defaultReferenceFrameFrequency = 5
+
+available_models = ["Frame Difference", "Background Substraction", "Default"]

package/src/plugin_typings.py

@@ -0,0 +1,28 @@
+from typing import Literal, TypedDict
+
+Detectors = Literal["Frame Difference", "Background Substraction", "Default"]
+
+
+class DefaultModelValues(TypedDict):
+    area: int
+    threshold: int
+    blur: int
+    dilation: int
+    reference_frame_frequency: int
+
+
+class BackgroundSubstractionValues(TypedDict):
+    area: int
+    threshold: int
+
+
+class FrameDifferenceValues(TypedDict):
+    area: int
+    reference_frame_frequency: int
+
+
+class CameraStorageValues(TypedDict):
+    motion_detector: Detectors
+    default: DefaultModelValues
+    background_substraction: BackgroundSubstractionValues
+    frame_difference: FrameDifferenceValues