2ea0420de7
Two independent adversarial reviews (codex CLI + a 6-dimension verification workflow) of the delivery-hardening branch surfaced ~40 findings; this closes the confirmed correctness/security/deploy blockers plus a codex re-review pass. edge: - geometry: track_displacement per-second threshold recalibrated (0.02->0.25, env-tunable via MOTION_THR, validated finite/positive); confidence-filter keypoints with a bbox-center fallback so hallucinated points don't fake motion - fall: low-confidence frames no longer cancel an active FALLING/FALLEN incident (freeze + reset recovery timer so recovery needs a fresh confident streak); baseline height only seeded from trusted frames - queue: PostClient.send() returns a tri-state SendResult; only definite 4xx count toward the poison drop cap, so a network outage (incl. 408/425/429/5xx) never deletes queued safety events; legacy rows persist their minted uuid - config: reject placeholder / http / short DEVICE_SECRET at startup - zones: warn+skip legacy pixel-space polygons that would silently match nothing cloud: - zone endpoints wired into P3-2b site-scope (cross-site read/write/delete closed) + role gate on list; catch narrowed so DB faults surface as 500 - snapshot purge keeps the DB row when unlink() fails (no untrackable PIPA orphan) - ingest dedup path re-stores missing snapshots (+ short-write guard); UNIQUE (event_id, content_hash) makes recovery idempotent under retry/race - event list cursor carries full-precision occurred_at (no float rounding at the page boundary); string keyset end-to-end - SiteScope '' fails closed (only NULL is global); dashboard fetches full page cap - runnable migration (site/event_uuid + backfill ordering + indexes); rate-limit reap fails open deploy: - offline bundle hashes EVERY file (fatal on missing/failed/injected; models in SBOM; arch in tarball name; REQUIRE_SIGNATURE option) - installer verifies before any mutation, Hailo arch preflight before install, atomic src swap, backend reconcile preserves a working operator choice - systemd DeviceAllow=char-dma_heap (the /dev/dma_heap/ dir form was inert) Verified: edge pytest 165 passed / 2 skipped; cloud phpunit 109 passed / 4 skipped; deploy scripts bash -n clean. Reviewed by codex twice (findings + fixes) with the second-pass findings folded in.
51 lines
2.2 KiB
Python
51 lines
2.2 KiB
Python
import json
|
|
import logging
|
|
|
|
from edge.detectors.zone import Zone
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
# Zones are stored NORMALIZED (0..1 of the image) by the current dashboard. Polygons drawn by the
|
|
# pre-normalization dashboard were saved in canvas PIXELS (values in the hundreds); after the edge
|
|
# normalizes the foot point, a pixel polygon can never match — silently killing that zone's
|
|
# intrusion detection with no error. Flag such rows loudly so the operator redraws them, instead
|
|
# of failing dark. A normalized coordinate may round slightly past 1.0, so allow a small margin.
|
|
_NORMALIZED_MAX = 1.5
|
|
|
|
|
|
def _looks_like_pixels(polygon: list[tuple[float, float]]) -> bool:
|
|
return any(abs(x) > _NORMALIZED_MAX or abs(y) > _NORMALIZED_MAX for x, y in polygon)
|
|
|
|
|
|
def zones_from_config(config: dict, camera_id: str | None = None) -> list[Zone]:
|
|
"""Parse cloud config zone rows into Zone objects. When camera_id is given, only
|
|
rows for that camera are kept (multi-camera routing); None keeps all rows."""
|
|
out: list[Zone] = []
|
|
rows = config.get("zones", []) or []
|
|
if not isinstance(rows, list):
|
|
return []
|
|
for row in rows:
|
|
try:
|
|
if camera_id is not None and str(row["camera_id"]) != str(camera_id):
|
|
continue
|
|
raw = row["polygon_json"]
|
|
pts = json.loads(raw) if isinstance(raw, str) else raw
|
|
polygon = [(float(p[0]), float(p[1])) for p in pts]
|
|
if len(polygon) < 3:
|
|
continue
|
|
if _looks_like_pixels(polygon):
|
|
log.warning(
|
|
"zone %s on camera %s has un-normalized (pixel-space) coordinates %r — it "
|
|
"would match nothing after foot normalization. Skipping; redraw this zone in "
|
|
"the dashboard so it is stored normalized (0..1).",
|
|
row.get("zone_id"), row.get("camera_id"), polygon[:2])
|
|
continue
|
|
out.append(Zone(str(row["zone_id"]), str(row["level"]), polygon))
|
|
except (KeyError, ValueError, TypeError, IndexError, AttributeError, json.JSONDecodeError):
|
|
continue
|
|
return out
|
|
|
|
|
|
def thresholds_from_config(config: dict) -> dict:
|
|
t = config.get("thresholds")
|
|
return t if isinstance(t, dict) else {}
|