wake-alarm/wake_alarm/_rounds.py
Krzysztof kuhy Rudnicki 9e0cd123ff Phase 3: remove the max-fan ramp, split _alarm.py, wire the new modules
Item 14: the fan ramp is gone entirely. It caused anxiety without helping
anyone wake up. Deletes _max_fans/_restore_fans/_find_fan_hwmon, the
_AlarmHardware.fan_state field, both call sites, and their tests.
wake-alarm-fans.sh and its NOPASSWD sudoers entry come out in the install.sh
pass -- dropping a passwordless root helper is a bonus.

_alarm.py was 478 lines and the 250-line gate fires on any commit that stages
it, so this carries the split it has owed for a while. New modules, each a
real seam rather than an arbitrary cut:

  _gating          should-it-run-today + CLI (no time gate; that is _trigger's)
  _beep_loop       the sounding thread, now driving _escalation's planner
  _alarm_timers    self-rescheduling challenge refresh / skip window (mixin)
  _alarm_state     the progress + hardware dataclasses
  _rounds          challenge presentation, re-exporting the view helpers
  _countdown       skip-window arithmetic and demo/production intervals
  _dismiss_view    the post-dismissal banner
  _screen_flash    the ~1.3 Hz attention flash (kept under the 3 Hz threshold)
  _lock_setup      gatelock config + arbiter claim
  _startup         wake display, brightness, plug
  _tone            tone synthesis and cache (out of _audio)
  _brightness      xrandr brightness (was in _audio, never belonged there)

main() deliberately stays in _alarm.py: morning_routine/_orchestrator.py:39
hardcodes "wake_alarm._alarm", and moving it is the exact mistake that caused
a month-long silent production failure once already. Verified after the split
that the module still resolves and accepts --production.

Also fixes the plug pre-roll found while researching speakers: main() fired
turn_on_plug() and the first beep in the same instant, so an amplifier's
soft-start relay swallowed the opening of the alarm. PLUG_PREROLL_SECONDS=4
now sits between them.

Two bugs found by running the code rather than by lint:
- ruff stripped `struct` from the extracted _tone.py because the import
  landed before its first usage; only executing it caught the NameError.
- test fixtures patched _play_on_all_sinks/_set_max_brightness at
  wake_alarm._alarm, which silently stopped intercepting once those moved.

404 tests, 100% branch coverage, no new noqa/type-ignore suppressions.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EckWmyfetYq3Mi8MAnUudh
2026-08-26 23:46:10 +02:00

121 lines
3.5 KiB
Python

"""Present a dismiss challenge and judge the answer.
Split out of ``_alarm.py`` for the 250-line cap. Everything here manipulates
the view for one round; the alarm keeps ownership of *how many* rounds are
needed and what happens when they are all done.
"""
from __future__ import annotations
import tkinter as tk
from typing import TYPE_CHECKING
from wake_alarm._countdown import (
NO_SKIP_STATUS,
WINDOW_CLOSED_INFO,
countdown_text,
refresh_interval_ms,
remaining_seconds,
skip_window_ms,
skip_window_seconds,
)
from wake_alarm._dismiss_view import BANNER_LINGER_MS, show_dismissal
from wake_alarm._screen_flash import FLASH_PERIOD_MS, apply_flash_colour
__all__ = [
"BANNER_LINGER_MS",
"FLASH_PERIOD_MS",
"NO_SKIP_STATUS",
"WINDOW_CLOSED_INFO",
"apply_flash_colour",
"countdown_text",
"hide_flash_code",
"normalise",
"refresh_interval_ms",
"remaining_seconds",
"show_challenge",
"show_dismissal",
"show_flash_countdown",
"show_round_progress",
"show_wrong_answer",
"skip_window_ms",
"skip_window_seconds",
]
if TYPE_CHECKING:
from wake_alarm._alarm_view import _ViewGroup
from wake_alarm._challenges import _Challenge
def normalise(entered: str) -> str:
"""Canonicalise typed input before comparison.
Args:
entered: Raw contents of the entry widget.
Returns:
Trimmed, upper-cased text.
"""
return entered.strip().upper()
def show_challenge(view: _ViewGroup, challenge: _Challenge) -> None:
"""Display *challenge* and clear the entry ready for the answer.
Args:
view: The multi-monitor view group.
challenge: The challenge to present.
"""
view.code_label.configure(text=challenge.display, fg=view.config.success)
view.info_label.configure(text=challenge.hint)
view.entry.delete(0, tk.END)
def show_wrong_answer(view: _ViewGroup, challenge: _Challenge) -> None:
"""Report an incorrect answer and re-present the same challenge.
Args:
view: The multi-monitor view group.
challenge: The challenge that was answered incorrectly.
"""
view.status_label.configure(text="Wrong! Try again.")
view.entry.delete(0, tk.END)
if challenge.kind == "flash":
view.code_label.configure(text=challenge.display, fg=view.config.success)
def show_flash_countdown(view: _ViewGroup, remaining: int) -> None:
"""Show how long the flash challenge stays visible.
Args:
view: The multi-monitor view group.
remaining: Seconds before the code is hidden.
"""
view.status_label.configure(text=f"Memorise! Hiding in {remaining}s…")
def hide_flash_code(view: _ViewGroup, challenge: _Challenge) -> None:
"""Mask the flash code and prompt for it from memory.
Args:
view: The multi-monitor view group.
challenge: The challenge whose display is being hidden.
"""
view.code_label.configure(
text="?" * len(challenge.display),
fg=view.config.muted,
)
view.status_label.configure(text="Now type the code from memory!")
def show_round_progress(view: _ViewGroup, *, completed: int, required: int) -> None:
"""Update the round counter and the encouragement line.
Args:
view: The multi-monitor view group.
completed: How many rounds are done.
required: How many rounds are needed in total.
"""
view.round_label.configure(text=f"Round {completed + 1} / {required}")
view.status_label.configure(text=f"Round {completed} done — keep going!")