screen-locker/screen_locker/_session_sync.py
Krzysztof kuhy Rudnicki a48bd1334a Credit StrongLifts sessions from the headless sync, as pc_workout_verified
`sync_now()` -- what workout-sync.timer runs every 15 minutes -- only ever
ingested MANUAL records. The session reader `pull_synced_workout()` was
reachable only from `_verify_phone_workout`, i.e. the interactive lock/status
UI, so a finished session earned nothing until a lock screen happened to open.

That was survivable while the phone was the only device recording sessions:
the same lock screen that demanded the workout also verified it. The Linux
build finishes sessions with no lock screen involved at all, so the credit
would simply never arrive.

`pull_all_session_records()` is the session counterpart to the existing
`pull_all_manual_records()` -- `pull_synced_workout` returns only the single
newest session for the live unlock check, which cannot backfill a week.

New type `pc_workout_verified` rather than reusing `phone_verified`: it is
machine-checked in exactly the same way (same WorkoutSession payload, same
set/rep and duration validation), but there is no phone involved, and writing
"phone_verified" into an HMAC-signed log would make the log lie about its own
provenance.

Ingestion re-derives the verdict instead of trusting the record's `succeeded`
flag -- the record arrives over the network and this is the thing handing out
unlock credit. Every rejection logs at WARNING with an actionable reason, per
the repo's no-silent-failures rule.

One real leak fixed along the way: formatting the duration with `.0f` rounded
34m59s up to "35 min", which is precisely the hidden accept bar -- the message
would have told the user the real threshold while rejecting them at it. It now
truncates, so the advertised 40 stays the only number shown.

Verified against live data: ingests the 4 real synced sessions, and a second
run ingests 0 (the write chokepoint dedups by workout_id), so the repeating
timer cannot double-credit. Suite green at 100% branch coverage, 1046 tests.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DfJC1Wu1SEgJ6X49k5Jqtg
2026-08-22 11:26:20 +02:00

131 lines
5.2 KiB
Python

"""Ingesting synced StrongLifts sessions into ``log.json``.
The manual-workout half of sync (``_manual_sync``) has always run headlessly
from ``workout-sync.timer``. Sessions did not: ``pull_synced_workout`` was
reachable only from the interactive verification flow, so a finished session
sat in Firebase uncredited until the locker next opened a window. That was
survivable while the phone was the only device recording sessions -- the same
lock screen that asked for the workout also verified it -- but the Linux build
finishes sessions with no lock screen involved at all.
Mirrors :mod:`screen_locker._manual_sync`: reconstruct, re-validate on the PC,
then HMAC-sign and append under the session's own date. Never trusts the
record's own claim that it succeeded.
"""
from __future__ import annotations
import logging
from typing import TYPE_CHECKING
from screen_locker._constants import (
MIN_WORKOUT_DURATION_MINUTES,
WORKOUT_DURATION_ACCEPT_MINUTES,
)
from screen_locker._log_mixin import write_signed_entry
from screen_locker._weekly_check import PC_WORKOUT_TYPE
if TYPE_CHECKING:
from collections.abc import Callable, Iterable, Mapping
from pathlib import Path
from screen_locker._log_mixin import RecordResult
OnIngestedCallback = Callable[[dict, "list[dict]"], None]
_logger = logging.getLogger(__name__)
def validate_session(payload: Mapping[str, object]) -> tuple[bool, str]:
"""Check a synced session payload is a real, long-enough workout.
Deliberately re-runs the same content checks
``PhoneVerificationMixin._validate_json_content`` applies, rather than
trusting ``succeeded``: a record arrives over the network and the PC is
the thing handing out unlock credit, so it re-derives the verdict.
Returns ``(ok, reason)``; ``reason`` always reads like a sentence so a
rejected session says why instead of silently not counting.
"""
exercises = payload.get("exercises")
if not isinstance(exercises, list) or not exercises:
return False, "no exercises in the session payload"
raw_duration = payload.get("duration_seconds", 0)
if not isinstance(raw_duration, (int, float)):
return False, f"duration_seconds is not a number: {raw_duration!r}"
duration_min = raw_duration / 60.0
# Accept bar carries the hidden leeway; the message advertises the round
# number only (see _constants.py).
if duration_min < WORKOUT_DURATION_ACCEPT_MINUTES:
# Truncate rather than round: 34m59s rounds UP to "35 min", which is
# exactly the hidden accept bar and would tell the user the real
# threshold while rejecting them at it. The advertised number stays
# MIN_WORKOUT_DURATION_MINUTES (see _constants.py).
return False, (
f"only {int(duration_min)} min logged, "
f"need at least {MIN_WORKOUT_DURATION_MINUTES} min"
)
return True, f"{duration_min:.0f} min"
def build_session_entry(payload: Mapping[str, object], detail: str) -> dict[str, str]:
"""Build the ``workout_data`` for a verified synced session."""
flag = "all succeeded" if payload.get("succeeded") else "partial"
workout_type = payload.get("workout_type", "?")
return {
"type": PC_WORKOUT_TYPE,
"source": f"StrongLifts workout {workout_type} ({detail}, {flag})",
"duration_minutes": f"{float(payload.get('duration_seconds', 0)) / 60.0:.1f}",
"sync_record_id": str(payload.get("start_time", "")),
}
def ingest_session_records(
log_file: Path,
records: Iterable[tuple[str, Mapping[str, object]]],
*,
on_ingested: OnIngestedCallback | None = None,
) -> list[str]:
"""Ingest synced StrongLifts sessions into ``log.json``.
For each ``(record_id, payload)``: re-validate on the PC, then HMAC-sign
and APPEND under the session's own ``date`` so the weekly count places it
in the right ISO week. Idempotent -- the write chokepoint dedups by
``workout_id`` -- so re-syncing the same session every 15 minutes is a
no-op rather than repeated credit.
``on_ingested(entry, prior_entries)`` fires for each newly-appended
session so the caller applies the identical live-workout reward.
Returns the record ids actually ingested.
"""
ingested: list[str] = []
for record_id, payload in records:
date = payload.get("date")
if not isinstance(date, str) or not date:
_logger.warning(
"Skipping synced session %s: no usable date field (%r), so it "
"cannot be filed in a week and will never count.",
record_id,
date,
)
continue
ok, detail = validate_session(payload)
if not ok:
_logger.warning(
"Skipping synced session %s dated %s: %s — it does NOT count "
"toward the weekly minimum.",
record_id,
date,
detail,
)
continue
entry = build_session_entry(payload, detail)
result: RecordResult = write_signed_entry(log_file, date, entry)
if not result.appended:
continue
ingested.append(record_id)
if on_ingested is not None:
on_ingested(entry, result.prior_entries)
return ingested