feat: stabilize cold display runtime deployment
This commit is contained in:
@@ -36,6 +36,7 @@ class BatchEngineTests(unittest.TestCase):
|
||||
self.assertEqual([event["event"] for event in events], ["batch_started"])
|
||||
self.assertEqual(events[0]["zone_id"], "r1c1")
|
||||
self.assertEqual(events[0]["current_count"], 3)
|
||||
self.assertEqual(events[0]["severity"], "info")
|
||||
|
||||
def test_consumes_batch_when_removed_before_threshold(self) -> None:
|
||||
self.engine.process(obs(self.t0, {"r1c1": 2}))
|
||||
@@ -48,9 +49,29 @@ class BatchEngineTests(unittest.TestCase):
|
||||
self.engine.process(obs(self.t0, {"r1c1": 2}))
|
||||
events = self.engine.process(obs(self.t0 + timedelta(seconds=10), {"r1c1": 0}))
|
||||
|
||||
self.assertEqual([event["event"] for event in events], ["batch_pending_disposal"])
|
||||
self.assertEqual(events[0]["dwell_seconds"], 10)
|
||||
self.assertIn("disposal_deadline", events[0])
|
||||
self.assertEqual([event["event"] for event in events], ["time_alarm", "batch_pending_disposal"])
|
||||
self.assertEqual(events[0]["severity"], "alarm")
|
||||
self.assertEqual(events[1]["dwell_seconds"], 10)
|
||||
self.assertIn("disposal_deadline", events[1])
|
||||
|
||||
def test_removal_observation_at_threshold_emits_alarm_before_pending_disposal(self) -> None:
|
||||
settings = EngineSettings(
|
||||
camera_id="test_cam",
|
||||
max_dwell_seconds=1200,
|
||||
trash_confirmation_seconds=120,
|
||||
zone_ids=("1",),
|
||||
)
|
||||
engine = BatchEngine(settings)
|
||||
engine.process(obs(self.t0, {"1": 1}))
|
||||
|
||||
events = engine.process(obs(self.t0 + timedelta(seconds=1200), {"1": 0}))
|
||||
|
||||
self.assertEqual([event["event"] for event in events], ["time_alarm", "batch_pending_disposal"])
|
||||
self.assertEqual(events[0]["severity"], "alarm")
|
||||
self.assertEqual(events[0]["current_count"], 1)
|
||||
self.assertEqual(events[0]["zone_index"], 1)
|
||||
self.assertEqual(events[1]["severity"], "warning")
|
||||
self.assertEqual(events[1]["state"], "pending_disposal")
|
||||
|
||||
def test_trash_deposit_confirms_pending_disposal(self) -> None:
|
||||
self.engine.process(obs(self.t0, {"r1c1": 2}))
|
||||
@@ -59,12 +80,13 @@ class BatchEngineTests(unittest.TestCase):
|
||||
|
||||
self.assertEqual([event["event"] for event in events], ["batch_discarded"])
|
||||
|
||||
def test_missing_trash_deposit_raises_violation_after_deadline(self) -> None:
|
||||
def test_missing_trash_deposit_escalates_warning_after_deadline(self) -> None:
|
||||
self.engine.process(obs(self.t0, {"r1c1": 2}))
|
||||
self.engine.process(obs(self.t0 + timedelta(seconds=11), {"r1c1": 0}))
|
||||
events = self.engine.process(obs(self.t0 + timedelta(seconds=17), {"r1c1": 0}))
|
||||
|
||||
self.assertEqual([event["event"] for event in events], ["missing_disposal_violation"])
|
||||
self.assertEqual([event["event"] for event in events], ["warning_escalated"])
|
||||
self.assertEqual(events[0]["severity"], "warning")
|
||||
self.assertEqual(events[0]["violation_reasons"], ["missing_disposal"])
|
||||
|
||||
def test_adding_food_before_zone_clears_raises_mixed_batch_violation(self) -> None:
|
||||
@@ -72,6 +94,7 @@ class BatchEngineTests(unittest.TestCase):
|
||||
events = self.engine.process(obs(self.t0 + timedelta(seconds=1), {"r1c1": 3}))
|
||||
|
||||
self.assertEqual([event["event"] for event in events], ["mixed_batch_violation"])
|
||||
self.assertEqual(events[0]["severity"], "warning")
|
||||
self.assertEqual(events[0]["reason"], "food_added_before_zone_cleared")
|
||||
|
||||
def test_count_decrease_keeps_same_batch_active(self) -> None:
|
||||
@@ -93,6 +116,178 @@ class BatchEngineTests(unittest.TestCase):
|
||||
)
|
||||
self.assertEqual(events[0]["appeared_zones"], ["r1c2"])
|
||||
|
||||
def test_time_alarm_emits_once_while_batch_remains_in_zone(self) -> None:
|
||||
settings = EngineSettings(
|
||||
camera_id="test_cam",
|
||||
max_dwell_seconds=1200,
|
||||
trash_confirmation_seconds=120,
|
||||
zone_ids=("1",),
|
||||
)
|
||||
engine = BatchEngine(settings)
|
||||
engine.process(obs(self.t0, {"1": 1}))
|
||||
|
||||
alarm_events = engine.process(obs(self.t0 + timedelta(seconds=1200), {"1": 1}))
|
||||
repeated_events = engine.process(obs(self.t0 + timedelta(seconds=1300), {"1": 1}))
|
||||
|
||||
self.assertEqual([event["event"] for event in alarm_events], ["time_alarm"])
|
||||
self.assertEqual(repeated_events, [])
|
||||
self.assertEqual(alarm_events[0]["severity"], "alarm")
|
||||
self.assertEqual(alarm_events[0]["zone_id"], "1")
|
||||
self.assertEqual(alarm_events[0]["zone_index"], 1)
|
||||
self.assertEqual(alarm_events[0]["zone_label"], "区域 1")
|
||||
self.assertEqual(alarm_events[0]["dwell_seconds"], 1200)
|
||||
self.assertEqual(alarm_events[0]["max_dwell_seconds"], 1200)
|
||||
self.assertEqual(alarm_events[0]["current_count"], 1)
|
||||
self.assertIn("alerted_at", alarm_events[0])
|
||||
|
||||
def test_alarmed_batch_removed_without_trash_deposit_escalates_warning(self) -> None:
|
||||
settings = EngineSettings(
|
||||
camera_id="test_cam",
|
||||
max_dwell_seconds=1200,
|
||||
trash_confirmation_seconds=120,
|
||||
zone_ids=("1",),
|
||||
)
|
||||
engine = BatchEngine(settings)
|
||||
engine.process(obs(self.t0, {"1": 1}))
|
||||
engine.process(obs(self.t0 + timedelta(seconds=1200), {"1": 1}))
|
||||
pending_events = engine.process(obs(self.t0 + timedelta(seconds=1300), {"1": 0}))
|
||||
warning_events = engine.process(obs(self.t0 + timedelta(seconds=1421), {"1": 0}))
|
||||
|
||||
self.assertEqual([event["event"] for event in pending_events], ["batch_pending_disposal"])
|
||||
self.assertEqual(pending_events[0]["severity"], "warning")
|
||||
self.assertEqual(pending_events[0]["state"], "pending_disposal")
|
||||
self.assertEqual(pending_events[0]["zone_index"], 1)
|
||||
self.assertEqual(pending_events[0]["ended_at"], (self.t0 + timedelta(seconds=1300)).isoformat())
|
||||
|
||||
self.assertEqual([event["event"] for event in warning_events], ["warning_escalated"])
|
||||
self.assertEqual(warning_events[0]["severity"], "warning")
|
||||
self.assertEqual(warning_events[0]["state"], "warning")
|
||||
self.assertEqual(warning_events[0]["reason"], "alarmed_batch_removed_without_trash_deposit")
|
||||
self.assertEqual(warning_events[0]["zone_label"], "区域 1")
|
||||
|
||||
def test_alarmed_batch_removed_with_trash_deposit_is_discarded(self) -> None:
|
||||
settings = EngineSettings(
|
||||
camera_id="test_cam",
|
||||
max_dwell_seconds=1200,
|
||||
trash_confirmation_seconds=120,
|
||||
zone_ids=("1",),
|
||||
)
|
||||
engine = BatchEngine(settings)
|
||||
engine.process(obs(self.t0, {"1": 1}))
|
||||
engine.process(obs(self.t0 + timedelta(seconds=1200), {"1": 1}))
|
||||
engine.process(obs(self.t0 + timedelta(seconds=1300), {"1": 0}))
|
||||
events = engine.process(obs(self.t0 + timedelta(seconds=1310), {"1": 0}, trash=True))
|
||||
|
||||
self.assertEqual([event["event"] for event in events], ["batch_discarded"])
|
||||
self.assertEqual(events[0]["severity"], "info")
|
||||
self.assertEqual(events[0]["state"], "discarded")
|
||||
|
||||
def test_same_observation_removal_and_trash_motion_discards_alerted_batch(self) -> None:
|
||||
settings = EngineSettings(
|
||||
camera_id="test_cam",
|
||||
max_dwell_seconds=1200,
|
||||
trash_confirmation_seconds=120,
|
||||
zone_ids=("1",),
|
||||
)
|
||||
engine = BatchEngine(settings)
|
||||
engine.process(obs(self.t0, {"1": 1}))
|
||||
engine.process(obs(self.t0 + timedelta(seconds=1200), {"1": 1}))
|
||||
|
||||
events = engine.process(obs(self.t0 + timedelta(seconds=1300), {"1": 0}, trash=True))
|
||||
later_events = engine.process(obs(self.t0 + timedelta(seconds=1421), {"1": 0}))
|
||||
|
||||
self.assertEqual([event["event"] for event in events], ["batch_pending_disposal", "batch_discarded"])
|
||||
self.assertEqual(events[1]["state"], "discarded")
|
||||
self.assertEqual(later_events, [])
|
||||
|
||||
def test_same_observation_trash_motion_discards_multiple_newly_pending_batches(self) -> None:
|
||||
settings = EngineSettings(
|
||||
camera_id="test_cam",
|
||||
max_dwell_seconds=300,
|
||||
trash_confirmation_seconds=120,
|
||||
zone_ids=("1", "4"),
|
||||
)
|
||||
engine = BatchEngine(settings)
|
||||
engine.process(obs(self.t0, {"1": 1, "4": 1}))
|
||||
engine.process(obs(self.t0 + timedelta(seconds=300), {"1": 1, "4": 1}))
|
||||
|
||||
events = engine.process(obs(self.t0 + timedelta(seconds=360), {"1": 0, "4": 0}, trash=True))
|
||||
later_events = engine.process(obs(self.t0 + timedelta(seconds=481), {"1": 0, "4": 0}))
|
||||
|
||||
self.assertEqual(
|
||||
[event["event"] for event in events],
|
||||
["batch_pending_disposal", "batch_pending_disposal", "batch_discarded", "batch_discarded"],
|
||||
)
|
||||
self.assertEqual([event["zone_id"] for event in events if event["event"] == "batch_discarded"], ["1", "4"])
|
||||
self.assertEqual(later_events, [])
|
||||
|
||||
def test_restore_keeps_active_alarm_batch_after_runtime_restart(self) -> None:
|
||||
settings = EngineSettings(
|
||||
camera_id="test_cam",
|
||||
max_dwell_seconds=1200,
|
||||
trash_confirmation_seconds=120,
|
||||
zone_ids=("1",),
|
||||
)
|
||||
engine = BatchEngine(settings)
|
||||
engine.restore_from_events(
|
||||
[
|
||||
{
|
||||
"event": "batch_started",
|
||||
"zone_id": "1",
|
||||
"batch_id": "batch_000124",
|
||||
"started_at": self.t0.isoformat(),
|
||||
"current_count": 1,
|
||||
"state": "active",
|
||||
},
|
||||
{
|
||||
"event": "time_alarm",
|
||||
"zone_id": "1",
|
||||
"batch_id": "batch_000124",
|
||||
"started_at": self.t0.isoformat(),
|
||||
"alerted_at": (self.t0 + timedelta(seconds=1200)).isoformat(),
|
||||
"current_count": 1,
|
||||
"state": "alerted",
|
||||
},
|
||||
],
|
||||
active_zone_counts={"1": 1},
|
||||
)
|
||||
|
||||
repeated_events = engine.process(obs(self.t0 + timedelta(seconds=1300), {"1": 1}))
|
||||
removal_events = engine.process(obs(self.t0 + timedelta(seconds=1400), {"1": 0}))
|
||||
|
||||
self.assertEqual(repeated_events, [])
|
||||
self.assertEqual([event["event"] for event in removal_events], ["batch_pending_disposal"])
|
||||
self.assertEqual(removal_events[0]["batch_id"], "batch_000124")
|
||||
self.assertEqual(removal_events[0]["dwell_seconds"], 1400)
|
||||
|
||||
def test_restore_skips_active_false_positive_when_latest_zone_count_is_empty(self) -> None:
|
||||
settings = EngineSettings(
|
||||
camera_id="test_cam",
|
||||
max_dwell_seconds=1200,
|
||||
trash_confirmation_seconds=120,
|
||||
zone_ids=("3",),
|
||||
)
|
||||
engine = BatchEngine(settings)
|
||||
engine.restore_from_events(
|
||||
[
|
||||
{
|
||||
"event": "time_alarm",
|
||||
"zone_id": "3",
|
||||
"batch_id": "batch_000213",
|
||||
"started_at": self.t0.isoformat(),
|
||||
"alerted_at": (self.t0 + timedelta(seconds=1200)).isoformat(),
|
||||
"current_count": 1,
|
||||
"state": "alerted",
|
||||
},
|
||||
],
|
||||
active_zone_counts={"3": 0},
|
||||
)
|
||||
|
||||
events = engine.process(obs(self.t0 + timedelta(seconds=1300), {"3": 0}))
|
||||
|
||||
self.assertEqual(events, [])
|
||||
self.assertEqual(engine.active_by_zone, {})
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user