Adapt Engine to api camera

.env.test

@@ -1,6 +1,7 @@
 API_URL=http://pyro_api:5050
 CAM_USER=my_dummy_login
 CAM_PWD=my_dummy_pwd
+MEDIAMTX_SERVER_IP=localhost
 
 LOKI_URL=http://my-loki-service.com
 PROMTAIL_DEVICE_SCOPE=tower_scope

Makefile

@@ -3,19 +3,21 @@
 
 help:
 	@echo "Targets:"
-	@echo "  init            Create .env from .env.test if missing"
-	@echo "  build           Build local images in this repo"
-	@echo "  build-external  Build images in sibling repos"
-	@echo "  build-all       Build local and external images"
-	@echo "  run-backend     Start base services only"
-	@echo "  run-engine      Start base services plus engine profile"
-	@echo "  run-tools       Start base services plus tools profile"
-	@echo "  run             Start base services plus front and tools profiles"
-	@echo "  run-all         Start base services plus front tools and engine profiles"
-	@echo "  stop            Stop and remove all services and volumes"
-	@echo "  ps              Show compose status"
-	@echo "  logs            Follow logs"
-	@echo "  test            Run pytest"
+	@echo "  init                Create .env from .env.test if missing"
+	@echo "  build               Build local images in this repo"
+	@echo "  build-external      Build images in sibling repos"
+	@echo "  build-all           Build local and external images"
+	@echo "  run-backend         Start base services only"
+	@echo "  run-engine          Start base services plus engine profile"
+	@echo "  run-tools-and-engine  Start base services plus tools and engine profiles"
+	@echo "  run-tools           Start base services plus tools profile"
+	@echo "  run                 Start base services plus front and tools profiles"
+	@echo "  stop-engine         Stop only engine services (engine + pyro_camera_api)"
+	@echo "  restart-engine      Restart engine services without re-running init_script"
+	@echo "  stop                Stop and remove all services and volumes"
+	@echo "  ps                  Show compose status"
+	@echo "  logs                Follow logs"
+	@echo "  test                Run pytest"
 
 # -------------------------------------------------------------------
 # Init
@@ -30,8 +32,6 @@ init:
 
 build:
 	docker build -f containers/init_script/Dockerfile -t pyronear/pyro-api-init:latest containers/init_script/
-	docker build -f containers/reolinkdev1/Dockerfile -t pyronear/reolinkdev1:latest containers/reolinkdev1/
-	docker build -f containers/reolinkdev2/Dockerfile -t pyronear/reolinkdev2:latest containers/reolinkdev2/
 	docker build -f containers/notebooks/Dockerfile -t pyronear/notebooks:latest containers/notebooks/
 
 # -------------------------------------------------------------------
@@ -42,7 +42,6 @@ build-external:
 	cd ../pyro-api && make build
 	cd ../pyro-engine && make build-lib
 	cd ../pyro-engine && make build-app
-	cd ../pyro-platform && make build
 
 build-all: build build-external
 
@@ -54,10 +53,15 @@ build-all: build build-external
 run-backend:
 	docker compose up -d
 
-# Engine profile adds pyro_engine, reolinkdev1, reolinkdev2
+# Engine profile adds engine + pyro_camera_api
 run-engine:
 	docker compose --profile engine up -d
 
+# Tools + engine (tools must be up first so the API is ready when engine starts)
+run-tools-and-engine:
+	$(MAKE) run-tools
+	$(MAKE) run-engine
+
 # Tools profile adds notebooks, db-ui
 run-tools:
 	docker compose --profile tools up -d
@@ -66,9 +70,11 @@ run-tools:
 run:
 	docker compose --profile front --profile tools up -d
 
-# Everything including engine
-run-all:
-	docker compose --profile front --profile tools --profile engine up -d
+stop-engine:
+	docker compose --profile engine stop engine pyro_camera_api
+
+restart-engine: stop-engine
+	docker compose --profile engine up -d engine pyro_camera_api --no-deps
 
 stop:
 	docker compose --profile front --profile engine --profile tools down -v

data/credentials.json

@@ -1,23 +1,14 @@
 {
-    "reolinkdev1": {
-        "brand": "reolink",
-        "name": "cam-1",
+    "mock_camera_1": {
+        "name": "brison-01",
+        "adapter": "mock",
         "type": "static",
-        "token": "",
-        "azimuth": 124
-    },
-    "reolinkdev2": {
-        "brand": "reolink",
-        "name": "cam-2",
-        "type": "ptz",
-        "token": "",
-        "poses": [
-            1,
-            2
+        "pose_ids": [
+            29
         ],
-        "azimuths": [
-            123.2,
-            184
-        ]
+        "id": "",
+        "poses": [],
+        "bbox_mask_url": "",
+        "token": ""
     }
 }