octo-technology · Arthemide · Dec 24, 2024 · Dec 26, 2024 · Dec 27, 2024 · Dec 27, 2024
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ vio-edge-up:
 
 .PHONY: vio-up ## 🐳 Start all edge services (db, model_serving, orchestrator, interface) and hubs (monitoring, monitoring_db, labelizer)
 vio-up:
-	BUILDOS=${BUILDOS} docker compose --profile hub --profile edge up -d --build
+	BUILDOS=${BUILDOS} docker compose --profile hub --profile edge up -d
 
 .PHONY: vio-down ## ❌ Stop all services (model_serving, edge_orchestrator, ui)
 vio-down:

diff --git a/deployment/edge/ansible/deploy_vio_on_edge.yml b/deployment/edge/ansible/deploy_vio_on_edge.yml
@@ -6,7 +6,7 @@
         repo: https://github.com/octo-technology/VIO.git
         dest: "{{ REMOTE_VIO_DIR }}"
         single_branch: yes
-        version: main
+        version: demo-grosse-conf
         force: true
 
     - name: Remove config folder

diff --git a/deployment/edge/ansible/files/docker-compose.template.yml b/deployment/edge/ansible/files/docker-compose.template.yml
@@ -30,7 +30,7 @@ services:
       SERVING_MODEL_URL: http://edge_model_serving:8501
       GOOGLE_APPLICATION_CREDENTIALS: /edge_orchestrator/config/secrets/credentials.json
       BUCKET_NAME: tf-vio-bucket
-      ACTIVE_CONFIG_NAME: marker_classification_with_1_fake_camera
+      ACTIVE_CONFIG_NAME: duck_detection_gcp_with_2_usbcamera
 
   edge_interface:
     container_name: edge_interface

diff --git a/deployment/edge/ansible/inventory.ini b/deployment/edge/ansible/inventory.ini
@@ -1,16 +1,16 @@
 [edge_1]
-10.103.252.192 ansible_user=devkit ansible_password=devkit
+172.23.26.98 ansible_user=octo ansible_password=devkit
 
 [edge_1:vars]
 EDGE_NAME="edge1"
-IP_ADDRESS="10.103.252.192"
+IP_ADDRESS="172.23.26.98"
 
 [edge_2]
-10.103.253.2 ansible_user=devkit ansible_password=devkit
+172.23.26.10 ansible_user=devkit ansible_password=devkit
 
 [edge_2:vars]
 EDGE_NAME="edge2"
-IP_ADDRESS="10.103.253.2"
+IP_ADDRESS="172.23.26.10"
 
 ; [localhost]
 ; 127.0.0.1
@@ -21,6 +21,6 @@ IP_ADDRESS="10.103.253.2"
 
 [all:vars]
 LOCAL_VIO_DIR={{ lookup('env', 'LOCAL_VIO_DIR') }}
-REMOTE_VIO_DIR="/home/devkit/vio"
+REMOTE_VIO_DIR="/home/{{ ansible_user }}/vio"
 GCP_VIO_BUCKET="tf-vio-bucket"
 GCP_VIO_PROJECT="acn-gcp-octo-sas"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,10 +23,10 @@ services:
       EDGE_ORCHESTRATOR_URL: http://edge_orchestrator:8000
     profiles: [hub]
 
-  edge_interface:
-    extends:
-      file: edge_interface/edge_interface.yml
-      service: edge_interface
+  # edge_interface:
+  #   extends:
+  #     file: edge_interface/edge_interface.yml
+  #     service: edge_interface
 
   hub_streamlit:
     container_name: hub_streamlit

diff --git a/edge_model_serving/models/tflite/duck_detection/best_float32.tflite b/edge_model_serving/models/tflite/duck_detection/best_float32.tflite
diff --git a/edge_model_serving/models/tflite/duck_detection/labels.txt b/edge_model_serving/models/tflite/duck_detection/labels.txt
@@ -0,0 +1,2 @@
+0 K0
+1 OK
diff --git a/edge_model_serving/tflite_serving/Dockerfile b/edge_model_serving/tflite_serving/Dockerfile
@@ -1,4 +1,4 @@
 FROM --platform=$TARGETPLATFORM python:3.10-slim AS builder
 ARG TARGETPLATFORM
 ARG BUILDOS

@@ -25,7 +25,7 @@
 COPY tflite_serving/pyproject.toml ./
 COPY tflite_serving/src/ ./src
 COPY tflite_serving/pip.conf /opt/venv/pip.conf
-COPY models/tflite/ $MODELS_PATH/tflite/
+# COPY models/tflite/ $MODELS_PATH/tflite/
 
 RUN pip install --no-cache-dir .
 

diff --git a/edge_model_serving/tflite_serving/tests/test_tflite_serving.py b/edge_model_serving/tflite_serving/tests/test_tflite_serving.py
@@ -27,10 +27,11 @@ def test_get_home_should_return_link_to_docs(self):
         assert actual_response.status_code == 200
         assert actual_response.json() == expected_message
 
-    def test_get_models_should_return_4_models(self):
+    def test_get_models_should_return_6_models(self):
         # Given
         model_url = f"{self.base_url}/models"
         expected_models = [
+            "duck_detection",
             "marker_quality_control",
             "mobilenet_ssd_v2_coco",
             "mobilenet_ssd_v2_face",

diff --git a/edge_orchestrator/Dockerfile b/edge_orchestrator/Dockerfile
@@ -48,7 +48,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools
 
 COPY pip.conf /opt/venv/pip.conf
 COPY pyproject.toml ./
-COPY config ./config
+# COPY config ./config
 COPY fake_images ./fake_images
 COPY model_labels ./model_labels
 COPY src/ ./src

diff --git a/...config/data_gathering_with_1_usb_cam.json → edge_orchestrator/config/data_gathering.json b/...config/data_gathering_with_1_usb_cam.json → edge_orchestrator/config/data_gathering.json
@@ -1,5 +1,5 @@
 {
-    "station_name": "data_gathering_with_1_usb_cam",
+    "station_name": "data_gathering",
     "camera_configs": {
         "camera_1": {
             "camera_id": "camera_1",

diff --git a/edge_orchestrator/config/duck_detection_gcp_with_2_usbcamera.json b/edge_orchestrator/config/duck_detection_gcp_with_2_usbcamera.json
@@ -0,0 +1,77 @@
+{
+    "station_name": "duck_detection_gcp_with_2_usbcamera",
+    "camera_configs": {
+        "camera_1": {
+            "camera_id": "camera_1",
+            "camera_type": "usb",
+            "source_directory": "/dev/video0",
+            "position": "front",
+            "model_forwarder_config": {
+                "model_name": "duck_detection",
+                "model_type": "classification",
+                "expected_image_resolution": {
+                    "width": 224,
+                    "height": 224
+                },
+                "model_version": "1",
+                "class_names": [
+                    "KO",
+                    "OK"
+                ],
+                "model_serving_url": "http://edge_model_serving:8501/",
+                "recreate_me": false
+            },
+            "camera_rule_config": {
+                "camera_rule_type": "expected_label_rule",
+                "expected_class": "OK",
+                "recreate_me": false
+            },
+            "recreate_me": false
+        },
+        "camera_2": {
+            "camera_id": "camera_2",
+            "camera_type": "usb",
+            "source_directory": "/dev/video2",
+            "position": "front",
+            "camera_resolution": {
+                "width": 1366,
+                "height": 768
+            },
+            "model_forwarder_config": {
+                "model_name": "duck_detection",
+                "model_type": "classification",
+                "expected_image_resolution": {
+                    "width": 224,
+                    "height": 224
+                },
+                "model_version": "1",
+                "class_names": [
+                    "KO",
+                    "OK"
+                ],
+                "model_serving_url": "http://edge_model_serving:8501/",
+                "recreate_me": false
+            },
+            "camera_rule_config": {
+                "camera_rule_type": "expected_label_rule",
+                "expected_class": "OK",
+                "recreate_me": false
+            },
+            "recreate_me": false
+        }
+    },
+    "binary_storage_config": {
+        "storage_type": "gcp",
+        "bucket_name": "tf-vio-bucket"
+    },
+    "metadata_storage_config": {
+        "storage_type": "gcp",
+        "bucket_name": "tf-vio-bucket"
+    },
+    "item_rule_config": {
+        "item_rule_type": "min_threshold_ratio_rule",
+        "expected_decision": "OK",
+        "threshold": 1,
+        "recreate_me": false
+    }
+}
diff --git a/...onfig/marker_classif_with_2_fake_cam.json → ...ck_detection_local_with_2_fakecamera.json b/...onfig/marker_classif_with_2_fake_cam.json → ...ck_detection_local_with_2_fakecamera.json
@@ -1,53 +1,63 @@
 {
-    "station_name": "marker_classif_with_2_fake_cam",
+    "station_name": "duck_detection_local_with_2_fakecamera",
     "camera_configs": {
         "camera_1": {
             "camera_id": "camera_1",
             "camera_type": "fake",
-            "source_directory": "fake_images/marker_images",
+            "source_directory": "fake_images/ducks",
             "position": "front",
             "model_forwarder_config": {
-                "model_name": "marker_quality_control",
+                "model_name": "duck_detection",
                 "model_type": "classification",
-                "model_serving_url": "http://edge_model_serving:8501/",
                 "expected_image_resolution": {
                     "width": 224,
                     "height": 224
                 },
                 "model_version": "1",
                 "class_names": [
-                    "OK",
-                    "KO"
-                ]
+                    "KO",
+                    "OK"
+                ],
+                "model_serving_url": "http://edge_model_serving:8501/",
+                "recreate_me": false
             },
             "camera_rule_config": {
                 "camera_rule_type": "expected_label_rule",
-                "expected_class": "OK"
-            }
+                "expected_class": "OK",
+                "recreate_me": false
+            },
+            "recreate_me": false
         },
         "camera_2": {
-            "camera_id": "camera_2",
+            "camera_id": "camera_1",
             "camera_type": "fake",
-            "source_directory": "fake_images/marker_images",
-            "position": "back",
+            "source_directory": "fake_images/ducks",
+            "position": "front",
+            "camera_resolution": {
+                "width": 1366,
+                "height": 768
+            },
             "model_forwarder_config": {
-                "model_name": "marker_quality_control",
+                "model_name": "duck_detection",
                 "model_type": "classification",
-                "model_serving_url": "http://edge_model_serving:8501/",
                 "expected_image_resolution": {
                     "width": 224,
                     "height": 224
                 },
                 "model_version": "1",
                 "class_names": [
-                    "OK",
-                    "KO"
-                ]
+                    "KO",
+                    "OK"
+                ],
+                "model_serving_url": "http://edge_model_serving:8501/",
+                "recreate_me": false
             },
             "camera_rule_config": {
                 "camera_rule_type": "expected_label_rule",
-                "expected_class": "OK"
-            }
+                "expected_class": "OK",
+                "recreate_me": false
+            },
+            "recreate_me": false
         }
     },
     "binary_storage_config": {
@@ -61,6 +71,7 @@
     "item_rule_config": {
         "item_rule_type": "min_threshold_ratio_rule",
         "expected_decision": "OK",
-        "threshold": 1
+        "threshold": 1,
+        "recreate_me": false
     }
-}
+}
diff --git a/.../config/pin_detection_with_2_usb_cam.json → ...uck_detection_local_with_2_usbcamera.json b/.../config/pin_detection_with_2_usb_cam.json → ...uck_detection_local_with_2_usbcamera.json
@@ -1,53 +1,63 @@
 {
-    "station_name": "pin_detection_with_2_usb_cam",
+    "station_name": "duck_detection_local_with_2_usbcamera",
     "camera_configs": {
         "camera_1": {
             "camera_id": "camera_1",
             "camera_type": "usb",
             "source_directory": "/dev/video0",
             "position": "front",
             "model_forwarder_config": {
-                "model_name": "pin_detection",
+                "model_name": "duck_detection",
                 "model_type": "classification",
-                "model_serving_url": "http://edge_model_serving:8501/",
                 "expected_image_resolution": {
                     "width": 224,
                     "height": 224
                 },
                 "model_version": "1",
                 "class_names": [
-                    "OK",
-                    "KO"
-                ]
+                    "KO",
+                    "OK"
+                ],
+                "model_serving_url": "http://edge_model_serving:8501/",
+                "recreate_me": false
             },
             "camera_rule_config": {
                 "camera_rule_type": "expected_label_rule",
-                "expected_class": "OK"
-            }
+                "expected_class": "OK",
+                "recreate_me": false
+            },
+            "recreate_me": false
         },
         "camera_2": {
             "camera_id": "camera_2",
             "camera_type": "usb",
-            "source_directory": "/dev/video4",
-            "position": "back",
+            "source_directory": "/dev/video2",
+            "position": "front",
+            "camera_resolution": {
+                "width": 1366,
+                "height": 768
+            },
             "model_forwarder_config": {
-                "model_name": "pin_detection",
+                "model_name": "duck_detection",
                 "model_type": "classification",
-                "model_serving_url": "http://edge_model_serving:8501/",
                 "expected_image_resolution": {
                     "width": 224,
                     "height": 224
                 },
                 "model_version": "1",
                 "class_names": [
-                    "OK",
-                    "KO"
-                ]
+                    "KO",
+                    "OK"
+                ],
+                "model_serving_url": "http://edge_model_serving:8501/",
+                "recreate_me": false
             },
             "camera_rule_config": {
                 "camera_rule_type": "expected_label_rule",
-                "expected_class": "OK"
-            }
+                "expected_class": "OK",
+                "recreate_me": false
+            },
+            "recreate_me": false
         }
     },
     "binary_storage_config": {
@@ -61,6 +71,7 @@
     "item_rule_config": {
         "item_rule_type": "min_threshold_ratio_rule",
         "expected_decision": "OK",
-        "threshold": 1
+        "threshold": 1,
+        "recreate_me": false
     }
 }