@digipair/skill-tensorflow 0.25.4 → 0.25.6

package/index.cjs.js

@@ -35,20 +35,23 @@ let TensorflowService = class TensorflowService {
         return buffer;
     }
     async cocoSsd(params, _pinsSettingsList, _context) {
-        const { image } = params;
-        const model = await cocoSsdModel__namespace.load();
+        const { image, base = 'lite_mobilenet_v2', modelUrl } = params;
+        const model = await cocoSsdModel__namespace.load({
+            base,
+            modelUrl
+        });
         const imageLoaded = await this.base64ToImage(image);
         const imageData = tf__namespace.node.decodeImage(imageLoaded, 3);
         const predictions = await model.detect(imageData);
         return predictions;
     }
     async faceDetection(params, _pinsSettingsList, _context) {
-        const { image } = params;
+        const { image, runtime = 'mediapipe' } = params;
         const model = faceDetectionModel__namespace.SupportedModels.MediaPipeFaceDetector;
         const imageLoaded = await this.base64ToImage(image);
         const imageData = tf__namespace.node.decodeImage(imageLoaded, 3);
         const detectorConfig = {
-            runtime: 'mediapipe'
+            runtime
         };
         const detector = await faceDetectionModel__namespace.createDetector(model, detectorConfig);
         const faces = await detector.estimateFaces(imageData);

package/index.esm.js

@@ -9,20 +9,23 @@ let TensorflowService = class TensorflowService {
         return buffer;
     }
     async cocoSsd(params, _pinsSettingsList, _context) {
-        const { image } = params;
-        const model = await cocoSsdModel.load();
+        const { image, base = 'lite_mobilenet_v2', modelUrl } = params;
+        const model = await cocoSsdModel.load({
+            base,
+            modelUrl
+        });
         const imageLoaded = await this.base64ToImage(image);
         const imageData = tf.node.decodeImage(imageLoaded, 3);
         const predictions = await model.detect(imageData);
         return predictions;
     }
     async faceDetection(params, _pinsSettingsList, _context) {
-        const { image } = params;
+        const { image, runtime = 'mediapipe' } = params;
         const model = faceDetectionModel.SupportedModels.MediaPipeFaceDetector;
         const imageLoaded = await this.base64ToImage(image);
         const imageData = tf.node.decodeImage(imageLoaded, 3);
         const detectorConfig = {
-            runtime: 'mediapipe'
+            runtime
         };
         const detector = await faceDetectionModel.createDetector(model, detectorConfig);
         const faces = await detector.estimateFaces(imageData);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-tensorflow",
-  "version": "0.25.4",
+  "version": "0.25.6",
   "dependencies": {
     "@tensorflow-models/coco-ssd": "^2.2.3",
     "@tensorflow-models/face-detection": "^1.0.2",

package/schema.json

@@ -22,6 +22,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "base",
+            "summary": "Base",
+            "required": false,
+            "description": "Model de base (mobilenet_v1, mobilenet_v2 ou lite_mobilenet_v2)",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "x-events": []
@@ -41,6 +50,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "runtime",
+            "summary": "Environnement d'exécution",
+            "required": false,
+            "description": "Environnement d'exécution (mediapipe or tfjs)",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "x-events": []