Unify serve edge services (#135)

* build: unify serve targets across edge services

* fix: camera service — config IDs, output_dir path resolution, loosen Pillow pin

Author: bojeanson

edge_camera/camera_config.yml

@@ -0,0 +1,14 @@
+# Camera service configuration for local development.
+# Camera IDs must match the camera_id values in the orchestrator station config.
+#
+# Backend options: fake | opencv | picamera2 | basler
+# - fake:      returns a blank JPEG, no hardware required
+# - opencv:    USB/webcam via OpenCV (requires edge-camera[usb])
+# - picamera2: Raspberry Pi camera (requires edge-camera[pi])
+# - basler:    Basler GigE camera (requires edge-camera[basler])
+
+cameras:
+  camera_1:
+    backend: fake
+  camera_2:
+    backend: fake

edge_camera/pyproject.toml

@@ -9,7 +9,7 @@ description = "vio-edge: camera service — standalone HTTP capture service"
 requires-python = ">=3.9"
 dependencies = [
     "fastapi[all]==0.115.6",
-    "Pillow==9.4.0",
+    "Pillow>=9.4.0",
     "pyyaml>=6.0",
 ]
 

edge_camera/src/edge_camera/interface/api/_paths.py

@@ -9,5 +9,6 @@ def output_dir(camera_id: str) -> Path:
     """
     shm = Path("/dev/shm")
     default = shm / "vio" if shm.is_dir() else Path("/tmp/vio")
-    base = Path(os.getenv("CAMERA_OUTPUT_DIR", "")) or default
+    env = os.getenv("CAMERA_OUTPUT_DIR")
+    base = Path(env) if env else default
     return base / camera_id

edge_camera/tests/unit_tests/interface/api/test_push_mode.py

@@ -68,6 +68,7 @@ async def fake_run_push_task(backend, camera_id, push_url, out_dir):
         await asyncio.sleep(float("inf"))
 
     app = create_app()
+    app.state.backends = {"cam_1": FakeCameraBackend()}
 
     with patch("edge_camera.interface.api.app._run_push_task", side_effect=fake_run_push_task):
         async with app.router.lifespan_context(app):

edge_model_serving/tflite_serving/Makefile

@@ -42,14 +42,6 @@ install:
 tflite_tests:
 	pytest -v --cov=src --junitxml=reports/tests-report.xml tests/
 
-.PHONY: run_tflite_serving  ## ✅ Launch the tflite serving app
-run_tflite_serving:
+.PHONY: serve  ## 🚀 Run the model server locally (port 8501)
+serve:
 	uvicorn tflite_serving.tflite_server:app --reload --port 8501 --host 0.0.0.0
-
-.PHONY: start_edge_model_serving ## 🕵 Start edge_model_serving service (Docker container)
-start_edge_model_serving:
-	BUILDOS=${BUILDOS} docker compose --file edge_model_serving.yml up edge_model_serving -d --build
-
-.PHONY: stop_edge_model_serving ## 🕵 Stop edge_model_serving service (Docker container)
-stop_edge_model_serving:
-	docker compose --file edge_model_serving.yml down edge_model_serving

edge_orchestrator/Makefile

@@ -81,10 +81,6 @@ pyramid:
 pyramid_and_badges:
 	python tests/tests_pyramid.py --badges-generation
 
-.PHONY: start_edge_orchestrator ## 🕵 Start edge_orchestrator service (Docker container)
-start_edge_orchestrator:
-	BUILDOS=${BUILDOS} docker compose --file edge_orchestrator.yml up edge_orchestrator -d --build
-
-.PHONY: stop_edge_orchestrator ## 🕵 Stop edge_orchestrator service (Docker container)
-stop_edge_orchestrator:
-	docker compose --file edge_orchestrator.yml down edge_orchestrator
+.PHONY: serve  ## 🚀 Run the orchestrator locally (port 8000)
+serve:
+	uvicorn edge_orchestrator.interface.api.main:app --host 0.0.0.0 --port 8000 --reload

edge_orchestrator/pyproject.toml

@@ -27,7 +27,7 @@ dependencies = [
     "fastapi[all]==0.115.6",
     "numpy==1.24.2",
     "opencv_python==4.11.0.86",
-    "Pillow==9.4.0",
+    "Pillow>=9.4.0",
     "smart-open[all]==7.1.0",
     "tenacity==9.0.0",
 ]