michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-02-03 14:13:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

detect: pubish betas

Browse Source
This commit is contained in:
Koushik Dutta
2026-01-08 09:13:42 -08:00
parent 126c96904b
commit beb7ec60ba
13 changed files with 30 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/coreml/package-lock.json generated
View File

@@ -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"
}

2
plugins/coreml/package.json
View File

@@ -50,5 +50,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.85"
"version": "0.1.86"
}

8
plugins/coreml/src/coreml/__init__.py
View File

@@ -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",
]

2
plugins/coreml/src/coreml/face_recognition.py
View File

@@ -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)

2
plugins/onnx/.vscode/settings.json vendored
View File

@@ -1,4 +1,4 @@
{
"scrypted.debugHost": "koushik-ubuntu24",
"scrypted.debugHost": "scrypted-nvr",
}

4
plugins/onnx/package-lock.json generated
View File

@@ -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"
}

2
plugins/onnx/package.json
View File

@@ -50,5 +50,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.127"
"version": "0.1.129"
}

26
plugins/onnx/src/ort/__init__.py
View File

@@ -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)

5
plugins/onnx/src/ort/face_recognition.py
View File

@@ -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)

4
plugins/openvino/package-lock.json generated
View File

@@ -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"
}

2
plugins/openvino/package.json
View File

@@ -50,5 +50,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.190"
"version": "0.1.191"
}

8
plugins/openvino/src/ov/__init__.py
View File

@@ -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",
]

2
plugins/openvino/src/predict/face_recognize.py
View File

@@ -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):