predict: switch everything to yolov9t/c

Author: koush

plugins/coreml/package-lock.json

@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.64"
+   "version": "0.1.65"
 }

plugins/coreml/package.json

@@ -31,6 +31,8 @@
     "scrypted_yolo_nas_s_320",
     "scrypted_yolov9e_320",
     "scrypted_yolov9c_320",
+    "scrypted_yolov9s_320",
+    "scrypted_yolov9t_320",
     "scrypted_yolov6n_320",
     "scrypted_yolov6s_320",
     "scrypted_yolov8n_320",
@@ -81,7 +83,7 @@ def __init__(self, nativeId: str | None = None):
         self.scrypted_yolo_nas = "scrypted_yolo_nas" in model
         self.scrypted_yolo = "scrypted_yolo" in model
         self.scrypted_model = "scrypted" in model
-        model_version = "v7"
+        model_version = "v8"
         mlmodel = "model" if self.scrypted_yolo else model
 
         print(f"model: {model}")

plugins/coreml/src/coreml/__init__.py

@@ -1,18 +1,20 @@
 
 {
     // docker installation
-    // "scrypted.debugHost": "koushik-ubuntuvm",
-    // "scrypted.serverRoot": "/server",
-    // "scrypted.debugHost": "koushik-ubuntuvm",
-    // "scrypted.serverRoot": "/home/koush/.scrypted",
+    "scrypted.debugHost": "koushik-ubuntuvm",
+    "scrypted.serverRoot": "/server",
+
+    // lxc
+    // "scrypted.debugHost": "scrypted-server",
+    // "scrypted.serverRoot": "/root/.scrypted",
 
     // pi local installation
     // "scrypted.debugHost": "192.168.2.119",
     // "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.debugHost": "koushik-winvm",
     // "scrypted.serverRoot": "C:\\Users\\koush\\.scrypted",
 

plugins/onnx/.vscode/settings.json

@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.102"
+   "version": "0.1.103"
 }

plugins/onnx/package-lock.json

@@ -35,6 +35,8 @@
     "scrypted_yolov6n_320",
     "scrypted_yolov6s_320",
     "scrypted_yolov9c_320",
+    "scrypted_yolov9s_320",
+    "scrypted_yolov9t_320",
     "scrypted_yolov8n_320",
 ]
 
@@ -55,7 +57,7 @@ def __init__(self, nativeId: str | None = None):
         if model == "Default" or model not in availableModels:
             if model != "Default":
                 self.storage.setItem("model", "Default")
-            model = "scrypted_yolov10m_320"
+            model = "scrypted_yolov9c_320"
         self.yolo = "yolo" in model
         self.scrypted_yolov10 = "scrypted_yolov10" in model
         self.scrypted_yolo_nas = "scrypted_yolo_nas" in model
@@ -66,7 +68,7 @@ def __init__(self, nativeId: str | None = None):
 
         onnxmodel = model if self.scrypted_yolo_nas else "best" if self.scrypted_model else model
 
-        model_version = "v2"
+        model_version = "v3"
         onnxfile = self.downloadFile(
             f"https://github.com/koush/onnx-models/raw/main/{model}/{onnxmodel}.onnx",
             f"{model_version}/{model}/{onnxmodel}.onnx",

plugins/onnx/package.json

@@ -5,16 +5,16 @@
     // "scrypted.serverRoot": "/server",
 
     // proxmox installation
-    // "scrypted.debugHost": "scrypted-server",
-    // "scrypted.serverRoot": "/root/.scrypted",
+    "scrypted.debugHost": "scrypted-server",
+    "scrypted.serverRoot": "/root/.scrypted",
 
     // pi local installation
     // "scrypted.debugHost": "192.168.2.119",
     // "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.debugHost": "koushik-winvm",
     // "scrypted.serverRoot": "C:\\Users\\koush\\.scrypted",
 

plugins/onnx/src/ort/__init__.py

@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.103"
+   "version": "0.1.104"
 }

plugins/openvino/.vscode/settings.json

@@ -37,6 +37,8 @@
     "scrypted_yolov6n_320",
     "scrypted_yolov6s_320",
     "scrypted_yolov9c_320",
+    "scrypted_yolov9s_320",
+    "scrypted_yolov9t_320",
     "scrypted_yolov8n_320",
     "ssd_mobilenet_v1_coco",
     "ssdlite_mobilenet_v2",
@@ -135,7 +137,7 @@ def __init__(self, nativeId: str | None = None):
         if model == "Default" or model not in availableModels:
             if model != "Default":
                 self.storage.setItem("model", "Default")
-            model = "scrypted_yolov10n_320"
+            model = "scrypted_yolov9t_320"
         self.yolo = "yolo" in model
         self.scrypted_yolov10 = "scrypted_yolov10" in model
         self.scrypted_yolo_nas = "scrypted_yolo_nas" in model

plugins/openvino/package-lock.json

@@ -35,7 +35,7 @@ def __init__(self, nativeId: str | None = None):
         self.loop = asyncio.get_event_loop()
         self.minThreshold = 0.5
 
-        self.detectModel = self.downloadModel("scrypted_yolov10n_face_320")
+        self.detectModel = self.downloadModel("scrypted_yolov9t_face_320")
         self.faceModel = self.downloadModel("inception_resnet_v1")
 
     def downloadModel(self, model: str):
@@ -53,7 +53,7 @@ def get_input_format(self) -> str:
 
     async def detect_once(self, input: Image.Image, settings: Any, src_size, cvss):
         results = await self.predictDetectModel(input)
-        objs = yolo.parse_yolov10(results)
+        objs = yolo.parse_yolov9(results)
         ret = self.create_detection_result(objs, src_size, cvss)
         return ret