diff --git a/app/services/cadence.py b/app/services/cadence.py index 866b4c9..b3c6127 100644 --- a/app/services/cadence.py +++ b/app/services/cadence.py @@ -18,11 +18,17 @@ from datetime import datetime, timezone @dataclass(frozen=True) class CadencePolicy: - # Active window in UTC. LSE opens 07:00 BST → 07:00 UTC summer, 08:00 UTC - # winter. NYSE closes 16:00 ET → 21:00 UTC summer, 21:00 UTC winter. The - # combined EU/US trading window is well covered by 07:00-21:00 UTC. - active_start_hour: int = 7 - active_end_hour: int = 21 + # Active trading windows in UTC. A timestamp is "active" if its hour + # falls in ANY listed window. Add or remove tuples to change coverage. + # + # LSE opens 07:00 BST → 07:00 UTC summer / 08:00 UTC winter. + # NYSE closes 16:00 ET → 21:00 UTC summer / 21:00 UTC winter. + # Tokyo trades 09:00-15:00 JST → 00:00-06:00 UTC. + # HK/Shanghai trade 09:30-16:00 local → 01:30-08:00 UTC. + active_windows: tuple[tuple[int, int], ...] = ( + (7, 21), # EU/US (LSE open through NYSE close) + # (0, 8), # Asia (Tokyo + HK/Shanghai) — uncomment to add + ) # Minimum gap between successful runs outside the active window. off_hours_gap_h: float = 4.0 weekend_gap_h: float = 12.0 @@ -31,7 +37,7 @@ class CadencePolicy: now = now or datetime.now(timezone.utc) if now.weekday() >= 5: # Saturday / Sunday return False - return self.active_start_hour <= now.hour < self.active_end_hour + return any(start <= now.hour < end for start, end in self.active_windows) def min_gap_hours(self, now: datetime | None = None) -> float: now = now or datetime.now(timezone.utc)