predict: update models

plugins/coreml/package.json

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

plugins/onnx/src/ort/__init__.py

@@ -55,7 +55,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_yolov8n_320"
+            model = "scrypted_yolov10m_320"
         self.yolo = "yolo" in model
         self.scrypted_yolov10 = "scrypted_yolov10" in model
         self.scrypted_yolo_nas = "scrypted_yolo_nas" in model
@@ -68,7 +68,7 @@ def __init__(self, nativeId: str | None = None):
 
         model_version = "v2"
         onnxfile = self.downloadFile(
-            f"https://raw.githubusercontent.com/koush/onnx-models/main/{model}/{onnxmodel}.onnx",
+            f"https://github.com/koush/onnx-models/raw/main/{model}/{onnxmodel}.onnx",
             f"{model_version}/{model}/{onnxmodel}.onnx",
         )
 

plugins/onnx/src/ort/face_recognition.py

@@ -23,7 +23,7 @@ def downloadModel(self, model: str):
         onnxmodel = "best" if "scrypted" in model else model
         model_version = "v1"
         onnxfile = self.downloadFile(
-            f"https://raw.githubusercontent.com/koush/onnx-models/main/{model}/{onnxmodel}.onnx",
+            f"https://github.com/koush/onnx-models/raw/main/{model}/{onnxmodel}.onnx",
             f"{model_version}/{model}/{onnxmodel}.onnx",
         )
         print(onnxfile)

plugins/onnx/src/ort/text_recognition.py

@@ -23,7 +23,7 @@ def downloadModel(self, model: str):
         onnxmodel = model
         model_version = "v3"
         onnxfile = self.downloadFile(
-            f"https://raw.githubusercontent.com/koush/onnx-models/main/{model}/{onnxmodel}.onnx",
+            f"https://github.com/koush/onnx-models/raw/main/{model}/{onnxmodel}.onnx",
             f"{model_version}/{model}/{onnxmodel}.onnx",
         )
         print(onnxfile)

plugins/openvino/package.json

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

plugins/openvino/src/ov/__init__.py

@@ -31,6 +31,7 @@
 availableModels = [
     "Default",
     "scrypted_yolov10m_320",
+    "scrypted_yolov10s_320",
     "scrypted_yolov10n_320",
     "scrypted_yolo_nas_s_320",
     "scrypted_yolov6n_320",
@@ -134,7 +135,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_yolov8n_320"
+            model = "scrypted_yolov10n_320"
         self.yolo = "yolo" in model
         self.scrypted_yolov10 = "scrypted_yolov10" in model
         self.scrypted_yolo_nas = "scrypted_yolo_nas" in model
@@ -148,31 +149,31 @@ def __init__(self, nativeId: str | None = None):
 
         model_version = "v5"
         xmlFile = self.downloadFile(
-            f"https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{ovmodel}.xml",
+            f"https://github.com/koush/openvino-models/raw/main/{model}/{precision}/{ovmodel}.xml",
             f"{model_version}/{model}/{precision}/{ovmodel}.xml",
         )
         binFile = self.downloadFile(
-            f"https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{ovmodel}.bin",
+            f"https://github.com/koush/openvino-models/raw/main/{model}/{precision}/{ovmodel}.bin",
             f"{model_version}/{model}/{precision}/{ovmodel}.bin",
         )
         if self.scrypted_yolo_nas:
             labelsFile = self.downloadFile(
-                "https://raw.githubusercontent.com/koush/openvino-models/main/scrypted_nas_labels.txt",
+                "https://github.com/koush/openvino-models/raw/main/scrypted_nas_labels.txt",
                 "scrypted_nas_labels.txt",
             )
         elif self.scrypted_model:
             labelsFile = self.downloadFile(
-                "https://raw.githubusercontent.com/koush/openvino-models/main/scrypted_labels.txt",
+                "https://github.com/koush/openvino-models/raw/main/scrypted_labels.txt",
                 "scrypted_labels.txt",
             )
         elif self.yolo:
             labelsFile = self.downloadFile(
-                "https://raw.githubusercontent.com/koush/openvino-models/main/coco_80cl.txt",
+                "https://github.com/koush/openvino-models/raw/main/coco_80cl.txt",
                 "coco_80cl.txt",
             )
         else:
             labelsFile = self.downloadFile(
-                "https://raw.githubusercontent.com/koush/openvino-models/main/coco_labels.txt",
+                "https://github.com/koush/openvino-models/raw/main/coco_labels.txt",
                 "coco_labels.txt",
             )
 

plugins/openvino/src/ov/face_recognition.py

@@ -26,11 +26,11 @@ def downloadModel(self, model: str):
         precision = self.plugin.precision
         model_version = "v5"
         xmlFile = self.downloadFile(
-            f"https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{ovmodel}.xml",
+            f"https://github.com/koush/openvino-models/raw/main/{model}/{precision}/{ovmodel}.xml",
             f"{model_version}/{model}/{precision}/{ovmodel}.xml",
         )
         binFile = self.downloadFile(
-            f"https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{ovmodel}.bin",
+            f"https://github.com/koush/openvino-models/raw/main/{model}/{precision}/{ovmodel}.bin",
             f"{model_version}/{model}/{precision}/{ovmodel}.bin",
         )
         print(xmlFile, binFile)

plugins/openvino/src/ov/text_recognition.py

@@ -25,11 +25,11 @@ def downloadModel(self, model: str):
         precision = self.plugin.precision
         model_version = "v5"
         xmlFile = self.downloadFile(
-            f"https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{ovmodel}.xml",
+            f"https://github.com/koush/openvino-models/raw/main/{model}/{precision}/{ovmodel}.xml",
             f"{model_version}/{model}/{precision}/{ovmodel}.xml",
         )
         binFile = self.downloadFile(
-            f"https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{ovmodel}.bin",
+            f"https://github.com/koush/openvino-models/raw/main/{model}/{precision}/{ovmodel}.bin",
             f"{model_version}/{model}/{precision}/{ovmodel}.bin",
         )
         print(xmlFile, binFile)

plugins/tensorflow-lite/src/predict/face_recognize.py

@@ -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_yolov9c_flt")
+        self.detectModel = self.downloadModel("scrypted_yolov10m_face")
         self.faceModel = self.downloadModel("inception_resnet_v1")
 
     def downloadModel(self, model: str):
@@ -49,7 +49,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_yolov9(results)
+        objs = yolo.parse_yolov10(results)
         ret = self.create_detection_result(objs, src_size, cvss)
         return ret