Refactoring model configuration to allow different per brick configurations

Author: rjtokenring

models/models-list.yaml

@@ -3,13 +3,15 @@ models:
     runner: brick
     name : "Lightweight-Face-Detection"
     description: "Face bounding box detection. This model is trained on the WIDER FACE dataset and can detect faces in images."
-    model_configuration:
-      "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/lw-face-det.eim"
     model_labels: 
       - face
     bricks:
-      - arduino:object_detection
-      - arduino:video_object_detection
+      - arduino:object_detection:
+          model_configuration:
+            "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/lw-face-det.eim"
+      - arduino:video_object_detection:
+          model_configuration:
+            "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/lw-face-det.eim"
     metadata:
       source: "qualcomm-ai-hub"
       ei-gpu-mode: false
@@ -19,8 +21,6 @@ models:
     runner: brick
     name : "General purpose object detection - YoloX"
     description: "General purpose object detection model based on YoloX-Nano. This model is trained on the COCO dataset and can detect 80 different object classes."
-    model_configuration:
-      "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/yolo-x-nano.eim"
     model_labels:
       - airplane
       - apple
@@ -109,14 +109,16 @@ models:
       source-model-id: "YOLOX-Nano"
       source-model-url: "https://github.com/Megvii-BaseDetection/YOLOX"
     bricks:
-      - arduino:object_detection
-      - arduino:video_object_detection
+      - arduino:video_object_detection:
+          model_configuration:
+            "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/yolo-x-nano.eim"
+      - arduino:video_object_detection:
+          model_configuration:
+            "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/yolo-x-nano.eim"
  - mobilenet-image-classification:
     runner: brick
     name : "General purpose image classification"
     description: "General purpose image classification model based on MobileNetV2. This model is trained on the ImageNet dataset and can classify images into 1000 categories."
-    model_configuration:
-      "EI_CLASSIFICATION_MODEL": "/models/ootb/ei/mobilenet-v2-224px.eim"
     model_labels:
       - abacus
       - abaya
@@ -1077,14 +1079,16 @@ models:
       source-model-id: "MobileNetV2"
       source-model-url: "https://www.tensorflow.org/api_docs/python/tf/keras/applications/MobileNetV2"
     bricks:
-      - arduino:image_classification
-      - arduino:video_image_classification
+      - arduino:image_classification:
+          model_configuration:
+            "EI_CLASSIFICATION_MODEL": "/models/ootb/ei/mobilenet-v2-224px.eim"
+      - arduino:video_image_classification:
+          model_configuration:
+            "EI_CLASSIFICATION_MODEL": "/models/ootb/ei/mobilenet-v2-224px.eim"
  - person-classification:
     runner: brick
     name : "Person classification"
     description: "Person classification model based on WakeVision dataset. This model is trained to classify images into two categories: person and not-person."
-    model_configuration:
-      "EI_CLASSIFICATION_MODEL": "/models/ootb/ei/person-classification.eim"
     model_labels: 
       - "non person"
       - "person"
@@ -1096,28 +1100,30 @@ models:
       source-model-id: "person-classification-wakevision"
       source-model-url: "https://studio.edgeimpulse.com/public/755016/live"
     bricks:
-      - arduino:image_classification
-      - arduino:video_image_classification   
+      - arduino:image_classification:
+          model_configuration:
+            "EI_CLASSIFICATION_MODEL": "/models/ootb/ei/person-classification.eim"
+      - arduino:video_image_classification:
+          model_configuration:
+            "EI_CLASSIFICATION_MODEL": "/models/ootb/ei/person-classification.eim"   
  - concreate-crack-anomaly-detection:
     runner: brick
     name : "Concrete crack anomaly detection"
     description: "Anomaly detection model to identify cracks in concrete structures."
-    model_configuration:
-      "EI_V_ANOMALY_DETECTION_MODEL": "/models/ootb/ei/concrete-crack-anomaly-detection.eim" 
     metadata:
       source: "edgeimpulse"
       ei-project-id: 800941
       ei-model-url: "https://studio.edgeimpulse.com/public/800941/live"
       source-model-id: "concrete-crack-anomaly-detection"
       source-model-url: "https://studio.edgeimpulse.com/public/800941/live"
     bricks:
-      - arduino:visual_anomaly_detection
+      - arduino:visual_anomaly_detection:
+          model_configuration:
+            "EI_V_ANOMALY_DETECTION_MODEL": "/models/ootb/ei/concrete-crack-anomaly-detection.eim" 
  - keyword-spotting-hey-arduino:
     runner: brick
     name : "Keyword spotting - Hey Arduino!"
     description: "A keyword-spotting model to detect the 'Hey Arduino!' in audio streams."
-    model_configuration:
-      "EI_KEYWORD_SPOTTING_MODEL": "/models/ootb/ei/keyword-spotting-hey-arduino.eim"
     model_labels: 
       - "background"
       - "hey_arduino"
@@ -1131,13 +1137,13 @@ models:
       source-model-url: "https://studio.edgeimpulse.com/studio/757509/live"
       private: true
     bricks:
-      - arduino:keyword_spotter
+      - arduino:keyword_spotter:
+          model_configuration:
+            "EI_KEYWORD_SPOTTING_MODEL": "/models/ootb/ei/keyword-spotting-hey-arduino.eim"
  - updown-wave-motion-detection:
     runner: brick
     name : "Continuous motion detection"
     description: "A motion detection model designed to identify up/down, wave, and snake movements evalauting accelerometer data."
-    model_configuration:
-      "EI_MOTION_DETECTION_MODEL": "/models/ootb/ei/updown-wave-motion-detection.eim"
     model_labels:
       - idle
       - snake
@@ -1150,27 +1156,27 @@ models:
       source-model-id: "continuous-motion-detection"
       source-model-url: "https://studio.edgeimpulse.com/public/734960/live"
     bricks:
-      - arduino:motion_detection
+      - arduino:motion_detection:
+          model_configuration:
+            "EI_MOTION_DETECTION_MODEL": "/models/ootb/ei/updown-wave-motion-detection.eim"
  - fan-anomaly-detection:
     runner: brick
     name : "Fan anomaly detection"
-    description: "An anomaly detection model designed to identify anomalies in fan operation."
-    model_configuration:
-      "EI_VIBRATION_ANOMALY_DETECTION_MODEL": "/models/ootb/ei/fan-anomaly-detection.eim" 
+    description: "An anomaly detection model designed to identify anomalies in fan operation." 
     metadata:
       source: "edgeimpulse"
       ei-project-id: 774707
       ei-model-url: "https://studio.edgeimpulse.com/public/774707/live"
       source-model-id: "fan-anomaly-detection"
       source-model-url: "https://studio.edgeimpulse.com/public/774707/live"
     bricks:
-      - arduino:vibration_anomaly_detection    
+      - arduino:vibration_anomaly_detection:
+          model_configuration:
+            "EI_VIBRATION_ANOMALY_DETECTION_MODEL": "/models/ootb/ei/fan-anomaly-detection.eim"    
  - glass-breaking:
     runner: brick
     name : "Glass breaking classifier"
     description: "A glass breaking classifier model to detect glass breaking sounds in audio recordings"
-    model_configuration:
-      "EI_AUDIO_CLASSIFICATION_MODEL": "/models/ootb/ei/glass-breaking.eim"
     model_labels:
       - "Background"
       - "Glass_Breaking"
@@ -1182,4 +1188,6 @@ models:
       source-model-url: "https://studio.edgeimpulse.com/public/749446/live"
       private: true
     bricks:
-      - arduino:audio_classifier
+      - arduino:audio_classifier:
+          model_configuration:
+            "EI_AUDIO_CLASSIFICATION_MODEL": "/models/ootb/ei/glass-breaking.eim"