{{ $t("recipe.ingredients") }}
-
-
-
diff --git a/frontend/composables/recipe-page/use-extract-recipe-yield.test.ts b/frontend/composables/recipe-page/use-extract-recipe-yield.test.ts
deleted file mode 100644
index 3bc8e7996e8..00000000000
--- a/frontend/composables/recipe-page/use-extract-recipe-yield.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { useExtractRecipeYield } from "./use-extract-recipe-yield";
-
-describe("test use extract recipe yield", () => {
- test("when text empty return empty", () => {
- const result = useExtractRecipeYield(null, 1);
- expect(result).toStrictEqual("");
- });
-
- test("when text matches nothing return text", () => {
- const val = "this won't match anything";
- const result = useExtractRecipeYield(val, 1);
- expect(result).toStrictEqual(val);
-
- const resultScaled = useExtractRecipeYield(val, 5);
- expect(resultScaled).toStrictEqual(val);
- });
-
- test("when text matches a mixed fraction, return a scaled fraction", () => {
- const val = "10 1/2 units";
- const result = useExtractRecipeYield(val, 1);
- expect(result).toStrictEqual(val);
-
- const resultScaled = useExtractRecipeYield(val, 3);
- expect(resultScaled).toStrictEqual("31 1/2 units");
-
- const resultScaledPartial = useExtractRecipeYield(val, 2.5);
- expect(resultScaledPartial).toStrictEqual("26 1/4 units");
-
- const resultScaledInt = useExtractRecipeYield(val, 4);
- expect(resultScaledInt).toStrictEqual("42 units");
- });
-
- test("when text matches a fraction, return a scaled fraction", () => {
- const val = "1/3 plates";
- const result = useExtractRecipeYield(val, 1);
- expect(result).toStrictEqual(val);
-
- const resultScaled = useExtractRecipeYield(val, 2);
- expect(resultScaled).toStrictEqual("2/3 plates");
-
- const resultScaledInt = useExtractRecipeYield(val, 3);
- expect(resultScaledInt).toStrictEqual("1 plates");
-
- const resultScaledPartial = useExtractRecipeYield(val, 2.5);
- expect(resultScaledPartial).toStrictEqual("5/6 plates");
-
- const resultScaledMixed = useExtractRecipeYield(val, 4);
- expect(resultScaledMixed).toStrictEqual("1 1/3 plates");
- });
-
- test("when text matches a decimal, return a scaled, rounded decimal", () => {
- const val = "1.25 parts";
- const result = useExtractRecipeYield(val, 1);
- expect(result).toStrictEqual(val);
-
- const resultScaled = useExtractRecipeYield(val, 2);
- expect(resultScaled).toStrictEqual("2.5 parts");
-
- const resultScaledInt = useExtractRecipeYield(val, 4);
- expect(resultScaledInt).toStrictEqual("5 parts");
-
- const resultScaledPartial = useExtractRecipeYield(val, 2.5);
- expect(resultScaledPartial).toStrictEqual("3.125 parts");
-
- const roundedVal = "1.33333333333333333333 parts";
- const resultScaledRounded = useExtractRecipeYield(roundedVal, 2);
- expect(resultScaledRounded).toStrictEqual("2.667 parts");
- });
-
- test("when text matches an int, return a scaled int", () => {
- const val = "5 bowls";
- const result = useExtractRecipeYield(val, 1);
- expect(result).toStrictEqual(val);
-
- const resultScaled = useExtractRecipeYield(val, 2);
- expect(resultScaled).toStrictEqual("10 bowls");
-
- const resultScaledPartial = useExtractRecipeYield(val, 2.5);
- expect(resultScaledPartial).toStrictEqual("12.5 bowls");
-
- const resultScaledLarge = useExtractRecipeYield(val, 10);
- expect(resultScaledLarge).toStrictEqual("50 bowls");
- });
-
- test("when text contains an invalid fraction, return the original string", () => {
- const valDivZero = "3/0 servings";
- const resultDivZero = useExtractRecipeYield(valDivZero, 3);
- expect(resultDivZero).toStrictEqual(valDivZero);
-
- const valDivZeroMixed = "2 4/0 servings";
- const resultDivZeroMixed = useExtractRecipeYield(valDivZeroMixed, 6);
- expect(resultDivZeroMixed).toStrictEqual(valDivZeroMixed);
- });
-
- test("when text contains a weird or small fraction, return the original string", () => {
- const valWeird = "2323231239087/134527431962272135 servings";
- const resultWeird = useExtractRecipeYield(valWeird, 5);
- expect(resultWeird).toStrictEqual(valWeird);
-
- const valSmall = "1/20230225 lovable servings";
- const resultSmall = useExtractRecipeYield(valSmall, 12);
- expect(resultSmall).toStrictEqual(valSmall);
- });
-
- test("when text contains multiple numbers, the first is parsed as the servings amount", () => {
- const val = "100 sets of 55 bowls";
- const result = useExtractRecipeYield(val, 3);
- expect(result).toStrictEqual("300 sets of 55 bowls");
- })
-});
diff --git a/frontend/composables/recipe-page/use-extract-recipe-yield.ts b/frontend/composables/recipe-page/use-extract-recipe-yield.ts
deleted file mode 100644
index bec7d658563..00000000000
--- a/frontend/composables/recipe-page/use-extract-recipe-yield.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { useFraction } from "~/composables/recipes";
-
-const matchMixedFraction = /(?:\d*\s\d*\d*|0)\/\d*\d*/;
-const matchFraction = /(?:\d*\d*|0)\/\d*\d*/;
-const matchDecimal = /(\d+.\d+)|(.\d+)/;
-const matchInt = /\d+/;
-
-
-
-function extractServingsFromMixedFraction(fractionString: string): number | undefined {
- const mixedSplit = fractionString.split(/\s/);
- const wholeNumber = parseInt(mixedSplit[0]);
- const fraction = mixedSplit[1];
-
- const fractionSplit = fraction.split("/");
- const numerator = parseInt(fractionSplit[0]);
- const denominator = parseInt(fractionSplit[1]);
-
- if (denominator === 0) {
- return undefined; // if the denominator is zero, just give up
- }
- else {
- return wholeNumber + (numerator / denominator);
- }
-}
-
-function extractServingsFromFraction(fractionString: string): number | undefined {
- const fractionSplit = fractionString.split("/");
- const numerator = parseInt(fractionSplit[0]);
- const denominator = parseInt(fractionSplit[1]);
-
- if (denominator === 0) {
- return undefined; // if the denominator is zero, just give up
- }
- else {
- return numerator / denominator;
- }
-}
-
-
-
-export function findMatch(yieldString: string): [matchString: string, servings: number, isFraction: boolean] | null {
- if (!yieldString) {
- return null;
- }
-
- const mixedFractionMatch = yieldString.match(matchMixedFraction);
- if (mixedFractionMatch?.length) {
- const match = mixedFractionMatch[0];
- const servings = extractServingsFromMixedFraction(match);
-
- // if the denominator is zero, return no match
- if (servings === undefined) {
- return null;
- } else {
- return [match, servings, true];
- }
- }
-
- const fractionMatch = yieldString.match(matchFraction);
- if (fractionMatch?.length) {
- const match = fractionMatch[0]
- const servings = extractServingsFromFraction(match);
-
- // if the denominator is zero, return no match
- if (servings === undefined) {
- return null;
- } else {
- return [match, servings, true];
- }
- }
-
- const decimalMatch = yieldString.match(matchDecimal);
- if (decimalMatch?.length) {
- const match = decimalMatch[0];
- return [match, parseFloat(match), false];
- }
-
- const intMatch = yieldString.match(matchInt);
- if (intMatch?.length) {
- const match = intMatch[0];
- return [match, parseInt(match), false];
- }
-
- return null;
-}
-
-function formatServings(servings: number, scale: number, isFraction: boolean): string {
- const val = servings * scale;
- if (Number.isInteger(val)) {
- return val.toString();
- } else if (!isFraction) {
- return (Math.round(val * 1000) / 1000).toString();
- }
-
- // convert val into a fraction string
- const { frac } = useFraction();
-
- let valString = "";
- const fraction = frac(val, 10, true);
-
- if (fraction[0] !== undefined && fraction[0] > 0) {
- valString += fraction[0];
- }
-
- if (fraction[1] > 0) {
- valString += ` ${fraction[1]}/${fraction[2]}`;
- }
-
- return valString.trim();
-}
-
-
-export function useExtractRecipeYield(yieldString: string | null, scale: number): string {
- if (!yieldString) {
- return "";
- }
-
- const match = findMatch(yieldString);
- if (!match) {
- return yieldString;
- }
-
- const [matchString, servings, isFraction] = match;
-
- const formattedServings = formatServings(servings, scale, isFraction);
- if (!formattedServings) {
- return yieldString // this only happens with very weird or small fractions
- } else {
- return yieldString.replace(matchString, formatServings(servings, scale, isFraction));
- }
-}
diff --git a/frontend/composables/recipes/use-scaled-amount.test.ts b/frontend/composables/recipes/use-scaled-amount.test.ts
new file mode 100644
index 00000000000..f3f0cdae52a
--- /dev/null
+++ b/frontend/composables/recipes/use-scaled-amount.test.ts
@@ -0,0 +1,68 @@
+import { describe, expect, test } from "vitest";
+import { useScaledAmount } from "./use-scaled-amount";
+
+describe("test use recipe yield", () => {
+ function asFrac(numerator: number, denominator: number): string {
+ return `${numerator}⁄${denominator}`;
+ }
+
+ test("base case", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(3);
+ expect(scaledAmount).toStrictEqual(3);
+ expect(scaledAmountDisplay).toStrictEqual("3");
+ });
+
+ test("base case scaled", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(3, 2);
+ expect(scaledAmount).toStrictEqual(6);
+ expect(scaledAmountDisplay).toStrictEqual("6");
+ });
+
+ test("zero scale", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(3, 0);
+ expect(scaledAmount).toStrictEqual(0);
+ expect(scaledAmountDisplay).toStrictEqual("");
+ });
+
+ test("zero quantity", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(0);
+ expect(scaledAmount).toStrictEqual(0);
+ expect(scaledAmountDisplay).toStrictEqual("");
+ });
+
+ test("basic fraction", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(0.5);
+ expect(scaledAmount).toStrictEqual(0.5);
+ expect(scaledAmountDisplay).toStrictEqual(asFrac(1, 2));
+ });
+
+ test("mixed fraction", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(1.5);
+ expect(scaledAmount).toStrictEqual(1.5);
+ expect(scaledAmountDisplay).toStrictEqual(`1${asFrac(1, 2)}`);
+ });
+
+ test("mixed fraction scaled", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(1.5, 9);
+ expect(scaledAmount).toStrictEqual(13.5);
+ expect(scaledAmountDisplay).toStrictEqual(`13${asFrac(1, 2)}`);
+ });
+
+ test("small scale", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(1, 0.125);
+ expect(scaledAmount).toStrictEqual(0.125);
+ expect(scaledAmountDisplay).toStrictEqual(asFrac(1, 8));
+ });
+
+ test("small qty", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(0.125);
+ expect(scaledAmount).toStrictEqual(0.125);
+ expect(scaledAmountDisplay).toStrictEqual(asFrac(1, 8));
+ });
+
+ test("rounded decimal", () => {
+ const { scaledAmount, scaledAmountDisplay } = useScaledAmount(1.3344559997);
+ expect(scaledAmount).toStrictEqual(1.334);
+ expect(scaledAmountDisplay).toStrictEqual(`1${asFrac(1, 3)}`);
+ });
+});
diff --git a/frontend/composables/recipes/use-scaled-amount.ts b/frontend/composables/recipes/use-scaled-amount.ts
new file mode 100644
index 00000000000..1f642e91d99
--- /dev/null
+++ b/frontend/composables/recipes/use-scaled-amount.ts
@@ -0,0 +1,32 @@
+import { useFraction } from "~/composables/recipes";
+
+function formatQuantity(val: number): string {
+ if (Number.isInteger(val)) {
+ return val.toString();
+ }
+
+ const { frac } = useFraction();
+
+ let valString = "";
+ const fraction = frac(val, 10, true);
+
+ if (fraction[0] !== undefined && fraction[0] > 0) {
+ valString += fraction[0];
+ }
+
+ if (fraction[1] > 0) {
+ valString += `${fraction[1]}⁄${fraction[2]}`;
+ }
+
+ return valString.trim();
+}
+
+export function useScaledAmount(amount: number, scale = 1) {
+ const scaledAmount = Number(((amount || 0) * scale).toFixed(3));
+ const scaledAmountDisplay = scaledAmount ? formatQuantity(scaledAmount) : "";
+
+ return {
+ scaledAmount,
+ scaledAmountDisplay,
+ };
+}
diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json
index 9b5c04f4186..b40fcc94e48 100644
--- a/frontend/lang/messages/en-US.json
+++ b/frontend/lang/messages/en-US.json
@@ -517,6 +517,7 @@
"save-recipe-before-use": "Save recipe before use",
"section-title": "Section Title",
"servings": "Servings",
+ "serves-amount": "Serves {amount}",
"share-recipe-message": "I wanted to share my {0} recipe with you.",
"show-nutrition-values": "Show Nutrition Values",
"sodium-content": "Sodium",
@@ -545,6 +546,8 @@
"failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
"failed-to-add-to-list": "Failed to add to list",
"yield": "Yield",
+ "yields-amount-with-text": "Yields {amount} {text}",
+ "yield-text": "Yield Text",
"quantity": "Quantity",
"choose-unit": "Choose Unit",
"press-enter-to-create": "Press Enter to Create",
@@ -640,7 +643,9 @@
"recipe-debugger-use-openai-description": "Use OpenAI to parse the results instead of relying on the scraper library. When creating a recipe via URL, this is done automatically if the scraper library fails, but you may test it manually here.",
"debug": "Debug",
"tree-view": "Tree View",
+ "recipe-servings": "Recipe Servings",
"recipe-yield": "Recipe Yield",
+ "recipe-yield-text": "Recipe Yield Text",
"unit": "Unit",
"upload-image": "Upload image",
"screen-awake": "Keep Screen Awake",
diff --git a/frontend/lib/api/types/admin.ts b/frontend/lib/api/types/admin.ts
index 7b40f6a849f..79678aed5e2 100644
--- a/frontend/lib/api/types/admin.ts
+++ b/frontend/lib/api/types/admin.ts
@@ -126,6 +126,8 @@ export interface RecipeSummary {
name?: string | null;
slug?: string;
image?: unknown;
+ recipeServings?: number;
+ recipeYieldQuantity?: number;
recipeYield?: string | null;
totalTime?: string | null;
prepTime?: string | null;
diff --git a/frontend/lib/api/types/cookbook.ts b/frontend/lib/api/types/cookbook.ts
index e43e48bcbf9..721e6320f78 100644
--- a/frontend/lib/api/types/cookbook.ts
+++ b/frontend/lib/api/types/cookbook.ts
@@ -62,6 +62,8 @@ export interface RecipeSummary {
name?: string | null;
slug?: string;
image?: unknown;
+ recipeServings?: number;
+ recipeYieldQuantity?: number;
recipeYield?: string | null;
totalTime?: string | null;
prepTime?: string | null;
diff --git a/frontend/lib/api/types/meal-plan.ts b/frontend/lib/api/types/meal-plan.ts
index ae033c1f45b..f11ec1feb0c 100644
--- a/frontend/lib/api/types/meal-plan.ts
+++ b/frontend/lib/api/types/meal-plan.ts
@@ -87,6 +87,8 @@ export interface RecipeSummary {
name?: string | null;
slug?: string;
image?: unknown;
+ recipeServings?: number;
+ recipeYieldQuantity?: number;
recipeYield?: string | null;
totalTime?: string | null;
prepTime?: string | null;
diff --git a/frontend/lib/api/types/recipe.ts b/frontend/lib/api/types/recipe.ts
index 72672dc15e6..ed0c7ab0052 100644
--- a/frontend/lib/api/types/recipe.ts
+++ b/frontend/lib/api/types/recipe.ts
@@ -230,6 +230,8 @@ export interface Recipe {
name?: string | null;
slug?: string;
image?: unknown;
+ recipeServings?: number;
+ recipeYieldQuantity?: number;
recipeYield?: string | null;
totalTime?: string | null;
prepTime?: string | null;
@@ -307,6 +309,8 @@ export interface RecipeSummary {
name?: string | null;
slug?: string;
image?: unknown;
+ recipeServings?: number;
+ recipeYieldQuantity?: number;
recipeYield?: string | null;
totalTime?: string | null;
prepTime?: string | null;
diff --git a/frontend/pages/group/data/recipes.vue b/frontend/pages/group/data/recipes.vue
index 94d2f245b8d..37bc477608e 100644
--- a/frontend/pages/group/data/recipes.vue
+++ b/frontend/pages/group/data/recipes.vue
@@ -218,6 +218,8 @@ export default defineComponent({
tags: true,
tools: true,
categories: true,
+ recipeServings: false,
+ recipeYieldQuantity: false,
recipeYield: false,
dateAdded: false,
});
@@ -228,7 +230,9 @@ export default defineComponent({
tags: i18n.t("tag.tags"),
categories: i18n.t("recipe.categories"),
tools: i18n.t("tool.tools"),
- recipeYield: i18n.t("recipe.recipe-yield"),
+ recipeServings: i18n.t("recipe.recipe-servings"),
+ recipeYieldQuantity: i18n.t("recipe.recipe-yield"),
+ recipeYield: i18n.t("recipe.recipe-yield-text"),
dateAdded: i18n.t("general.date-added"),
};
diff --git a/mealie/db/models/recipe/recipe.py b/mealie/db/models/recipe/recipe.py
index fc9c142bb9c..ebbb0bfc963 100644
--- a/mealie/db/models/recipe/recipe.py
+++ b/mealie/db/models/recipe/recipe.py
@@ -89,7 +89,8 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
cook_time: Mapped[str | None] = mapped_column(sa.String)
recipe_yield: Mapped[str | None] = mapped_column(sa.String)
- recipeCuisine: Mapped[str | None] = mapped_column(sa.String)
+ recipe_yield_quantity: Mapped[float] = mapped_column(sa.Float, index=True, default=0)
+ recipe_servings: Mapped[float] = mapped_column(sa.Float, index=True, default=0)
assets: Mapped[list[RecipeAsset]] = orm.relationship("RecipeAsset", cascade="all, delete-orphan")
nutrition: Mapped[Nutrition] = orm.relationship("Nutrition", uselist=False, cascade="all, delete-orphan")
@@ -131,7 +132,6 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
notes: Mapped[list[Note]] = orm.relationship("Note", cascade="all, delete-orphan")
org_url: Mapped[str | None] = mapped_column(sa.String)
extras: Mapped[list[ApiExtras]] = orm.relationship("ApiExtras", cascade="all, delete-orphan")
- is_ocr_recipe: Mapped[bool | None] = mapped_column(sa.Boolean, default=False)
# Time Stamp Properties
date_added: Mapped[date | None] = mapped_column(sa.Date, default=get_utc_today)
@@ -167,6 +167,10 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
},
)
+ # Deprecated
+ recipeCuisine: Mapped[str | None] = mapped_column(sa.String)
+ is_ocr_recipe: Mapped[bool | None] = mapped_column(sa.Boolean, default=False)
+
@validates("name")
def validate_name(self, _, name):
assert name != ""
diff --git a/mealie/lang/messages/en-US.json b/mealie/lang/messages/en-US.json
index ad7c43af44e..e5d8c10ce1c 100644
--- a/mealie/lang/messages/en-US.json
+++ b/mealie/lang/messages/en-US.json
@@ -8,6 +8,14 @@
"recipe-defaults": {
"ingredient-note": "1 Cup Flour",
"step-text": "Recipe steps as well as other fields in the recipe page support markdown syntax.\n\n**Add a link**\n\n[My Link](https://demo.mealie.io)\n"
+ },
+ "servings-text": {
+ "makes": "Makes",
+ "serves": "Serves",
+ "serving": "Serving",
+ "servings": "Servings",
+ "yield": "Yield",
+ "yields": "Yields"
}
},
"mealplan": {
diff --git a/mealie/lang/providers.py b/mealie/lang/providers.py
index b263e65646b..106a894032e 100644
--- a/mealie/lang/providers.py
+++ b/mealie/lang/providers.py
@@ -29,3 +29,9 @@ def local_provider(accept_language: str | None = Header(None)) -> Translator:
factory = _load_factory()
accept_language = accept_language or "en-US"
return factory.get(accept_language)
+
+
+@lru_cache
+def get_all_translations(key: str) -> dict[str, str]:
+ factory = _load_factory()
+ return {locale: factory.get(locale).t(key) for locale in factory.supported_locales}
diff --git a/mealie/pkgs/i18n/provider_factory.py b/mealie/pkgs/i18n/provider_factory.py
index 81cb7fa659d..5324126a0e6 100644
--- a/mealie/pkgs/i18n/provider_factory.py
+++ b/mealie/pkgs/i18n/provider_factory.py
@@ -1,4 +1,5 @@
from dataclasses import dataclass, field
+from functools import cached_property
from pathlib import Path
from .json_provider import JsonProvider
@@ -10,7 +11,7 @@ class InUseProvider:
locks: int
-@dataclass(slots=True)
+@dataclass
class ProviderFactory:
directory: Path
fallback_locale: str = "en-US"
@@ -22,6 +23,10 @@ class ProviderFactory:
def fallback_file(self) -> Path:
return self.directory / self.filename_format.format(locale=self.fallback_locale, format="json")
+ @cached_property
+ def supported_locales(self) -> list[str]:
+ return [path.stem for path in self.directory.glob(self.filename_format.format(locale="*", format="json"))]
+
def _load(self, locale: str) -> JsonProvider:
filename = self.filename_format.format(locale=locale, format="json")
path = self.directory / filename
diff --git a/mealie/routes/spa/__init__.py b/mealie/routes/spa/__init__.py
index d4c21e4c050..824764b6e42 100644
--- a/mealie/routes/spa/__init__.py
+++ b/mealie/routes/spa/__init__.py
@@ -116,7 +116,7 @@ def content_with_meta(group_slug: str, recipe: Recipe) -> str:
"prepTime": recipe.prep_time,
"cookTime": recipe.cook_time,
"totalTime": recipe.total_time,
- "recipeYield": recipe.recipe_yield,
+ "recipeYield": recipe.recipe_yield_display,
"recipeIngredient": ingredients,
"recipeInstructions": [i.text for i in recipe.recipe_instructions] if recipe.recipe_instructions else [],
"recipeCategory": [c.name for c in recipe.recipe_category] if recipe.recipe_category else [],
diff --git a/mealie/schema/recipe/recipe.py b/mealie/schema/recipe/recipe.py
index a328614d5c3..9de142427a8 100644
--- a/mealie/schema/recipe/recipe.py
+++ b/mealie/schema/recipe/recipe.py
@@ -91,6 +91,8 @@ class RecipeSummary(MealieModel):
name: str | None = None
slug: Annotated[str, Field(validate_default=True)] = ""
image: Any | None = None
+ recipe_servings: float = 0
+ recipe_yield_quantity: float = 0
recipe_yield: str | None = None
total_time: str | None = None
@@ -122,6 +124,10 @@ def clean_strings(val: Any):
return val
+ @property
+ def recipe_yield_display(self) -> str:
+ return f"{self.recipe_yield_quantity} {self.recipe_yield}".strip()
+
@classmethod
def loader_options(cls) -> list[LoaderOption]:
return [
diff --git a/mealie/services/migrations/tandoor.py b/mealie/services/migrations/tandoor.py
index 7806e55ad84..ba89792452f 100644
--- a/mealie/services/migrations/tandoor.py
+++ b/mealie/services/migrations/tandoor.py
@@ -92,10 +92,8 @@ def _process_recipe_document(self, source_dir: Path, recipe_data: dict) -> dict:
recipe_data.pop("working_time", 0), recipe_data.pop("waiting_time", 0)
)
- serving_size = recipe_data.pop("servings", 0)
- serving_text = recipe_data.pop("servings_text", "")
- if serving_size and serving_text:
- recipe_data["recipeYield"] = f"{serving_size} {serving_text}"
+ recipe_data["recipeYieldQuantity"] = recipe_data.pop("servings", 0)
+ recipe_data["recipeYield"] = recipe_data.pop("servings_text", "")
try:
recipe_image_path = next(source_dir.glob("image.*"))
diff --git a/mealie/services/parser_services/_helpers/string_utils.py b/mealie/services/parser_services/_helpers/string_utils.py
deleted file mode 100644
index 426d540c8e2..00000000000
--- a/mealie/services/parser_services/_helpers/string_utils.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import re
-
-compiled_match = re.compile(r"(.){1,6}\s\((.[^\(\)])+\)\s")
-compiled_search = re.compile(r"\((.[^\(])+\)")
-
-
-def move_parens_to_end(ing_str) -> str:
- """
- Moves all parentheses in the string to the end of the string using Regex.
- If no parentheses are found, the string is returned unchanged.
- """
- if re.match(compiled_match, ing_str):
- if match := re.search(compiled_search, ing_str):
- start = match.start()
- end = match.end()
- ing_str = ing_str[:start] + ing_str[end:] + " " + ing_str[start:end]
-
- return ing_str
-
-
-def check_char(char, *eql) -> bool:
- """Helper method to check if a characters matches any of the additional provided arguments"""
- return any(char == eql_char for eql_char in eql)
diff --git a/mealie/services/parser_services/brute/process.py b/mealie/services/parser_services/brute/process.py
index 446a6f54a59..f9cd97b49f7 100644
--- a/mealie/services/parser_services/brute/process.py
+++ b/mealie/services/parser_services/brute/process.py
@@ -3,7 +3,7 @@
from pydantic import BaseModel, ConfigDict
-from .._helpers import check_char, move_parens_to_end
+from ..parser_utils import check_char, move_parens_to_end
class BruteParsedIngredient(BaseModel):
diff --git a/mealie/services/parser_services/crfpp/pre_processor.py b/mealie/services/parser_services/crfpp/pre_processor.py
index d008acb49e1..aea0262a041 100644
--- a/mealie/services/parser_services/crfpp/pre_processor.py
+++ b/mealie/services/parser_services/crfpp/pre_processor.py
@@ -1,5 +1,6 @@
import re
-import unicodedata
+
+from mealie.services.parser_services.parser_utils import convert_vulgar_fractions_to_regular_fractions
replace_abbreviations = {
"cup": " cup ",
@@ -29,23 +30,6 @@ def remove_periods(string: str) -> str:
return re.sub(r"(? str:
"""
string = string.lower()
- string = replace_fraction_unicode(string)
+ string = convert_vulgar_fractions_to_regular_fractions(string)
string = remove_periods(string)
string = replace_common_abbreviations(string)
diff --git a/mealie/services/parser_services/_helpers/__init__.py b/mealie/services/parser_services/parser_utils/__init__.py
similarity index 100%
rename from mealie/services/parser_services/_helpers/__init__.py
rename to mealie/services/parser_services/parser_utils/__init__.py
diff --git a/mealie/services/parser_services/parser_utils/string_utils.py b/mealie/services/parser_services/parser_utils/string_utils.py
new file mode 100644
index 00000000000..497bf76b7db
--- /dev/null
+++ b/mealie/services/parser_services/parser_utils/string_utils.py
@@ -0,0 +1,111 @@
+import re
+from fractions import Fraction
+
+compiled_match = re.compile(r"(.){1,6}\s\((.[^\(\)])+\)\s")
+compiled_search = re.compile(r"\((.[^\(])+\)")
+
+
+def move_parens_to_end(ing_str) -> str:
+ """
+ Moves all parentheses in the string to the end of the string using Regex.
+ If no parentheses are found, the string is returned unchanged.
+ """
+ if re.match(compiled_match, ing_str):
+ if match := re.search(compiled_search, ing_str):
+ start = match.start()
+ end = match.end()
+ ing_str = ing_str[:start] + ing_str[end:] + " " + ing_str[start:end]
+
+ return ing_str
+
+
+def check_char(char, *eql) -> bool:
+ """Helper method to check if a characters matches any of the additional provided arguments"""
+ return any(char == eql_char for eql_char in eql)
+
+
+def convert_vulgar_fractions_to_regular_fractions(text: str) -> str:
+ vulgar_fractions = {
+ "¼": "1/4",
+ "½": "1/2",
+ "¾": "3/4",
+ "⅐": "1/7",
+ "⅑": "1/9",
+ "⅒": "1/10",
+ "⅓": "1/3",
+ "⅔": "2/3",
+ "⅕": "1/5",
+ "⅖": "2/5",
+ "⅗": "3/5",
+ "⅘": "4/5",
+ "⅙": "1/6",
+ "⅚": "5/6",
+ "⅛": "1/8",
+ "⅜": "3/8",
+ "⅝": "5/8",
+ "⅞": "7/8",
+ }
+
+ for vulgar_fraction, regular_fraction in vulgar_fractions.items():
+ # if we don't add a space in front of the fraction, mixed fractions will be broken
+ # e.g. "1½" -> "11/2"
+ text = text.replace(vulgar_fraction, f" {regular_fraction}").strip()
+
+ return text
+
+
+def extract_quantity_from_string(source_str: str) -> tuple[float, str]:
+ """
+ Extracts a quantity from a string. The quantity can be a fraction, decimal, or integer.
+
+ Returns the quantity and the remaining string. If no quantity is found, returns the quantity as 0.
+ """
+
+ source_str = source_str.strip()
+ if not source_str:
+ return 0, ""
+
+ source_str = convert_vulgar_fractions_to_regular_fractions(source_str)
+
+ mixed_fraction_pattern = re.compile(r"(\d+)\s+(\d+)/(\d+)")
+ fraction_pattern = re.compile(r"(\d+)/(\d+)")
+ number_pattern = re.compile(r"\d+(\.\d+)?")
+
+ try:
+ # Check for a mixed fraction (e.g. "1 1/2")
+ match = mixed_fraction_pattern.search(source_str)
+ if match:
+ whole_number = int(match.group(1))
+ numerator = int(match.group(2))
+ denominator = int(match.group(3))
+ quantity = whole_number + float(Fraction(numerator, denominator))
+ remaining_str = source_str[: match.start()] + source_str[match.end() :]
+
+ remaining_str = remaining_str.strip()
+ return quantity, remaining_str
+
+ # Check for a fraction (e.g. "1/2")
+ match = fraction_pattern.search(source_str)
+ if match:
+ numerator = int(match.group(1))
+ denominator = int(match.group(2))
+ quantity = float(Fraction(numerator, denominator))
+ remaining_str = source_str[: match.start()] + source_str[match.end() :]
+
+ remaining_str = remaining_str.strip()
+ return quantity, remaining_str
+
+ # Check for a number (integer or float)
+ match = number_pattern.search(source_str)
+ if match:
+ quantity = float(match.group())
+ remaining_str = source_str[: match.start()] + source_str[match.end() :]
+
+ remaining_str = remaining_str.strip()
+ return quantity, remaining_str
+
+ except ZeroDivisionError:
+ pass
+
+ # If no match, return 0 and the original string
+ return 0, source_str
diff --git a/mealie/services/scraper/cleaner.py b/mealie/services/scraper/cleaner.py
index bfbc971d40d..661792022b6 100644
--- a/mealie/services/scraper/cleaner.py
+++ b/mealie/services/scraper/cleaner.py
@@ -10,8 +10,9 @@
from slugify import slugify
from mealie.core.root_logger import get_logger
-from mealie.lang.providers import Translator
+from mealie.lang.providers import Translator, get_all_translations
from mealie.schema.recipe.recipe import Recipe
+from mealie.services.parser_services.parser_utils import extract_quantity_from_string
logger = get_logger("recipe-scraper")
@@ -51,18 +52,21 @@ def clean(recipe_data: Recipe | dict, translator: Translator, url=None) -> Recip
recipe_data = recipe_data_dict
+ recipe_data["slug"] = slugify(recipe_data.get("name", ""))
recipe_data["description"] = clean_string(recipe_data.get("description", ""))
- # Times
recipe_data["prepTime"] = clean_time(recipe_data.get("prepTime"), translator)
recipe_data["performTime"] = clean_time(recipe_data.get("performTime"), translator)
recipe_data["totalTime"] = clean_time(recipe_data.get("totalTime"), translator)
+
+ recipe_data["recipeServings"], recipe_data["recipeYieldQuantity"], recipe_data["recipeYield"] = clean_yield(
+ recipe_data.get("recipeYield")
+ )
recipe_data["recipeCategory"] = clean_categories(recipe_data.get("recipeCategory", []))
- recipe_data["recipeYield"] = clean_yield(recipe_data.get("recipeYield"))
recipe_data["recipeIngredient"] = clean_ingredients(recipe_data.get("recipeIngredient", []))
recipe_data["recipeInstructions"] = clean_instructions(recipe_data.get("recipeInstructions", []))
+
recipe_data["image"] = clean_image(recipe_data.get("image"))[0]
- recipe_data["slug"] = slugify(recipe_data.get("name", ""))
recipe_data["orgURL"] = url or recipe_data.get("orgURL")
recipe_data["notes"] = clean_notes(recipe_data.get("notes"))
recipe_data["rating"] = clean_int(recipe_data.get("rating"))
@@ -324,7 +328,31 @@ def clean_notes(notes: typing.Any) -> list[dict] | None:
return parsed_notes
-def clean_yield(yld: str | list[str] | None) -> str:
+@functools.lru_cache
+def _get_servings_options() -> set[str]:
+ options: set[str] = set()
+ for key in [
+ "recipe.servings-text.makes",
+ "recipe.servings-text.serves",
+ "recipe.servings-text.serving",
+ "recipe.servings-text.servings",
+ "recipe.servings-text.yield",
+ "recipe.servings-text.yields",
+ ]:
+ options.update([t.strip().lower() for t in get_all_translations(key).values()])
+
+ return options
+
+
+def _is_serving_string(txt: str) -> bool:
+ txt = txt.strip().lower()
+ for option in _get_servings_options():
+ if option in txt.strip().lower():
+ return True
+ return False
+
+
+def clean_yield(yields: str | list[str] | None) -> tuple[float, float, str]:
"""
yield_amount attemps to parse out the yield amount from a recipe.
@@ -333,15 +361,34 @@ def clean_yield(yld: str | list[str] | None) -> str:
- `["4 servings", "4 Pies"]` - returns the last value
Returns:
+ float: The servings, if it can be parsed else 0
+ float: The yield quantity, if it can be parsed else 0
str: The yield amount, if it can be parsed else an empty string
"""
- if not yld:
- return ""
+ servings_qty: float = 0
+ yld_qty: float = 0
+ yld_str = ""
+
+ if not yields:
+ return servings_qty, yld_qty, yld_str
+
+ if not isinstance(yields, list):
+ yields = [yields]
+
+ for yld in yields:
+ if not yld:
+ continue
+ if not isinstance(yld, str):
+ yld = str(yld)
- if isinstance(yld, list):
- return yld[-1]
+ qty, txt = extract_quantity_from_string(yld)
+ if qty and _is_serving_string(yld):
+ servings_qty = qty
+ else:
+ yld_qty = qty
+ yld_str = txt
- return yld
+ return servings_qty, yld_qty, yld_str
def clean_time(time_entry: str | timedelta | None, translator: Translator) -> None | str:
diff --git a/tests/unit_tests/services_tests/scraper_tests/test_cleaner_parts.py b/tests/unit_tests/services_tests/scraper_tests/test_cleaner_parts.py
index 1c308ac912f..98bf636dced 100644
--- a/tests/unit_tests/services_tests/scraper_tests/test_cleaner_parts.py
+++ b/tests/unit_tests/services_tests/scraper_tests/test_cleaner_parts.py
@@ -275,22 +275,102 @@ def test_cleaner_clean_ingredients(ingredients: CleanerCase):
CleanerCase(
test_id="empty string",
input="",
- expected="",
+ expected=(0, 0, ""),
+ ),
+ CleanerCase(
+ test_id="regular string",
+ input="4 Batches",
+ expected=(0, 4, "Batches"),
+ ),
+ CleanerCase(
+ test_id="regular serving string",
+ input="4 Servings",
+ expected=(4, 0, ""),
+ ),
+ CleanerCase(
+ test_id="regular string with whitespace",
+ input="4 Batches ",
+ expected=(0, 4, "Batches"),
+ ),
+ CleanerCase(
+ test_id="regular serving string with whitespace",
+ input="4 Servings ",
+ expected=(4, 0, ""),
),
CleanerCase(
test_id="list of strings",
- input=["Makes 4 Batches", "4 Batches"],
- expected="4 Batches",
+ input=["Serves 2", "4 Batches", "5 Batches"],
+ expected=(2, 5, "Batches"),
),
CleanerCase(
test_id="basic string",
+ input="Makes a lot of Batches",
+ expected=(0, 0, "Makes a lot of Batches"),
+ ),
+ CleanerCase(
+ test_id="basic serving string",
input="Makes 4 Batches",
- expected="Makes 4 Batches",
+ expected=(4, 0, ""),
),
CleanerCase(
test_id="empty list",
input=[],
- expected="",
+ expected=(0, 0, ""),
+ ),
+ CleanerCase(
+ test_id="basic fraction",
+ input="1/2 Batches",
+ expected=(0, 0.5, "Batches"),
+ ),
+ CleanerCase(
+ test_id="mixed fraction",
+ input="1 1/2 Batches",
+ expected=(0, 1.5, "Batches"),
+ ),
+ CleanerCase(
+ test_id="improper fraction",
+ input="11/2 Batches",
+ expected=(0, 5.5, "Batches"),
+ ),
+ CleanerCase(
+ test_id="vulgar fraction",
+ input="¾ Batches",
+ expected=(0, 0.75, "Batches"),
+ ),
+ CleanerCase(
+ test_id="mixed vulgar fraction",
+ input="2¾ Batches",
+ expected=(0, 2.75, "Batches"),
+ ),
+ CleanerCase(
+ test_id="mixed vulgar fraction with space",
+ input="2 ¾ Batches",
+ expected=(0, 2.75, "Batches"),
+ ),
+ CleanerCase(
+ test_id="basic decimal",
+ input="0.5 Batches",
+ expected=(0, 0.5, "Batches"),
+ ),
+ CleanerCase(
+ test_id="text with numbers",
+ input="6 Batches or 10 Batches",
+ expected=(0, 6, "Batches or 10 Batches"),
+ ),
+ CleanerCase(
+ test_id="no qty",
+ input="A Lot of Servings",
+ expected=(0, 0, "A Lot of Servings"),
+ ),
+ CleanerCase(
+ test_id="invalid qty",
+ input="1/0 Batches",
+ expected=(0, 0, "1/0 Batches"),
+ ),
+ CleanerCase(
+ test_id="int as float",
+ input="3.0 Batches",
+ expected=(0, 3, "Batches"),
),
)