From fbf8017665aa228a4a1ad732f3470875039fb93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AF=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9A=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D0=B0=D1=88=D0=BE=D0=B2?= Date: Tue, 10 Nov 2026 12:00:15 +0700 Subject: [PATCH] Log same-native zoom pulse continuation --- .gitattributes | 1 + .../ptz_same_native_diagnostics/README.md | 7 +++ .../ptz_same_native_diagnostics/pins.json | 12 ++++ .../ptz_same_native_diagnostics/server.patch | 55 +++++++++++++++++++ .../test_native_floor.py | 16 +++++- 5 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 integration/ptz_same_native_diagnostics/README.md create mode 100644 integration/ptz_same_native_diagnostics/pins.json create mode 100644 integration/ptz_same_native_diagnostics/server.patch diff --git a/.gitattributes b/.gitattributes index 0bc59d1..a79d303 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ integration/ptz_zoom_zero_decision/server.patch text eol=lf -whitespace integration/ptz_native_floor_continuation/server.patch text eol=lf -whitespace +integration/ptz_same_native_diagnostics/server.patch text eol=lf -whitespace diff --git a/integration/ptz_same_native_diagnostics/README.md b/integration/ptz_same_native_diagnostics/README.md new file mode 100644 index 0000000..7c8325d --- /dev/null +++ b/integration/ptz_same_native_diagnostics/README.md @@ -0,0 +1,7 @@ +# Диагностика продолжения импульса same_native + +`ZOOM CONTINUE reason=same_native` фиксирует кадр, камеру, поколение и номер уже начавшегося запроса. `proposed` и `held` показывают дробные значения, `native` — скорость камеры. `nominal_until` содержит исходный срок, `pulse` и `hard` — исходные длительности. `dispatch_zoom` показывает команду на выходе контроллера после остальных ограничений. + +Сопоставляйте запись с `ZOOM DELIVERY` по камере, запросу и поколению. Факт и длительность доставки берите из записи завершения. Для одного запроса могут появиться записи по нескольким кадрам. + +Патч рассчитан на установленный PR №5. На исходном коде и кандидате прошли по 16 офлайн-тестов. Повтор подтвердил одинаковые команды в общих сценариях и запись при сохранении native10. Проверено побайтное применение и обратное применение патча. diff --git a/integration/ptz_same_native_diagnostics/pins.json b/integration/ptz_same_native_diagnostics/pins.json new file mode 100644 index 0000000..77ba2ce --- /dev/null +++ b/integration/ptz_same_native_diagnostics/pins.json @@ -0,0 +1,12 @@ +{ + "requires": "PR #5", + "files": { + "ptz_tracker_modular/postprocess.py": { + "before": "376f705fb3be06ab04afc1ebb718cb71a2c27a67987023b099f5d921148b64ad", + "after": "d85439504ebf56fc39ee8a883c44b1bfc6db721df938aedc85d6c6484cb97776" + } + }, + "unchanged": { + "ptz_tracker_modular/ptz_io.py": "13d31539193b1a773a5d1db2187cc2a0c8db67d0aacaad89082face64df07499" + } +} diff --git a/integration/ptz_same_native_diagnostics/server.patch b/integration/ptz_same_native_diagnostics/server.patch new file mode 100644 index 0000000..69543b0 --- /dev/null +++ b/integration/ptz_same_native_diagnostics/server.patch @@ -0,0 +1,55 @@ +--- a/ptz_tracker_modular/postprocess.py ++++ b/ptz_tracker_modular/postprocess.py +@@ -4577,6 +4577,7 @@ + pulse_timing: Tuple[float, float] | None = None, + optics_observed_now: float | None = None, + stop_trace: list[str] | None = None, ++ continuation_trace: list[tuple[int, int, float, float, float, float, float]] | None = None, + ) -> float: + """Break continuous zoom-in into short feedback-controlled steps.""" + pulse_until = float(st.get("zoom_step_until", 0.0) or 0.0) +@@ -4650,6 +4651,12 @@ + ): + _finish_zoom_step(st, now, stable_key=stable_key) + return _reject_zoom_step("pending_native_floor", stop_trace) ++ if same_native and continuation_trace is not None: ++ continuation_trace.append(( ++ st["ptz_generation"], native, float(zoom_cmd), useful_cmd, pulse_until, ++ float(st.get("zoom_step_pending_pulse_sec", 0.0) or 0.0), ++ float(st.get("zoom_step_pending_hard_sec", 0.0) or 0.0), ++ )) + zoom_cmd = useful_cmd + physical_started = float(st.get("zoom_step_physical_started_at", 0.0) or 0.0) + if physical_started > 0.0: +@@ -9232,6 +9239,7 @@ + st["zoom_useful_pulse_reason"] = "wait_response_framing" + zoom_zero_reason = "response_framing" + gate_stop = [] if decision_request else None ++ continuation_trace = [] if decision_request else None + zoom_cmd = _gate_zoom_in_pulse( + st, + # Keep new-request expiry tied to the frame that authorized +@@ -9247,6 +9255,7 @@ + pulse_timing=response_timing, + optics_observed_now=zoom_gate_now, + stop_trace=gate_stop, ++ continuation_trace=continuation_trace, + ) + if gate_stop: + zoom_zero_reason = gate_stop[-1] +@@ -9788,6 +9797,15 @@ + cam_idx, prepared_fps, visual_only, max(0., time.time()-now)*1000., + st.get('control_updates', 0), st.get('control_visual_updates', 0)) + ingest_detection(alarm_eligible) ++ if continuation_trace: ++ generation, native, proposed, held, until, pulse_sec, hard_sec = continuation_trace[0] ++ logger.info( ++ "[ZOOM CONTINUE] cam=%s frame=%s request=%s gen=%s reason=same_native " ++ "native=%s proposed=%.12g held=%.12g nominal_until=%.6f " ++ "pulse=%.3fs hard=%.3fs dispatch_zoom=%.12g", ++ cam_idx, source_seq, decision_request, generation, native, proposed, ++ held, until, pulse_sec, hard_sec, zoom_cmd, ++ ) + return + + # ========================= diff --git a/integration/ptz_zoom_zero_decision/test_native_floor.py b/integration/ptz_zoom_zero_decision/test_native_floor.py index 9022a7a..6a03dcd 100644 --- a/integration/ptz_zoom_zero_decision/test_native_floor.py +++ b/integration/ptz_zoom_zero_decision/test_native_floor.py @@ -133,8 +133,19 @@ def build_floor_cases(boundary, controller_replay, pp, ptz_io, config, report_pa break self.assertEqual(self.st["zoom_step_pending_useful_cmd"], .106) deadline = self.st["zoom_step_until"] - with patch.object(pp, "_gate_zoom_in_pulse", wraps=pp._gate_zoom_in_pulse) as gate: + with (patch.object(pp, "_gate_zoom_in_pulse", wraps=pp._gate_zoom_in_pulse) as gate, + patch.object(pp.logger, "info", wraps=pp.logger.info) as log): row = self.tick(.06) + events = [call.args for call in log.call_args_list if "[ZOOM CONTINUE]" in call.args[0]] + self.assertEqual(len(events), int(fixed)) + if events: + fmt, *values = events[0] + self.assertEqual(values[0:2], [self.cam, row["seq"]]) + self.assertEqual(values[2], self.st["zoom_step_physical_request_id"]) + self.assertEqual(values[3], self.st["ptz_generation"]) + self.assertEqual(values[4:8], [10, .103, .106, deadline]) + self.assertEqual(values[8:11], [.34, .40, .106]) + self.assertIn("reason=same_native", fmt % tuple(values)) self.assertEqual(gate.call_args.args[2], .103) if fixed: self.assertEqual(self.st["zoom_step_until"], deadline) @@ -142,6 +153,9 @@ def build_floor_cases(boundary, controller_replay, pp, ptz_io, config, report_pa else: self.assertEqual(row["sent"][-1], (0, 0, 0)) self.assertEqual(self.st["zoom_step_last_delivery_result"], "short") + with patch.object(pp.logger, "info", wraps=pp.logger.info) as log: + self.tick(.05, detector=False, score=.1) + self.assertFalse(any("[ZOOM CONTINUE]" in call.args[0] for call in log.call_args_list)) return [ NativeFloor("test_observed_native10_windows"), -- 2.17.1