Skip to content

Commit 1292048

Browse files
author
gireg.roussel
committed
[fix] make duck detection works on new orchestrator version
1 parent 4fca7bc commit 1292048

File tree

4 files changed

+79
-48
lines changed

4 files changed

+79
-48
lines changed

deployment/edge/ansible/files/docker-compose.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
SERVING_MODEL_URL: http://edge_model_serving:8501
3131
GOOGLE_APPLICATION_CREDENTIALS: /edge_orchestrator/config/secrets/credentials.json
3232
BUCKET_NAME: tf-vio-bucket
33-
ACTIVE_CONFIG_NAME: duck_detector_with_2_usbcamera
33+
ACTIVE_CONFIG_NAME: duck_detection_with_2_usbcamera
3434

3535
edge_interface:
3636
container_name: edge_interface
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"station_name": "duck_detection_with_2_usbcamera",
3+
"camera_configs": {
4+
"camera_1": {
5+
"camera_id": "camera_1",
6+
"camera_type": "usb",
7+
"source_directory": "/dev/video0",
8+
"position": "front",
9+
"model_forwarder_config": {
10+
"model_name": "duck_detection",
11+
"model_type": "classification",
12+
"expected_image_resolution": {
13+
"width": 224,
14+
"height": 224
15+
},
16+
"model_version": "1",
17+
"class_names": [
18+
"NOK_COLORED",
19+
"OK"
20+
],
21+
"model_serving_url": "http://edge_model_serving:8501/",
22+
"recreate_me": false
23+
},
24+
"camera_rule_config": {
25+
"camera_rule_type": "expected_label_rule",
26+
"expected_class": "OK",
27+
"recreate_me": false
28+
},
29+
"recreate_me": false
30+
},
31+
"camera_2": {
32+
"camera_id": "camera_2",
33+
"camera_type": "usb",
34+
"source_directory": "/dev/video3",
35+
"position": "front",
36+
"camera_resolution": {
37+
"width": 1366,
38+
"height": 768
39+
},
40+
"model_forwarder_config": {
41+
"model_name": "duck_detection",
42+
"model_type": "classification",
43+
"expected_image_resolution": {
44+
"width": 224,
45+
"height": 224
46+
},
47+
"model_version": "1",
48+
"class_names": [
49+
"NOK_COLORED",
50+
"KO"
51+
],
52+
"model_serving_url": "http://edge_model_serving:8501/",
53+
"recreate_me": false
54+
},
55+
"camera_rule_config": {
56+
"camera_rule_type": "expected_label_rule",
57+
"expected_class": "OK",
58+
"recreate_me": false
59+
},
60+
"recreate_me": false
61+
}
62+
},
63+
"binary_storage_config": {
64+
"storage_type": "gcp",
65+
"recreate_me": false
66+
},
67+
"metadata_storage_config": {
68+
"storage_type": "gcp",
69+
"recreate_me": false
70+
},
71+
"item_rule_config": {
72+
"item_rule_type": "min_threshold_ratio_rule",
73+
"expected_decision": "OK",
74+
"threshold": 1,
75+
"recreate_me": false
76+
}
77+
}

edge_orchestrator/config/station_configs/duck_detector_with_2_usbcamera.json

Lines changed: 0 additions & 47 deletions
This file was deleted.

edge_orchestrator/src/edge_orchestrator/domain/models/model_forwarder/model_name.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ class ModelName(str, Enum):
88
mobilenet_ssd_v2_coco = "mobilenet_ssd_v2_coco"
99
mobilenet_ssd_v2_face = "mobilenet_ssd_v2_face"
1010
yolo_coco_nano = "yolo_coco_nano"
11+
duck_detection = "duck_detection"

0 commit comments

Comments
 (0)