mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-12 08:30:51 +01:00
Four asks, plus the fixes two review passes turned up. Removals (all unused): - "Repeat last meal" button, and the reward/temptation-bundling prompt it was the sole trigger for. Replaced with a post-log progress card showing kcal against budget, macros, and the adherence streak. - The multi-item meal builder, on both the gate and the phone. The stored `components` field stays: nothing writes it now, but historical composite entries and the food bank still read it and it is part of the wire format. - Meal photos entirely: 13 files, `imagePath`, the photo filter, the wrapper's /blobs/ route, image_picker, and the CAMERA permission. Reminder false alarms had three real causes, all fixed: - Logging never reconciled notifications, so a reminder sat on screen up to 15 minutes after the meal was logged -- on the phone itself. - The background check never pulled, so a PC-logged meal nagged forever until the app was opened. Now mirrors _cli_gate._should_lock: cheap local check, network only when a slot looks due, then re-check. - Meals before 08:00 / after 22:00 were attributed to no slot at all. New slot_for_log/slotForLog clamps them to the first/last slot, byte-identical across Python and Dart. Deliberately separate from elapsed_slots, which would otherwise make every slot fall due at 23:00. Budget history, so lowering the budget stops rewriting the past: - Forward-only (effective_from, kcal) entries; each day is judged against the budget in force then. Verified live: setting 2000 left a 36-day adherence streak and the whole calendar pixel-identical. - Rides as hist:<date> fields on the existing budget record. crdt_sync merges per-field over the union of field names and both devices push the merged log, so a device that predates the feature relays them untouched -- no coordinated rollout, no second document. - The seed guard tests emptiness, not file presence: _sync can write an empty history after merging with a pre-feature peer, and a presence check would then never seed again, silently reclassifying every past day. One shared source of truth for every piece of data: - Body weight now travels as its own `weight` CRDT field. Inside `value` it was collateral damage of whole-map LWW -- any phone budget edit deleted it, and the protein target with it. - Both halves of the food bank sync. The curated half (foods added without eating them) was the last device-local state. The derived half merges with count as the clock, so LWW means max-count-wins; the log stays authoritative for membership, because a CRDT union never shrinks and a peer's stale copy would otherwise resurrect a deleted food permanently. - Bank adapters honour tombstones, and Dart parses bank records defensively: a cast failure there is an Error, not an Exception, so one malformed remote record would have broken phone sync permanently. _test_guard.py blocks any pathlib write to real user state while pytest is in the process, whatever conftest is loaded. A throwaway test run outside the package conftest destroyed a real GitHub token during this work; this makes that class of accident impossible rather than merely discouraged. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
260 lines
10 KiB
Python
260 lines
10 KiB
Python
"""Submit/record flow and dashboard for the MealGate gate.
|
|
|
|
Split out of :mod:`._gatelock` to keep that module under the repo's 500-line
|
|
limit. ``_GateMealFlow`` extends
|
|
:class:`~diet_guard._gatelock_nutrition._GateNutrition` with the
|
|
submit/lookup/log flow, the per-slot input reset, and the running
|
|
calorie/macro dashboard.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import contextlib
|
|
import tkinter as tk
|
|
from typing import TYPE_CHECKING
|
|
|
|
from diet_guard._budget import BudgetError, daily_budget, protein_target_g
|
|
from diet_guard._foodbank import remember_food
|
|
from diet_guard._gate import due_slots
|
|
from diet_guard._gatelock_nutrition import _GateNutrition
|
|
from diet_guard._gatelock_ui import ERR, FG, UNIT_GRAMS
|
|
from diet_guard._resolve import lookup_candidates
|
|
from diet_guard._slots import slot_label
|
|
from diet_guard._state import (
|
|
entry_kcal,
|
|
log_meal,
|
|
today_entries,
|
|
today_total_kcal,
|
|
today_total_macros,
|
|
)
|
|
from diet_guard._sync import pull_shared_log
|
|
|
|
if TYPE_CHECKING:
|
|
from diet_guard._estimator import Nutrition
|
|
|
|
# How long the "unlocking..." confirmation lingers before the window tears down.
|
|
_UNLOCK_DELAY_MS = 1200
|
|
# How many recent meals the dashboard lists.
|
|
_DASHBOARD_ROWS = 5
|
|
# ISO timestamp "YYYY-MM-DDTHH:MM:SS": HH:MM is characters 11..16.
|
|
_TIME_SLICE = slice(11, 16)
|
|
# Width a meal description is truncated to in the dashboard.
|
|
_DASH_DESC_WIDTH = 22
|
|
|
|
|
|
class _GateMealFlow(_GateNutrition):
|
|
"""Submit/lookup/log flow for a logged food."""
|
|
|
|
# -- slot walk ------------------------------------------------------------
|
|
|
|
def _clear_inputs(self) -> None:
|
|
"""Empty the food fields, picker, preview, and basis for a new slot."""
|
|
self._set_desc("")
|
|
self._widgets.amount_entry.delete(0, tk.END)
|
|
self._vars.unit.set(UNIT_GRAMS)
|
|
self._relabel_basis()
|
|
self._reset_per_default()
|
|
for entry in self._macro_entries():
|
|
entry.delete(0, tk.END)
|
|
self._widgets.suggestion_box.delete(0, tk.END)
|
|
self._state.suggestions = []
|
|
self._state.source = "manual"
|
|
self._state.last_reference = None
|
|
self._vars.preview.set("")
|
|
self._refresh_projection()
|
|
|
|
# -- behaviour ------------------------------------------------------------
|
|
|
|
def _set_status(self, text: str, *, error: bool = False) -> None:
|
|
"""Update the status line, red for errors."""
|
|
self._vars.status.set(text)
|
|
self._widgets.status_label.config(fg=ERR if error else FG)
|
|
|
|
def _on_return(self, _event: tk.Event[tk.Misc]) -> None:
|
|
"""Handle the Enter key in any entry field."""
|
|
self._on_submit()
|
|
|
|
def _on_submit(self) -> None:
|
|
"""Validate, then look the food up, or log it."""
|
|
description = self._get_desc()
|
|
if not description:
|
|
self._set_status("Type what you ate first.", error=True)
|
|
self._widgets.desc_text.focus_set()
|
|
return
|
|
|
|
values = self._macro_values()
|
|
if values is None:
|
|
self._set_status("Macros must be numbers.", error=True)
|
|
self._widgets.macros.kcal.focus_set()
|
|
return
|
|
|
|
if values[0] is None:
|
|
self._begin_lookup(description)
|
|
return
|
|
nutrition = self._current_nutrition()
|
|
if nutrition is None:
|
|
self._set_status("Enter the calories, then submit.", error=True)
|
|
self._widgets.macros.kcal.focus_set()
|
|
return
|
|
self._record(description, nutrition)
|
|
|
|
def _begin_lookup(self, description: str) -> None:
|
|
"""Step 1: look the food up, fill the label fields, offer alternatives.
|
|
|
|
Nothing is logged here -- the user must see and confirm the filled
|
|
values (a second submit) before they are recorded. The food is looked
|
|
up at its natural basis (per 100 g / serving); the amount eaten scales
|
|
it, so the lookup never bakes in a portion.
|
|
"""
|
|
self._set_status("looking up…")
|
|
self.root.update_idletasks()
|
|
candidates = lookup_candidates(description)
|
|
if not candidates:
|
|
self._set_status(
|
|
"Couldn't look that up. Enter the calories yourself, then submit.",
|
|
error=True,
|
|
)
|
|
self._widgets.macros.kcal.focus_set()
|
|
return
|
|
self._show_candidates(candidates)
|
|
self._apply_reference(candidates[0][1])
|
|
source = candidates[0][1].source
|
|
tail = (
|
|
"Review, or pick another below, then submit to log."
|
|
if len(candidates) > 1
|
|
else "Review the values, then submit to log."
|
|
)
|
|
self._set_status(f"Filled from {source}. {tail}")
|
|
|
|
def _record(self, description: str, nutrition: Nutrition) -> None:
|
|
"""Log and bank a single food for the current slot, then advance."""
|
|
log_meal(description, nutrition, self._slot_for_log())
|
|
remember_food(description, nutrition)
|
|
self._finish_slot(f"{nutrition.kcal:g} kcal ({nutrition.source})")
|
|
|
|
def _slot_for_log(self) -> int | None:
|
|
"""Return the slot to tag a log with -- None in demo (satisfies no slot).
|
|
|
|
A synthetic demo slot must never satisfy a real checkpoint, so demo logs
|
|
are slot-less: they still bank the food and update the dashboard, but do
|
|
not silently stop the production gate from firing.
|
|
"""
|
|
return None if self.demo_mode else self._pending[0]
|
|
|
|
def _finish_slot(self, summary: str) -> None:
|
|
"""Advance past the current slot after something was logged for it.
|
|
|
|
Args:
|
|
summary: A short description of what was logged (calories and
|
|
source), shown in the confirmation line.
|
|
"""
|
|
slot = self._pending[0]
|
|
self._pending.pop(0)
|
|
self._refresh_dashboard()
|
|
logged = f"Logged {slot_label(slot)}: {summary}"
|
|
if not self._pending:
|
|
self._unlock(logged)
|
|
return
|
|
self._clear_inputs()
|
|
self._refresh_slot_header()
|
|
self._set_status(f"{logged} — next meal, please.")
|
|
self._widgets.desc_text.focus_set()
|
|
|
|
def _unlock(self, logged: str) -> None:
|
|
"""Confirm the final log and tear the window down.
|
|
|
|
Teardown is scheduled *before* the budget is looked up, so a corrupt
|
|
budget file (which raises) can never re-trap the user at unlock time.
|
|
"""
|
|
self._set_status(f"{logged} — all meals logged, unlocking…")
|
|
self.root.after(_UNLOCK_DELAY_MS, self.close)
|
|
|
|
# -- manual sync ------------------------------------------------------------
|
|
|
|
def _on_fetch_sync(self) -> None:
|
|
"""Pull the shared log on demand and unlock any slots it now satisfies.
|
|
|
|
For a meal already logged on another device (typically the phone) that
|
|
has not yet propagated here: rather than re-entering it to unlock, the
|
|
user pulls it in. The pull blocks the window briefly (bounded by the
|
|
sync timeout) and fails closed -- a failure leaves the lock untouched.
|
|
"""
|
|
if self.demo_mode:
|
|
self._set_status("Fetch from sync is only available on the real lock.")
|
|
return
|
|
self._set_status("Fetching from sync…")
|
|
self.root.update_idletasks()
|
|
reason = pull_shared_log()
|
|
if reason is not None:
|
|
self._set_status(f"{reason} — still locked.", error=True)
|
|
return
|
|
self._reconcile_after_fetch()
|
|
|
|
def _reconcile_after_fetch(self) -> None:
|
|
"""Drop pending slots a freshly pulled meal now covers; unlock if none."""
|
|
still_due = set(due_slots())
|
|
satisfied_slots = [slot for slot in self._pending if slot not in still_due]
|
|
self._refresh_dashboard()
|
|
if not satisfied_slots:
|
|
self._set_status("No new meals found in sync.")
|
|
return
|
|
self._pending = [slot for slot in self._pending if slot in still_due]
|
|
if not self._pending:
|
|
self._unlock("Synced from another device")
|
|
return
|
|
self._clear_inputs()
|
|
self._refresh_slot_header()
|
|
count = len(satisfied_slots)
|
|
meal_word = "meal" if count == 1 else "meals"
|
|
self._set_status(f"Pulled {count} {meal_word} — next meal, please.")
|
|
self._widgets.desc_text.focus_set()
|
|
|
|
# -- dashboard --------------------------------------------------------------
|
|
|
|
def _refresh_dashboard(self) -> None:
|
|
"""Recompute the prominent calorie headline and the detail panel."""
|
|
self._vars.cal_headline.set(self._cal_headline_text())
|
|
self._vars.dashboard.set(self._dashboard_text())
|
|
|
|
def _cal_headline_text(self) -> str:
|
|
"""Return the big calories-today line: consumed, target, and remaining."""
|
|
consumed = today_total_kcal()
|
|
try:
|
|
budget = daily_budget()
|
|
except (BudgetError, OSError):
|
|
return f"{consumed:g} kcal today"
|
|
return (
|
|
f"{consumed:g} / {budget:g} kcal · {round(budget - consumed, 1):g} left"
|
|
)
|
|
|
|
def _dashboard_text(self) -> str:
|
|
"""Build the detail panel: recent meals, then macros and protein."""
|
|
lines = ["── Today ───────────────────────────────"]
|
|
entries = today_entries()
|
|
if entries:
|
|
for entry in entries[-_DASHBOARD_ROWS:]:
|
|
clock = str(entry.get("time", ""))[_TIME_SLICE]
|
|
desc = str(entry.get("desc", "?"))[:_DASH_DESC_WIDTH]
|
|
lines.append(
|
|
f" {clock:>5} {desc:<{_DASH_DESC_WIDTH}} "
|
|
f"{entry_kcal(entry):>5.0f} kcal",
|
|
)
|
|
else:
|
|
lines.append(" (nothing logged yet today)")
|
|
protein, carbs, fat = today_total_macros()
|
|
lines.append(f" macros so far: P{protein:g} C{carbs:g} F{fat:g} g")
|
|
target = protein_target_g()
|
|
if target is not None:
|
|
left = round(target - protein, 1)
|
|
lines.append(f" protein {protein:g} / {target:g} g ({left:g} g left)")
|
|
return "\n".join(lines)
|
|
|
|
def on_callback_error(self) -> None:
|
|
"""Surface an unexpected callback error without dropping the grab."""
|
|
self._set_status(
|
|
"Something went wrong. Enter the calories, then submit again.",
|
|
error=True,
|
|
)
|
|
with contextlib.suppress(tk.TclError):
|
|
self._widgets.macros.kcal.focus_set()
|