feat(engine): Pi-side animation engine with protocol outputs and sequencer
Add src/engine, modelled on technicalkiwi/portal's player and sequence runner: - Pixel generator: runs the unchanged led-driver patterns under CPython (utime shim + NeoPixel-like buffer) on a per-zone render thread and streams frames to pixel outputs, with keepalive for static frames. - Output drivers: DDP, Art-Net (ArtDMX/ArtSync), sACN/E1.31, USB-DMX (Enttec Pro / Open DMX), plus an ESP32 preset output that reuses the existing preset + select delivery path. Registry in db/output.json, CRUD and test pattern at /outputs. - Sequencer: timed preset chains per zone (portal step shape), deadline scheduling, loop/repeat, resume after restart; legacy sequence records are migrated. Zone play/stop, sequence and scene play/stop endpoints. - CLI (python -m engine.cli), Outputs and Sequences modals, preset tiles drive pixel outputs, API/README docs, engine test suite. ESP32 firmware is unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
827eb97203
commit
a5a7fc575f
42 files changed
+4117
-75
No files matched your search
@@ -125,6 +125,11 @@ def server(monkeypatch, tmp_path_factory):
|
||||
import models.pattern as models_pattern # noqa: E402
|
||||
import models.squence as models_sequence # noqa: E402
|
||||
import models.device as models_device # noqa: E402
|
||||
import models.output as models_output # noqa: E402
|
||||
import engine as engine_pkg # noqa: E402
|
||||
|
||||
# Fresh Pi-side engine per test (it caches players and sequence tasks).
|
||||
engine_pkg.set_engine(None)
|
||||
|
||||
for cls in (
|
||||
models_preset.Preset,
|
||||
@@ -136,6 +141,7 @@ def server(monkeypatch, tmp_path_factory):
|
||||
models_pattern.Pattern,
|
||||
models_sequence.Sequence,
|
||||
models_device.Device,
|
||||
models_output.Output,
|
||||
):
|
||||
if hasattr(cls, "_instance"):
|
||||
delattr(cls, "_instance")
|
||||
@@ -170,6 +176,7 @@ def server(monkeypatch, tmp_path_factory):
|
||||
"controllers.pattern",
|
||||
"controllers.settings",
|
||||
"controllers.device",
|
||||
"controllers.output",
|
||||
):
|
||||
sys.modules.pop(mod_name, None)
|
||||
|
||||
@@ -184,6 +191,7 @@ def server(monkeypatch, tmp_path_factory):
|
||||
import controllers.pattern as pattern_ctl # noqa: E402
|
||||
import controllers.settings as settings_ctl # noqa: E402
|
||||
import controllers.device as device_ctl # noqa: E402
|
||||
import controllers.output as output_ctl # noqa: E402
|
||||
|
||||
# Configure transport sender used by /presets/send.
|
||||
from models.transport import set_sender # noqa: E402
|
||||
@@ -211,6 +219,7 @@ def server(monkeypatch, tmp_path_factory):
|
||||
app.mount(pattern_ctl.controller, "/patterns")
|
||||
app.mount(settings_ctl.controller, "/settings")
|
||||
app.mount(device_ctl.controller, "/devices")
|
||||
app.mount(output_ctl.controller, "/outputs")
|
||||
|
||||
@app.route("/")
|
||||
def index(request):
|
||||
@@ -527,21 +536,32 @@ def test_groups_sequences_scenes_palettes_patterns_endpoints(server):
|
||||
assert resp.status_code == 200
|
||||
|
||||
# Sequences.
|
||||
unique_seq_group_name = f"pytest-seq-group-{uuid.uuid4().hex[:8]}"
|
||||
unique_seq_name = f"pytest-seq-{uuid.uuid4().hex[:8]}"
|
||||
resp = c.post(
|
||||
f"{base_url}/sequences",
|
||||
json={"group_name": unique_seq_group_name, "presets": []},
|
||||
json={"name": unique_seq_name, "steps": [{"preset_id": "1", "duration_s": 2}]},
|
||||
)
|
||||
assert resp.status_code == 201
|
||||
sequences_list = c.get(f"{base_url}/sequences").json()
|
||||
seq_id = _find_id_by_field(sequences_list, "group_name", unique_seq_group_name)
|
||||
seq_id = _find_id_by_field(sequences_list, "name", unique_seq_name)
|
||||
|
||||
resp = c.get(f"{base_url}/sequences/{seq_id}")
|
||||
assert resp.status_code == 200
|
||||
assert resp.json()["steps"] == [{"preset_id": "1", "duration_s": 2.0}]
|
||||
|
||||
resp = c.put(f"{base_url}/sequences/{seq_id}", json={"sequence_duration": 1234})
|
||||
resp = c.put(f"{base_url}/sequences/{seq_id}", json={"loop": False, "repeat_count": 2})
|
||||
assert resp.status_code == 200
|
||||
assert resp.json()["loop"] is False and resp.json()["repeat_count"] == 2
|
||||
|
||||
resp = c.put(f"{base_url}/sequences/{seq_id}", json={"steps": [{"duration_s": 1}]})
|
||||
assert resp.status_code == 400
|
||||
|
||||
# No zone_id -> cannot play.
|
||||
resp = c.post(f"{base_url}/sequences/{seq_id}/play")
|
||||
assert resp.status_code == 400
|
||||
|
||||
resp = c.get(f"{base_url}/sequences/status")
|
||||
assert resp.status_code == 200
|
||||
assert resp.json()["sequence_duration"] == 1234
|
||||
|
||||
resp = c.delete(f"{base_url}/sequences/{seq_id}")
|
||||
assert resp.status_code == 200
|
||||
@@ -764,3 +784,76 @@ def test_groups_sequences_scenes_palettes_patterns_endpoints(server):
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
|
||||
|
||||
def test_engine_outputs_zone_play_and_sequences(server):
|
||||
c: requests.Session = server["client"]
|
||||
base_url: str = server["base_url"]
|
||||
sender: DummySender = server["sender"]
|
||||
|
||||
# Outputs CRUD + validation.
|
||||
resp = c.post(f"{base_url}/outputs", json={"name": "wall", "protocol": "ddp"})
|
||||
assert resp.status_code == 400 and "host" in resp.json()["error"]
|
||||
resp = c.post(
|
||||
f"{base_url}/outputs",
|
||||
json={"name": "wall", "protocol": "ddp", "host": "127.0.0.1", "port": 9, "pixel_count": 10},
|
||||
)
|
||||
assert resp.status_code == 201
|
||||
output_id = resp.json()["id"]
|
||||
resp = c.put(f"{base_url}/outputs/{output_id}", json={"color_order": "grb"})
|
||||
assert resp.status_code == 200 and resp.json()["color_order"] == "grb"
|
||||
resp = c.post(f"{base_url}/outputs/{output_id}/test", json={"step_s": 0.1})
|
||||
assert resp.status_code == 200 and resp.json()["status"]["frames"] > 0
|
||||
|
||||
# A profile gives us presets + a zone; add a pixel output and an ESP32 name to it.
|
||||
resp = c.post(f"{base_url}/profiles", json={"name": f"pytest-engine-{uuid.uuid4().hex[:6]}"})
|
||||
assert resp.status_code in (200, 201)
|
||||
profile_id = str(resp.json().get("id") or next(iter(resp.json())))
|
||||
c.post(f"{base_url}/profiles/{profile_id}/apply")
|
||||
preset = c.post(f"{base_url}/presets", json={"name": "pytest-on", "pattern": "on", "colors": ["#ff0000"]})
|
||||
assert preset.status_code == 201
|
||||
preset_id = str(next(iter(preset.json())))
|
||||
zone = c.post(f"{base_url}/zones", json={"name": "pytest-engine-zone", "names": ["wall", "dj"]})
|
||||
assert zone.status_code in (200, 201)
|
||||
zone_id = str(zone.json().get("id") or next(iter(zone.json())))
|
||||
c.put(f"{base_url}/zones/{zone_id}", json={"names": ["wall", "dj"]})
|
||||
|
||||
resp = c.post(f"{base_url}/zones/{zone_id}/play", json={})
|
||||
assert resp.status_code == 400
|
||||
resp = c.post(f"{base_url}/zones/{zone_id}/play", json={"preset_id": "nope"})
|
||||
assert resp.status_code == 404
|
||||
|
||||
sender.sent.clear()
|
||||
resp = c.post(f"{base_url}/zones/{zone_id}/play", json={"preset_id": preset_id})
|
||||
assert resp.status_code == 200, resp.text
|
||||
status = resp.json()
|
||||
assert status["preset_id"] == preset_id and status["frame_length"] == 10
|
||||
kinds = sorted(o["kind"] for o in status["outputs"])
|
||||
assert kinds == ["frame", "preset"]
|
||||
# "dj" has no registered device -> preset + select still broadcast to the bridge.
|
||||
sent = [json.loads(d) for d, _a in sender.sent]
|
||||
assert any(m.get("presets", {}).get(preset_id) for m in sent)
|
||||
assert {"v": "1", "select": {"dj": [preset_id]}} in sent
|
||||
|
||||
resp = c.get(f"{base_url}/zones/engine/status")
|
||||
assert zone_id in resp.json()["zones"]
|
||||
|
||||
# Sequence on the zone.
|
||||
resp = c.post(
|
||||
f"{base_url}/sequences",
|
||||
json={"name": "pytest-engine-seq", "zone_id": zone_id, "loop": False,
|
||||
"steps": [{"preset_id": preset_id, "duration_s": 0.5}]},
|
||||
)
|
||||
seq_id = next(k for k, v in c.get(f"{base_url}/sequences").json().items()
|
||||
if v.get("name") == "pytest-engine-seq")
|
||||
resp = c.post(f"{base_url}/sequences/{seq_id}/play")
|
||||
assert resp.status_code == 200 and resp.json()["zone_id"] == zone_id
|
||||
assert c.get(f"{base_url}/sequences/{seq_id}").json()["active"] is True
|
||||
resp = c.post(f"{base_url}/sequences/{seq_id}/stop")
|
||||
assert resp.json()["stopped"] is True
|
||||
assert c.get(f"{base_url}/sequences/{seq_id}").json()["active"] is False
|
||||
|
||||
resp = c.post(f"{base_url}/zones/{zone_id}/stop")
|
||||
assert resp.json()["stopped"] is True
|
||||
resp = c.delete(f"{base_url}/outputs/{output_id}")
|
||||
assert resp.status_code == 200
|
||||
Reference in new issue
Block a user