feat: Listen-Dialog mit Mengen/Einheiten, Mitai ohne Kochrezepte
Roh-Kombinationen statt Rezept-Sprache; Zutaten suchen, EL/TL/Prise auf Gramm. Gekochte Gerichte und Ausbeute bleiben Tandoor. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
a7e5511039
commit
fa542e0fb9
17 files changed
+776
-203
No files matched your search
@@ -132,6 +132,16 @@ UNIT_ALIASES = {
|
||||
MASS_VOLUME_TO_G = {"g": 1.0, "kg": 1000.0, "ml": 1.0, "l": 1000.0}
|
||||
DEFAULT_UNIT_G = {"el": 15.0, "tl": 5.0, "prise": 0.3, "msp": 1.0}
|
||||
COUNT_UNITS = frozenset({"stück", "scheibe", "portion", "becher", "tasse"})
|
||||
UNIT_LABELS = {
|
||||
"g": "g", "kg": "kg", "ml": "ml", "l": "l",
|
||||
"el": "EL", "tl": "TL", "prise": "Prise", "msp": "Msp.",
|
||||
"stück": "Stück", "scheibe": "Scheibe", "portion": "Portion",
|
||||
"becher": "Becher", "tasse": "Tasse",
|
||||
}
|
||||
UNIT_ORDER = (
|
||||
"g", "ml", "el", "tl", "prise", "msp",
|
||||
"stück", "scheibe", "portion", "becher", "tasse", "kg", "l",
|
||||
)
|
||||
QTY_PARSE_RE = re.compile(
|
||||
r"^\s*(\d+(?:[.,]\d+)?)\s*([a-zA-ZäöüÄÖÜß.]+)?\s*$",
|
||||
re.IGNORECASE,
|
||||
@@ -186,6 +196,74 @@ def detect_quantity_unit(*texts: str | None) -> str | None:
|
||||
return None
|
||||
|
||||
|
||||
def format_quantity_raw(value: float | None, unit: str | None) -> str | None:
|
||||
if value is None:
|
||||
return None
|
||||
label = UNIT_LABELS.get(unit or "g", unit or "g")
|
||||
num = int(value) if float(value) == int(value) else value
|
||||
return f"{num} {label}".replace(".", ",")
|
||||
|
||||
|
||||
def list_quantity_units() -> list[dict[str, Any]]:
|
||||
out = []
|
||||
for uid in UNIT_ORDER:
|
||||
default_g = MASS_VOLUME_TO_G.get(uid)
|
||||
if default_g is None:
|
||||
default_g = DEFAULT_UNIT_G.get(uid)
|
||||
out.append({
|
||||
"id": uid,
|
||||
"label": UNIT_LABELS[uid],
|
||||
"default_g": default_g,
|
||||
"needs_unit_map": uid in COUNT_UNITS,
|
||||
})
|
||||
return out
|
||||
|
||||
|
||||
def resolve_quantity(
|
||||
*,
|
||||
quantity_raw: str | None = None,
|
||||
quantity_amount: float | None = None,
|
||||
source_unit: str | None = None,
|
||||
quantity_g: float | None = None,
|
||||
grams_per_unit: float | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Amount + unit → quantity_g. Standard unit is grams; conversion uses mapping or defaults."""
|
||||
amount = None
|
||||
if quantity_amount not in (None, ""):
|
||||
try:
|
||||
amount = float(quantity_amount)
|
||||
except (TypeError, ValueError):
|
||||
amount = None
|
||||
explicit_g = None
|
||||
if quantity_g not in (None, ""):
|
||||
try:
|
||||
explicit_g = float(quantity_g)
|
||||
except (TypeError, ValueError):
|
||||
explicit_g = None
|
||||
if amount is not None:
|
||||
unit = _canon_unit(source_unit) or "g"
|
||||
raw = format_quantity_raw(amount, unit)
|
||||
parsed = parse_quantity(raw.replace(",", "."), grams_per_unit)
|
||||
elif quantity_raw:
|
||||
parsed = parse_quantity(quantity_raw, grams_per_unit)
|
||||
elif explicit_g is not None:
|
||||
parsed = {"value": explicit_g, "unit": "g", "quantity_g": explicit_g, "needs_unit_map": False}
|
||||
else:
|
||||
parsed = {"value": None, "unit": _canon_unit(source_unit), "quantity_g": None, "needs_unit_map": False}
|
||||
qty_g = parsed.get("quantity_g")
|
||||
if qty_g is None and explicit_g is not None:
|
||||
qty_g = explicit_g
|
||||
unit = parsed.get("unit")
|
||||
value = parsed.get("value")
|
||||
return {
|
||||
"quantity_amount": value,
|
||||
"source_unit": unit,
|
||||
"quantity_raw": format_quantity_raw(value, unit) or (str(quantity_raw).strip() if quantity_raw else None),
|
||||
"quantity_g": qty_g,
|
||||
"needs_unit_map": bool(parsed.get("needs_unit_map")),
|
||||
}
|
||||
|
||||
|
||||
def get_food_mapping_with_cursor(
|
||||
cur,
|
||||
source_name: str,
|
||||
|
||||
Reference in new issue
Block a user