@camera.ui/camera-ui-opencv 0.0.1 → 0.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "OpenCV",
   "name": "@camera.ui/camera-ui-opencv",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "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 .types 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/types.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

package/requirements-lock.txt

@@ -1,6 +0,0 @@
-# Python version: 3.11.9
-# Server version: 0.0.6
-# Dependency version: 0.1.64
-numpy==1.26.4
-opencv-python==4.10.0.84
-camera-ui-python-types==0.1.75

package/ruff.toml

@@ -1,90 +0,0 @@
-# Exclude a variety of commonly ignored directories.
-exclude = [
-    ".bzr",
-    ".direnv",
-    ".eggs",
-    ".git",
-    ".git-rewrite",
-    ".hg",
-    ".ipynb_checkpoints",
-    ".mypy_cache",
-    ".nox",
-    ".pants.d",
-    ".pyenv",
-    ".pytest_cache",
-    ".pytype",
-    ".ruff_cache",
-    ".svn",
-    ".tox",
-    ".venv",
-    ".vscode",
-    "__pypackages__",
-    "_build",
-    "buck-out",
-    "build",
-    "dist",
-    "node_modules",
-    "site-packages",
-    "venv",
-]
-
-# Same as Black.
-line-length = 110
-indent-width = 4
-
-# Assume Python 3.8
-target-version = "py39"
-
-[lint]
-# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
-# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
-# McCabe complexity (`C901`) by default.
-select = [
-    # pycodestyle
-    "E",
-    # Pyflakes
-    "F",
-    # pyupgrade
-    "UP",
-    # flake8-bugbear
-    "B",
-    # flake8-simplify
-    "SIM",
-    # isort
-    "I",
-]
-ignore = ["E501", "B023", "B006"]
-
-# Allow fix for all enabled rules (when `--fix`) is provided.
-fixable = ["ALL"]
-unfixable = []
-
-# Allow unused variables when underscore-prefixed.
-dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
-
-[format]
-# Like Black, use double quotes for strings.
-quote-style = "double"
-
-# Like Black, indent with spaces, rather than tabs.
-indent-style = "space"
-
-# Like Black, respect magic trailing commas.
-skip-magic-trailing-comma = false
-
-# Like Black, automatically detect the appropriate line ending.
-line-ending = "auto"
-
-# Enable auto-formatting of code examples in docstrings. Markdown,
-# reStructuredText code/literal blocks and doctests are all supported.
-#
-# This is currently disabled by default, but it is planned for this
-# to be opt-out in the future.
-docstring-code-format = true
-
-# Set the line length limit used when formatting code snippets in
-# docstrings.
-#
-# This only has an effect when the `docstring-code-format` setting is
-# enabled.
-docstring-code-line-length = "dynamic"