Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-24 15:49:42 +02:00
Code Issues Releases Activity

feat: Migrate from CRF++ to Ingredient Parser (a Python package) (#5061)

Browse source
This commit is contained in:
Michael Genson 2025-02-28 08:17:28 -06:00 • committed by GitHub
parent ec1a9d78ac
commit b12aea8272
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 367 additions and 592 deletions
Download patch file Download diff file Expand all files Collapse all files

36
tests/unit_tests/test_ingredient_parser.py
View file

@ -1,8 +1,6 @@
import asyncio
import json
import shutil
from dataclasses import dataclass
from fractions import Fraction
import pytest
from pydantic import UUID4
@ -27,10 +25,6 @@ from mealie.schema.recipe.recipe_ingredient import (
from mealie.schema.user.user import GroupBase
from mealie.services.openai import OpenAIService
from mealie.services.parser_services import RegisteredParser, get_parser
from mealie.services.parser_services.crfpp.processor import (
CRFIngredient,
convert_list_to_crf_model,
)
from tests.utils.factories import random_int, random_string
@ -43,10 +37,6 @@ class TestIngredient:
comments: str
def crf_exists() -> bool:
return shutil.which("crf_test") is not None
def build_parsed_ing(food: str | None, unit: str | None) -> ParsedIngredient:
ing = RecipeIngredient(unit=None, food=None)
if food:
@ -134,32 +124,6 @@ def parsed_ingredient_data(
return foods, units
# TODO - add more robust test cases
test_ingredients = [
TestIngredient("½ cup all-purpose flour", 0.5, "cup", "all-purpose flour", ""),
TestIngredient("1 ½ teaspoons ground black pepper", 1.5, "teaspoon", "black pepper", "ground"),
TestIngredient("⅔ cup unsweetened flaked coconut", 0.667, "cup", "coconut", "unsweetened flaked"),
TestIngredient("⅓ cup panko bread crumbs", 0.333, "cup", "panko bread crumbs", ""),
# Small Fraction Tests - PR #1369
# Reported error is was for 1/8 - new lowest expected threshold is 1/32
TestIngredient("1/8 cup all-purpose flour", 0.125, "cup", "all-purpose flour", ""),
TestIngredient("1/32 cup all-purpose flour", 0.031, "cup", "all-purpose flour", ""),
]
@pytest.mark.skipif(not crf_exists(), reason="CRF++ not installed")
def test_nlp_parser() -> None:
models: list[CRFIngredient] = convert_list_to_crf_model([x.input for x in test_ingredients])
# Iterate over models and test_ingredients to gather
for model, test_ingredient in zip(models, test_ingredients, strict=False):
assert round(float(sum(Fraction(s) for s in model.qty.split())), 3) == pytest.approx(test_ingredient.quantity)
assert model.comment == test_ingredient.comments
assert model.name == test_ingredient.food
assert model.unit == test_ingredient.unit
@pytest.mark.parametrize(
"input, quantity, unit, food, comment",
[