From 608f82cf8122c72f60bc9e37bc506e1e2a9726d5 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Tue, 6 Aug 2024 13:33:22 -0700 Subject: [PATCH] detect: proper model name --- plugins/coreml/package-lock.json | 4 ++-- plugins/coreml/package.json | 2 +- plugins/coreml/src/coreml/__init__.py | 1 + plugins/onnx/package-lock.json | 4 ++-- plugins/onnx/package.json | 2 +- plugins/onnx/src/ort/__init__.py | 1 + plugins/openvino/package-lock.json | 4 ++-- plugins/openvino/package.json | 2 +- plugins/openvino/src/detect/__init__.py | 3 ++- plugins/openvino/src/ov/__init__.py | 1 + plugins/tensorflow-lite/package-lock.json | 4 ++-- plugins/tensorflow-lite/package.json | 2 +- plugins/tensorflow-lite/src/tflite/__init__.py | 1 + 13 files changed, 18 insertions(+), 13 deletions(-) diff --git a/plugins/coreml/package-lock.json b/plugins/coreml/package-lock.json index 2b699f196..0e52fffa7 100644 --- a/plugins/coreml/package-lock.json +++ b/plugins/coreml/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/coreml", - "version": "0.1.69", + "version": "0.1.70", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/coreml", - "version": "0.1.69", + "version": "0.1.70", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/coreml/package.json b/plugins/coreml/package.json index 1e19fc763..87dcb4964 100644 --- a/plugins/coreml/package.json +++ b/plugins/coreml/package.json @@ -42,5 +42,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.69" + "version": "0.1.70" } diff --git a/plugins/coreml/src/coreml/__init__.py b/plugins/coreml/src/coreml/__init__.py index 885a4fef9..e21924b6d 100644 --- a/plugins/coreml/src/coreml/__init__.py +++ b/plugins/coreml/src/coreml/__init__.py @@ -85,6 +85,7 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.Settings, scrypted_sdk.DeviceProv self.scrypted_model = "scrypted" in model model_version = "v8" mlmodel = "model" if self.scrypted_yolo else model + self.modelName = model print(f"model: {model}") diff --git a/plugins/onnx/package-lock.json b/plugins/onnx/package-lock.json index 2b33f830a..bd679f04a 100644 --- a/plugins/onnx/package-lock.json +++ b/plugins/onnx/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/onnx", - "version": "0.1.104", + "version": "0.1.105", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/onnx", - "version": "0.1.104", + "version": "0.1.105", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/onnx/package.json b/plugins/onnx/package.json index 5ba253386..e1a381a33 100644 --- a/plugins/onnx/package.json +++ b/plugins/onnx/package.json @@ -42,5 +42,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.104" + "version": "0.1.105" } diff --git a/plugins/onnx/src/ort/__init__.py b/plugins/onnx/src/ort/__init__.py index b40fe77cf..b1b9d341f 100644 --- a/plugins/onnx/src/ort/__init__.py +++ b/plugins/onnx/src/ort/__init__.py @@ -63,6 +63,7 @@ class ONNXPlugin( self.scrypted_yolo_nas = "scrypted_yolo_nas" in model self.scrypted_yolo = "scrypted_yolo" in model self.scrypted_model = "scrypted" in model + self.modelName = model print(f"model {model}") diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json index 39754c310..685952fa5 100644 --- a/plugins/openvino/package-lock.json +++ b/plugins/openvino/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/openvino", - "version": "0.1.108", + "version": "0.1.109", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/openvino", - "version": "0.1.108", + "version": "0.1.109", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json index 4a82243f2..cdecd665a 100644 --- a/plugins/openvino/package.json +++ b/plugins/openvino/package.json @@ -42,5 +42,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.108" + "version": "0.1.109" } diff --git a/plugins/openvino/src/detect/__init__.py b/plugins/openvino/src/detect/__init__.py index 2cefd0763..9c1c4d086 100644 --- a/plugins/openvino/src/detect/__init__.py +++ b/plugins/openvino/src/detect/__init__.py @@ -14,6 +14,7 @@ class DetectPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection): def __init__(self, nativeId: str | None = None): super().__init__(nativeId=nativeId) self.loop = asyncio.get_event_loop() + self.modelName = self.pluginId def getClasses(self) -> list[str]: pass @@ -32,7 +33,7 @@ class DetectPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection): async def getDetectionModel(self, settings: Any = None) -> ObjectDetectionModel: d: ObjectDetectionModel = { - 'name': self.pluginId, + 'name': self.modelName, 'classes': self.getClasses(), 'triggerClasses': self.getTriggerClasses(), 'inputSize': self.get_input_details(), diff --git a/plugins/openvino/src/ov/__init__.py b/plugins/openvino/src/ov/__init__.py index 6b809f194..021bfeef7 100644 --- a/plugins/openvino/src/ov/__init__.py +++ b/plugins/openvino/src/ov/__init__.py @@ -149,6 +149,7 @@ class OpenVINOPlugin( self.scrypted_yolo = "scrypted_yolo" in model self.scrypted_model = "scrypted" in model self.sigmoid = model == "yolo-v4-tiny-tf" + self.modelName = model print(f"model/mode/precision: {model}/{mode}/{precision}") diff --git a/plugins/tensorflow-lite/package-lock.json b/plugins/tensorflow-lite/package-lock.json index 13cf93b5b..7423b61b9 100644 --- a/plugins/tensorflow-lite/package-lock.json +++ b/plugins/tensorflow-lite/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/tensorflow-lite", - "version": "0.1.62", + "version": "0.1.63", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/tensorflow-lite", - "version": "0.1.62", + "version": "0.1.63", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/tensorflow-lite/package.json b/plugins/tensorflow-lite/package.json index 2834078e3..160e62f84 100644 --- a/plugins/tensorflow-lite/package.json +++ b/plugins/tensorflow-lite/package.json @@ -53,5 +53,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.62" + "version": "0.1.63" } diff --git a/plugins/tensorflow-lite/src/tflite/__init__.py b/plugins/tensorflow-lite/src/tflite/__init__.py index 278b80aa4..24b65d937 100644 --- a/plugins/tensorflow-lite/src/tflite/__init__.py +++ b/plugins/tensorflow-lite/src/tflite/__init__.py @@ -100,6 +100,7 @@ class TensorFlowLitePlugin( self.yolo = "yolo" in model self.yolov9 = "yolov9" in model self.scrypted_model = "scrypted" in model + self.modelName = model print(f"model: {model}")