Bug Fix für type_converter.py und executor.py
Deploy Development / deploy (push) Successful in 55s
Build Test / pytest-backend (push) Successful in 4s
Build Test / lint-backend (push) Successful in 0s
Build Test / build-frontend (push) Successful in 16s

This commit is contained in:
Lars committed 2026-04-10 16:52:11 +02:00
1 parent 5b96bd4f75
commit a9bd3faabb
5 files changed
+112 -11

No files matched your search

+3
View File
@@ -822,6 +822,9 @@ def _import_activity(
start_key = start_raw.strftime("%Y-%m-%d %H:%M:%S")
if date_d is None:
date_d = start_raw.date()
elif isinstance(start_raw, dt.date):
date_d = start_raw
start_key = f"{start_raw.isoformat()} 00:00:00"
elif isinstance(start_raw, dt.time):
if date_d is None:
error_details.append(
+52 -7
View File
@@ -168,6 +168,12 @@ def _collect_strptime_date_formats(spec: Mapping[str, Any], *, for_datetime: boo
if p2 not in seen:
seen.add(p2)
out.append(p2)
elif for_datetime and p.endswith(":%S"):
# z. B. Apple Health „2026-04-09 16:48“ ohne Sekunden
p_short = p[:-3]
if p_short not in seen:
seen.add(p_short)
out.append(p_short)
primary = spec.get("format")
if primary:
@@ -204,18 +210,43 @@ def _try_strptime_trim_time(s: str, patterns: Sequence[str]) -> dt.datetime | No
return _try_strptime(s, patterns)
def _normalize_locale_date_months(s: str) -> str:
"""
Omron Connect / Berichte: «10 Apr. 2026», «31 März 2026» — ohne DE→EN scheitert dateutil.
"""
if not s:
return s
out = s
for pat, rep in (
(r"März", "March"),
(r"Maerz", "March"),
(r"Januar", "January"),
(r"Februar", "February"),
(r"Oktober", "October"),
(r"Dezember", "December"),
(r"Juni", "June"),
(r"Juli", "July"),
(r"\bMai\b", "May"),
):
out = re.sub(pat, rep, out, flags=re.IGNORECASE)
return out
def _dateutil_parse(s: str, spec: Mapping[str, Any]) -> dt.datetime | None:
s_trim = s.strip()
dayfirst_opt = spec.get("dayfirst")
# ISO YYYY-MM-DD: dayfirst=True vertauscht Monat/Tag (09.04. → 04.09.)
iso_ymd_prefix = bool(re.match(r"^\d{4}-\d{2}-\d{2}(\D|$)", s_trim))
tries: list[bool | None]
if dayfirst_opt is True:
tries = [True]
elif dayfirst_opt is False:
tries = [False]
else:
tries = [True, False]
tries = [False, True] if iso_ymd_prefix else [True, False]
for df in tries:
try:
return dateutil_parser.parse(s, dayfirst=df)
return dateutil_parser.parse(s_trim, dayfirst=df)
except (ValueError, TypeError, OverflowError):
continue
return None
@@ -223,12 +254,18 @@ def _dateutil_parse(s: str, spec: Mapping[str, Any]) -> dt.datetime | None:
def _parse_date_typed(s: str, spec: Mapping[str, Any]) -> dt.date | dt.datetime:
extract = spec.get("extract", "date_only")
s0 = _normalize_locale_date_months(s.strip())
patterns = _collect_strptime_date_formats(spec, for_datetime=False)
part = _try_strptime_trim_time(s, patterns) if patterns else None
part = _try_strptime_trim_time(s0, patterns) if patterns else None
if part is None:
part = _try_strptime(s, _collect_strptime_date_formats(spec, for_datetime=True))
part = _try_strptime(s0, _collect_strptime_date_formats(spec, for_datetime=True))
if part is None and (bool(spec.get("flexible")) or spec.get("formats")):
part = _dateutil_parse(s, spec)
part = _dateutil_parse(s0, spec)
if part is None:
merged: dict[str, Any] = {**dict(spec), "flexible": True}
if "dayfirst" not in merged:
merged["dayfirst"] = True
part = _dateutil_parse(s0, merged)
if part is None:
fmt_key = str(spec.get("format", ""))
raise ValueError(f"Datum nicht parsbar: {fmt_key} / {s!r}")
@@ -238,10 +275,18 @@ def _parse_date_typed(s: str, spec: Mapping[str, Any]) -> dt.date | dt.datetime:
def _parse_datetime_typed(s: str, spec: Mapping[str, Any]) -> dt.datetime:
s0 = _normalize_locale_date_months(s.strip())
patterns = _collect_strptime_date_formats(spec, for_datetime=True)
part = _try_strptime(s, patterns)
part = _try_strptime(s0, patterns)
if part is None and (bool(spec.get("flexible")) or spec.get("formats")):
du = _dateutil_parse(s, spec)
du = _dateutil_parse(s0, spec)
if du:
part = du
if part is None:
merged: dict[str, Any] = {**dict(spec), "flexible": True}
if "dayfirst" not in merged:
merged["dayfirst"] = True
du = _dateutil_parse(s0, merged)
if du:
part = du
if part is None: