predict: lock opencv version,

roll back to 9c flt
koush · Jun 3, 2024 · 5eac8d0 · 5eac8d0
1 parent 83a3352
commit 5eac8d0
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 18 deletions.
diff --git a/plugins/coreml/package-lock.json b/plugins/coreml/package-lock.json
diff --git a/plugins/coreml/package.json b/plugins/coreml/package.json
@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.54"
+   "version": "0.1.55"
 }
diff --git a/plugins/coreml/src/coreml/__init__.py b/plugins/coreml/src/coreml/__init__.py
@@ -29,6 +29,7 @@
     "scrypted_yolov10m_320",
     "scrypted_yolov10n_320",
     "scrypted_yolo_nas_s_320",
+    "scrypted_yolov9e_320",
     "scrypted_yolov9c_320",
     "scrypted_yolov6n_320",
     "scrypted_yolov6s_320",

diff --git a/plugins/coreml/src/requirements.optional.txt b/plugins/coreml/src/requirements.optional.txt
@@ -1 +1 @@
-opencv-python
+opencv-python==4.9.0.80
diff --git a/plugins/coreml/src/requirements.txt b/plugins/coreml/src/requirements.txt
@@ -1,3 +1,2 @@
-# 2024-04-23 - modify timestamp to force pip reinstall
 coremltools==7.1
 Pillow>=5.4.1
diff --git a/plugins/onnx/package-lock.json b/plugins/onnx/package-lock.json
diff --git a/plugins/onnx/package.json b/plugins/onnx/package.json
@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.93"
+   "version": "0.1.94"
 }
diff --git a/plugins/onnx/src/requirements.optional.txt b/plugins/onnx/src/requirements.optional.txt
@@ -1 +1 @@
-opencv-python
+opencv-python==4.9.0.80
diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json
diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json
@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.89"
+   "version": "0.1.92"
 }
diff --git a/plugins/openvino/src/requirements.optional.txt b/plugins/openvino/src/requirements.optional.txt
@@ -1 +1 @@
-opencv-python
+opencv-python==4.9.0.80
diff --git a/plugins/tensorflow-lite/src/predict/face_recognize.py b/plugins/tensorflow-lite/src/predict/face_recognize.py
@@ -20,8 +20,8 @@ class FaceRecognizeDetection(PredictPlugin):
     def __init__(self, nativeId: str | None = None):
         super().__init__(nativeId=nativeId)
 
-        self.inputheight = 320
-        self.inputwidth = 320
+        self.inputheight = 640
+        self.inputwidth = 640
 
         self.labels = {
             0: "face",
@@ -31,7 +31,7 @@ def __init__(self, nativeId: str | None = None):
         self.loop = asyncio.get_event_loop()
         self.minThreshold = 0.7
 
-        self.detectModel = self.downloadModel("scrypted_yolov8n_flt_320")
+        self.detectModel = self.downloadModel("scrypted_yolov9c_flt")
         self.faceModel = self.downloadModel("inception_resnet_v1")
 
     def downloadModel(self, model: str):

diff --git a/server/package-lock.json b/server/package-lock.json