From f4dcb8e662cda038ac5486399e4f5580ad794269 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 29 Mar 2024 23:16:23 -0700
Subject: [PATCH] openvino: publish new models

---
 plugins/openvino/package-lock.json  |  4 ++--
 plugins/openvino/package.json       |  2 +-
 plugins/openvino/src/ov/__init__.py | 16 +++++++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json
index 040aa88da9..23d817694d 100644
--- a/plugins/openvino/package-lock.json
+++ b/plugins/openvino/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/openvino",
-   "version": "0.1.54",
+   "version": "0.1.55",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/openvino",
-         "version": "0.1.54",
+         "version": "0.1.55",
          "devDependencies": {
             "@scrypted/sdk": "file:../../sdk"
          }
diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json
index 6fbbacda31..d6dd2ee653 100644
--- a/plugins/openvino/package.json
+++ b/plugins/openvino/package.json
@@ -41,5 +41,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.54"
+   "version": "0.1.55"
 }
diff --git a/plugins/openvino/src/ov/__init__.py b/plugins/openvino/src/ov/__init__.py
index bdf8b72ed8..f7a41d8c8e 100644
--- a/plugins/openvino/src/ov/__init__.py
+++ b/plugins/openvino/src/ov/__init__.py
@@ -79,14 +79,19 @@ def __init__(self, nativeId: str | None = None):
         self.yolo = 'yolo' in model
         self.yolov8 = "yolov8" in model
         self.yolov9 = "yolov9" in model
+        self.scrypted_model = "scrypted" in model
         self.sigmoid = model == 'yolo-v4-tiny-tf'
 
         print(f'model/mode/precision: {model}/{mode}/{precision}')
 
+        ovmodel = 'best' if self.scrypted_model else model
+
         model_version = 'v4'
-        xmlFile = self.downloadFile(f'https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{model}.xml', f'{model_version}/{precision}/{model}.xml')
-        binFile = self.downloadFile(f'https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{model}.bin', f'{model_version}/{precision}/{model}.bin')
-        if self.yolo:
+        xmlFile = self.downloadFile(f'https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{ovmodel}.xml', f'{model_version}/{precision}/{ovmodel}.xml')
+        binFile = self.downloadFile(f'https://raw.githubusercontent.com/koush/openvino-models/main/{model}/{precision}/{ovmodel}.bin', f'{model_version}/{precision}/{ovmodel}.bin')
+        if self.scrypted_model:
+            labelsFile = self.downloadFile('https://raw.githubusercontent.com/koush/openvino-models/main/scrypted_labels.txt', 'scrypted_labels.txt')
+        elif self.yolo:
             labelsFile = self.downloadFile('https://raw.githubusercontent.com/koush/openvino-models/main/coco_80cl.txt', 'coco_80cl.txt')
         else:
             labelsFile = self.downloadFile('https://raw.githubusercontent.com/koush/openvino-models/main/coco_labels.txt', 'coco_labels.txt')
@@ -132,13 +137,14 @@ async def getSettings(self) -> list[Setting]:
                 'description': 'The detection model used to find objects.',
                 'choices': [
                     'Default',
+                    'scrypted_yolov8n_320',
+                    'yolov8n_320',
+                    'yolov9c_320',
                     'ssd_mobilenet_v1_coco',
                     'ssdlite_mobilenet_v2',
                     'yolo-v3-tiny-tf',
                     'yolo-v4-tiny-tf',
                     'yolov8n',
-                    'yolov8n_320',
-                    'yolov9c_320',
                 ],
                 'value': model,
             },