Additional env in preparation for two adapaters (midas, metric3d) for…

… the obstacle avoidance engine.

cnc/server/docker-compose.yml

@@ -112,7 +112,7 @@ services:
     container_name: obstacle-engine
     restart: unless-stopped
     privileged: true
-    entrypoint: ["./depth.py", "--source", "telemetry", "--model", "${MIDAS}", "--threshold", "${DEPTH_THRESHOLD}", "${STORE}", "-a", "${REDIS_AUTH}"]
+    entrypoint: ["./depth.py", "--source", "telemetry", "--model", "${DEPTH_MODEL}", "--threshold", "${DEPTH_THRESHOLD}", "${STORE}", "-a", "${REDIS_AUTH}", "${USE_METRIC3D}"]
     # for NVIDIA GPUs
     #gpus: all     # not yet supported by docker-compose
     deploy:
@@ -229,9 +229,12 @@ services:
     volumes:
       - ./redis:/data
       - ./redis/redis.conf:/redis-stack.conf
-
 networks:
   cnc-net:
+    ipam:
+      driver: default
+      config:
+        - subnet: 11.11.0.0/24
   redis:
 volumes:
   training-vol:

cnc/server/template.env

@@ -35,7 +35,10 @@ HSV_THRESHOLD=5.0
 
 #obstacle-engine
 DEPTH_THRESHOLD=150
-MIDAS=DPT_Large
+DEPTH_MODEL=DPT_Large
+#uncomment to use metric3d instead of midas for avoidance
+#USE_METRIC3D=--metric3d
+#DEPTH_MODEL=metric3d_vit_large
 
 #ms-face-service
 #BILLING_ENDPOINT=<endpoint from Azure>