From beb7ec60ba2a4a7fd5fd067ba2fe5fe9da48aee7 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jan 2026 09:13:42 -0800 Subject: [PATCH] detect: pubish betas --- plugins/coreml/package-lock.json | 4 +-- plugins/coreml/package.json | 2 +- plugins/coreml/src/coreml/__init__.py | 8 +++--- plugins/coreml/src/coreml/face_recognition.py | 2 +- plugins/onnx/.vscode/settings.json | 2 +- plugins/onnx/package-lock.json | 4 +-- plugins/onnx/package.json | 2 +- plugins/onnx/src/ort/__init__.py | 26 ++++++------------- plugins/onnx/src/ort/face_recognition.py | 5 ++-- plugins/openvino/package-lock.json | 4 +-- plugins/openvino/package.json | 2 +- plugins/openvino/src/ov/__init__.py | 8 +++--- .../openvino/src/predict/face_recognize.py | 2 +- 13 files changed, 30 insertions(+), 41 deletions(-) diff --git a/plugins/coreml/package-lock.json b/plugins/coreml/package-lock.json index 07440c697..3a7305ec9 100644 --- a/plugins/coreml/package-lock.json +++ b/plugins/coreml/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/coreml", - "version": "0.1.85", + "version": "0.1.86", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/coreml", - "version": "0.1.85", + "version": "0.1.86", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/coreml/package.json b/plugins/coreml/package.json index 05e2f6463..0f3ee93de 100644 --- a/plugins/coreml/package.json +++ b/plugins/coreml/package.json @@ -50,5 +50,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.85" + "version": "0.1.86" } diff --git a/plugins/coreml/src/coreml/__init__.py b/plugins/coreml/src/coreml/__init__.py index 16ab75645..0c9fdabfd 100644 --- a/plugins/coreml/src/coreml/__init__.py +++ b/plugins/coreml/src/coreml/__init__.py @@ -29,10 +29,10 @@ predictExecutor = concurrent.futures.ThreadPoolExecutor(1, "CoreML-Predict") availableModels = [ "Default", "scrypted_yolov9t_relu_test", - "scrypted_yolov9c_relu_320", - "scrypted_yolov9m_relu_320", - "scrypted_yolov9s_relu_320", - "scrypted_yolov9t_relu_320", + "scrypted_yolov9c_relu", + "scrypted_yolov9m_relu", + "scrypted_yolov9s_relu", + "scrypted_yolov9t_relu", ] diff --git a/plugins/coreml/src/coreml/face_recognition.py b/plugins/coreml/src/coreml/face_recognition.py index 565ff9b79..e1c4dae76 100644 --- a/plugins/coreml/src/coreml/face_recognition.py +++ b/plugins/coreml/src/coreml/face_recognition.py @@ -43,7 +43,7 @@ class CoreMLFaceRecognition(FaceRecognizeDetection): for f in files: p = self.downloadFile( - f"https://github.com/koush/coreml-models/raw/main/{f}", + f"https://huggingface.co/scrypted/plugin-models/resolve/main/coreml/{f}", f"{model_version}/{f}", ) modelFile = os.path.dirname(p) diff --git a/plugins/onnx/.vscode/settings.json b/plugins/onnx/.vscode/settings.json index 33448efc3..dfb225250 100644 --- a/plugins/onnx/.vscode/settings.json +++ b/plugins/onnx/.vscode/settings.json @@ -1,4 +1,4 @@ { - "scrypted.debugHost": "koushik-ubuntu24", + "scrypted.debugHost": "scrypted-nvr", } \ No newline at end of file diff --git a/plugins/onnx/package-lock.json b/plugins/onnx/package-lock.json index f5b5e73ce..685994d49 100644 --- a/plugins/onnx/package-lock.json +++ b/plugins/onnx/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/onnx", - "version": "0.1.127", + "version": "0.1.129", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/onnx", - "version": "0.1.127", + "version": "0.1.129", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/onnx/package.json b/plugins/onnx/package.json index 92ca145d1..fb9deb85b 100644 --- a/plugins/onnx/package.json +++ b/plugins/onnx/package.json @@ -50,5 +50,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.127" + "version": "0.1.129" } diff --git a/plugins/onnx/src/ort/__init__.py b/plugins/onnx/src/ort/__init__.py index c7e953954..f9da02aa5 100644 --- a/plugins/onnx/src/ort/__init__.py +++ b/plugins/onnx/src/ort/__init__.py @@ -31,15 +31,11 @@ except: availableModels = [ "Default", - "scrypted_yolov10m_320", - "scrypted_yolov10n_320", - "scrypted_yolo_nas_s_320", - "scrypted_yolov6n_320", - "scrypted_yolov6s_320", - "scrypted_yolov9c_320", - "scrypted_yolov9s_320", - "scrypted_yolov9t_320", - "scrypted_yolov8n_320", + "scrypted_yolov9t_relu_test", + "scrypted_yolov9c_relu", + "scrypted_yolov9m_relu", + "scrypted_yolov9s_relu", + "scrypted_yolov9t_relu", ] @@ -66,7 +62,7 @@ class ONNXPlugin( if model == "Default" or model not in availableModels: if model != "Default": self.storage.setItem("model", "Default") - model = "scrypted_yolov9c_320" + model = "scrypted_yolov9c_relu" self.yolo = "yolo" in model self.scrypted_yolov10 = "scrypted_yolov10" in model self.scrypted_yolo_nas = "scrypted_yolo_nas" in model @@ -76,16 +72,10 @@ class ONNXPlugin( print(f"model {model}") - onnxmodel = ( - model - if self.scrypted_yolo_nas - else "best" if self.scrypted_model else model - ) - model_version = "v3" onnxfile = self.downloadFile( - f"https://github.com/koush/onnx-models/raw/main/{model}/{onnxmodel}.onnx", - f"{model_version}/{model}/{onnxmodel}.onnx", + f"https://huggingface.co/scrypted/plugin-models/resolve/main/onnx/{model}/{model}.onnx", + f"{model_version}/{model}/{model}.onnx", ) print(onnxfile) diff --git a/plugins/onnx/src/ort/face_recognition.py b/plugins/onnx/src/ort/face_recognition.py index 447d255ea..15f8eb005 100644 --- a/plugins/onnx/src/ort/face_recognition.py +++ b/plugins/onnx/src/ort/face_recognition.py @@ -15,11 +15,10 @@ from predict.face_recognize import FaceRecognizeDetection class ONNXFaceRecognition(FaceRecognizeDetection): def downloadModel(self, model: str): - onnxmodel = "best" if "scrypted" in model else model model_version = "v1" onnxfile = self.downloadFile( - f"https://github.com/koush/onnx-models/raw/main/{model}/{onnxmodel}.onnx", - f"{model_version}/{model}/{onnxmodel}.onnx", + f"https://huggingface.co/scrypted/plugin-models/resolve/main/onnx/{model}/{model}.onnx", + f"{model_version}/{model}/{model}.onnx", ) print(onnxfile) diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json index 0f3c52cf5..3a6e4ffc7 100644 --- a/plugins/openvino/package-lock.json +++ b/plugins/openvino/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/openvino", - "version": "0.1.190", + "version": "0.1.191", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/openvino", - "version": "0.1.190", + "version": "0.1.191", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json index 11294b395..bdd5b733c 100644 --- a/plugins/openvino/package.json +++ b/plugins/openvino/package.json @@ -50,5 +50,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.190" + "version": "0.1.191" } diff --git a/plugins/openvino/src/ov/__init__.py b/plugins/openvino/src/ov/__init__.py index 473e28bc0..03091e6a9 100644 --- a/plugins/openvino/src/ov/__init__.py +++ b/plugins/openvino/src/ov/__init__.py @@ -37,10 +37,10 @@ prepareExecutor = concurrent.futures.ThreadPoolExecutor( availableModels = [ "Default", "scrypted_yolov9t_relu_test_int8", - "scrypted_yolov9c_relu_int8_320", - "scrypted_yolov9m_relu_int8_320", - "scrypted_yolov9s_relu_int8_320", - "scrypted_yolov9t_relu_int8_320", + "scrypted_yolov9c_relu_int8", + "scrypted_yolov9m_relu_int8", + "scrypted_yolov9s_relu_int8", + "scrypted_yolov9t_relu_int8", ] diff --git a/plugins/openvino/src/predict/face_recognize.py b/plugins/openvino/src/predict/face_recognize.py index f8c9157d7..495de4e3f 100644 --- a/plugins/openvino/src/predict/face_recognize.py +++ b/plugins/openvino/src/predict/face_recognize.py @@ -35,7 +35,7 @@ class FaceRecognizeDetection(PredictPlugin): self.loop = asyncio.get_event_loop() self.minThreshold = 0.5 - self.detectModel = self.downloadModel("scrypted_yolov9t_relu_face_320") + self.detectModel = self.downloadModel("scrypted_yolov9t_relu_face") self.faceModel = self.downloadModel("inception_resnet_v1") def downloadModel(self, model: str):