feat: improve history overview visualization and data handling
- Added `safe_float` utility to enhance float handling in correlation calculations, preventing potential errors. - Refactored lag correlation logic in `get_history_overview_viz_bundle` to utilize absolute values safely, improving accuracy in metric comparisons. - Enhanced nutrition body merge logic to ensure proper date handling and data integrity, optimizing the retrieval of nutrition and weight logs. - Introduced new functions in the frontend for processing lag details, improving the visualization of correlation data in the History page.
This commit is contained in:
1 parent
3106ebedae
commit
0365d9eb52
3 files changed
+128
-13
No files matched your search
@@ -13,6 +13,7 @@ from data_layer.correlations import calculate_lag_correlation, calculate_top_dri
|
||||
from data_layer.fitness_viz import get_fitness_dashboard_viz_bundle
|
||||
from data_layer.nutrition_viz import get_nutrition_history_viz_bundle
|
||||
from data_layer.recovery_viz import get_recovery_dashboard_viz_bundle
|
||||
from data_layer.utils import safe_float
|
||||
|
||||
|
||||
def _take_kpis(tiles: Any, max_n: int = 4) -> List[Dict[str, Any]]:
|
||||
@@ -90,11 +91,9 @@ def get_history_overview_viz_bundle(profile_id: str, days: int) -> Dict[str, Any
|
||||
c3_rhr = calculate_lag_correlation(profile_id, "load", "rhr", 14)
|
||||
c3 = None
|
||||
if c3_hrv and c3_rhr:
|
||||
c3 = (
|
||||
c3_hrv
|
||||
if abs(float(c3_hrv.get("correlation") or 0)) >= abs(float(c3_rhr.get("correlation") or 0))
|
||||
else c3_rhr
|
||||
)
|
||||
a1 = abs(safe_float(c3_hrv.get("correlation"), 0.0))
|
||||
a2 = abs(safe_float(c3_rhr.get("correlation"), 0.0))
|
||||
c3 = c3_hrv if a1 >= a2 else c3_rhr
|
||||
if c3 is c3_hrv:
|
||||
c3 = dict(c3)
|
||||
c3["metric"] = "HRV"
|
||||
|
||||
@@ -9,7 +9,7 @@ from __future__ import annotations
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
from db import get_db, get_cursor, r2d
|
||||
from caliper_composition import compute_lean_fat_kg, nearest_weight_kg_from_map
|
||||
from caliper_composition import as_date, compute_lean_fat_kg, nearest_weight_kg_from_map
|
||||
|
||||
|
||||
def build_merged_daily_nutrition_body_rows(profile_id: str) -> List[Dict[str, Any]]:
|
||||
@@ -20,21 +20,42 @@ def build_merged_daily_nutrition_body_rows(profile_id: str) -> List[Dict[str, An
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
cur.execute("SELECT * FROM nutrition_log WHERE profile_id=%s ORDER BY date", (profile_id,))
|
||||
nutr = {r["date"]: r2d(r) for r in cur.fetchall()}
|
||||
nutr: Dict[Any, Dict[str, Any]] = {}
|
||||
for r in cur.fetchall():
|
||||
rd = r2d(r)
|
||||
dk = as_date(rd.get("date"))
|
||||
if dk is not None:
|
||||
nutr[dk] = rd
|
||||
cur.execute("SELECT date, weight FROM weight_log WHERE profile_id=%s ORDER BY date", (profile_id,))
|
||||
wlog = {r["date"]: r["weight"] for r in cur.fetchall()}
|
||||
wlog: Dict[Any, Any] = {}
|
||||
for r in cur.fetchall():
|
||||
rd = r2d(r)
|
||||
dk = as_date(rd.get("date"))
|
||||
if dk is not None:
|
||||
wlog[dk] = rd["weight"]
|
||||
cur.execute(
|
||||
"SELECT date, lean_mass, body_fat_pct FROM caliper_log WHERE profile_id=%s ORDER BY date",
|
||||
(profile_id,),
|
||||
)
|
||||
cals = sorted([r2d(r) for r in cur.fetchall()], key=lambda x: x["date"])
|
||||
cals = [r2d(r) for r in cur.fetchall()]
|
||||
cals = sorted(
|
||||
[c for c in cals if as_date(c.get("date")) is not None],
|
||||
key=lambda x: as_date(x["date"]),
|
||||
)
|
||||
|
||||
all_dates = sorted(set(list(nutr.keys()) + list(wlog.keys())))
|
||||
# Alle Keys sind datetime.date — vermeidet TypeError bei Vergleichen (str vs date)
|
||||
all_dates = sorted(set(nutr.keys()) | set(wlog.keys()))
|
||||
mi = 0
|
||||
last_cal: Dict[str, Any] = {}
|
||||
cal_by_date: Dict[Any, Dict[str, Any]] = {}
|
||||
for d in all_dates:
|
||||
while mi < len(cals) and cals[mi]["date"] <= d:
|
||||
while mi < len(cals):
|
||||
cd = as_date(cals[mi].get("date"))
|
||||
if cd is None:
|
||||
mi += 1
|
||||
continue
|
||||
if cd > d:
|
||||
break
|
||||
last_cal = cals[mi]
|
||||
mi += 1
|
||||
if last_cal:
|
||||
|
||||
Reference in new issue
Block a user