michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-06-20 16:40:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

predict: strip out allow list

Browse Source
This commit is contained in:
Koushik Dutta
2023-04-16 20:50:49 -07:00
parent 3863527b4d
commit 0b6ffc2b87
11 changed files with 14 additions and 18 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.10",
"version": "0.1.11",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/coreml",
"version": "0.1.10",
"version": "0.1.11",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

2
plugins/coreml/package.json
View File

@@ -41,5 +41,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.10"
"version": "0.1.11"
}

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

@@ -91,6 +91,5 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Set
))
objs.append(obj)
allowList = settings.get('allowList', None) if settings else None
ret = self.create_detection_result(objs, src_size, allowList, cvss)
ret = self.create_detection_result(objs, src_size, cvss)
return ret

4
plugins/tensorflow-lite/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/tensorflow-lite",
"version": "0.1.10",
"version": "0.1.11",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/tensorflow-lite",
"version": "0.1.10",
"version": "0.1.11",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

2
plugins/tensorflow-lite/package.json
View File

@@ -44,5 +44,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.10"
"version": "0.1.11"
}

1
plugins/tensorflow-lite/src/detect/__init__.py
View File

@@ -55,6 +55,7 @@ class DetectPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
try:
videoFrames = await scrypted_sdk.sdk.connectRPCObject(videoFrames)
async for videoFrame in videoFrames:
videoFrame = await scrypted_sdk.sdk.connectRPCObject(videoFrame)
detected = await self.run_detection_videoframe(videoFrame, session)
yield {
'__json_copy_serialize_children': True,

4
plugins/tensorflow-lite/src/predict/__init__.py
View File

@@ -149,7 +149,7 @@ class PredictPlugin(DetectPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Set
def getModelSettings(self, settings: Any = None) -> list[Setting]:
return []
def create_detection_result(self, objs: List[Prediction], size, allowList, convert_to_src_size=None) -> ObjectsDetected:
def create_detection_result(self, objs: List[Prediction], size, convert_to_src_size=None) -> ObjectsDetected:
detections: List[ObjectDetectionResult] = []
detection_result: ObjectsDetected = {}
detection_result['detections'] = detections
@@ -157,8 +157,6 @@ class PredictPlugin(DetectPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Set
for obj in objs:
className = self.labels.get(obj.id, obj.id)
if allowList and len(allowList) and className not in allowList:
continue
detection: ObjectDetectionResult = {}
detection['boundingBox'] = (
obj.bbox.xmin, obj.bbox.ymin, obj.bbox.xmax - obj.bbox.xmin, obj.bbox.ymax - obj.bbox.ymin)

3
plugins/tensorflow-lite/src/tflite/__init__.py
View File

@@ -133,6 +133,5 @@ class TensorFlowLitePlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted
objs = await asyncio.get_event_loop().run_in_executor(self.executor, predict)
allowList = settings.get('allowList', None) if settings else None
ret = self.create_detection_result(objs, src_size, allowList, cvss)
ret = self.create_detection_result(objs, src_size, cvss)
return ret

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

@@ -1,12 +1,12 @@
{
"name": "@scrypted/tensorflow-lite",
"version": "0.1.10",
"version": "0.1.11",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/tensorflow-lite",
"version": "0.1.10",
"version": "0.1.11",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

2
plugins/tensorflow/package.json
View File

@@ -41,5 +41,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.1.10"
"version": "0.1.11"
}

3
plugins/tensorflow/src/tf/__init__.py
View File

@@ -86,6 +86,5 @@ class TensorFlowPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk
))
objs.append(obj)
allowList = settings.get('allowList', None) if settings else None
ret = self.create_detection_result(objs, src_size, allowList, cvss)
ret = self.create_detection_result(objs, src_size, cvss)
return ret