coreml: move vision framework into coreml

plugins/coreml/package.json

@@ -34,12 +34,13 @@
       "type": "API",
       "interfaces": [
          "Settings",
+         "DeviceProvider",
          "ObjectDetection",
          "ObjectDetectionPreview"
       ]
    },
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.30"
+   "version": "0.1.31"
 }

plugins/coreml/src/coreml/__init__.py

@@ -44,7 +44,7 @@ def parse_labels(userDefined):
         raise Exception("no classes found in model metadata")
     return parse_label_contents(classes)
 
-class CoreMLPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Settings):
+class CoreMLPlugin(PredictPlugin, scrypted_sdk.Settings, scrypted_sdk.DeviceProvider):
     def __init__(self, nativeId: str | None = None):
         super().__init__(nativeId=nativeId)
 
@@ -107,6 +107,32 @@ def __init__(self, nativeId: str | None = None):
         self.loop = asyncio.get_event_loop()
         self.minThreshold = 0.2
 
+        asyncio.ensure_future(self.prepareVisionFramework(), loop = self.loop)
+
+    async def prepareVisionFramework(self):
+        try:
+            from vision import VisionPlugin
+            if not VisionPlugin:
+                raise Exception("no vision plugin")
+            await scrypted_sdk.deviceManager.onDevicesChanged({
+                "devices": [
+                    {
+                        "nativeId": "vision",
+                        "type": scrypted_sdk.ScryptedDeviceType.Builtin.value,
+                        "interfaces": [
+                            scrypted_sdk.ScryptedInterface.ObjectDetection.value,
+                        ],
+                        "name": "Vision Framework",
+                    }
+                ]
+            })
+        except:
+            pass
+
+    async def getDevice(self, nativeId: str) -> Any:
+        from vision import VisionPlugin
+        return VisionPlugin(nativeId)
+
     async def getSettings(self) -> list[Setting]:
         model = self.storage.getItem("model") or "Default"
         return [

plugins/coreml/src/requirements.optional.txt

@@ -0,0 +1 @@
+pyobjc

plugins/coreml/src/requirements.txt

@@ -1,6 +1,2 @@
-#
 coremltools==7.1
-
-# pillow for anything not intel linux, pillow-simd is available on x64 linux
-Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64'
-pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64'
+Pillow>=5.4.1

plugins/vision-framework/src/vision/__init__.py → plugins/coreml/src/vision/__init__.py

@@ -2,23 +2,21 @@
 
 import asyncio
 import concurrent.futures
-import os
 from typing import Any, Tuple
 
+import Quartz
 import scrypted_sdk
+from Foundation import NSData, NSMakeSize
 from PIL import Image
 from scrypted_sdk import Setting, SettingValue
 
 import Vision
-import Quartz
-from Foundation import NSData, NSMakeSize
-
 from predict import Prediction, PredictPlugin, from_bounding_box
 
 predictExecutor = concurrent.futures.ThreadPoolExecutor(8, "Vision-Predict")
 
 
-class VisionPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Settings):
+class VisionPlugin(PredictPlugin):
     def __init__(self, nativeId: str | None = None):
         super().__init__(nativeId=nativeId)
 

plugins/tensorflow-lite/src/predict/__init__.py

@@ -68,7 +68,7 @@ def __init__(self, id: int, score: float, bbox: Tuple[float, float, float, float
         self.score = score
         self.bbox = bbox
 
-class PredictPlugin(DetectPlugin, scrypted_sdk.BufferConverter):
+class PredictPlugin(DetectPlugin):
     labels: dict
 
     def __init__(self, nativeId: str | None = None):