feat(csv-import): Enhance Apple sleep CSV import functionality
- Integrated date parsing improvements using dateutil for better handling of various date formats in sleep data. - Added total sleep hours to the nights dictionary for comprehensive sleep analysis. - Updated the import logic to handle cases where sleep duration is zero, providing appropriate warnings. - Enhanced the CSV import interface to detect Apple sleep CSV format and provide user feedback on template selection. - Improved the admin CSV template editor to accommodate new sleep import requirements and clarify usage instructions.
This commit is contained in:
1 parent
26ab11eb7b
commit
41cc0ed2a8
6 files changed
+223
-54
No files matched your search
@@ -13,6 +13,8 @@ from datetime import date, datetime
|
||||
from decimal import Decimal, InvalidOperation
|
||||
from typing import Any, Literal
|
||||
|
||||
from dateutil import parser as dateutil_parser
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -44,13 +46,15 @@ def _parse_apple_sleep_datetime(value: str) -> datetime:
|
||||
"%d.%m.%Y %H:%M:%S",
|
||||
"%Y-%m-%d %H:%M:%S",
|
||||
)
|
||||
last_err = None
|
||||
for fmt in fmts:
|
||||
try:
|
||||
return datetime.strptime(raw, fmt)
|
||||
except ValueError as e:
|
||||
last_err = e
|
||||
raise ValueError(f"Unbekanntes Datumsformat: {raw!r}") from last_err
|
||||
except ValueError:
|
||||
continue
|
||||
try:
|
||||
return dateutil_parser.parse(raw, dayfirst=False)
|
||||
except (ValueError, TypeError, OverflowError) as e:
|
||||
raise ValueError(f"Unbekanntes Datumsformat: {raw!r}") from e
|
||||
|
||||
|
||||
def _hr_to_minutes(hours: float | None) -> int:
|
||||
@@ -102,6 +106,7 @@ def _build_nights_from_apple_summary(reader: csv.DictReader) -> dict[date, dict]
|
||||
rem_min = _hr_to_minutes(_safe_float(row.get("REM (hr)")))
|
||||
light_min = _hr_to_minutes(core_hr)
|
||||
awake_min = _hr_to_minutes(_safe_float(row.get("Awake (hr)")))
|
||||
total_sleep_hr = _safe_float(row.get("Total Sleep (hr)"))
|
||||
nights_dict[wake_d] = {
|
||||
"bedtime": start_dt,
|
||||
"wake_time": end_dt,
|
||||
@@ -110,6 +115,7 @@ def _build_nights_from_apple_summary(reader: csv.DictReader) -> dict[date, dict]
|
||||
"rem_minutes": rem_min,
|
||||
"light_minutes": light_min,
|
||||
"awake_minutes": awake_min,
|
||||
"total_sleep_hr": total_sleep_hr,
|
||||
}
|
||||
return nights_dict
|
||||
|
||||
@@ -219,9 +225,24 @@ def import_apple_sleep_nights(cur, profile_id: str, text: str) -> dict[str, Any]
|
||||
row_hint = 0
|
||||
for wake_date, night in nights_dict.items():
|
||||
row_hint += 1
|
||||
duration_minutes = (
|
||||
phase_sum = (
|
||||
night["deep_minutes"] + night["rem_minutes"] + night["light_minutes"]
|
||||
)
|
||||
total_hr = night.get("total_sleep_hr")
|
||||
fallback_min = int(round(float(total_hr) * 60)) if total_hr is not None else 0
|
||||
duration_minutes = phase_sum if phase_sum > 0 else fallback_min
|
||||
if duration_minutes <= 0:
|
||||
logger.warning(
|
||||
"Sleep import: überspringe %s — Dauer 0 (Phasen-Summe und Total Sleep (hr) leer/0).",
|
||||
wake_date,
|
||||
)
|
||||
error_details.append(
|
||||
{
|
||||
"row": row_hint,
|
||||
"error": f"Schlafdauer für {wake_date} ist 0 — Phasen oder Total Sleep (hr) fehlen.",
|
||||
}
|
||||
)
|
||||
continue
|
||||
wake_count = sum(1 for seg in night["segments"] if seg["phase"] == "awake")
|
||||
|
||||
sleep_segments = [
|
||||
|
||||
Reference in new issue
Block a user