tensorflow: update to new api, add opencv dep

koush · Mar 20, 2023 · d956ee0 · d956ee0
1 parent 420f070
commit d956ee0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/plugins/tensorflow/package-lock.json b/plugins/tensorflow/package-lock.json
diff --git a/plugins/tensorflow/package.json b/plugins/tensorflow/package.json
@@ -41,5 +41,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.4"
+   "version": "0.1.5"
 }
diff --git a/plugins/tensorflow/src/requirements.txt b/plugins/tensorflow/src/requirements.txt
@@ -3,7 +3,10 @@ Pillow>=5.4.1
 tensorflow-macos; sys_platform == 'darwin'
 tensorflow; sys_platform != 'darwin'
 PyGObject>=3.30.4; sys_platform != 'win32'
+# not available on armhf
 av>=10.0.0; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64'
+# not available on armhf
+opencv-python; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64'
 
 # sort_oh
 scipy

diff --git a/plugins/tensorflow/src/tf/__init__.py b/plugins/tensorflow/src/tf/__init__.py
@@ -47,7 +47,7 @@ def get_input_details(self) -> Tuple[int, int, int]:
     def get_input_size(self) -> Tuple[float, float]:
         return (self.inputwidth, self.inputheight)
 
-    def detect_once(self, input: Image.Image, settings: Any, src_size, cvss):
+    async def detect_once(self, input: Image.Image, settings: Any, src_size, cvss):
         image_array  = tf.keras.utils.img_to_array(input)
 
         input_tensor = tf.convert_to_tensor(image_array, dtype = tf.uint8)