fix: FDDB-Zeilen im CSV-Import speichern und in Ernährung zeigen
Bezeichnung/Menge auch ohne Vorlagen-Mapping, Zuordnen-Hinweis, Tagesliste mit Lebensmitteln. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
a07a668de2
commit
4b1be3019d
7 files changed
+141
-5
No files matched your search
@@ -11,7 +11,31 @@ from typing import Any
|
||||
|
||||
import logging
|
||||
|
||||
from csv_parser.core import iter_csv_dict_rows, resolve_effective_csv_delimiter
|
||||
from csv_parser.core import iter_csv_dict_rows, normalize_header_for_signature, resolve_effective_csv_delimiter
|
||||
|
||||
_FOOD_NAME_HEADERS = frozenset({
|
||||
"bezeichnung", "lebensmittel", "food", "food_name", "name", "gericht",
|
||||
})
|
||||
_QTY_HEADERS = frozenset({
|
||||
"menge", "quantity", "quantity_raw", "portion", "amount", "gramm",
|
||||
})
|
||||
|
||||
|
||||
def guess_nutrition_item_fields(csv_row: dict[str, Any] | None) -> tuple[str | None, str | None]:
|
||||
"""FDDB-Spalten auch ohne Vorlagen-Mapping auf food_name / menge erkennen."""
|
||||
name = qty = None
|
||||
for key, val in (csv_row or {}).items():
|
||||
if val is None:
|
||||
continue
|
||||
text = str(val).strip().strip('"')
|
||||
if not text:
|
||||
continue
|
||||
norm = normalize_header_for_signature(str(key))
|
||||
if name is None and (norm in _FOOD_NAME_HEADERS or "bezeichnung" in norm):
|
||||
name = text
|
||||
if qty is None and (norm in _QTY_HEADERS or norm.startswith("menge")):
|
||||
qty = text
|
||||
return name, qty
|
||||
from csv_parser.import_row_processing import (
|
||||
aggregate_mapped_rows,
|
||||
resolve_import_row_processing,
|
||||
@@ -181,6 +205,8 @@ def run_universal_csv_import(
|
||||
"error_details": error_details[:50],
|
||||
"new_entries": stats.get("new_entries", stats.get("inserted", 0)),
|
||||
"affected_ids": dict(affected_ids),
|
||||
"items_written": stats.get("items_written", 0),
|
||||
"unmapped_names": stats.get("unmapped_names", 0),
|
||||
}
|
||||
return out
|
||||
|
||||
@@ -203,6 +229,11 @@ def _import_nutrition(
|
||||
for csv_row in iter_csv_dict_rows(text, delim, has_header=has_header):
|
||||
rows_total += 1
|
||||
mapped = build_row_after_mapping(csv_row, fm, tc, module="nutrition")
|
||||
guessed_name, guessed_qty = guess_nutrition_item_fields(csv_row)
|
||||
if not mapped.get("food_name") and guessed_name:
|
||||
mapped["food_name"] = guessed_name
|
||||
if not mapped.get("quantity_raw") and guessed_qty:
|
||||
mapped["quantity_raw"] = guessed_qty
|
||||
d = coerce_date(mapped.get("date"))
|
||||
if d is None:
|
||||
error_details.append({"row": rows_total, "error": "Datum fehlt oder ungültig"})
|
||||
@@ -246,6 +277,15 @@ def _import_nutrition(
|
||||
|
||||
policy = get_import_policy(cur, profile_id)
|
||||
ingest = replace_csv_items_for_dates(cur, profile_id, item_rows, policy=policy)
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT COUNT(DISTINCT source_name_normalized) AS n
|
||||
FROM nutrition_items
|
||||
WHERE profile_id = %s AND food_id IS NULL
|
||||
""",
|
||||
(profile_id,),
|
||||
)
|
||||
unmapped_row = cur.fetchone() or {}
|
||||
return {
|
||||
"rows_total": rows_total,
|
||||
"inserted": ingest.get("new_log_days", 0),
|
||||
@@ -253,6 +293,7 @@ def _import_nutrition(
|
||||
"skipped": skipped_groups,
|
||||
"new_entries": ingest.get("new_log_days", 0),
|
||||
"items_written": ingest.get("items_written", 0),
|
||||
"unmapped_names": int(unmapped_row.get("n") or 0),
|
||||
"conflicts": ingest.get("conflicts") or [],
|
||||
"policy": ingest.get("policy"),
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user