Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-02-24 00:33:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix oz -> fl oz conversion in merge

Browse Source
This commit is contained in:
Michael Genson
2026-02-22 17:32:51 +00:00
parent 48cdf27ea9
commit ee482afbd2
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mealie/services/parser_services/parser_utils/unit_utils.py
View File

@@ -120,8 +120,15 @@ def merge_quantity_and_unit[T: CreateIngredientUnit](
PINT_UNIT_2_TXT = "_mealie_unit_2"
uc = UnitConverter()
uc.ureg.define(f"{PINT_UNIT_1_TXT} = {unit_1.standard_quantity} * {unit_1.standard_unit}")
uc.ureg.define(f"{PINT_UNIT_2_TXT} = {unit_2.standard_quantity} * {unit_2.standard_unit}")
# pre-process units to account for ounce -> fluid ounce conversion
unit_1_standard = uc.parse(unit_1.standard_unit, strict=True)
unit_2_standard = uc.parse(unit_2.standard_unit, strict=True)
unit_1_standard, unit_2_standard = uc._resolve_ounce(unit_1_standard, unit_2_standard)
# create custon unit definition so pint can handle them natively
uc.ureg.define(f"{PINT_UNIT_1_TXT} = {unit_1.standard_quantity} * {unit_1_standard}")
uc.ureg.define(f"{PINT_UNIT_2_TXT} = {unit_2.standard_quantity} * {unit_2_standard}")
pint_unit_1 = uc.parse(PINT_UNIT_1_TXT)
pint_unit_2 = uc.parse(PINT_UNIT_2_TXT)