mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 13:47:38 +01:00
The calendar already said which individual days went over budget, but not whether the week as a whole did. A run of small overages reads as four harmless yellow squares; averaged, it is the thing that actually moves the needle. Three rules are load-bearing, and are documented in CLAUDE.md because getting any of them wrong silently changes what "under budget" means: - The denominator is logged days, not elapsed days. An unlogged day is not a zero-kcal day, and averaging gaps in as zeros would make a badly-tracked week look like the best week of the year. - The yardstick is the mean of the per-day budgets over those same days, resolved through BudgetSchedule -- never today's budget, which would retroactively reclassify past weeks on every budget edit. - Today is excluded. A half-logged today drags the mean far enough to flip the band, so every period ends at yesterday. Band boundaries reuse the calendar's own OVER_BUDGET_YELLOW_CEILING by import rather than by copy, so a period and its days can never disagree about what "over" means; that constant loses its underscore to say so. The MCP get_averages tool returns the average and the band but drops the average budget, keeping the module's existing invariant that the budget number never leaves this machine. The CLI, the gate and the phone all show both, since it is hidden from the network, not from the user. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DjJqpcEsaV5WRhPXyxCThd
299 lines
9.7 KiB
Python
299 lines
9.7 KiB
Python
"""Weekly and monthly average intake, and how that average met the budget.
|
|
|
|
PERIOD AVERAGE SPEC (keep in sync with
|
|
``app/lib/services/average_service.dart``):
|
|
|
|
* the average is over **logged days only** -- ``sum(kcal) / logged_days``. A
|
|
day you forgot to log is not a zero-calorie day, and counting it as one
|
|
would make every gap in the log read as "well under budget", which is the
|
|
exact opposite of the truth. ``logged_days`` / ``elapsed_days`` travel with
|
|
the average so a caller can show how much of the period it actually covers.
|
|
* the yardstick is the **mean of the per-day budgets over those same logged
|
|
days**, resolved through a
|
|
:class:`~diet_guard._budget_history.BudgetSchedule` -- never today's budget.
|
|
Comparing a past week's intake against a budget you lowered yesterday would
|
|
retroactively reclassify it, which is precisely what
|
|
:mod:`diet_guard._budget_history` exists to prevent.
|
|
* bands, reusing the calendar's own over-budget boundary
|
|
(:data:`~diet_guard._daystatus.OVER_BUDGET_YELLOW_CEILING`) so a period and
|
|
its days can never disagree about what "over" means:
|
|
|
|
- ``under``: ``avg_kcal <= avg_budget``
|
|
- ``slightly_over``: ``avg_budget < avg_kcal <= avg_budget * ceiling``
|
|
- ``very_over``: ``avg_kcal > avg_budget * ceiling``
|
|
|
|
* **today is excluded.** A period ending at "now" mixes complete days with
|
|
one that is three hours old, and a half-logged today drags the mean down far
|
|
enough to flip the band. Every period therefore ends at
|
|
:func:`last_complete_day` -- yesterday -- so "this week" means "this week so
|
|
far, in finished days". A period with no finished days yet (Monday, or the
|
|
1st) reports ``elapsed_days == 0`` and a ``None`` average rather than a
|
|
flattering fake one.
|
|
* weeks are **ISO weeks, Monday through Sunday**; months are calendar months.
|
|
|
|
Every function here is a pure function of its explicit ``log`` / ``schedule``
|
|
/ ``today`` arguments and never reaches into on-disk state, so the band
|
|
boundaries and the period edges are testable with synthetic data.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import calendar
|
|
from dataclasses import dataclass
|
|
from datetime import date, timedelta
|
|
import enum
|
|
from typing import TYPE_CHECKING
|
|
|
|
from diet_guard._daystatus import OVER_BUDGET_YELLOW_CEILING, day_total_kcal
|
|
from diet_guard._state import now_local
|
|
|
|
if TYPE_CHECKING:
|
|
from diet_guard._budget_history import BudgetSchedule
|
|
from diet_guard._state import DayLog
|
|
|
|
_DAYS_PER_WEEK = 7
|
|
_MONTHS_PER_YEAR = 12
|
|
|
|
|
|
class AverageBand(enum.Enum):
|
|
"""How a period's average intake compared with its average budget."""
|
|
|
|
UNDER = "under"
|
|
SLIGHTLY_OVER = "slightly_over"
|
|
VERY_OVER = "very_over"
|
|
|
|
|
|
_BAND_LABELS = {
|
|
AverageBand.UNDER: "under",
|
|
AverageBand.SLIGHTLY_OVER: "slightly over",
|
|
AverageBand.VERY_OVER: "very over",
|
|
}
|
|
|
|
_NO_DATA_LABEL = "no data"
|
|
|
|
|
|
def band_label(band: AverageBand | None) -> str:
|
|
"""Return the human phrase for ``band``, or ``"no data"`` for None."""
|
|
return _NO_DATA_LABEL if band is None else _BAND_LABELS[band]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class PeriodAverage:
|
|
"""One period's mean intake and how it compared with the mean budget.
|
|
|
|
Attributes:
|
|
start: ``YYYY-MM-DD``, the period's first day (inclusive).
|
|
end: ``YYYY-MM-DD``, the period's last *complete* day (inclusive);
|
|
earlier than ``start`` when the period has none yet.
|
|
logged_days: Days in the range that carry at least one valid entry.
|
|
elapsed_days: Complete days in the range, logged or not.
|
|
avg_kcal: Mean kcal across ``logged_days``, or None when that is zero.
|
|
avg_budget: Mean daily budget across those same days, or None.
|
|
band: The :class:`AverageBand`, or None when there is nothing to judge.
|
|
"""
|
|
|
|
start: str
|
|
end: str
|
|
logged_days: int
|
|
elapsed_days: int
|
|
avg_kcal: float | None
|
|
avg_budget: float | None
|
|
band: AverageBand | None
|
|
|
|
|
|
def band_for(avg_kcal: float, avg_budget: float) -> AverageBand:
|
|
"""Classify ``avg_kcal`` against ``avg_budget``.
|
|
|
|
Args:
|
|
avg_kcal: The period's mean daily intake.
|
|
avg_budget: The period's mean daily budget.
|
|
|
|
Returns:
|
|
The matching :class:`AverageBand`.
|
|
"""
|
|
if avg_kcal <= avg_budget:
|
|
return AverageBand.UNDER
|
|
if avg_kcal <= avg_budget * OVER_BUDGET_YELLOW_CEILING:
|
|
return AverageBand.SLIGHTLY_OVER
|
|
return AverageBand.VERY_OVER
|
|
|
|
|
|
def last_complete_day(today: date) -> date:
|
|
"""Return the last day whose log is finished: the day before ``today``."""
|
|
return today - timedelta(days=1)
|
|
|
|
|
|
def week_bounds(day: date) -> tuple[date, date]:
|
|
"""Return the Monday and Sunday of the ISO week containing ``day``."""
|
|
monday = day - timedelta(days=day.weekday())
|
|
return monday, monday + timedelta(days=_DAYS_PER_WEEK - 1)
|
|
|
|
|
|
def month_bounds(day: date) -> tuple[date, date]:
|
|
"""Return the first and last dates of ``day``'s calendar month."""
|
|
last = calendar.monthrange(day.year, day.month)[1]
|
|
return day.replace(day=1), day.replace(day=last)
|
|
|
|
|
|
def _shift_months(day: date, months: int) -> date:
|
|
"""Return the first of the month ``months`` before ``day``'s month."""
|
|
index = day.year * _MONTHS_PER_YEAR + (day.month - 1) - months
|
|
year, month = divmod(index, _MONTHS_PER_YEAR)
|
|
return date(year, month + 1, 1)
|
|
|
|
|
|
def period_average(
|
|
log: DayLog,
|
|
*,
|
|
schedule: BudgetSchedule,
|
|
start: date,
|
|
end: date,
|
|
) -> PeriodAverage:
|
|
"""Average ``log``'s intake over ``[start, end]`` and classify it.
|
|
|
|
Args:
|
|
log: A filtered log as returned by
|
|
:func:`diet_guard._state.load_log` (only valid, non-tombstoned
|
|
entries; a day with none is simply absent).
|
|
schedule: Resolves the budget that applied on each individual day.
|
|
start: First day of the period (inclusive).
|
|
end: Last day of the period (inclusive); an ``end`` before ``start``
|
|
is an empty period, not an error.
|
|
|
|
Returns:
|
|
The period's :class:`PeriodAverage`.
|
|
"""
|
|
totals: list[float] = []
|
|
budgets: list[int] = []
|
|
day = start
|
|
while day <= end:
|
|
key = day.isoformat()
|
|
if key in log:
|
|
totals.append(day_total_kcal(log, key))
|
|
budgets.append(schedule.for_day(key))
|
|
day += timedelta(days=1)
|
|
elapsed = max((end - start).days + 1, 0)
|
|
if not totals:
|
|
return PeriodAverage(
|
|
start=start.isoformat(),
|
|
end=end.isoformat(),
|
|
logged_days=0,
|
|
elapsed_days=elapsed,
|
|
avg_kcal=None,
|
|
avg_budget=None,
|
|
band=None,
|
|
)
|
|
avg_kcal = sum(totals) / len(totals)
|
|
avg_budget = sum(budgets) / len(budgets)
|
|
return PeriodAverage(
|
|
start=start.isoformat(),
|
|
end=end.isoformat(),
|
|
logged_days=len(totals),
|
|
elapsed_days=elapsed,
|
|
avg_kcal=avg_kcal,
|
|
avg_budget=avg_budget,
|
|
band=band_for(avg_kcal, avg_budget),
|
|
)
|
|
|
|
|
|
def _resolve_today(today: date | None) -> date:
|
|
"""Return ``today`` or the real current local date when it is None."""
|
|
return today if today is not None else now_local().date()
|
|
|
|
|
|
def _capped(
|
|
log: DayLog,
|
|
schedule: BudgetSchedule,
|
|
bounds: tuple[date, date],
|
|
ref: date,
|
|
) -> PeriodAverage:
|
|
"""Average ``bounds``, truncated so it never includes ``ref`` itself.
|
|
|
|
The single place the "today is excluded" rule is applied, so a caller
|
|
cannot construct a period that half-counts an unfinished day.
|
|
"""
|
|
start, end = bounds
|
|
return period_average(
|
|
log,
|
|
schedule=schedule,
|
|
start=start,
|
|
end=min(end, last_complete_day(ref)),
|
|
)
|
|
|
|
|
|
def weekly_average(
|
|
log: DayLog,
|
|
*,
|
|
schedule: BudgetSchedule,
|
|
weeks_ago: int = 0,
|
|
today: date | None = None,
|
|
) -> PeriodAverage:
|
|
"""Return the average for an ISO week, ``weeks_ago`` weeks back.
|
|
|
|
Args:
|
|
log: A filtered log (see :func:`period_average`).
|
|
schedule: Resolves each day's budget.
|
|
weeks_ago: 0 for the current week (through yesterday), 1 for the
|
|
previous complete week, and so on.
|
|
today: The reference "today"; defaults to the real current date.
|
|
|
|
Returns:
|
|
That week's :class:`PeriodAverage`.
|
|
"""
|
|
ref = _resolve_today(today)
|
|
anchor = ref - timedelta(weeks=weeks_ago)
|
|
return _capped(log, schedule, week_bounds(anchor), ref)
|
|
|
|
|
|
def monthly_average(
|
|
log: DayLog,
|
|
*,
|
|
schedule: BudgetSchedule,
|
|
months_ago: int = 0,
|
|
today: date | None = None,
|
|
) -> PeriodAverage:
|
|
"""Return the average for a calendar month, ``months_ago`` months back.
|
|
|
|
Args:
|
|
log: A filtered log (see :func:`period_average`).
|
|
schedule: Resolves each day's budget.
|
|
months_ago: 0 for the current month (through yesterday), 1 for the
|
|
previous complete month, and so on.
|
|
today: The reference "today"; defaults to the real current date.
|
|
|
|
Returns:
|
|
That month's :class:`PeriodAverage`.
|
|
"""
|
|
ref = _resolve_today(today)
|
|
return _capped(log, schedule, month_bounds(_shift_months(ref, months_ago)), ref)
|
|
|
|
|
|
def recent_weeks(
|
|
log: DayLog,
|
|
*,
|
|
schedule: BudgetSchedule,
|
|
count: int,
|
|
today: date | None = None,
|
|
) -> tuple[PeriodAverage, ...]:
|
|
"""Return the last ``count`` weekly averages, most recent first."""
|
|
ref = _resolve_today(today)
|
|
return tuple(
|
|
weekly_average(log, schedule=schedule, weeks_ago=back, today=ref)
|
|
for back in range(count)
|
|
)
|
|
|
|
|
|
def recent_months(
|
|
log: DayLog,
|
|
*,
|
|
schedule: BudgetSchedule,
|
|
count: int,
|
|
today: date | None = None,
|
|
) -> tuple[PeriodAverage, ...]:
|
|
"""Return the last ``count`` monthly averages, most recent first."""
|
|
ref = _resolve_today(today)
|
|
return tuple(
|
|
monthly_average(log, schedule=schedule, months_ago=back, today=ref)
|
|
for back in range(count)
|
|
)
|