Add PTZ17 optics replay and bounded focus recovery
parent
05dcdcd06a
commit
25c94c1e8d
@ -1,6 +1,6 @@
|
||||
{
|
||||
"base_sha256": "6cf484271ef3659028b0b4d43041addb05102f91d2758ab472d968a52d24e911",
|
||||
"candidate_sha256": "da2a970deb041d6dc4897fd58c2efa2943803d46c3af6ddcf92d010a4ca0f589",
|
||||
"patch_sha256": "6c6f5ee84f9be3976cf318431cfa505817f2322345215a76ae638873376d14c8",
|
||||
"candidate_sha256": "26edb69b9d0bd0ae6ad4b9c18ff2f793bcb2a2cf035b38293a3e07d6fc833f8b",
|
||||
"patch_sha256": "6a563f751871dcadc3c4daf730cc3cfb1ff6fd8edf1f379a2cee01f99302d4de",
|
||||
"installed": false
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,390 @@
|
||||
{
|
||||
"1412": {
|
||||
"start_utc": "2026-11-13T07:12:02.328+00:00",
|
||||
"status_samples": 257,
|
||||
"first_send_s": 6.041,
|
||||
"first_start_s": 6.115,
|
||||
"first_confirmed_request": 3,
|
||||
"first_optics_s": 10.627,
|
||||
"startup_to_optics_s": 4.512,
|
||||
"first_logged_projection_s": 9.869,
|
||||
"first_request_projection_at_decision": "unknown",
|
||||
"requests": [
|
||||
{
|
||||
"request": 1,
|
||||
"kind": "normal",
|
||||
"seq": 5714,
|
||||
"start_s": 6.115,
|
||||
"nominal_s": 0.1,
|
||||
"hard_limit_s": 0.12,
|
||||
"final": {
|
||||
"time_s": 6.231,
|
||||
"status": "delivered_wait_optics",
|
||||
"accounted_duration_s": 0.191,
|
||||
"required_duration_s": 0.07,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:watchdog"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 2,
|
||||
"kind": "normal",
|
||||
"seq": 5724,
|
||||
"start_s": 7.766,
|
||||
"nominal_s": 0.22,
|
||||
"hard_limit_s": 0.28,
|
||||
"final": {
|
||||
"time_s": 8.086,
|
||||
"status": "delivered_wait_optics",
|
||||
"accounted_duration_s": 0.402,
|
||||
"required_duration_s": 0.154,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:watchdog"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 3,
|
||||
"kind": "normal",
|
||||
"seq": 5736,
|
||||
"start_s": 10.164,
|
||||
"nominal_s": 0.34,
|
||||
"hard_limit_s": 0.4,
|
||||
"final": {
|
||||
"time_s": 10.496,
|
||||
"status": "delivered_wait_optics",
|
||||
"accounted_duration_s": 0.395,
|
||||
"required_duration_s": 0.238,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "physical_stop"
|
||||
},
|
||||
"explicit_confirmation_s": 10.627,
|
||||
"decisions": [
|
||||
{
|
||||
"time_s": 10.481,
|
||||
"reason": "recenter",
|
||||
"blockers": "angle"
|
||||
}
|
||||
],
|
||||
"first_status_narrowing": {
|
||||
"time_s": 10.627,
|
||||
"hfov_deg": 54.12173440987275
|
||||
}
|
||||
},
|
||||
{
|
||||
"request": 4,
|
||||
"kind": "normal",
|
||||
"seq": 5757,
|
||||
"start_s": 14.109,
|
||||
"nominal_s": 0.1,
|
||||
"hard_limit_s": 0.12,
|
||||
"final": {
|
||||
"time_s": 14.182,
|
||||
"status": "discarded",
|
||||
"accounted_duration_s": 0.147,
|
||||
"required_duration_s": 0.07,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:cancel_after_put"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [
|
||||
{
|
||||
"time_s": 14.055,
|
||||
"reason": "recenter",
|
||||
"blockers": "followup+angle+center_sample"
|
||||
}
|
||||
],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 5,
|
||||
"kind": "normal",
|
||||
"seq": 5772,
|
||||
"start_s": 16.382,
|
||||
"nominal_s": 0.1,
|
||||
"hard_limit_s": 0.12,
|
||||
"final": {
|
||||
"time_s": 16.419,
|
||||
"status": "short",
|
||||
"accounted_duration_s": 0.055,
|
||||
"required_duration_s": 0.07,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "physical_stop"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [
|
||||
{
|
||||
"time_s": 16.399,
|
||||
"reason": "size_controller",
|
||||
"blockers": "angle"
|
||||
}
|
||||
],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 6,
|
||||
"kind": "normal",
|
||||
"seq": 5778,
|
||||
"start_s": 17.247,
|
||||
"nominal_s": 0.34,
|
||||
"hard_limit_s": 0.4,
|
||||
"final": {
|
||||
"time_s": 17.445,
|
||||
"status": "delivered_wait_optics",
|
||||
"accounted_duration_s": 0.244,
|
||||
"required_duration_s": 0.238,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "physical_stop"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [
|
||||
{
|
||||
"time_s": 17.401,
|
||||
"reason": "recenter",
|
||||
"blockers": "angle"
|
||||
},
|
||||
{
|
||||
"time_s": 17.444,
|
||||
"reason": "size_controller",
|
||||
"blockers": "followup+angle+center_history+track_history"
|
||||
}
|
||||
],
|
||||
"first_status_narrowing": null
|
||||
}
|
||||
]
|
||||
},
|
||||
"1424": {
|
||||
"start_utc": "2026-11-13T07:24:57.917+00:00",
|
||||
"status_samples": 259,
|
||||
"first_send_s": 8.054,
|
||||
"first_start_s": 8.118,
|
||||
"first_confirmed_request": 3,
|
||||
"first_optics_s": 17.02,
|
||||
"startup_to_optics_s": 8.902,
|
||||
"first_logged_projection_s": 11.23,
|
||||
"first_request_projection_at_decision": "unknown",
|
||||
"requests": [
|
||||
{
|
||||
"request": 1,
|
||||
"kind": "normal",
|
||||
"seq": 7515,
|
||||
"start_s": 8.118,
|
||||
"nominal_s": 0.1,
|
||||
"hard_limit_s": 0.12,
|
||||
"final": {
|
||||
"time_s": 8.245,
|
||||
"status": "delivered_wait_optics",
|
||||
"accounted_duration_s": 0.192,
|
||||
"required_duration_s": 0.07,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:watchdog"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 2,
|
||||
"kind": "normal",
|
||||
"seq": 7536,
|
||||
"start_s": 12.205,
|
||||
"nominal_s": 0.22,
|
||||
"hard_limit_s": 0.28,
|
||||
"final": {
|
||||
"time_s": 12.392,
|
||||
"status": "delivered_wait_optics",
|
||||
"accounted_duration_s": 0.248,
|
||||
"required_duration_s": 0.154,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "physical_stop"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [
|
||||
{
|
||||
"time_s": 12.379,
|
||||
"reason": "recenter",
|
||||
"blockers": "angle+center_sample"
|
||||
}
|
||||
],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 3,
|
||||
"kind": "normal",
|
||||
"seq": 7556,
|
||||
"start_s": 16.563,
|
||||
"nominal_s": 0.34,
|
||||
"hard_limit_s": 0.4,
|
||||
"final": {
|
||||
"time_s": 17.018,
|
||||
"status": "delivered_wait_optics",
|
||||
"accounted_duration_s": 0.47,
|
||||
"required_duration_s": 0.238,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:watchdog"
|
||||
},
|
||||
"explicit_confirmation_s": 17.02,
|
||||
"decisions": [],
|
||||
"first_status_narrowing": {
|
||||
"time_s": 17.02,
|
||||
"hfov_deg": 54.12173440987275
|
||||
}
|
||||
},
|
||||
{
|
||||
"request": 4,
|
||||
"kind": "normal",
|
||||
"seq": 7572,
|
||||
"start_s": 19.593,
|
||||
"nominal_s": 0.34,
|
||||
"hard_limit_s": 0.4,
|
||||
"final": null,
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [],
|
||||
"first_status_narrowing": {
|
||||
"time_s": 19.901,
|
||||
"hfov_deg": 46.524147844879025
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"1428": {
|
||||
"start_utc": "2026-11-13T07:28:06.389+00:00",
|
||||
"status_samples": 253,
|
||||
"first_send_s": 4.227,
|
||||
"first_start_s": 4.294,
|
||||
"first_confirmed_request": 5,
|
||||
"first_optics_s": 16.985,
|
||||
"startup_to_optics_s": 12.691,
|
||||
"first_logged_projection_s": 13.713,
|
||||
"first_request_projection_at_decision": "unknown",
|
||||
"requests": [
|
||||
{
|
||||
"request": 1,
|
||||
"kind": "normal",
|
||||
"seq": 8125,
|
||||
"start_s": 4.294,
|
||||
"nominal_s": 0.1,
|
||||
"hard_limit_s": 0.12,
|
||||
"final": {
|
||||
"time_s": 4.399,
|
||||
"status": "discarded",
|
||||
"accounted_duration_s": 0.172,
|
||||
"required_duration_s": 0.07,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:cancel_after_put"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [
|
||||
{
|
||||
"time_s": 4.235,
|
||||
"reason": "image_motion",
|
||||
"blockers": "-"
|
||||
}
|
||||
],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 2,
|
||||
"kind": "probe",
|
||||
"seq": 8137,
|
||||
"start_s": 6.302,
|
||||
"nominal_s": 0.1,
|
||||
"hard_limit_s": 0.12,
|
||||
"final": {
|
||||
"time_s": 6.448,
|
||||
"status": "discarded",
|
||||
"accounted_duration_s": 0.208,
|
||||
"required_duration_s": 0.07,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:watchdog"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 3,
|
||||
"kind": "probe",
|
||||
"seq": 8157,
|
||||
"start_s": 10.195,
|
||||
"nominal_s": 0.1,
|
||||
"hard_limit_s": 0.12,
|
||||
"final": {
|
||||
"time_s": 10.365,
|
||||
"status": "delivered_wait_optics",
|
||||
"accounted_duration_s": 0.208,
|
||||
"required_duration_s": 0.07,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:watchdog"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [
|
||||
{
|
||||
"time_s": 10.261,
|
||||
"reason": "size_controller",
|
||||
"blockers": "angle"
|
||||
}
|
||||
],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 4,
|
||||
"kind": "normal",
|
||||
"seq": 8178,
|
||||
"start_s": 14.181,
|
||||
"nominal_s": 0.22,
|
||||
"hard_limit_s": 0.28,
|
||||
"final": {
|
||||
"time_s": 14.273,
|
||||
"status": "discarded",
|
||||
"accounted_duration_s": 0.121,
|
||||
"required_duration_s": 0.154,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:cancel_after_put"
|
||||
},
|
||||
"explicit_confirmation_s": null,
|
||||
"decisions": [
|
||||
{
|
||||
"time_s": 14.158,
|
||||
"reason": "recenter",
|
||||
"blockers": "angle+center_sample"
|
||||
}
|
||||
],
|
||||
"first_status_narrowing": null
|
||||
},
|
||||
{
|
||||
"request": 5,
|
||||
"kind": "normal",
|
||||
"seq": 8194,
|
||||
"start_s": 16.639,
|
||||
"nominal_s": 0.22,
|
||||
"hard_limit_s": 0.28,
|
||||
"final": {
|
||||
"time_s": 16.942,
|
||||
"status": "delivered_wait_optics",
|
||||
"accounted_duration_s": 0.314,
|
||||
"required_duration_s": 0.154,
|
||||
"optics_at_finalize": false,
|
||||
"reason": "priority_stop:watchdog"
|
||||
},
|
||||
"explicit_confirmation_s": 16.985,
|
||||
"decisions": [
|
||||
{
|
||||
"time_s": 16.894,
|
||||
"reason": "size_controller",
|
||||
"blockers": "angle"
|
||||
}
|
||||
],
|
||||
"first_status_narrowing": {
|
||||
"time_s": 16.986,
|
||||
"hfov_deg": 54.12173440987275
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,135 @@
|
||||
"""Replay recorded PTZ17 lens transactions and their fresh HFOV samples."""
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
from dataclasses import asdict, dataclass
|
||||
import json
|
||||
import math
|
||||
from pathlib import Path
|
||||
import re
|
||||
from typing import Any
|
||||
|
||||
|
||||
WINDOW_S = 20.0
|
||||
MIN_HFOV_CHANGE_RATIO = 0.004
|
||||
MAX_STATUS_AGE_S = 0.65
|
||||
MIN_PROJECTION_MARGIN = 0.16
|
||||
EPISODES = ("1412", "1424", "1428")
|
||||
START = re.compile(r"request=(\d+) kind=(\w+) physical start seq=(\d+) pulse=([.\d]+)s hard=([.\d]+)s")
|
||||
RESULT = re.compile(r"request=(\d+) result=(\w+) duration=([.\d]+)s min=([.\d]+)s optics=(True|False) reason=(\S+)")
|
||||
DECISION = re.compile(r"request=(\d+).*?reason=(\S+) blockers=(\S+)")
|
||||
CONFIRMED = re.compile(r"request=(\d+) optics confirmed\b")
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class LensSample:
|
||||
time_s: float
|
||||
hfov_deg: float
|
||||
|
||||
|
||||
def first_hfov_change(
|
||||
baseline: LensSample, samples: list[LensSample], *, from_s: float, until_s: float,
|
||||
) -> LensSample | None:
|
||||
"""Return the first fresh HFOV narrowing of at least 0.4 percent."""
|
||||
return next((
|
||||
sample for sample in samples
|
||||
if math.isfinite(sample.time_s) and math.isfinite(sample.hfov_deg)
|
||||
and 0.0 < sample.hfov_deg < 180.0
|
||||
and from_s <= sample.time_s < until_s and sample.time_s > baseline.time_s
|
||||
and (baseline.hfov_deg - sample.hfov_deg) / baseline.hfov_deg >= MIN_HFOV_CHANGE_RATIO
|
||||
), None)
|
||||
|
||||
|
||||
def make_fixture(path: Path) -> dict[str, Any]:
|
||||
report = json.loads(path.read_bytes())
|
||||
assert report["status"] == "checked"
|
||||
detail = report["detail"]
|
||||
assert detail["covers"]
|
||||
rows = detail["rows"]
|
||||
own_status = [value["early_status"] for value in detail["telemetry"].values() if value["early_status"]]
|
||||
assert len(own_status) == 1
|
||||
keys = ("[ZOOM DELIVERY]", "[ZOOM DECISION]")
|
||||
return {
|
||||
"start_utc": report["start"],
|
||||
"initial_send_s": detail["axis_commands"]["first"][0][0],
|
||||
"rows": {key: [row for row in rows.get(key, []) if 0.0 <= row[0] <= WINDOW_S] for key in keys},
|
||||
"status": own_status[0],
|
||||
"first_logged_projection_s": next(
|
||||
(t for t, row in rows.get("[AIM]", []) if 0.0 <= t <= WINDOW_S
|
||||
and float(row.get("approach_margin", -1.0)) >= MIN_PROJECTION_MARGIN), None,
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
def replay(episode: dict[str, Any]) -> dict[str, Any]:
|
||||
samples = [LensSample(*row) for row in episode["status"]]
|
||||
assert all(math.isfinite(s.time_s) and 0.0 < s.hfov_deg < 180.0 for s in samples)
|
||||
assert samples and samples == sorted(samples, key=lambda sample: sample.time_s)
|
||||
requests: dict[int, dict[str, Any]] = {}
|
||||
for time_s, line in episode["rows"]["[ZOOM DELIVERY]"]:
|
||||
if match := START.search(line):
|
||||
request_id, kind, seq, pulse, hard = match.groups()
|
||||
assert int(request_id) not in requests
|
||||
requests[int(request_id)] = dict(
|
||||
request=int(request_id), kind=kind, seq=int(seq), start_s=time_s,
|
||||
nominal_s=float(pulse), hard_limit_s=float(hard), final=None,
|
||||
explicit_confirmation_s=None, decisions=[],
|
||||
)
|
||||
elif match := RESULT.search(line):
|
||||
request_id, status, duration, minimum, optics, reason = match.groups()
|
||||
request = requests[int(request_id)]
|
||||
assert request["final"] is None
|
||||
request["final"] = dict(
|
||||
time_s=time_s, status=status, accounted_duration_s=float(duration),
|
||||
required_duration_s=float(minimum), optics_at_finalize=optics == "True", reason=reason,
|
||||
)
|
||||
elif match := CONFIRMED.search(line):
|
||||
requests[int(match[1])]["explicit_confirmation_s"] = time_s
|
||||
for time_s, line in episode["rows"]["[ZOOM DECISION]"]:
|
||||
if (match := DECISION.search(line)) and int(match[1]) in requests:
|
||||
requests[int(match[1])]["decisions"].append(dict(time_s=time_s, reason=match[2], blockers=match[3]))
|
||||
|
||||
ordered = list(requests.values())
|
||||
for index, request in enumerate(ordered):
|
||||
start_s = request["start_s"]
|
||||
assert 0.0 < request["nominal_s"] <= request["hard_limit_s"] <= 0.4
|
||||
until_s = ordered[index + 1]["start_s"] if index + 1 < len(ordered) else math.nextafter(WINDOW_S, math.inf)
|
||||
baseline = next((s for s in reversed(samples) if s.time_s < start_s), None)
|
||||
measured = None
|
||||
if baseline is not None and start_s - baseline.time_s <= MAX_STATUS_AGE_S:
|
||||
measured = first_hfov_change(baseline, samples, from_s=start_s, until_s=until_s)
|
||||
request["first_status_narrowing"] = asdict(measured) if measured is not None else None
|
||||
final = request["final"]
|
||||
if final is not None and final["status"] == "confirmed" and request["explicit_confirmation_s"] is None:
|
||||
request["explicit_confirmation_s"] = final["time_s"]
|
||||
first_confirmed = next((row for row in ordered if row["explicit_confirmation_s"] is not None), None)
|
||||
first_s = ordered[0]["start_s"] if ordered else None
|
||||
confirm_s = first_confirmed["explicit_confirmation_s"] if first_confirmed else None
|
||||
return dict(
|
||||
start_utc=episode["start_utc"], status_samples=len(samples),
|
||||
first_send_s=episode["initial_send_s"], first_start_s=first_s,
|
||||
first_confirmed_request=first_confirmed["request"] if first_confirmed else None,
|
||||
first_optics_s=confirm_s,
|
||||
startup_to_optics_s=round(confirm_s - first_s, 3) if confirm_s is not None else None,
|
||||
first_logged_projection_s=episode["first_logged_projection_s"],
|
||||
first_request_projection_at_decision="unknown",
|
||||
requests=ordered,
|
||||
)
|
||||
|
||||
|
||||
def main() -> None:
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--session", type=Path, help="Build the fixture from the three bounded observer reports")
|
||||
parser.add_argument("--fixture", type=Path, default=Path(__file__).with_name("reference_fixture.json"))
|
||||
parser.add_argument("--output", type=Path, default=Path(__file__).with_name("reference_replay.json"))
|
||||
args = parser.parse_args()
|
||||
if args.session:
|
||||
fixture = {key: make_fixture(args.session / f"ref_{key}.json") for key in EPISODES}
|
||||
args.fixture.write_text(json.dumps(fixture, indent=2) + "\n", encoding="utf-8")
|
||||
fixture = json.loads(args.fixture.read_bytes())
|
||||
result = {key: replay(value) for key, value in fixture.items()}
|
||||
args.output.write_text(json.dumps(result, indent=2) + "\n", encoding="utf-8")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -0,0 +1,30 @@
|
||||
from pathlib import Path
|
||||
import json
|
||||
|
||||
import pytest
|
||||
|
||||
from replay_ptz17_reference import LensSample, first_hfov_change, replay
|
||||
|
||||
|
||||
@pytest.mark.parametrize("key,start,request_id,confirmation,delay", [
|
||||
("1412", 6.115, 3, 10.627, 4.512),
|
||||
("1424", 8.118, 3, 17.020, 8.902),
|
||||
("1428", 4.294, 5, 16.985, 12.691),
|
||||
])
|
||||
def test_replays_observed_first_optics(
|
||||
key: str, start: float, request_id: int, confirmation: float, delay: float,
|
||||
) -> None:
|
||||
fixture = json.loads(Path(__file__).with_name("reference_fixture.json").read_bytes())
|
||||
result = replay(fixture[key])
|
||||
assert result["first_start_s"] == start
|
||||
assert result["first_confirmed_request"] == request_id
|
||||
assert result["first_optics_s"] == confirmation and result["startup_to_optics_s"] == delay
|
||||
assert all(row["first_status_narrowing"] is None for row in result["requests"][:request_id - 1])
|
||||
assert result["requests"][request_id - 1]["first_status_narrowing"]["hfov_deg"] == pytest.approx(54.122, abs=.001)
|
||||
|
||||
|
||||
def test_measurement_does_not_cross_request_boundary() -> None:
|
||||
assert first_hfov_change(
|
||||
LensSample(1., 59.), [LensSample(1.1, float("nan")), LensSample(1.2, 58.9), LensSample(1.3, 54.)],
|
||||
from_s=1.1, until_s=1.3,
|
||||
) is None
|
||||
Loading…
Reference in New Issue