commit fcd005b8624023547f28b7b28e59e6099bcfc7d4
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 20:24:07 2025 +1100
Openapi tightening
commit f93bd8f641d561052c7bd075bae321b4ff3b676d
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 19:03:52 2025 +1100
Removed refactor strategy doc
commit 0c5a61092f522be0c47cbbe86917c8a7e4e2d339
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 17:48:33 2025 +1100
mypy & ruff checks
commit 23d66d6b18984127e17c73c3063f6120385935e9
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 16:49:35 2025 +1100
Final removal of db.py files
commit f454aed1ca9783cc558cc203f29a7fe31b62a975
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 15:42:31 2025 +1100
Finalise restructure, remove db.py files
commit 7187f6dd89489521538791c6bdebb426514beb99
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 15:34:54 2025 +1100
commit 6fea227ae20d32b8eb1e7a4885006a620fcc7bb1
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 15:32:53 2025 +1100
commit 27415e7e02d89195ad514cb017a9dbbf84d7a5e4
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 15:31:10 2025 +1100
commit b773428033d855f9ad82005602e049c1a2e3c585
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 15:28:58 2025 +1100
commit 116592c95278d995f4c516e87f2cea43cf5b7735
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 15:25:21 2025 +1100
commit 03ec565faea088971968ee2f9bb83e2de16b21f3
Author: jableader <jacobdunk@gmail.com>
Date: Sun Oct 19 15:21:29 2025 +1100
Plan
48 lines
1.2 KiB
Python
48 lines
1.2 KiB
Python
from __future__ import annotations
|
|
|
|
from typing import Any, ClassVar, List, Optional
|
|
|
|
from pydantic import Field, field_validator
|
|
|
|
from common import ApiModel
|
|
from products import Product
|
|
from units import ALL_UNITS
|
|
|
|
|
|
class Ingredient(ApiModel):
|
|
KEYS: ClassVar[List[str]] = [
|
|
"id",
|
|
"name",
|
|
"line",
|
|
"preparation",
|
|
"unit",
|
|
"quantity",
|
|
"product_id",
|
|
"recipe_id",
|
|
"meal_id",
|
|
]
|
|
id: int = -1
|
|
name: str
|
|
line: str
|
|
unit: str = Field(
|
|
title="Unit",
|
|
description="Measurement unit (enum values are advisory; runtime accepts any string)",
|
|
json_schema_extra={"enum": [u.name for u in ALL_UNITS]},
|
|
)
|
|
quantity: float
|
|
preparation: str
|
|
product_id: Optional[int] = None
|
|
recipe_id: Optional[int] = None
|
|
meal_id: Optional[int] = None
|
|
product: Optional[Product] = None
|
|
|
|
# Ensure quantity is stored as a float even if provided as a string in tests
|
|
@field_validator("quantity", mode="before")
|
|
@classmethod
|
|
def _coerce_quantity(cls, v: Any) -> Any:
|
|
if isinstance(v, str):
|
|
try:
|
|
return float(v)
|
|
except ValueError:
|
|
return v
|
|
return v
|