feat: Enhance nutrition and activity metrics with new data layers
- Added new functions for BMI and goal weight/body fat percentage retrieval in `body_metrics.py`. - Introduced training frequency and inter-session gap calculations in `activity_metrics.py`. - Updated placeholder registrations to include new metrics for nutrition and activity. - Improved data handling in `placeholder_resolver.py` for better integration of new metrics. - Enhanced documentation across modules to reflect the new functionalities. These updates improve the accuracy and comprehensiveness of health and fitness assessments within the application.
This commit is contained in:
1 parent
61a5bb39ae
commit
e9e094c6a4
13 files changed
+1092
-117
No files matched your search
@@ -51,6 +51,9 @@ __all__ = [
|
||||
|
||||
# Body Metrics (Basic)
|
||||
'get_latest_weight_data',
|
||||
'get_bmi_data',
|
||||
'get_profile_goal_weight_data',
|
||||
'get_profile_goal_bf_pct_data',
|
||||
'get_weight_trend_data',
|
||||
'get_body_composition_data',
|
||||
'get_circumference_summary_data',
|
||||
@@ -99,6 +102,9 @@ __all__ = [
|
||||
'get_activity_summary_data',
|
||||
'get_activity_detail_data',
|
||||
'get_training_type_distribution_data',
|
||||
'get_training_frequency_by_type_data',
|
||||
'get_training_inter_session_gap_data',
|
||||
'get_training_sessions_recent_weeks_data',
|
||||
|
||||
# Activity Metrics (Calculated)
|
||||
'calculate_training_minutes_week',
|
||||
|
||||
@@ -7,6 +7,9 @@ Functions:
|
||||
- get_activity_summary_data(): Count, total duration, calories, averages
|
||||
- get_activity_detail_data(): Detailed activity log entries
|
||||
- get_training_type_distribution_data(): Training category percentages
|
||||
- get_training_frequency_by_type_data(): Häufigkeit & Intensität pro activity_type
|
||||
- get_training_inter_session_gap_data(): Pausen zwischen Einheiten (Stunden)
|
||||
- get_training_sessions_recent_weeks_data(): Wochen-JSON für KI-Kontext
|
||||
|
||||
All functions return structured data (dict) without formatting.
|
||||
Use placeholder_resolver.py for formatted strings for AI.
|
||||
@@ -15,11 +18,11 @@ Phase 0c: Multi-Layer Architecture
|
||||
Version: 1.0
|
||||
"""
|
||||
|
||||
from typing import Dict, List, Optional
|
||||
from datetime import datetime, timedelta, date
|
||||
from typing import Dict, List, Optional, Any
|
||||
from datetime import datetime, timedelta, date, time
|
||||
import statistics
|
||||
from db import get_db, get_cursor, r2d
|
||||
from data_layer.utils import calculate_confidence, safe_float, safe_int
|
||||
from data_layer.utils import calculate_confidence, safe_float, safe_int, serialize_dates
|
||||
|
||||
|
||||
def get_activity_summary_data(
|
||||
@@ -904,3 +907,266 @@ def calculate_activity_data_quality(profile_id: str) -> Dict[str, any]:
|
||||
"quality": int(quality_score)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
def _session_sort_ts(row: Dict) -> datetime:
|
||||
"""Einheitlicher Zeitstempel für Sortierung und Pausenberechnung."""
|
||||
d = row["date"]
|
||||
if isinstance(d, str):
|
||||
d = datetime.strptime(d[:10], "%Y-%m-%d").date()
|
||||
st = row.get("start_time")
|
||||
if st is None:
|
||||
t = time(12, 0, 0)
|
||||
else:
|
||||
t = st
|
||||
return datetime.combine(d, t)
|
||||
|
||||
|
||||
def get_training_frequency_by_type_data(
|
||||
profile_id: str,
|
||||
days: int = 28,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
Pro activity_type (Roh-Label aus Import/Anzeige): Häufigkeit & Intensitätskennzahlen.
|
||||
|
||||
Returns:
|
||||
{
|
||||
"days_analyzed": int,
|
||||
"confidence": str,
|
||||
"by_type": [
|
||||
{
|
||||
"activity_type": str,
|
||||
"session_count": int,
|
||||
"sessions_per_week": float,
|
||||
"avg_duration_min": float | None,
|
||||
"avg_kcal_active": float | None,
|
||||
"avg_hr_avg": float | None,
|
||||
"avg_hr_max": float | None,
|
||||
"avg_rpe": float | None,
|
||||
"avg_kcal_per_min": float | None, # grobe Intensität, wenn kcal & Dauer
|
||||
},
|
||||
...
|
||||
],
|
||||
}
|
||||
"""
|
||||
weeks = max(days / 7.0, 0.01)
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cutoff = (datetime.now() - timedelta(days=days)).strftime("%Y-%m-%d")
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT
|
||||
activity_type,
|
||||
COUNT(*)::int AS session_count,
|
||||
AVG(duration_min)::float AS avg_duration_min,
|
||||
AVG(kcal_active)::float AS avg_kcal_active,
|
||||
AVG(hr_avg)::float AS avg_hr_avg,
|
||||
AVG(hr_max)::float AS avg_hr_max,
|
||||
AVG(rpe)::float AS avg_rpe,
|
||||
SUM(COALESCE(duration_min, 0))::float AS sum_duration,
|
||||
SUM(COALESCE(kcal_active, 0))::float AS sum_kcal
|
||||
FROM activity_log
|
||||
WHERE profile_id = %s AND date >= %s
|
||||
GROUP BY activity_type
|
||||
ORDER BY session_count DESC
|
||||
""",
|
||||
(profile_id, cutoff),
|
||||
)
|
||||
rows = [r2d(r) for r in cur.fetchall()]
|
||||
|
||||
if not rows:
|
||||
return {
|
||||
"days_analyzed": days,
|
||||
"confidence": "insufficient",
|
||||
"by_type": [],
|
||||
}
|
||||
|
||||
by_type = []
|
||||
for r in rows:
|
||||
sc = int(r["session_count"])
|
||||
sum_dur = float(r["sum_duration"] or 0)
|
||||
sum_kcal = float(r["sum_kcal"] or 0)
|
||||
kcal_per_min = (sum_kcal / sum_dur) if sum_dur > 0 else None
|
||||
by_type.append(
|
||||
{
|
||||
"activity_type": r["activity_type"],
|
||||
"session_count": sc,
|
||||
"sessions_per_week": round(sc / weeks, 2),
|
||||
"avg_duration_min": r["avg_duration_min"],
|
||||
"avg_kcal_active": r["avg_kcal_active"],
|
||||
"avg_hr_avg": r["avg_hr_avg"],
|
||||
"avg_hr_max": r["avg_hr_max"],
|
||||
"avg_rpe": r["avg_rpe"],
|
||||
"avg_kcal_per_min": round(kcal_per_min, 2) if kcal_per_min is not None else None,
|
||||
}
|
||||
)
|
||||
|
||||
total_sessions = sum(x["session_count"] for x in by_type)
|
||||
confidence = calculate_confidence(total_sessions, days, "general")
|
||||
return {
|
||||
"days_analyzed": days,
|
||||
"confidence": confidence,
|
||||
"by_type": by_type,
|
||||
}
|
||||
|
||||
|
||||
def get_training_inter_session_gap_data(
|
||||
profile_id: str,
|
||||
days: int = 28,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
Mittlere/median Pausen zwischen aufeinanderfolgenden Trainingseinheiten (Stunden).
|
||||
|
||||
Sortierung: Datum + start_time (fehlend → 12:00), dann created.
|
||||
"""
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cutoff = (datetime.now() - timedelta(days=days)).strftime("%Y-%m-%d")
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT date, start_time, created
|
||||
FROM activity_log
|
||||
WHERE profile_id = %s AND date >= %s
|
||||
ORDER BY date ASC, start_time ASC NULLS LAST, created ASC
|
||||
""",
|
||||
(profile_id, cutoff),
|
||||
)
|
||||
rows = [r2d(r) for r in cur.fetchall()]
|
||||
|
||||
if len(rows) < 2:
|
||||
return {
|
||||
"days_analyzed": days,
|
||||
"confidence": "insufficient",
|
||||
"gap_hours_median": None,
|
||||
"gap_hours_mean": None,
|
||||
"gap_hours_min": None,
|
||||
"gaps_count": 0,
|
||||
}
|
||||
|
||||
gaps = []
|
||||
prev_ts = None
|
||||
for r in rows:
|
||||
ts = _session_sort_ts(r)
|
||||
if prev_ts is not None:
|
||||
gaps.append((ts - prev_ts).total_seconds() / 3600.0)
|
||||
prev_ts = ts
|
||||
|
||||
if not gaps:
|
||||
return {
|
||||
"days_analyzed": days,
|
||||
"confidence": "insufficient",
|
||||
"gap_hours_median": None,
|
||||
"gap_hours_mean": None,
|
||||
"gap_hours_min": None,
|
||||
"gaps_count": 0,
|
||||
}
|
||||
|
||||
gaps_sorted = sorted(gaps)
|
||||
mid = len(gaps_sorted) // 2
|
||||
median = (
|
||||
gaps_sorted[mid]
|
||||
if len(gaps_sorted) % 2
|
||||
else (gaps_sorted[mid - 1] + gaps_sorted[mid]) / 2.0
|
||||
)
|
||||
confidence = calculate_confidence(len(rows), days, "general")
|
||||
return {
|
||||
"days_analyzed": days,
|
||||
"confidence": confidence,
|
||||
"gap_hours_median": round(median, 1),
|
||||
"gap_hours_mean": round(statistics.mean(gaps), 1),
|
||||
"gap_hours_min": round(min(gaps), 1),
|
||||
"gaps_count": len(gaps),
|
||||
}
|
||||
|
||||
|
||||
def get_training_sessions_recent_weeks_data(
|
||||
profile_id: str,
|
||||
weeks: int = 4,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
Letzte Wochen mit Einzeltrainings für KI-Kontext (Dauer, kcal, HF, Typ).
|
||||
|
||||
weeks: Anzahl zurückliegender ISO-Kalenderwochen (Default 4).
|
||||
"""
|
||||
days = max(weeks * 7, 7)
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cutoff = (datetime.now() - timedelta(days=days)).strftime("%Y-%m-%d")
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT
|
||||
a.id,
|
||||
a.date,
|
||||
a.start_time,
|
||||
a.activity_type,
|
||||
a.training_category,
|
||||
a.duration_min,
|
||||
a.kcal_active,
|
||||
a.hr_avg,
|
||||
a.hr_max,
|
||||
a.rpe,
|
||||
tt.name_de AS training_type_name
|
||||
FROM activity_log a
|
||||
LEFT JOIN training_types tt ON tt.id = a.training_type_id
|
||||
WHERE a.profile_id = %s AND a.date >= %s
|
||||
ORDER BY a.date ASC, a.start_time ASC NULLS LAST, a.created ASC
|
||||
""",
|
||||
(profile_id, cutoff),
|
||||
)
|
||||
rows = [r2d(r) for r in cur.fetchall()]
|
||||
|
||||
if not rows:
|
||||
return {
|
||||
"weeks": [],
|
||||
"meta": {
|
||||
"weeks_requested": weeks,
|
||||
"days_loaded": days,
|
||||
"session_count": 0,
|
||||
"confidence": "insufficient",
|
||||
},
|
||||
}
|
||||
|
||||
by_week: Dict[str, List[Dict]] = {}
|
||||
for r in rows:
|
||||
d = r["date"]
|
||||
if isinstance(d, str):
|
||||
d = datetime.strptime(d[:10], "%Y-%m-%d").date()
|
||||
iso = d.isocalendar()
|
||||
wk = f"{iso.year}-W{iso.week:02d}"
|
||||
if wk not in by_week:
|
||||
by_week[wk] = []
|
||||
dur = r.get("duration_min")
|
||||
dur_f = float(dur) if dur is not None else None
|
||||
kcal = r.get("kcal_active")
|
||||
kcal_f = float(kcal) if kcal is not None else None
|
||||
hr_a = r.get("hr_avg")
|
||||
hr_m = r.get("hr_max")
|
||||
by_week[wk].append(
|
||||
{
|
||||
"date": d,
|
||||
"start_time": str(r["start_time"]) if r.get("start_time") is not None else None,
|
||||
"activity_type": r.get("activity_type"),
|
||||
"training_category": r.get("training_category"),
|
||||
"training_type_name": r.get("training_type_name"),
|
||||
"duration_min": dur_f,
|
||||
"kcal_active": kcal_f,
|
||||
"hr_avg": int(hr_a) if hr_a is not None else None,
|
||||
"hr_max": int(hr_m) if hr_m is not None else None,
|
||||
"rpe": int(r["rpe"]) if r.get("rpe") is not None else None,
|
||||
}
|
||||
)
|
||||
|
||||
week_keys = sorted(by_week.keys())
|
||||
weeks_out = [{"week_iso": wk, "sessions": by_week[wk]} for wk in week_keys]
|
||||
confidence = calculate_confidence(len(rows), days, "general")
|
||||
return serialize_dates(
|
||||
{
|
||||
"weeks": weeks_out,
|
||||
"meta": {
|
||||
"weeks_requested": weeks,
|
||||
"days_loaded": days,
|
||||
"session_count": len(rows),
|
||||
"confidence": confidence,
|
||||
},
|
||||
}
|
||||
)
|
||||
@@ -5,6 +5,9 @@ Provides structured data for body composition and measurements.
|
||||
|
||||
Functions:
|
||||
- get_latest_weight_data(): Most recent weight entry
|
||||
- get_bmi_data(): BMI from latest weight + profile height
|
||||
- get_profile_goal_weight_data(): Zielgewicht (Profilfeld)
|
||||
- get_profile_goal_bf_pct_data(): Ziel-KFA % (Profilfeld)
|
||||
- get_weight_trend_data(): Weight trend with slope and direction
|
||||
- get_body_composition_data(): Body fat percentage and lean mass
|
||||
- get_circumference_summary_data(): Latest circumference measurements
|
||||
@@ -68,6 +71,105 @@ def get_latest_weight_data(
|
||||
}
|
||||
|
||||
|
||||
def get_bmi_data(profile_id: str) -> Dict:
|
||||
"""
|
||||
BMI from latest weight_log entry and profiles.height (cm).
|
||||
|
||||
Returns:
|
||||
{
|
||||
"bmi": float | None,
|
||||
"weight_kg": float | None,
|
||||
"height_cm": float | None,
|
||||
"confidence": "high" | "insufficient",
|
||||
}
|
||||
"""
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT pr.height,
|
||||
(SELECT wl.weight FROM weight_log wl
|
||||
WHERE wl.profile_id = pr.id
|
||||
ORDER BY wl.date DESC
|
||||
LIMIT 1) AS weight
|
||||
FROM profiles pr
|
||||
WHERE pr.id = %s
|
||||
""",
|
||||
(profile_id,),
|
||||
)
|
||||
row = cur.fetchone()
|
||||
if not row:
|
||||
return {
|
||||
"bmi": None,
|
||||
"weight_kg": None,
|
||||
"height_cm": None,
|
||||
"confidence": "insufficient",
|
||||
}
|
||||
|
||||
height_cm = row["height"]
|
||||
weight = row["weight"]
|
||||
if height_cm is None or weight is None:
|
||||
return {
|
||||
"bmi": None,
|
||||
"weight_kg": safe_float(weight) if weight is not None else None,
|
||||
"height_cm": safe_float(height_cm) if height_cm is not None else None,
|
||||
"confidence": "insufficient",
|
||||
}
|
||||
|
||||
h = safe_float(height_cm)
|
||||
w = safe_float(weight)
|
||||
if h <= 0:
|
||||
return {
|
||||
"bmi": None,
|
||||
"weight_kg": w,
|
||||
"height_cm": h,
|
||||
"confidence": "insufficient",
|
||||
}
|
||||
|
||||
height_m = h / 100.0
|
||||
bmi = w / (height_m ** 2)
|
||||
return {
|
||||
"bmi": bmi,
|
||||
"weight_kg": w,
|
||||
"height_cm": h,
|
||||
"confidence": "high",
|
||||
}
|
||||
|
||||
|
||||
def get_profile_goal_weight_data(profile_id: str) -> Dict:
|
||||
"""Strategisches Zielgewicht aus profiles.goal_weight (kg), nicht goals-Tabelle."""
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"SELECT goal_weight FROM profiles WHERE id=%s",
|
||||
(profile_id,),
|
||||
)
|
||||
row = cur.fetchone()
|
||||
if not row or row.get("goal_weight") is None:
|
||||
return {"goal_weight_kg": None, "confidence": "insufficient"}
|
||||
return {
|
||||
"goal_weight_kg": safe_float(row["goal_weight"]),
|
||||
"confidence": "high",
|
||||
}
|
||||
|
||||
|
||||
def get_profile_goal_bf_pct_data(profile_id: str) -> Dict:
|
||||
"""Strategisches Ziel-KFA aus profiles.goal_bf_pct (%), nicht goals-Tabelle."""
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"SELECT goal_bf_pct FROM profiles WHERE id=%s",
|
||||
(profile_id,),
|
||||
)
|
||||
row = cur.fetchone()
|
||||
if not row or row.get("goal_bf_pct") is None:
|
||||
return {"goal_bf_pct": None, "confidence": "insufficient"}
|
||||
return {
|
||||
"goal_bf_pct": safe_float(row["goal_bf_pct"]),
|
||||
"confidence": "high",
|
||||
}
|
||||
|
||||
|
||||
def get_weight_trend_data(
|
||||
profile_id: str,
|
||||
days: int = 28
|
||||
@@ -89,7 +191,8 @@ def get_weight_trend_data(
|
||||
"confidence": str,
|
||||
"days_analyzed": int,
|
||||
"first_date": date,
|
||||
"last_date": date
|
||||
"last_date": date,
|
||||
"series": [{"date": date, "weight": float}, ...], # für Charts ohne zweites Query
|
||||
}
|
||||
|
||||
Confidence Rules:
|
||||
@@ -127,7 +230,8 @@ def get_weight_trend_data(
|
||||
"delta": 0.0,
|
||||
"direction": "unknown",
|
||||
"first_date": None,
|
||||
"last_date": None
|
||||
"last_date": None,
|
||||
"series": [],
|
||||
}
|
||||
|
||||
# Extract values
|
||||
@@ -152,7 +256,11 @@ def get_weight_trend_data(
|
||||
"confidence": confidence,
|
||||
"days_analyzed": days,
|
||||
"first_date": rows[0]['date'],
|
||||
"last_date": rows[-1]['date']
|
||||
"last_date": rows[-1]['date'],
|
||||
"series": [
|
||||
{"date": r["date"], "weight": safe_float(r["weight"])}
|
||||
for r in rows
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user