Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-01-08 18:11:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(deps): update dependency ingredient-parser-nlp to v2 (#5137)

Browse Source
This commit is contained in:
Michael Genson
2025-02-28 09:51:36 -06:00
committed by GitHub
parent 61ae6b3e32
commit cfba2fff7e
4 changed files with 148 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mealie/services/parser_services/ingredient_parser.py
View File

@@ -1,3 +1,5 @@
from fractions import Fraction
from ingredient_parser import parse_ingredient
from ingredient_parser.dataclasses import CompositeIngredientAmount, IngredientAmount
from ingredient_parser.dataclasses import ParsedIngredient as IngredientParserParsedIngredient
@@ -54,7 +56,9 @@ class NLPParser(ABCIngredientParser):
@staticmethod
def _extract_amount(ingredient: IngredientParserParsedIngredient) -> IngredientAmount:
if not (ingredient_amounts := ingredient.amount):
return IngredientAmount(quantity=0, quantity_max=0, unit="", text="", confidence=0, starting_index=-1)
return IngredientAmount(
quantity=Fraction(0), quantity_max=Fraction(0), unit="", text="", confidence=0, starting_index=-1
)
ingredient_amount = ingredient_amounts[0]
if isinstance(ingredient_amount, CompositeIngredientAmount):
@@ -67,12 +71,15 @@ class NLPParser(ABCIngredientParser):
confidence = ingredient_amount.confidence
if isinstance(ingredient_amount.quantity, str):
return extract_quantity_from_string(ingredient_amount.quantity)[0], confidence
qty = extract_quantity_from_string(ingredient_amount.quantity)[0]
else:
try:
return float(ingredient_amount.quantity), confidence
qty = float(ingredient_amount.quantity)
except ValueError:
return 0, 0
qty = 0
confidence = 0
return qty, confidence
@staticmethod
def _extract_unit(ingredient_amount: IngredientAmount) -> tuple[str, float]:
@@ -82,8 +89,13 @@ class NLPParser(ABCIngredientParser):
@staticmethod
def _extract_food(ingredient: IngredientParserParsedIngredient) -> tuple[str, float]:
confidence = ingredient.name.confidence if ingredient.name else 0
food = str(ingredient.name.text) if ingredient.name else ""
if not ingredient.name:
return "", 0
ingredient_name = ingredient.name[0]
confidence = ingredient_name.confidence
food = ingredient_name.text
return food, confidence
@staticmethod