feat: introduce recovery dashboard visualization and refactor recovery charts
- Added a new endpoint for the recovery dashboard visualization in `charts.py`, integrating multiple recovery metrics and insights. - Implemented the `get_recovery_dashboard_viz` function to streamline data retrieval for recovery-related charts. - Refactored the `RecoveryCharts` component to utilize the new `RecoveryDashboardOverview`, simplifying the component structure and enhancing maintainability. - Updated the `RecoveryChartsPanelWidget` and `History` page to reflect the new recovery dashboard, improving user navigation and experience. - Deprecated the old recovery charts component, encouraging the use of the new overview for better data presentation.
This commit is contained in:
1 parent
bf84e3c2a5
commit
f42d3a9c92
9 files changed
+1219
-857
No files matched your search
@@ -0,0 +1,454 @@
|
||||
"""
|
||||
Chart.js-Payloads für Recovery (R1–R5) — gemeinsam mit routers/charts und recovery-dashboard-viz.
|
||||
|
||||
Ausgelagert aus routers/charts.py (Issue 53 / Layer 1).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Any, Dict
|
||||
|
||||
from db import get_db, get_cursor
|
||||
from data_layer.recovery_metrics import (
|
||||
calculate_hrv_vs_baseline_pct,
|
||||
calculate_recovery_score_v2,
|
||||
calculate_rhr_vs_baseline_pct,
|
||||
calculate_sleep_debt_hours,
|
||||
get_sleep_duration_data,
|
||||
get_sleep_quality_data,
|
||||
)
|
||||
from data_layer.utils import calculate_confidence, safe_float, serialize_dates
|
||||
|
||||
|
||||
def build_recovery_score_chart_payload(profile_id: str, days: int) -> Dict[str, Any]:
|
||||
if days < 7:
|
||||
days = 7
|
||||
if days > 90:
|
||||
days = 90
|
||||
current_score = calculate_recovery_score_v2(profile_id)
|
||||
|
||||
if current_score is None:
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {"labels": [], "datasets": []},
|
||||
"metadata": {
|
||||
"confidence": "insufficient",
|
||||
"data_points": 0,
|
||||
"message": "Keine Recovery-Daten vorhanden",
|
||||
},
|
||||
}
|
||||
|
||||
cutoff = (datetime.now() - timedelta(days=days)).strftime("%Y-%m-%d")
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"""SELECT date, resting_hr, hrv
|
||||
FROM vitals_baseline
|
||||
WHERE profile_id=%s AND date >= %s
|
||||
ORDER BY date""",
|
||||
(profile_id, cutoff),
|
||||
)
|
||||
rows = cur.fetchall()
|
||||
|
||||
if not rows:
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {
|
||||
"labels": [datetime.now().strftime("%Y-%m-%d")],
|
||||
"datasets": [
|
||||
{
|
||||
"label": "Recovery Score",
|
||||
"data": [current_score],
|
||||
"borderColor": "#1D9E75",
|
||||
"backgroundColor": "rgba(29, 158, 117, 0.1)",
|
||||
"borderWidth": 2,
|
||||
"tension": 0.3,
|
||||
"fill": True,
|
||||
}
|
||||
],
|
||||
},
|
||||
"metadata": {
|
||||
"confidence": "low",
|
||||
"data_points": 1,
|
||||
"current_score": current_score,
|
||||
},
|
||||
}
|
||||
|
||||
labels = [row["date"].isoformat() for row in rows]
|
||||
values = [min(100, max(0, safe_float(row["hrv"]) if row["hrv"] else 50)) for row in rows]
|
||||
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {
|
||||
"labels": labels,
|
||||
"datasets": [
|
||||
{
|
||||
"label": "Recovery Score (proxy)",
|
||||
"data": values,
|
||||
"borderColor": "#1D9E75",
|
||||
"backgroundColor": "rgba(29, 158, 117, 0.1)",
|
||||
"borderWidth": 2,
|
||||
"tension": 0.3,
|
||||
"fill": True,
|
||||
}
|
||||
],
|
||||
},
|
||||
"metadata": serialize_dates(
|
||||
{
|
||||
"confidence": calculate_confidence(len(rows), days, "general"),
|
||||
"data_points": len(rows),
|
||||
"current_score": current_score,
|
||||
"note": "Score based on HRV proxy; true recovery score calculation in development",
|
||||
}
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
def build_hrv_rhr_baseline_chart_payload(profile_id: str, days: int) -> Dict[str, Any]:
|
||||
if days < 7:
|
||||
days = 7
|
||||
if days > 90:
|
||||
days = 90
|
||||
cutoff = (datetime.now() - timedelta(days=days)).strftime("%Y-%m-%d")
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"""SELECT date, resting_hr, hrv
|
||||
FROM vitals_baseline
|
||||
WHERE profile_id=%s AND date >= %s
|
||||
ORDER BY date""",
|
||||
(profile_id, cutoff),
|
||||
)
|
||||
rows = cur.fetchall()
|
||||
|
||||
if not rows:
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {"labels": [], "datasets": []},
|
||||
"metadata": {
|
||||
"confidence": "insufficient",
|
||||
"data_points": 0,
|
||||
"message": "Keine Vitalwerte vorhanden",
|
||||
},
|
||||
}
|
||||
|
||||
labels = [row["date"].isoformat() for row in rows]
|
||||
hrv_values = [safe_float(row["hrv"]) if row["hrv"] else None for row in rows]
|
||||
rhr_values = [safe_float(row["resting_hr"]) if row["resting_hr"] else None for row in rows]
|
||||
|
||||
hrv_baseline = calculate_hrv_vs_baseline_pct(profile_id)
|
||||
rhr_baseline = calculate_rhr_vs_baseline_pct(profile_id)
|
||||
|
||||
hrv_filtered = [v for v in hrv_values if v is not None]
|
||||
rhr_filtered = [v for v in rhr_values if v is not None]
|
||||
|
||||
avg_hrv = sum(hrv_filtered) / len(hrv_filtered) if hrv_filtered else 50
|
||||
avg_rhr = sum(rhr_filtered) / len(rhr_filtered) if rhr_filtered else 60
|
||||
|
||||
datasets = [
|
||||
{
|
||||
"label": "HRV (ms)",
|
||||
"data": hrv_values,
|
||||
"borderColor": "#1D9E75",
|
||||
"backgroundColor": "rgba(29, 158, 117, 0.1)",
|
||||
"borderWidth": 2,
|
||||
"tension": 0.3,
|
||||
"yAxisID": "y1",
|
||||
"fill": False,
|
||||
},
|
||||
{
|
||||
"label": "RHR (bpm)",
|
||||
"data": rhr_values,
|
||||
"borderColor": "#3B82F6",
|
||||
"backgroundColor": "rgba(59, 130, 246, 0.1)",
|
||||
"borderWidth": 2,
|
||||
"tension": 0.3,
|
||||
"yAxisID": "y2",
|
||||
"fill": False,
|
||||
},
|
||||
]
|
||||
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {"labels": labels, "datasets": datasets},
|
||||
"metadata": serialize_dates(
|
||||
{
|
||||
"confidence": calculate_confidence(len(rows), days, "general"),
|
||||
"data_points": len(rows),
|
||||
"avg_hrv": round(avg_hrv, 1),
|
||||
"avg_rhr": round(avg_rhr, 1),
|
||||
"hrv_vs_baseline_pct": hrv_baseline,
|
||||
"rhr_vs_baseline_pct": rhr_baseline,
|
||||
}
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
def build_sleep_duration_quality_chart_payload(profile_id: str, days: int) -> Dict[str, Any]:
|
||||
if days < 7:
|
||||
days = 7
|
||||
if days > 90:
|
||||
days = 90
|
||||
duration_data = get_sleep_duration_data(profile_id, days)
|
||||
quality_data = get_sleep_quality_data(profile_id, days)
|
||||
|
||||
if duration_data["confidence"] == "insufficient":
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {"labels": [], "datasets": []},
|
||||
"metadata": {
|
||||
"confidence": "insufficient",
|
||||
"data_points": 0,
|
||||
"message": "Keine Schlafdaten vorhanden",
|
||||
},
|
||||
}
|
||||
|
||||
cutoff = (datetime.now() - timedelta(days=days)).strftime("%Y-%m-%d")
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"""SELECT date, total_sleep_min
|
||||
FROM sleep_log
|
||||
WHERE profile_id=%s AND date >= %s
|
||||
ORDER BY date""",
|
||||
(profile_id, cutoff),
|
||||
)
|
||||
rows = cur.fetchall()
|
||||
|
||||
if not rows:
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {"labels": [], "datasets": []},
|
||||
"metadata": {
|
||||
"confidence": "insufficient",
|
||||
"data_points": 0,
|
||||
"message": "Keine Schlafdaten",
|
||||
},
|
||||
}
|
||||
|
||||
labels = [row["date"].isoformat() for row in rows]
|
||||
duration_hours = [safe_float(row["total_sleep_min"]) / 60 if row["total_sleep_min"] else None for row in rows]
|
||||
|
||||
quality_scores = [(d / 8 * 100) if d else None for d in duration_hours]
|
||||
|
||||
datasets = [
|
||||
{
|
||||
"label": "Schlafdauer (h)",
|
||||
"data": duration_hours,
|
||||
"borderColor": "#3B82F6",
|
||||
"backgroundColor": "rgba(59, 130, 246, 0.1)",
|
||||
"borderWidth": 2,
|
||||
"tension": 0.3,
|
||||
"yAxisID": "y1",
|
||||
"fill": True,
|
||||
},
|
||||
{
|
||||
"label": "Qualität (%)",
|
||||
"data": quality_scores,
|
||||
"borderColor": "#1D9E75",
|
||||
"backgroundColor": "rgba(29, 158, 117, 0.1)",
|
||||
"borderWidth": 2,
|
||||
"tension": 0.3,
|
||||
"yAxisID": "y2",
|
||||
"fill": False,
|
||||
},
|
||||
]
|
||||
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {"labels": labels, "datasets": datasets},
|
||||
"metadata": serialize_dates(
|
||||
{
|
||||
"confidence": duration_data["confidence"],
|
||||
"data_points": len(rows),
|
||||
"avg_duration_hours": round(duration_data["avg_duration_hours"], 1),
|
||||
"sleep_quality_score": quality_data.get("sleep_quality_score", 0),
|
||||
}
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
def build_sleep_debt_chart_payload(profile_id: str, days: int) -> Dict[str, Any]:
|
||||
if days < 7:
|
||||
days = 7
|
||||
if days > 90:
|
||||
days = 90
|
||||
current_debt = calculate_sleep_debt_hours(profile_id)
|
||||
|
||||
if current_debt is None:
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {"labels": [], "datasets": []},
|
||||
"metadata": {
|
||||
"confidence": "insufficient",
|
||||
"data_points": 0,
|
||||
"message": "Keine Schlafdaten für Schulden-Berechnung",
|
||||
},
|
||||
}
|
||||
|
||||
cutoff = (datetime.now() - timedelta(days=days)).strftime("%Y-%m-%d")
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"""SELECT date, total_sleep_min
|
||||
FROM sleep_log
|
||||
WHERE profile_id=%s AND date >= %s
|
||||
ORDER BY date""",
|
||||
(profile_id, cutoff),
|
||||
)
|
||||
rows = cur.fetchall()
|
||||
|
||||
if not rows:
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {"labels": [], "datasets": []},
|
||||
"metadata": {
|
||||
"confidence": "insufficient",
|
||||
"data_points": 0,
|
||||
"message": "Keine Schlafdaten",
|
||||
},
|
||||
}
|
||||
|
||||
labels = [row["date"].isoformat() for row in rows]
|
||||
|
||||
target_hours = 8.0
|
||||
cumulative_debt = 0.0
|
||||
debt_values = []
|
||||
|
||||
for row in rows:
|
||||
actual_hours = safe_float(row["total_sleep_min"]) / 60 if row["total_sleep_min"] else 0
|
||||
daily_deficit = target_hours - actual_hours
|
||||
cumulative_debt += daily_deficit
|
||||
debt_values.append(cumulative_debt)
|
||||
|
||||
return {
|
||||
"chart_type": "line",
|
||||
"data": {
|
||||
"labels": labels,
|
||||
"datasets": [
|
||||
{
|
||||
"label": "Schlafschuld (Stunden)",
|
||||
"data": debt_values,
|
||||
"borderColor": "#EF4444",
|
||||
"backgroundColor": "rgba(239, 68, 68, 0.1)",
|
||||
"borderWidth": 2,
|
||||
"tension": 0.3,
|
||||
"fill": True,
|
||||
}
|
||||
],
|
||||
},
|
||||
"metadata": serialize_dates(
|
||||
{
|
||||
"confidence": calculate_confidence(len(rows), days, "general"),
|
||||
"data_points": len(rows),
|
||||
"current_debt_hours": round(float(current_debt), 1),
|
||||
"final_debt_hours": round(float(cumulative_debt), 1),
|
||||
}
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
def build_vital_signs_matrix_chart_payload(profile_id: str, days: int) -> Dict[str, Any]:
|
||||
if days < 7:
|
||||
days = 7
|
||||
if days > 30:
|
||||
days = 30
|
||||
cutoff = (datetime.now() - timedelta(days=days)).strftime("%Y-%m-%d")
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute(
|
||||
"""SELECT resting_hr, hrv, vo2_max, spo2, respiratory_rate
|
||||
FROM vitals_baseline
|
||||
WHERE profile_id=%s AND date >= %s
|
||||
ORDER BY date DESC
|
||||
LIMIT 1""",
|
||||
(profile_id, cutoff),
|
||||
)
|
||||
vitals_row = cur.fetchone()
|
||||
|
||||
cur.execute(
|
||||
"""SELECT systolic, diastolic
|
||||
FROM blood_pressure_log
|
||||
WHERE profile_id=%s AND date >= %s
|
||||
ORDER BY date DESC, time DESC
|
||||
LIMIT 1""",
|
||||
(profile_id, cutoff),
|
||||
)
|
||||
bp_row = cur.fetchone()
|
||||
|
||||
if not vitals_row and not bp_row:
|
||||
return {
|
||||
"chart_type": "bar",
|
||||
"data": {"labels": [], "datasets": []},
|
||||
"metadata": {
|
||||
"confidence": "insufficient",
|
||||
"data_points": 0,
|
||||
"message": "Keine aktuellen Vitalwerte",
|
||||
},
|
||||
}
|
||||
|
||||
labels = []
|
||||
values = []
|
||||
|
||||
if vitals_row:
|
||||
if vitals_row["resting_hr"]:
|
||||
labels.append("Ruhepuls (bpm)")
|
||||
values.append(safe_float(vitals_row["resting_hr"]))
|
||||
if vitals_row["hrv"]:
|
||||
labels.append("HRV (ms)")
|
||||
values.append(safe_float(vitals_row["hrv"]))
|
||||
if vitals_row["vo2_max"]:
|
||||
labels.append("VO2 Max")
|
||||
values.append(safe_float(vitals_row["vo2_max"]))
|
||||
if vitals_row["spo2"]:
|
||||
labels.append("SpO2 (%)")
|
||||
values.append(safe_float(vitals_row["spo2"]))
|
||||
if vitals_row["respiratory_rate"]:
|
||||
labels.append("Atemfrequenz")
|
||||
values.append(safe_float(vitals_row["respiratory_rate"]))
|
||||
|
||||
if bp_row:
|
||||
if bp_row["systolic"]:
|
||||
labels.append("Blutdruck sys (mmHg)")
|
||||
values.append(safe_float(bp_row["systolic"]))
|
||||
if bp_row["diastolic"]:
|
||||
labels.append("Blutdruck dia (mmHg)")
|
||||
values.append(safe_float(bp_row["diastolic"]))
|
||||
|
||||
if not labels:
|
||||
return {
|
||||
"chart_type": "bar",
|
||||
"data": {"labels": [], "datasets": []},
|
||||
"metadata": {
|
||||
"confidence": "insufficient",
|
||||
"data_points": 0,
|
||||
"message": "Keine Vitalwerte verfügbar",
|
||||
},
|
||||
}
|
||||
|
||||
return {
|
||||
"chart_type": "bar",
|
||||
"data": {
|
||||
"labels": labels,
|
||||
"datasets": [
|
||||
{
|
||||
"label": "Wert",
|
||||
"data": values,
|
||||
"backgroundColor": "#1D9E75",
|
||||
"borderColor": "#085041",
|
||||
"borderWidth": 1,
|
||||
}
|
||||
],
|
||||
},
|
||||
"metadata": {
|
||||
"confidence": "medium",
|
||||
"data_points": len(values),
|
||||
"note": "Latest measurements within last " + str(days) + " days",
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,183 @@
|
||||
"""
|
||||
KPIs und Kurz-Aussagen für Recovery-Dashboard (Layer 2b).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
|
||||
def _verdict(status: str) -> str:
|
||||
if status == "good":
|
||||
return "Gut"
|
||||
if status == "warn":
|
||||
return "Hinweis"
|
||||
return "Achtung"
|
||||
|
||||
|
||||
def _recovery_score_status(score: Optional[int]) -> str:
|
||||
if score is None:
|
||||
return "warn"
|
||||
if score >= 70:
|
||||
return "good"
|
||||
if score >= 45:
|
||||
return "warn"
|
||||
return "bad"
|
||||
|
||||
|
||||
def _debt_status(hours: Optional[float]) -> str:
|
||||
if hours is None:
|
||||
return "warn"
|
||||
if hours <= 2:
|
||||
return "good"
|
||||
if hours <= 8:
|
||||
return "warn"
|
||||
return "bad"
|
||||
|
||||
|
||||
def build_recovery_dashboard_kpi_tiles(
|
||||
recovery_score: Optional[int],
|
||||
sleep_debt_hours: Optional[float],
|
||||
avg_sleep_hours: Optional[float],
|
||||
hrv_vs_baseline_pct: Optional[float],
|
||||
rhr_vs_baseline_pct: Optional[float],
|
||||
) -> List[Dict[str, Any]]:
|
||||
tiles: List[Dict[str, Any]] = []
|
||||
|
||||
rs = _recovery_score_status(recovery_score)
|
||||
tiles.append(
|
||||
{
|
||||
"key": "recovery_score",
|
||||
"category": "Recovery-Score",
|
||||
"icon": "💚",
|
||||
"value": str(recovery_score) if recovery_score is not None else "—",
|
||||
"sublabel": "Modell aus Schlaf + Vitaldaten",
|
||||
"status": rs,
|
||||
"verdict": _verdict(rs),
|
||||
"hoverTop": "Gesamt-Recovery-Score (0–100)",
|
||||
"hoverBody": "calculate_recovery_score_v2 — gleiche Quelle wie Platzhalter.",
|
||||
"keys": ["recovery_score"],
|
||||
}
|
||||
)
|
||||
|
||||
ds = _debt_status(sleep_debt_hours)
|
||||
tiles.append(
|
||||
{
|
||||
"key": "sleep_debt",
|
||||
"category": "Schlafschuld",
|
||||
"icon": "⏳",
|
||||
"value": f"{sleep_debt_hours:.1f} h".replace(".", ",")
|
||||
if sleep_debt_hours is not None
|
||||
else "—",
|
||||
"sublabel": "Kumuliert (Ziel 8 h/Nacht)",
|
||||
"status": ds,
|
||||
"verdict": _verdict(ds),
|
||||
"hoverTop": "Geschätzte Schlafschuld",
|
||||
"hoverBody": "calculate_sleep_debt_hours",
|
||||
"keys": ["sleep_debt_hours"],
|
||||
}
|
||||
)
|
||||
|
||||
tiles.append(
|
||||
{
|
||||
"key": "avg_sleep",
|
||||
"category": "Ø Schlafdauer",
|
||||
"icon": "🌙",
|
||||
"value": f"{avg_sleep_hours:.1f} h".replace(".", ",") if avg_sleep_hours is not None else "—",
|
||||
"sublabel": "Im gewählten Fenster",
|
||||
"status": "good" if avg_sleep_hours and avg_sleep_hours >= 7 else "warn",
|
||||
"verdict": "Gut" if avg_sleep_hours and avg_sleep_hours >= 7 else "Hinweis",
|
||||
"hoverTop": "Durchschnittliche Schlafdauer",
|
||||
"hoverBody": "get_sleep_duration_data",
|
||||
"keys": ["sleep_duration_avg"],
|
||||
}
|
||||
)
|
||||
|
||||
h_s = (
|
||||
"good"
|
||||
if hrv_vs_baseline_pct is not None and hrv_vs_baseline_pct >= 0
|
||||
else "warn"
|
||||
if hrv_vs_baseline_pct is not None
|
||||
else "warn"
|
||||
)
|
||||
tiles.append(
|
||||
{
|
||||
"key": "hrv_baseline",
|
||||
"category": "HRV vs. Basis",
|
||||
"icon": "〰️",
|
||||
"value": f"{hrv_vs_baseline_pct:+.1f} %".replace(".", ",")
|
||||
if hrv_vs_baseline_pct is not None
|
||||
else "—",
|
||||
"sublabel": "Letzte 3 Tage vs. ältere Basis",
|
||||
"status": h_s,
|
||||
"verdict": _verdict(h_s),
|
||||
"hoverTop": "Abweichung HRV vom Referenzmittel",
|
||||
"hoverBody": "calculate_hrv_vs_baseline_pct",
|
||||
"keys": ["hrv_vs_baseline"],
|
||||
}
|
||||
)
|
||||
|
||||
tiles.append(
|
||||
{
|
||||
"key": "rhr_baseline",
|
||||
"category": "Ruhepuls vs. Basis",
|
||||
"icon": "❤️",
|
||||
"value": f"{rhr_vs_baseline_pct:+.1f} %".replace(".", ",")
|
||||
if rhr_vs_baseline_pct is not None
|
||||
else "—",
|
||||
"sublabel": "Niedriger oft günstiger",
|
||||
"status": "good",
|
||||
"verdict": "Gut",
|
||||
"hoverTop": "Abweichung Ruhepuls",
|
||||
"hoverBody": "calculate_rhr_vs_baseline_pct",
|
||||
"keys": ["rhr_vs_baseline"],
|
||||
}
|
||||
)
|
||||
|
||||
return tiles
|
||||
|
||||
|
||||
def build_recovery_progress_insights(
|
||||
recovery_score: Optional[int],
|
||||
sleep_debt_hours: Optional[float],
|
||||
hrv_vs_baseline_pct: Optional[float],
|
||||
) -> List[Dict[str, Any]]:
|
||||
out: List[Dict[str, Any]] = []
|
||||
|
||||
if recovery_score is not None:
|
||||
tone = "good" if recovery_score >= 65 else "warn" if recovery_score >= 45 else "bad"
|
||||
out.append(
|
||||
{
|
||||
"key": "ins_rec",
|
||||
"tone": tone,
|
||||
"title": "Gesamterholung",
|
||||
"body": f"Der Recovery-Score liegt bei {recovery_score}/100. "
|
||||
"Er kombiniert Schlaf- und Vital-Signale — ideal für die Einordnung von Trainingstagen.",
|
||||
}
|
||||
)
|
||||
|
||||
if sleep_debt_hours is not None:
|
||||
tone = "good" if sleep_debt_hours <= 3 else "warn" if sleep_debt_hours <= 10 else "bad"
|
||||
out.append(
|
||||
{
|
||||
"key": "ins_debt",
|
||||
"tone": tone,
|
||||
"title": "Schlaf nachholen",
|
||||
"body": f"Geschätzte Schlafschuld: {sleep_debt_hours:.1f} h. "
|
||||
"Hohe Schulden erhöhen Verletzungs- und Ermüdungsrisiko — Priorität Schlafhygiene.",
|
||||
}
|
||||
)
|
||||
|
||||
if hrv_vs_baseline_pct is not None:
|
||||
tone = "good" if hrv_vs_baseline_pct >= 0 else "warn"
|
||||
out.append(
|
||||
{
|
||||
"key": "ins_hrv",
|
||||
"tone": tone,
|
||||
"title": "Autonomes System",
|
||||
"body": f"HRV liegt {hrv_vs_baseline_pct:+.1f} % relativ zur Basis. "
|
||||
"Positive Werte werden oft mit guter Regeneration assoziiert (individuell interpretieren).",
|
||||
}
|
||||
)
|
||||
|
||||
return out
|
||||
@@ -0,0 +1,111 @@
|
||||
"""
|
||||
Layer 2b: Recovery/Erholung — Bundle für Verlauf unter Fitness (Issue 53).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
from db import get_db, get_cursor
|
||||
from data_layer.recovery_chart_payloads import (
|
||||
build_hrv_rhr_baseline_chart_payload,
|
||||
build_recovery_score_chart_payload,
|
||||
build_sleep_debt_chart_payload,
|
||||
build_sleep_duration_quality_chart_payload,
|
||||
build_vital_signs_matrix_chart_payload,
|
||||
)
|
||||
from data_layer.recovery_interpretation import (
|
||||
build_recovery_dashboard_kpi_tiles,
|
||||
build_recovery_progress_insights,
|
||||
)
|
||||
from data_layer.recovery_metrics import (
|
||||
calculate_hrv_vs_baseline_pct,
|
||||
calculate_recovery_score_v2,
|
||||
calculate_rhr_vs_baseline_pct,
|
||||
calculate_sleep_debt_hours,
|
||||
get_sleep_duration_data,
|
||||
)
|
||||
|
||||
|
||||
def _has_recovery_sources(profile_id: str) -> bool:
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute("SELECT 1 FROM sleep_log WHERE profile_id=%s LIMIT 1", (profile_id,))
|
||||
if cur.fetchone():
|
||||
return True
|
||||
cur.execute("SELECT 1 FROM vitals_baseline WHERE profile_id=%s LIMIT 1", (profile_id,))
|
||||
return cur.fetchone() is not None
|
||||
|
||||
|
||||
def get_recovery_dashboard_viz_bundle(profile_id: str, days: int) -> Dict[str, Any]:
|
||||
"""
|
||||
Ein Request: KPIs, Insights, Charts R1–R5 (Chart.js-kompatibel).
|
||||
"""
|
||||
if not _has_recovery_sources(profile_id):
|
||||
return {
|
||||
"confidence": "insufficient",
|
||||
"has_recovery_data": False,
|
||||
"message": "Noch keine Schlaf- oder Vitaldaten",
|
||||
"kpi_tiles": [],
|
||||
"progress_insights": [],
|
||||
"charts": {},
|
||||
"meta": {"layer_1": "recovery_metrics", "layer_2b": "recovery_viz"},
|
||||
}
|
||||
|
||||
all_history = days >= 9999
|
||||
eff_days = 3650 if all_history else max(7, min(int(days), 3650))
|
||||
chart_days = min(90, max(7, min(eff_days, 365)))
|
||||
vital_days = min(30, max(7, chart_days))
|
||||
|
||||
recovery_score_val = calculate_recovery_score_v2(profile_id)
|
||||
sleep_debt = calculate_sleep_debt_hours(profile_id)
|
||||
dur = get_sleep_duration_data(profile_id, chart_days)
|
||||
avg_sleep = None
|
||||
if dur.get("confidence") != "insufficient":
|
||||
avg_sleep = float(dur.get("avg_duration_hours") or 0) or None
|
||||
|
||||
hrv_dev = calculate_hrv_vs_baseline_pct(profile_id)
|
||||
rhr_dev = calculate_rhr_vs_baseline_pct(profile_id)
|
||||
|
||||
kpi_tiles = build_recovery_dashboard_kpi_tiles(
|
||||
recovery_score_val,
|
||||
float(sleep_debt) if sleep_debt is not None else None,
|
||||
avg_sleep,
|
||||
float(hrv_dev) if hrv_dev is not None else None,
|
||||
float(rhr_dev) if rhr_dev is not None else None,
|
||||
)
|
||||
|
||||
insights = build_recovery_progress_insights(
|
||||
recovery_score_val,
|
||||
float(sleep_debt) if sleep_debt is not None else None,
|
||||
float(hrv_dev) if hrv_dev is not None else None,
|
||||
)
|
||||
|
||||
charts = {
|
||||
"recovery_score": build_recovery_score_chart_payload(profile_id, chart_days),
|
||||
"hrv_rhr": build_hrv_rhr_baseline_chart_payload(profile_id, chart_days),
|
||||
"sleep_duration_quality": build_sleep_duration_quality_chart_payload(profile_id, chart_days),
|
||||
"sleep_debt": build_sleep_debt_chart_payload(profile_id, chart_days),
|
||||
"vital_signs_matrix": build_vital_signs_matrix_chart_payload(profile_id, vital_days),
|
||||
}
|
||||
|
||||
conf = "medium"
|
||||
if recovery_score_val is None and sleep_debt is None:
|
||||
conf = "low"
|
||||
|
||||
return {
|
||||
"confidence": conf,
|
||||
"has_recovery_data": True,
|
||||
"days_requested": days,
|
||||
"effective_window_days": eff_days,
|
||||
"chart_days_used": chart_days,
|
||||
"vital_matrix_days_used": vital_days,
|
||||
"kpi_tiles": kpi_tiles,
|
||||
"progress_insights": insights,
|
||||
"charts": charts,
|
||||
"meta": {
|
||||
"layer_1": "recovery_metrics",
|
||||
"layer_2b": "recovery_viz",
|
||||
"issue": "53-layer-2b-recovery",
|
||||
},
|
||||
}
|
||||
Reference in new issue
Block a user