python-codecs: weight the image reader to prefer snapshot plugin. tf/…

…ov publish log spam betas.
koush · Mar 2, 2024 · 04de63a · 04de63a
1 parent 803a2d7
commit 04de63a
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 16 deletions.
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
@@ -41,5 +41,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.51"
+   "version": "0.1.52"
 }
diff --git a/plugins/python-codecs/.vscode/launch.json b/plugins/python-codecs/.vscode/launch.json
@@ -6,7 +6,7 @@
     "configurations": [
         {
             "name": "Scrypted Debugger",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "${config:scrypted.debugHost}",
@@ -28,7 +28,7 @@
         },
         {
             "name": "Python: Test",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/src/test.py",
             "console": "internalConsole",

diff --git a/plugins/python-codecs/.vscode/settings.json b/plugins/python-codecs/.vscode/settings.json
@@ -1,9 +1,13 @@
 
 {
     // docker installation
-    // "scrypted.debugHost": "koushik-ubuntu",
+    // "scrypted.debugHost": "scrypted-server",
     // "scrypted.serverRoot": "/server",
 
+    // lxc installation
+    "scrypted.debugHost": "scrypted-server",
+    "scrypted.serverRoot": "/root/.scrypted",
+
     // windows installation
     // "scrypted.debugHost": "koushik-windows",
     // "scrypted.serverRoot": "C:\\Users\\koush\\.scrypted",
@@ -13,8 +17,8 @@
     // "scrypted.serverRoot": "/home/pi/.scrypted",
 
     // local checkout
-    "scrypted.debugHost": "127.0.0.1",
-    "scrypted.serverRoot": "/Users/koush/.scrypted",
+    // "scrypted.debugHost": "127.0.0.1",
+    // "scrypted.serverRoot": "/Users/koush/.scrypted",
 
     "scrypted.pythonRemoteRoot": "${config:scrypted.serverRoot}/volume/plugin.zip",
     "python.analysis.extraPaths": [

diff --git a/plugins/python-codecs/package-lock.json b/plugins/python-codecs/package-lock.json
diff --git a/plugins/python-codecs/package.json b/plugins/python-codecs/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.92",
+   "version": "0.1.93",
    "description": "Python Codecs for Scrypted",
    "keywords": [
       "scrypted",

diff --git a/plugins/python-codecs/src/pilimage.py b/plugins/python-codecs/src/pilimage.py
@@ -106,7 +106,7 @@ class ImageReader(scrypted_sdk.ScryptedDeviceBase, scrypted_sdk.BufferConverter)
     def __init__(self, nativeId: str):
         super().__init__(nativeId)
 
-        self.fromMimeType = 'image/*'
+        self.fromMimeType = 'image/*;converter-weight=2'
         self.toMimeType = scrypted_sdk.ScryptedMimeTypes.Image.value
 
     async def convert(self, data: Any, fromMimeType: str, toMimeType: str, options: scrypted_sdk.MediaObjectOptions = None) -> Any:

diff --git a/plugins/python-codecs/src/vipsimage.py b/plugins/python-codecs/src/vipsimage.py
@@ -104,7 +104,7 @@ class ImageReader(scrypted_sdk.ScryptedDeviceBase, scrypted_sdk.BufferConverter)
     def __init__(self, nativeId: str):
         super().__init__(nativeId)
 
-        self.fromMimeType = 'image/*'
+        self.fromMimeType = 'image/*;converter-weight=2'
         self.toMimeType = scrypted_sdk.ScryptedMimeTypes.Image.value
 
     async def convert(self, data: Any, fromMimeType: str, toMimeType: str, options: scrypted_sdk.MediaObjectOptions = None) -> Any:

diff --git a/plugins/tensorflow-lite/package-lock.json b/plugins/tensorflow-lite/package-lock.json
diff --git a/plugins/tensorflow-lite/package.json b/plugins/tensorflow-lite/package.json
@@ -53,5 +53,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.46"
+   "version": "0.1.47"
 }
diff --git a/plugins/tensorflow-lite/src/detect/__init__.py b/plugins/tensorflow-lite/src/detect/__init__.py
@@ -73,6 +73,7 @@ async def detectObjects(self, mediaObject: MediaObject, session: ObjectDetection
         if mediaObject.mimeType == ScryptedMimeTypes.Image.value:
             image = await scrypted_sdk.sdk.connectRPCObject(mediaObject)
         else:
+            print('non image provided')
             image = await scrypted_sdk.mediaManager.convertMediaObjectToBuffer(mediaObject, ScryptedMimeTypes.Image.value)
 
         return await self.run_detection_image(image, session)