openvino: regenerate models

koush · Nov 18, 2024 · 75b2ff2 · 75b2ff2
1 parent 8622934
commit 75b2ff2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 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
@@ -48,5 +48,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.129"
+   "version": "0.1.130"
 }
diff --git a/plugins/openvino/src/ov/__init__.py b/plugins/openvino/src/ov/__init__.py
@@ -38,6 +38,7 @@
     "scrypted_yolov6n_320",
     "scrypted_yolov6s_320",
     "scrypted_yolov9c_320",
+    "scrypted_yolov9m_320",
     "scrypted_yolov9s_320",
     "scrypted_yolov9t_320",
     "scrypted_yolov8n_320",
@@ -163,6 +164,7 @@ def __init__(self, nativeId: str | None = None):
             else:
                 model = "scrypted_yolov9t_320"
         self.yolo = "yolo" in model
+        self.scrypted_yolov9 = "scrypted_yolov9" in model
         self.scrypted_yolov10 = "scrypted_yolov10" in model
         self.scrypted_yolo_nas = "scrypted_yolo_nas" in model
         self.scrypted_yolo = "scrypted_yolo" in model
@@ -171,9 +173,9 @@ def __init__(self, nativeId: str | None = None):
         self.sigmoid = model == "yolo-v4-tiny-tf"
         self.modelName = model
 
-        ovmodel = "best" if self.scrypted_model else model
+        ovmodel = "best-converted" if self.scrypted_yolov9 else "best" if self.scrypted_model else model
 
-        model_version = "v5"
+        model_version = "v7"
         xmlFile = self.downloadFile(
             f"https://github.com/koush/openvino-models/raw/main/{model}/{precision}/{ovmodel}.xml",
             f"{model_version}/{model}/{precision}/{ovmodel}.xml",

diff --git a/plugins/openvino/src/ov/face_recognition.py b/plugins/openvino/src/ov/face_recognition.py
@@ -22,9 +22,10 @@ def __init__(self, plugin, nativeId: str | None = None):
         super().__init__(nativeId=nativeId)
 
     def downloadModel(self, model: str):
-        ovmodel = "best"
+        scrypted_yolov9 = "scrypted_yolov9" in model
+        ovmodel = "best-converted" if scrypted_yolov9 else "best"
         precision = self.plugin.precision
-        model_version = "v5"
+        model_version = "v7"
         xmlFile = self.downloadFile(
             f"https://github.com/koush/openvino-models/raw/main/{model}/{precision}/{ovmodel}.xml",
             f"{model_version}/{model}/{precision}/{ovmodel}.xml",