From 606bfc9ade2cf17046a59a0157d5f097d86b4ecb Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Thu, 9 May 2024 22:22:08 +0000
Subject: [PATCH 01/29] added openai settings

---
 .../installation/backend-config.md            |  7 +++
 mealie/core/settings/settings.py              | 11 ++++
 poetry.lock                                   | 56 ++++++++++++++++++-
 pyproject.toml                                |  1 +
 4 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/docs/docs/documentation/getting-started/installation/backend-config.md b/docs/docs/documentation/getting-started/installation/backend-config.md
index 51ea84f1780..085780c6360 100644
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -102,6 +102,13 @@ For usage, see [Usage - OpenID Connect](../authentication/oidc.md)
 | OIDC_GROUPS_CLAIM      | groups  | Optional if not using `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP`. This is the claim Mealie will request from your IdP and will use to compare to `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP` to allow the user to log in to Mealie or is set as an admin. **Your IdP must be configured to grant this claim**|
 | OIDC_TLS_CACERTFILE    | None    | File path to Certificate Authority used to verify server certificate (e.g. `/path/to/ca.crt`) |
 
+### OpenAI
+
+| Variables             |     Default   | Description                                                             |
+| --------------------- |    :------:   | ----------------------------------------------------------------------- |
+| OPENAI_API_KEY        |      None     | Your OpenAI API Key. Enables OpenAI-related features                    |
+| OPENAI_MODEL          |  gpt-4-turbo  | Which OpenAI model to use. If you're not sure, leave this empty         |
+
 ### Themeing
 
 Setting the following environmental variables will change the theme of the frontend. Note that the themes are the same for all users. This is a break-change when migration from v0.x.x -> 1.x.x.
diff --git a/mealie/core/settings/settings.py b/mealie/core/settings/settings.py
index 6b042936a89..fd3015dbc45 100644
--- a/mealie/core/settings/settings.py
+++ b/mealie/core/settings/settings.py
@@ -207,6 +207,17 @@ def OIDC_READY(self) -> bool:
 
         return self.OIDC_AUTH_ENABLED and not_none and valid_group_claim
 
+    # ===============================================
+    # OpenAI Configuration
+
+    OPENAI_API_KEY: str | None = None
+    OPENAI_MODEL: str = "gpt-4-turbo"
+
+    @property
+    def OPENAI_ENABLED(self) -> bool:
+        """Validates OpenAI settings are all set"""
+        return bool(self.OPENAI_API_KEY and self.OPENAI_MODEL)
+
     # ===============================================
     # Testing Config
 
diff --git a/poetry.lock b/poetry.lock
index edd3ec7400c..0efa5f480f6 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -566,6 +566,17 @@ files = [
     {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
 ]
 
+[[package]]
+name = "distro"
+version = "1.9.0"
+description = "Distro - an OS platform information API"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "distro-1.9.0-py3-none-any.whl", hash = "sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2"},
+    {file = "distro-1.9.0.tar.gz", hash = "sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed"},
+]
+
 [[package]]
 name = "dnspython"
 version = "2.6.1"
@@ -1491,6 +1502,29 @@ rsa = ["cryptography (>=3.0.0)"]
 signals = ["blinker (>=1.4.0)"]
 signedtoken = ["cryptography (>=3.0.0)", "pyjwt (>=2.0.0,<3)"]
 
+[[package]]
+name = "openai"
+version = "1.27.0"
+description = "The official Python library for the openai API"
+optional = false
+python-versions = ">=3.7.1"
+files = [
+    {file = "openai-1.27.0-py3-none-any.whl", hash = "sha256:1183346fae6e63cb3a9134e397c0067690dc9d94ceb36eb0eb2c1bb9a1542aca"},
+    {file = "openai-1.27.0.tar.gz", hash = "sha256:498adc80ba81a95324afdfd11a71fa43a37e1d94a5ca5f4542e52fe9568d995b"},
+]
+
+[package.dependencies]
+anyio = ">=3.5.0,<5"
+distro = ">=1.7.0,<2"
+httpx = ">=0.23.0,<1"
+pydantic = ">=1.9.0,<3"
+sniffio = "*"
+tqdm = ">4"
+typing-extensions = ">=4.7,<5"
+
+[package.extras]
+datalib = ["numpy (>=1)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"]
+
 [[package]]
 name = "orjson"
 version = "3.10.3"
@@ -2883,6 +2917,26 @@ files = [
     {file = "tomlkit-0.11.6.tar.gz", hash = "sha256:71b952e5721688937fb02cf9d354dbcf0785066149d2855e44531ebdd2b65d73"},
 ]
 
+[[package]]
+name = "tqdm"
+version = "4.66.4"
+description = "Fast, Extensible Progress Meter"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "tqdm-4.66.4-py3-none-any.whl", hash = "sha256:b75ca56b413b030bc3f00af51fd2c1a1a5eac6a0c1cca83cbb37a5c52abce644"},
+    {file = "tqdm-4.66.4.tar.gz", hash = "sha256:e4d936c9de8727928f3be6079590e97d9abfe8d39a590be678eb5919ffc186bb"},
+]
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
+[package.extras]
+dev = ["pytest (>=6)", "pytest-cov", "pytest-timeout", "pytest-xdist"]
+notebook = ["ipywidgets (>=6)"]
+slack = ["slack-sdk"]
+telegram = ["requests"]
+
 [[package]]
 name = "typer"
 version = "0.12.3"
@@ -3336,4 +3390,4 @@ pgsql = ["psycopg2-binary"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "e774640ffaf7f86a486066bead71af770a2a974385073fffa2c7a7333a15fc5d"
+content-hash = "4155d1d818a04f1e03b512399d5ecbc01b007fae7884f6322d5d389745276a17"
diff --git a/pyproject.toml b/pyproject.toml
index 151f8ed18e7..60cc8f49e44 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,6 +48,7 @@ paho-mqtt = "^1.6.1"
 pydantic-settings = "^2.1.0"
 pillow-heif = "^0.16.0"
 pyjwt = "^2.8.0"
+openai = "^1.27.0"
 
 [tool.poetry.group.postgres.dependencies]
 psycopg2-binary = { version = "^2.9.1" }

From 64f5a42b22a4129f76ffa62d938dfe44c32464ce Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Thu, 9 May 2024 22:30:08 +0000
Subject: [PATCH 02/29] added WIP openai service

---
 mealie/services/openai/__init__.py            |   0
 mealie/services/openai/openai.py              | 113 ++++++++++++++++++
 .../recipes/parse-recipe-ingredients.txt      |   1 +
 3 files changed, 114 insertions(+)
 create mode 100644 mealie/services/openai/__init__.py
 create mode 100644 mealie/services/openai/openai.py
 create mode 100644 mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt

diff --git a/mealie/services/openai/__init__.py b/mealie/services/openai/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/mealie/services/openai/openai.py b/mealie/services/openai/openai.py
new file mode 100644
index 00000000000..aabc99692ad
--- /dev/null
+++ b/mealie/services/openai/openai.py
@@ -0,0 +1,113 @@
+from mealie.core.config import get_app_settings
+from .._base_service import BaseService
+from openai import AsyncOpenAI, NOT_GIVEN
+
+import os
+from pathlib import Path
+from pydantic import BaseModel, field_validator
+import json
+from textwrap import dedent
+
+
+class OpenAIDataInjection(BaseModel):
+    description: str
+    value: str
+
+    @field_validator("value", mode="before")
+    def parse_value(cls, value):
+        if not value:
+            raise ValueError("Value cannot be empty")
+        if isinstance(value, str):
+            return value
+
+        # convert Pydantic models to JSON
+        if isinstance(value, BaseModel):
+            return value.model_dump_json()
+
+        # convert Pydantic types to their JSON schema definition
+        if issubclass(value, BaseModel):
+            value = value.model_json_schema()
+
+        # attempt to convert object to JSON
+        try:
+            return json.dumps(value, separators=(",", ":"))
+        except TypeError:
+            return value
+
+
+class OpenAIService(BaseService):
+    PROMPTS_DIR = Path(os.path.dirname(os.path.abspath(__file__))) / "prompts"
+
+    def __init__(self) -> None:
+        settings = get_app_settings()
+        if not settings.OPENAI_ENABLED:
+            raise ValueError("OpenAI is not enabled")
+
+        self.model = settings.OPENAI_MODEL
+        self.get_client = lambda: AsyncOpenAI(api_key=settings.OPENAI_API_KEY)
+
+        super().__init__()
+
+    @classmethod
+    def get_prompt(cls, name: str, data_injections: list[OpenAIDataInjection] | None = None) -> str:
+        """
+        Load stored prompt and inject data into it.
+
+        Access prompts with dot notation.
+        For example, to access `prompts/recipes/parse-recipe-ingredients.txt`, use
+        `recipes.parse-recipe-ingredients`
+        """
+
+        if not name:
+            raise ValueError("Prompt name cannot be empty")
+
+        tree = name.split(".")
+        prompt_dir = os.path.join(cls.PROMPTS_DIR, *tree[:-1], tree[-1] + ".txt")
+        try:
+            with open(prompt_dir, "r") as f:
+                content = f.read()
+        except OSError as e:
+            raise OSError(f"Unable to load prompt {name}") from e
+
+        if not data_injections:
+            return content
+
+        content_parts = [content]
+        for data_injection in data_injections:
+            content_parts.append(
+                dedent(
+                    f"""
+                    ###
+                    {data_injection.description}
+                    ---
+
+                    {data_injection.value}
+                    """
+                )
+            )
+        return "\n".join(content_parts)
+
+    async def get_response(self, prompt: str, message: str, force_json_response=True) -> str | None:
+        try:
+            client = self.get_client()
+            response = await client.chat.completions.create(
+                messages=[
+                    {
+                        "role": "system",
+                        "content": prompt,
+                    },
+                    {
+                        "role": "user",
+                        "content": message,
+                    },
+                ],
+                model=self.model,
+                response_format={"type": "json_object"} if force_json_response else NOT_GIVEN,
+            )
+
+            if not response.choices:
+                return None
+            return response.choices[0].message.content
+        except Exception:
+            self.logger.exception("OpenAI Request Failed")
+            return None
diff --git a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
new file mode 100644
index 00000000000..1333ed77b7e
--- /dev/null
+++ b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
@@ -0,0 +1 @@
+TODO

From f184cd27b7cb2e9fdfe8fff11380acc8ff667049 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 15:17:37 +0000
Subject: [PATCH 03/29] added openai ingredient parser backend

---
 mealie/routes/parser/ingredient_parser.py     |  9 +--
 mealie/schema/recipe/recipe_ingredient.py     |  1 +
 mealie/services/openai/__init__.py            |  1 +
 mealie/services/openai/openai.py              | 44 +++++++------
 .../recipes/parse-recipe-ingredients.txt      | 21 ++++++-
 .../parser_services/ingredient_parser.py      | 31 +++++----
 .../parser_services/openai/__init__.py        |  5 ++
 .../parser_services/openai/process.py         | 63 +++++++++++++++++++
 8 files changed, 141 insertions(+), 34 deletions(-)
 create mode 100644 mealie/services/parser_services/openai/__init__.py
 create mode 100644 mealie/services/parser_services/openai/process.py

diff --git a/mealie/routes/parser/ingredient_parser.py b/mealie/routes/parser/ingredient_parser.py
index 0a63fa845de..dc2cc732c2e 100644
--- a/mealie/routes/parser/ingredient_parser.py
+++ b/mealie/routes/parser/ingredient_parser.py
@@ -11,11 +11,12 @@
 @controller(router)
 class IngredientParserController(BaseUserController):
     @router.post("/ingredients", response_model=list[ParsedIngredient])
-    def parse_ingredients(self, ingredients: IngredientsRequest):
+    async def parse_ingredients(self, ingredients: IngredientsRequest):
         parser = get_parser(ingredients.parser, self.group_id, self.session)
-        return parser.parse(ingredients.ingredients)
+        return await parser.parse(ingredients.ingredients)
 
     @router.post("/ingredient", response_model=ParsedIngredient)
-    def parse_ingredient(self, ingredient: IngredientRequest):
+    async def parse_ingredient(self, ingredient: IngredientRequest):
         parser = get_parser(ingredient.parser, self.group_id, self.session)
-        return parser.parse([ingredient.ingredient])[0]
+        response = await parser.parse([ingredient.ingredient])
+        return response[0]
diff --git a/mealie/schema/recipe/recipe_ingredient.py b/mealie/schema/recipe/recipe_ingredient.py
index 7609fa5486e..5b00c05285f 100644
--- a/mealie/schema/recipe/recipe_ingredient.py
+++ b/mealie/schema/recipe/recipe_ingredient.py
@@ -327,6 +327,7 @@ class ParsedIngredient(MealieModel):
 class RegisteredParser(str, enum.Enum):
     nlp = "nlp"
     brute = "brute"
+    openai = "openai"
 
 
 class IngredientsRequest(MealieModel):
diff --git a/mealie/services/openai/__init__.py b/mealie/services/openai/__init__.py
index e69de29bb2d..0919383b5ba 100644
--- a/mealie/services/openai/__init__.py
+++ b/mealie/services/openai/__init__.py
@@ -0,0 +1 @@
+from .openai import OpenAIService, OpenAIDataInjection
diff --git a/mealie/services/openai/openai.py b/mealie/services/openai/openai.py
index aabc99692ad..68047fa6cee 100644
--- a/mealie/services/openai/openai.py
+++ b/mealie/services/openai/openai.py
@@ -7,6 +7,8 @@
 from pydantic import BaseModel, field_validator
 import json
 from textwrap import dedent
+import inspect
+from openai.resources.chat.completions import ChatCompletion
 
 
 class OpenAIDataInjection(BaseModel):
@@ -25,7 +27,7 @@ def parse_value(cls, value):
             return value.model_dump_json()
 
         # convert Pydantic types to their JSON schema definition
-        if issubclass(value, BaseModel):
+        if inspect.isclass(value) and issubclass(value, BaseModel):
             value = value.model_json_schema()
 
         # attempt to convert object to JSON
@@ -87,24 +89,30 @@ def get_prompt(cls, name: str, data_injections: list[OpenAIDataInjection] | None
             )
         return "\n".join(content_parts)
 
-    async def get_response(self, prompt: str, message: str, force_json_response=True) -> str | None:
+    async def _get_raw_response(
+        self, prompt: str, message: str, temperature=0.2, force_json_response=True
+    ) -> ChatCompletion:
+        client = self.get_client()
+        return await client.chat.completions.create(
+            messages=[
+                {
+                    "role": "system",
+                    "content": prompt,
+                },
+                {
+                    "role": "user",
+                    "content": message,
+                },
+            ],
+            model=self.model,
+            temperature=temperature,
+            response_format={"type": "json_object"} if force_json_response else NOT_GIVEN,
+        )
+
+    async def get_response(self, prompt: str, message: str, temperature=0.2, force_json_response=True) -> str | None:
+        """Send data to OpenAI and return the response message content"""
         try:
-            client = self.get_client()
-            response = await client.chat.completions.create(
-                messages=[
-                    {
-                        "role": "system",
-                        "content": prompt,
-                    },
-                    {
-                        "role": "user",
-                        "content": message,
-                    },
-                ],
-                model=self.model,
-                response_format={"type": "json_object"} if force_json_response else NOT_GIVEN,
-            )
-
+            response = await self._get_raw_response(prompt, message, temperature, force_json_response)
             if not response.choices:
                 return None
             return response.choices[0].message.content
diff --git a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
index 1333ed77b7e..5ad04c00a10 100644
--- a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
+++ b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
@@ -1 +1,20 @@
-TODO
+You are a bot that parses user input into recipe ingredients. You will receive a list of one or more ingredients, each containing one or more of the following components:
+    - Food: the actual physical ingredient used in the recipe. For instance, if you receive "3 cups of onions, chopped", the food is "onions"
+    - Unit: the unit of measurement for this ingredient. For instance, if you receive "2 lbs chicken breast", the unit is "lbs" (short for "pounds")
+    - Quantity: the numerical representation of how much of this ingredient. For instance, if you receive "3 1/2 grams of minced garlic", the quantity is "3 1/2". Quantity may be represented as a whole number (integer), a float or decimal, or a fraction. You should output quantity in only whole numbers or floats, converting fractions into floats. Floats longer than 10 decimal places should be rounded to 10 decimal places.
+    - Note: the rest of the text that represents more detail on how to prepare the ingredient. Anything that is not one of the above should be the note. For instance, if you receive "one can of butter beans, drained" the note would be "drained". If you receive "3 cloves of garlic peeled and finely chopped", the note would be "finely chopped"
+
+While parsing the ingredients, there are some things to keep in mind:
+    - If you cannot accurately determine the quantity, unit, food, or note, you should place everything into the note field and leave everything else empty. It's better to err on the side of putting everything in the note field than being wrong
+    - You may receive recipe ingredients from multiple different languages. You should adhere to the grammar rules of the input language when trying to parse the ingredient string
+    - Sometimes foods or units will be in their singular, plural, or other grammatical forms. You must interpret all of them appropriately
+
+It is imperative that you do not create any data or otherwise make up any information. Failure to adhere to this rule is illegal and will result in harsh punishment. If you are unsure, place the entire string into the note section of the response. Do not make things up.
+
+If you are not provided entires from the database to compare against, and you do not have any UUIDs to populate the schema with, so you should leave UUID fields empty. Do not create data out of thin air.
+
+In addition to calculating the recipe ingredient fields, you are also responsible for including a confidence value. This value should range from 0 - 100, where 100 is full confidence that the result is correct, and 0 is no confidence that the result is correct. If you're unable to parse anything, and you put the entire string in the notes, you should return 0 confidence. If you can easily parse the string into each component, then you should return a confidence of 100. If you have to guess which part is the unit and which part is the food, your confidence should be lower, such as 60.
+
+Below you will receive the JSON schema for your response. Your response must be in valid JSON in the below schema as provided. You must respond in this JSON schema; failure to do so is illegal. It is imperative that you follow the schema precisely to avoid punishment. You must follow the JSON schema.
+
+The user message that you receive will be the list of one or more recipe ingredients for you to parse. Your response should have exactly one item for each item provided. For instance, if you receive 12 items to parse, then your response should be an array of 12 parsed items.
diff --git a/mealie/services/parser_services/ingredient_parser.py b/mealie/services/parser_services/ingredient_parser.py
index 079010d41d0..df14e040a27 100644
--- a/mealie/services/parser_services/ingredient_parser.py
+++ b/mealie/services/parser_services/ingredient_parser.py
@@ -1,7 +1,6 @@
 from abc import ABC, abstractmethod
 from fractions import Fraction
 from typing import TypeVar
-
 from pydantic import UUID4, BaseModel
 from rapidfuzz import fuzz, process
 from sqlalchemy.orm import Session
@@ -23,7 +22,7 @@
 )
 from mealie.schema.response.pagination import PaginationQuery
 
-from . import brute, crfpp
+from . import brute, crfpp, openai
 
 logger = get_logger(__name__)
 T = TypeVar("T", bound=BaseModel)
@@ -106,10 +105,10 @@ def unit_fuzzy_match_threshold(self) -> int:
         return 70
 
     @abstractmethod
-    def parse_one(self, ingredient_string: str) -> ParsedIngredient: ...
+    async def parse_one(self, ingredient_string: str) -> ParsedIngredient: ...
 
     @abstractmethod
-    def parse(self, ingredients: list[str]) -> list[ParsedIngredient]: ...
+    async def parse(self, ingredients: list[str]) -> list[ParsedIngredient]: ...
 
     @classmethod
     def find_match(cls, match_value: str, *, store_map: dict[str, T], fuzzy_match_threshold: int = 0) -> T | None:
@@ -175,7 +174,7 @@ class BruteForceParser(ABCIngredientParser):
     Brute force ingredient parser.
     """
 
-    def parse_one(self, ingredient: str) -> ParsedIngredient:
+    async def parse_one(self, ingredient: str) -> ParsedIngredient:
         bfi = brute.parse(ingredient, self)
 
         parsed_ingredient = ParsedIngredient(
@@ -191,8 +190,8 @@ def parse_one(self, ingredient: str) -> ParsedIngredient:
 
         return self.find_ingredient_match(parsed_ingredient)
 
-    def parse(self, ingredients: list[str]) -> list[ParsedIngredient]:
-        return [self.parse_one(ingredient) for ingredient in ingredients]
+    async def parse(self, ingredients: list[str]) -> list[ParsedIngredient]:
+        return [await self.parse_one(ingredient) for ingredient in ingredients]
 
 
 class NLPParser(ABCIngredientParser):
@@ -234,18 +233,28 @@ def _crf_to_ingredient(self, crf_model: crfpp.CRFIngredient) -> ParsedIngredient
 
         return self.find_ingredient_match(parsed_ingredient)
 
-    def parse(self, ingredients: list[str]) -> list[ParsedIngredient]:
+    async def parse(self, ingredients: list[str]) -> list[ParsedIngredient]:
         crf_models = crfpp.convert_list_to_crf_model(ingredients)
         return [self._crf_to_ingredient(crf_model) for crf_model in crf_models]
 
-    def parse_one(self, ingredient: str) -> ParsedIngredient:
-        items = self.parse([ingredient])
+    async def parse_one(self, ingredient_string: str) -> ParsedIngredient:
+        items = await self.parse([ingredient_string])
         return items[0]
 
 
-__registrar = {
+class OpenAIParser(ABCIngredientParser):
+    async def parse_one(self, ingredient_string: str) -> ParsedIngredient:
+        items = await self.parse([ingredient_string])
+        return items[0]
+
+    async def parse(self, ingredients: list[str]) -> list[ParsedIngredient]:
+        return await openai.parse(ingredients)
+
+
+__registrar: dict[RegisteredParser, type[ABCIngredientParser]] = {
     RegisteredParser.nlp: NLPParser,
     RegisteredParser.brute: BruteForceParser,
+    RegisteredParser.openai: OpenAIParser,
 }
 
 
diff --git a/mealie/services/parser_services/openai/__init__.py b/mealie/services/parser_services/openai/__init__.py
new file mode 100644
index 00000000000..d423c48706e
--- /dev/null
+++ b/mealie/services/parser_services/openai/__init__.py
@@ -0,0 +1,5 @@
+from .process import parse
+
+__all__ = [
+    "parse",
+]
diff --git a/mealie/services/parser_services/openai/process.py b/mealie/services/parser_services/openai/process.py
new file mode 100644
index 00000000000..4140a69e141
--- /dev/null
+++ b/mealie/services/parser_services/openai/process.py
@@ -0,0 +1,63 @@
+import json
+
+from pydantic import BaseModel
+from mealie.schema.recipe.recipe_ingredient import (
+    CreateIngredientFood,
+    CreateIngredientUnit,
+    IngredientConfidence,
+    ParsedIngredient,
+    RecipeIngredient,
+)
+from mealie.services.openai import OpenAIDataInjection, OpenAIService
+
+
+class OpenAIIngredient(BaseModel):
+    input: str
+    confidence: float | None = None
+
+    quantity: float | None = 0
+    unit: str | None = None
+    food: str | None = None
+    note: str | None = None
+
+
+class OpenAIIngredients(BaseModel):
+    ingredients: list[OpenAIIngredient] = []
+
+
+def _convert(ing: OpenAIIngredient) -> ParsedIngredient:
+    return ParsedIngredient(
+        input=ing.input,
+        confidence=IngredientConfidence(average=ing.confidence),
+        ingredient=RecipeIngredient(
+            original_text=ing.input,
+            quantity=ing.quantity,
+            unit=CreateIngredientUnit(name=ing.unit) if ing.unit else None,
+            food=CreateIngredientFood(name=ing.food) if ing.food else None,
+            note=ing.note,
+        ),
+    )
+
+
+async def parse(ingredients: list[str]) -> list[ParsedIngredient]:
+    service = OpenAIService()
+    data_injections = [
+        OpenAIDataInjection(
+            description=(
+                "This is the JSON response schema. You must respond in valid JSON that follows this schema. "
+                "Your payload should be as compact as possible, eliminating unncessesary whitespace. Any fields "
+                "with default values which you do not populate should not be in the payload."
+            ),
+            value=OpenAIIngredients,
+        ),
+    ]
+
+    prompt = service.get_prompt("recipes.parse-recipe-ingredients", data_injections=data_injections)
+    response = await service.get_response(
+        prompt, json.dumps(ingredients, separators=(",", ":")), force_json_response=True
+    )
+    if not response:
+        raise Exception("No response from OpenAI")
+
+    parsed_ingredients = OpenAIIngredients.model_validate_json(response)
+    return [_convert(ing) for ing in parsed_ingredients.ingredients]

From 19a98b48751828467ce894ae86d96ffb6961f758 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 16:28:11 +0000
Subject: [PATCH 04/29] improve confidence calculation

---
 .../openai/prompts/recipes/parse-recipe-ingredients.txt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
index 5ad04c00a10..9a1871f5eed 100644
--- a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
+++ b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
@@ -13,7 +13,7 @@ It is imperative that you do not create any data or otherwise make up any inform
 
 If you are not provided entires from the database to compare against, and you do not have any UUIDs to populate the schema with, so you should leave UUID fields empty. Do not create data out of thin air.
 
-In addition to calculating the recipe ingredient fields, you are also responsible for including a confidence value. This value should range from 0 - 100, where 100 is full confidence that the result is correct, and 0 is no confidence that the result is correct. If you're unable to parse anything, and you put the entire string in the notes, you should return 0 confidence. If you can easily parse the string into each component, then you should return a confidence of 100. If you have to guess which part is the unit and which part is the food, your confidence should be lower, such as 60.
+In addition to calculating the recipe ingredient fields, you are also responsible for including a confidence value. This value should range from 0 - 100, where 100 is full confidence that the result is correct, and 0 is no confidence that the result is correct. If you're unable to parse anything, and you put the entire string in the notes, you should return 0 confidence. If you can easily parse the string into each component, then you should return a confidence of 100. If you have to guess which part is the unit and which part is the food, your confidence should be lower, such as 60. Even if there is no unit or note, if you're able to determine the food, you may use a higher confidence. If the entire ingredient consists of only a food, you can use a confidence of 100.
 
 Below you will receive the JSON schema for your response. Your response must be in valid JSON in the below schema as provided. You must respond in this JSON schema; failure to do so is illegal. It is imperative that you follow the schema precisely to avoid punishment. You must follow the JSON schema.
 

From 74ef0f52acd43c620a1fab8c58b3a06237aa5b5c Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 16:29:54 +0000
Subject: [PATCH 05/29] explicit definition for input string

---
 .../services/openai/prompts/recipes/parse-recipe-ingredients.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
index 9a1871f5eed..b0ed4e834d3 100644
--- a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
+++ b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
@@ -3,6 +3,7 @@ You are a bot that parses user input into recipe ingredients. You will receive a
     - Unit: the unit of measurement for this ingredient. For instance, if you receive "2 lbs chicken breast", the unit is "lbs" (short for "pounds")
     - Quantity: the numerical representation of how much of this ingredient. For instance, if you receive "3 1/2 grams of minced garlic", the quantity is "3 1/2". Quantity may be represented as a whole number (integer), a float or decimal, or a fraction. You should output quantity in only whole numbers or floats, converting fractions into floats. Floats longer than 10 decimal places should be rounded to 10 decimal places.
     - Note: the rest of the text that represents more detail on how to prepare the ingredient. Anything that is not one of the above should be the note. For instance, if you receive "one can of butter beans, drained" the note would be "drained". If you receive "3 cloves of garlic peeled and finely chopped", the note would be "finely chopped"
+    - Input: The input is simply the ingredient string you are processing as-is. It is forbidden to modify this at all, you must provide the input exactly as you received it
 
 While parsing the ingredients, there are some things to keep in mind:
     - If you cannot accurately determine the quantity, unit, food, or note, you should place everything into the note field and leave everything else empty. It's better to err on the side of putting everything in the note field than being wrong

From 009f0bf3fb0b2170d6ef65d4787c1b4c192c58cc Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 16:30:52 +0000
Subject: [PATCH 06/29] docs

---
 docs/docs/documentation/getting-started/faq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/documentation/getting-started/faq.md b/docs/docs/documentation/getting-started/faq.md
index 7df1f46a5be..b033eb4edf8 100644
--- a/docs/docs/documentation/getting-started/faq.md
+++ b/docs/docs/documentation/getting-started/faq.md
@@ -26,7 +26,7 @@ Do the following for each recipe you want to intelligently handle ingredients.
 6. Click the Edit button/icon again
 7. Scroll to the ingredients and you should see new fields for Amount, Unit, Food, and Note. The Note in particular will contain the original text of the Recipe.
 8. Click `Parse` and you will be taken to the ingredient parsing page.
-9. Choose your parser. The `Natural Language Parser` works very well, but you can also use the `Brute Parser`.
+9. Choose your parser. The `Natural Language Parser` works very well, but you can also use the `Brute Parser`, or the `OpenAI Parser` if you've enabled OpenAI support.
 10. Click `Parse All`, and your ingredients should be separated out into Units and Foods based on your seeding in Step 1 above.
 11. For ingredients where the Unit or Food was not found, you can click a button to accept an automatically suggested Food to add to the database. Or, manually enter the Unit/Food and hit `Enter` (or click `Create`) to add it to the database
 12. When done, click `Save All` and you will be taken back to the recipe. Now the Unit and Food fields of the recipe should be filled out.

From ec23dfb24aed8a7f20eb87621c2985507d0131f8 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 16:33:35 +0000
Subject: [PATCH 07/29] added openai parser to frontend

---
 frontend/lang/messages/en-US.json                  |  2 ++
 frontend/lib/api/types/recipe.ts                   |  2 +-
 frontend/lib/api/user/recipes/recipe.ts            |  2 +-
 frontend/pages/admin/parser.vue                    |  3 ++-
 .../g/_groupSlug/r/_slug/ingredient-parser.vue     | 14 +++++++++-----
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json
index 84a7e45da67..8514171bb37 100644
--- a/frontend/lang/messages/en-US.json
+++ b/frontend/lang/messages/en-US.json
@@ -594,6 +594,7 @@
       "select-parser": "Select Parser",
       "natural-language-processor": "Natural Language Processor",
       "brute-parser": "Brute Parser",
+      "openai-parser": "OpenAI Parser",
       "parse-all": "Parse All",
       "no-unit": "No unit",
       "missing-unit": "Create missing unit: {unit}",
@@ -1170,6 +1171,7 @@
     "ingredients-natural-language-processor-explanation-2": "It's not perfect, but it yields great results in general and is a good starting point for manually parsing ingredients into individual fields. Alternatively, you can also use the \"Brute\" processor that uses a pattern matching technique to identify ingredients.",
     "nlp": "NLP",
     "brute": "Brute",
+    "openai": "OpenAI",
     "show-individual-confidence": "Show individual confidence",
     "ingredient-text": "Ingredient Text",
     "average-confident": "{0} Confident",
diff --git a/frontend/lib/api/types/recipe.ts b/frontend/lib/api/types/recipe.ts
index 62da68c8363..23189db6011 100644
--- a/frontend/lib/api/types/recipe.ts
+++ b/frontend/lib/api/types/recipe.ts
@@ -6,7 +6,7 @@
 */
 
 export type ExportTypes = "json";
-export type RegisteredParser = "nlp" | "brute";
+export type RegisteredParser = "nlp" | "brute" | "openai";
 export type TimelineEventType = "system" | "info" | "comment";
 export type TimelineEventImage = "has image" | "does not have image";
 
diff --git a/frontend/lib/api/user/recipes/recipe.ts b/frontend/lib/api/user/recipes/recipe.ts
index 2a7dd0f4012..c036bcf33cf 100644
--- a/frontend/lib/api/user/recipes/recipe.ts
+++ b/frontend/lib/api/user/recipes/recipe.ts
@@ -17,7 +17,7 @@ import {
 } from "~/lib/api/types/recipe";
 import { ApiRequestInstance, PaginationData } from "~/lib/api/types/non-generated";
 
-export type Parser = "nlp" | "brute";
+export type Parser = "nlp" | "brute" | "openai";
 
 export interface CreateAsset {
   name: string;
diff --git a/frontend/pages/admin/parser.vue b/frontend/pages/admin/parser.vue
index bb1ac20faef..2290624d679 100644
--- a/frontend/pages/admin/parser.vue
+++ b/frontend/pages/admin/parser.vue
@@ -13,6 +13,7 @@
         <v-btn-toggle v-model="parser" dense mandatory @change="processIngredient">
           <v-btn value="nlp"> {{ $t('admin.nlp') }} </v-btn>
           <v-btn value="brute"> {{ $t('admin.brute') }} </v-btn>
+          <v-btn value="openai"> {{ $t('admin.openai') }} </v-btn>
         </v-btn-toggle>
 
         <v-checkbox v-model="showConfidence" class="ml-5" :label="$t('admin.show-individual-confidence')"></v-checkbox>
@@ -63,8 +64,8 @@
 
 <script lang="ts">
 import { defineComponent, reactive, ref, toRefs, useContext } from "@nuxtjs/composition-api";
-import { IngredientConfidence } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
+import { IngredientConfidence } from "~/lib/api/types/recipe";
 import { Parser } from "~/lib/api/user/recipes/recipe";
 
 type ConfidenceAttribute = "average" | "comment" | "name" | "unit" | "quantity" | "food";
diff --git a/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue b/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
index 0c2ad94b3fe..45fb9045fc8 100644
--- a/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
+++ b/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
@@ -28,6 +28,10 @@
                 text: $tc('recipe.parser.brute-parser'),
                 value: 'brute',
               },
+              {
+                text: $tc('recipe.parser.openai-parser'),
+                value: 'openai',
+              },
             ]"
           />
         </div>
@@ -100,6 +104,11 @@
 import { computed, defineComponent, ref, useContext, useRoute, useRouter } from "@nuxtjs/composition-api";
 import { invoke, until } from "@vueuse/core";
 import draggable from "vuedraggable";
+import RecipeIngredientEditor from "~/components/Domain/Recipe/RecipeIngredientEditor.vue";
+import { useUserApi } from "~/composables/api";
+import { useRecipe } from "~/composables/recipes";
+import { useFoodData, useFoodStore, useUnitData, useUnitStore } from "~/composables/store";
+import { uuid4 } from "~/composables/use-utils";
 import {
   CreateIngredientFood,
   CreateIngredientUnit,
@@ -108,12 +117,7 @@ import {
   ParsedIngredient,
   RecipeIngredient,
 } from "~/lib/api/types/recipe";
-import RecipeIngredientEditor from "~/components/Domain/Recipe/RecipeIngredientEditor.vue";
-import { useUserApi } from "~/composables/api";
-import { useRecipe } from "~/composables/recipes";
-import { useFoodData, useFoodStore, useUnitStore, useUnitData } from "~/composables/store";
 import { Parser } from "~/lib/api/user/recipes/recipe";
-import { uuid4 } from "~/composables/use-utils";
 
 interface Error {
   ingredientIndex: number;

From abc20a65f7816385eaabd574c5ea5b95c9d02075 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 17:07:29 +0000
Subject: [PATCH 08/29] match parser response with food/unit store

---
 .../parser_services/ingredient_parser.py      | 20 +++++++++++++-
 .../parser_services/openai/__init__.py        |  3 ++-
 .../parser_services/openai/process.py         | 26 ++-----------------
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/mealie/services/parser_services/ingredient_parser.py b/mealie/services/parser_services/ingredient_parser.py
index df14e040a27..e6132bd498e 100644
--- a/mealie/services/parser_services/ingredient_parser.py
+++ b/mealie/services/parser_services/ingredient_parser.py
@@ -243,12 +243,30 @@ async def parse_one(self, ingredient_string: str) -> ParsedIngredient:
 
 
 class OpenAIParser(ABCIngredientParser):
+    def _convert_ingredient(self, openai_ing: openai.OpenAIIngredient) -> ParsedIngredient:
+        ingredient = RecipeIngredient(
+            original_text=openai_ing.input,
+            quantity=openai_ing.quantity,
+            unit=CreateIngredientUnit(name=openai_ing.unit) if openai_ing.unit else None,
+            food=CreateIngredientFood(name=openai_ing.food) if openai_ing.food else None,
+            note=openai_ing.note,
+        )
+
+        parsed_ingredient = ParsedIngredient(
+            input=openai_ing.input,
+            confidence=IngredientConfidence(average=openai_ing.confidence),
+            ingredient=ingredient,
+        )
+
+        return self.find_ingredient_match(parsed_ingredient)
+
     async def parse_one(self, ingredient_string: str) -> ParsedIngredient:
         items = await self.parse([ingredient_string])
         return items[0]
 
     async def parse(self, ingredients: list[str]) -> list[ParsedIngredient]:
-        return await openai.parse(ingredients)
+        response = await openai.parse(ingredients)
+        return [self._convert_ingredient(ing) for ing in response.ingredients]
 
 
 __registrar: dict[RegisteredParser, type[ABCIngredientParser]] = {
diff --git a/mealie/services/parser_services/openai/__init__.py b/mealie/services/parser_services/openai/__init__.py
index d423c48706e..609f6ccd770 100644
--- a/mealie/services/parser_services/openai/__init__.py
+++ b/mealie/services/parser_services/openai/__init__.py
@@ -1,5 +1,6 @@
-from .process import parse
+from .process import parse, OpenAIIngredient
 
 __all__ = [
+    "OpenAIIngredient",
     "parse",
 ]
diff --git a/mealie/services/parser_services/openai/process.py b/mealie/services/parser_services/openai/process.py
index 4140a69e141..4c6e4edead1 100644
--- a/mealie/services/parser_services/openai/process.py
+++ b/mealie/services/parser_services/openai/process.py
@@ -1,13 +1,6 @@
 import json
 
 from pydantic import BaseModel
-from mealie.schema.recipe.recipe_ingredient import (
-    CreateIngredientFood,
-    CreateIngredientUnit,
-    IngredientConfidence,
-    ParsedIngredient,
-    RecipeIngredient,
-)
 from mealie.services.openai import OpenAIDataInjection, OpenAIService
 
 
@@ -25,21 +18,7 @@ class OpenAIIngredients(BaseModel):
     ingredients: list[OpenAIIngredient] = []
 
 
-def _convert(ing: OpenAIIngredient) -> ParsedIngredient:
-    return ParsedIngredient(
-        input=ing.input,
-        confidence=IngredientConfidence(average=ing.confidence),
-        ingredient=RecipeIngredient(
-            original_text=ing.input,
-            quantity=ing.quantity,
-            unit=CreateIngredientUnit(name=ing.unit) if ing.unit else None,
-            food=CreateIngredientFood(name=ing.food) if ing.food else None,
-            note=ing.note,
-        ),
-    )
-
-
-async def parse(ingredients: list[str]) -> list[ParsedIngredient]:
+async def parse(ingredients: list[str]) -> OpenAIIngredients:
     service = OpenAIService()
     data_injections = [
         OpenAIDataInjection(
@@ -59,5 +38,4 @@ async def parse(ingredients: list[str]) -> list[ParsedIngredient]:
     if not response:
         raise Exception("No response from OpenAI")
 
-    parsed_ingredients = OpenAIIngredients.model_validate_json(response)
-    return [_convert(ing) for ing in parsed_ingredients.ingredients]
+    return OpenAIIngredients.model_validate_json(response)

From 8ef9c800c3c71f2cbbbf96f28d1ad4042adab1bb Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 17:07:45 +0000
Subject: [PATCH 09/29] add more parsing instructions to prompt

---
 .../openai/prompts/recipes/parse-recipe-ingredients.txt    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
index b0ed4e834d3..c04c757d600 100644
--- a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
+++ b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
@@ -9,12 +9,17 @@ While parsing the ingredients, there are some things to keep in mind:
     - If you cannot accurately determine the quantity, unit, food, or note, you should place everything into the note field and leave everything else empty. It's better to err on the side of putting everything in the note field than being wrong
     - You may receive recipe ingredients from multiple different languages. You should adhere to the grammar rules of the input language when trying to parse the ingredient string
     - Sometimes foods or units will be in their singular, plural, or other grammatical forms. You must interpret all of them appropriately
+    - Sometimes ingredients will have text in parenthesis (like this). Parenthesis typically indicate something that should appear in the notes. For example: an input of "3 potatoes (roughly chopped)" would parse "roughly chopped" into the notes. Notice that when this occurs, the parenthesis are dropped, and you should use "roughly chopped" instead of "(roughly chopped)" in the note
+    - It's possible for the input to contain typos. For instance, you might see the word "potatos" instead of "potatoes". If it is a common misspelling, you may correct it
+    - Pay close attention to what can be considered a unit of measurement. There are common measurements such as tablespoon, teaspoon, and gram, abbreviations such as tsp, tbsp, and oz, and others such as can, sprig, bundle, bunch, unit, cube, package, and pinch
+    - Sometimes quantities can be given a range, such as "3-5" or "1 to 2" or "three or four". In this instance, choose the lower quantity; do not try to average or otherwise calculate the quantity. For instance, if the input it "2-3 lbs of chicken breast" the quantity should be "2"
+    - Any text that does not appear in the unit or food must appear in the notes. No text should be left off
 
 It is imperative that you do not create any data or otherwise make up any information. Failure to adhere to this rule is illegal and will result in harsh punishment. If you are unsure, place the entire string into the note section of the response. Do not make things up.
 
 If you are not provided entires from the database to compare against, and you do not have any UUIDs to populate the schema with, so you should leave UUID fields empty. Do not create data out of thin air.
 
-In addition to calculating the recipe ingredient fields, you are also responsible for including a confidence value. This value should range from 0 - 100, where 100 is full confidence that the result is correct, and 0 is no confidence that the result is correct. If you're unable to parse anything, and you put the entire string in the notes, you should return 0 confidence. If you can easily parse the string into each component, then you should return a confidence of 100. If you have to guess which part is the unit and which part is the food, your confidence should be lower, such as 60. Even if there is no unit or note, if you're able to determine the food, you may use a higher confidence. If the entire ingredient consists of only a food, you can use a confidence of 100.
+In addition to calculating the recipe ingredient fields, you are also responsible for including a confidence value. This value is a float between 0 - 1, where 1 is full confidence that the result is correct, and 0 is no confidence that the result is correct. If you're unable to parse anything, and you put the entire string in the notes, you should return 0 confidence. If you can easily parse the string into each component, then you should return a confidence of 1. If you have to guess which part is the unit and which part is the food, your confidence should be lower, such as 0.6. Even if there is no unit or note, if you're able to determine the food, you may use a higher confidence. If the entire ingredient consists of only a food, you can use a confidence of 1.
 
 Below you will receive the JSON schema for your response. Your response must be in valid JSON in the below schema as provided. You must respond in this JSON schema; failure to do so is illegal. It is imperative that you follow the schema precisely to avoid punishment. You must follow the JSON schema.
 

From 50ed3e7321d3637b0dca36e0c11c87eb7ad3952c Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 17:15:59 +0000
Subject: [PATCH 10/29] remember last chosen parser

---
 frontend/composables/use-users/preferences.ts | 20 ++++++++++++++++++-
 .../_groupSlug/r/_slug/ingredient-parser.vue  |  9 +++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/frontend/composables/use-users/preferences.ts b/frontend/composables/use-users/preferences.ts
index 88b0ba1e92a..52a4d26fdfa 100644
--- a/frontend/composables/use-users/preferences.ts
+++ b/frontend/composables/use-users/preferences.ts
@@ -1,6 +1,6 @@
 import { Ref, useContext } from "@nuxtjs/composition-api";
 import { useLocalStorage, useSessionStorage } from "@vueuse/core";
-import { TimelineEventType } from "~/lib/api/types/recipe";
+import { RegisteredParser, TimelineEventType } from "~/lib/api/types/recipe";
 
 export interface UserPrintPreferences {
   imagePosition: string;
@@ -36,6 +36,10 @@ export interface UserTimelinePreferences {
   types: TimelineEventType[];
 }
 
+export interface UserParsingPreferences {
+  parser: RegisteredParser;
+}
+
 export function useUserPrintPreferences(): Ref<UserPrintPreferences> {
   const fromStorage = useLocalStorage(
     "recipe-print-preferences",
@@ -116,3 +120,17 @@ export function useTimelinePreferences(): Ref<UserTimelinePreferences> {
 
   return fromStorage;
 }
+
+export function useParsingPreferences(): Ref<UserParsingPreferences> {
+  const fromStorage = useLocalStorage(
+    "parsing-preferences",
+    {
+      parser: "nlp",
+    },
+    { mergeDefaults: true }
+    // we cast to a Ref because by default it will return an optional type ref
+    // but since we pass defaults we know all properties are set.
+  ) as unknown as Ref<UserParsingPreferences>;
+
+  return fromStorage;
+}
diff --git a/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue b/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
index 45fb9045fc8..f455d7bb871 100644
--- a/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
+++ b/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
@@ -101,13 +101,14 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref, useContext, useRoute, useRouter } from "@nuxtjs/composition-api";
+import { computed, defineComponent, ref, useContext, useRoute, useRouter, watch } from "@nuxtjs/composition-api";
 import { invoke, until } from "@vueuse/core";
 import draggable from "vuedraggable";
 import RecipeIngredientEditor from "~/components/Domain/Recipe/RecipeIngredientEditor.vue";
 import { useUserApi } from "~/composables/api";
 import { useRecipe } from "~/composables/recipes";
 import { useFoodData, useFoodStore, useUnitData, useUnitStore } from "~/composables/store";
+import { useParsingPreferences } from "~/composables/use-users/preferences";
 import { uuid4 } from "~/composables/use-utils";
 import {
   CreateIngredientFood,
@@ -158,8 +159,12 @@ export default defineComponent({
 
     // =========================================================
     // Parser Logic
-    const parser = ref<Parser>("nlp");
+    const parserPreferences = useParsingPreferences();
+    const parser = ref<Parser>(parserPreferences.value.parser || "nlp");
     const parsedIng = ref<ParsedIngredient[]>([]);
+    watch(parser, (val) => {
+      parserPreferences.value.parser = val;
+    });
 
     function processIngredientError(ing: ParsedIngredient, index: number): Error {
       const unitError = !checkForUnit(ing.ingredient.unit);

From 54676fcd582ec4d22e7af78347c71221dac7a5a5 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 19:33:12 +0000
Subject: [PATCH 11/29] refactored and added more openai
 customization/optimization

---
 mealie/core/settings/settings.py              |  12 ++
 mealie/services/openai/openai.py              |   3 +
 mealie/services/parser_services/_base.py      | 161 +++++++++++++++
 .../parser_services/ingredient_parser.py      | 187 +-----------------
 .../parser_services/openai/__init__.py        |   5 +-
 .../services/parser_services/openai/parser.py | 119 +++++++++++
 .../parser_services/openai/process.py         |  41 ----
 7 files changed, 303 insertions(+), 225 deletions(-)
 create mode 100644 mealie/services/parser_services/_base.py
 create mode 100644 mealie/services/parser_services/openai/parser.py
 delete mode 100644 mealie/services/parser_services/openai/process.py

diff --git a/mealie/core/settings/settings.py b/mealie/core/settings/settings.py
index fd3015dbc45..f535100a1e6 100644
--- a/mealie/core/settings/settings.py
+++ b/mealie/core/settings/settings.py
@@ -211,7 +211,19 @@ def OIDC_READY(self) -> bool:
     # OpenAI Configuration
 
     OPENAI_API_KEY: str | None = None
+    """Your OpenAPI API key. Required to enable OpenAI features"""
     OPENAI_MODEL: str = "gpt-4-turbo"
+    """Which OpenAPI model to send requests to. Leave this unset for most usecases"""
+    OPENAI_WORKERS: int = 4
+    """
+    Number of OpenAI workers per request. Higher values may increase
+    processing speed, but will incur additional API costs
+    """
+    OPENAI_SEND_DATABASE_DATA: bool = True
+    """
+    Sending database data may increase accuracy in certain requests,
+    but will incur additional API costs
+    """
 
     @property
     def OPENAI_ENABLED(self) -> bool:
diff --git a/mealie/services/openai/openai.py b/mealie/services/openai/openai.py
index 68047fa6cee..e63f3f1e0eb 100644
--- a/mealie/services/openai/openai.py
+++ b/mealie/services/openai/openai.py
@@ -46,6 +46,9 @@ def __init__(self) -> None:
             raise ValueError("OpenAI is not enabled")
 
         self.model = settings.OPENAI_MODEL
+        self.workers = settings.OPENAI_WORKERS
+        self.send_db_data = settings.OPENAI_SEND_DATABASE_DATA
+
         self.get_client = lambda: AsyncOpenAI(api_key=settings.OPENAI_API_KEY)
 
         super().__init__()
diff --git a/mealie/services/parser_services/_base.py b/mealie/services/parser_services/_base.py
new file mode 100644
index 00000000000..82f28c7780f
--- /dev/null
+++ b/mealie/services/parser_services/_base.py
@@ -0,0 +1,161 @@
+from abc import ABC, abstractmethod
+from typing import TypeVar
+from pydantic import UUID4, BaseModel
+from rapidfuzz import fuzz, process
+from sqlalchemy.orm import Session
+
+from mealie.db.models.recipe.ingredient import IngredientFoodModel, IngredientUnitModel
+from mealie.repos.all_repositories import get_repositories
+from mealie.repos.repository_factory import AllRepositories
+from mealie.schema.recipe.recipe_ingredient import (
+    CreateIngredientFood,
+    CreateIngredientUnit,
+    IngredientFood,
+    IngredientUnit,
+    ParsedIngredient,
+)
+from mealie.schema.response.pagination import PaginationQuery
+
+
+T = TypeVar("T", bound=BaseModel)
+
+
+class ABCIngredientParser(ABC):
+    """
+    Abstract class for ingredient parsers.
+    """
+
+    def __init__(self, group_id: UUID4, session: Session) -> None:
+        self.group_id = group_id
+        self.session = session
+
+        self._foods_by_alias: dict[str, IngredientFood] | None = None
+        self._units_by_alias: dict[str, IngredientUnit] | None = None
+
+    @property
+    def _repos(self) -> AllRepositories:
+        return get_repositories(self.session)
+
+    @property
+    def foods_by_alias(self) -> dict[str, IngredientFood]:
+        if self._foods_by_alias is None:
+            foods_repo = self._repos.ingredient_foods.by_group(self.group_id)
+            query = PaginationQuery(page=1, per_page=-1)
+            all_foods = foods_repo.page_all(query).items
+
+            foods_by_alias: dict[str, IngredientFood] = {}
+            for food in all_foods:
+                if food.name:
+                    foods_by_alias[IngredientFoodModel.normalize(food.name)] = food
+                if food.plural_name:
+                    foods_by_alias[IngredientFoodModel.normalize(food.plural_name)] = food
+
+                for alias in food.aliases or []:
+                    if alias.name:
+                        foods_by_alias[IngredientFoodModel.normalize(alias.name)] = food
+
+            self._foods_by_alias = foods_by_alias
+
+        return self._foods_by_alias
+
+    @property
+    def units_by_alias(self) -> dict[str, IngredientUnit]:
+        if self._units_by_alias is None:
+            units_repo = self._repos.ingredient_units.by_group(self.group_id)
+            query = PaginationQuery(page=1, per_page=-1)
+            all_units = units_repo.page_all(query).items
+
+            units_by_alias: dict[str, IngredientUnit] = {}
+            for unit in all_units:
+                if unit.name:
+                    units_by_alias[IngredientUnitModel.normalize(unit.name)] = unit
+                if unit.plural_name:
+                    units_by_alias[IngredientUnitModel.normalize(unit.plural_name)] = unit
+                if unit.abbreviation:
+                    units_by_alias[IngredientUnitModel.normalize(unit.abbreviation)] = unit
+                if unit.plural_abbreviation:
+                    units_by_alias[IngredientUnitModel.normalize(unit.plural_abbreviation)] = unit
+
+                for alias in unit.aliases or []:
+                    if alias.name:
+                        units_by_alias[IngredientUnitModel.normalize(alias.name)] = unit
+
+            self._units_by_alias = units_by_alias
+
+        return self._units_by_alias
+
+    @property
+    def food_fuzzy_match_threshold(self) -> int:
+        """Minimum threshold to fuzzy match against a database food search"""
+
+        return 85
+
+    @property
+    def unit_fuzzy_match_threshold(self) -> int:
+        """Minimum threshold to fuzzy match against a database unit search"""
+
+        return 70
+
+    @abstractmethod
+    async def parse_one(self, ingredient_string: str) -> ParsedIngredient: ...
+
+    @abstractmethod
+    async def parse(self, ingredients: list[str]) -> list[ParsedIngredient]: ...
+
+    @classmethod
+    def find_match(cls, match_value: str, *, store_map: dict[str, T], fuzzy_match_threshold: int = 0) -> T | None:
+        # check for literal matches
+        if match_value in store_map:
+            return store_map[match_value]
+
+        # fuzzy match against food store
+        fuzz_result = process.extractOne(
+            match_value, store_map.keys(), scorer=fuzz.ratio, score_cutoff=fuzzy_match_threshold
+        )
+        if fuzz_result is None:
+            return None
+
+        return store_map[fuzz_result[0]]
+
+    def find_food_match(self, food: IngredientFood | CreateIngredientFood | str) -> IngredientFood | None:
+        if isinstance(food, IngredientFood):
+            return food
+
+        food_name = food if isinstance(food, str) else food.name
+        match_value = IngredientFoodModel.normalize(food_name)
+        return self.find_match(
+            match_value,
+            store_map=self.foods_by_alias,
+            fuzzy_match_threshold=self.food_fuzzy_match_threshold,
+        )
+
+    def find_unit_match(self, unit: IngredientUnit | CreateIngredientUnit | str) -> IngredientUnit | None:
+        if isinstance(unit, IngredientUnit):
+            return unit
+
+        unit_name = unit if isinstance(unit, str) else unit.name
+        match_value = IngredientUnitModel.normalize(unit_name)
+        return self.find_match(
+            match_value,
+            store_map=self.units_by_alias,
+            fuzzy_match_threshold=self.unit_fuzzy_match_threshold,
+        )
+
+    def find_ingredient_match(self, ingredient: ParsedIngredient) -> ParsedIngredient:
+        if ingredient.ingredient.food and (food_match := self.find_food_match(ingredient.ingredient.food)):
+            ingredient.ingredient.food = food_match
+
+        if ingredient.ingredient.unit and (unit_match := self.find_unit_match(ingredient.ingredient.unit)):
+            ingredient.ingredient.unit = unit_match
+
+        # Parser might have wrongly split a food into a unit and food.
+        if isinstance(ingredient.ingredient.food, CreateIngredientFood) and isinstance(
+            ingredient.ingredient.unit, CreateIngredientUnit
+        ):
+            if food_match := self.find_food_match(
+                f"{ingredient.ingredient.unit.name} {ingredient.ingredient.food.name}"
+            ):
+                ingredient.ingredient.food = food_match
+                ingredient.ingredient.unit = None
+
+        return ingredient
diff --git a/mealie/services/parser_services/ingredient_parser.py b/mealie/services/parser_services/ingredient_parser.py
index e6132bd498e..60a13e2ee07 100644
--- a/mealie/services/parser_services/ingredient_parser.py
+++ b/mealie/services/parser_services/ingredient_parser.py
@@ -1,172 +1,24 @@
-from abc import ABC, abstractmethod
 from fractions import Fraction
-from typing import TypeVar
-from pydantic import UUID4, BaseModel
-from rapidfuzz import fuzz, process
+from pydantic import UUID4
 from sqlalchemy.orm import Session
-
+from ._base import ABCIngredientParser
 from mealie.core.root_logger import get_logger
-from mealie.db.models.recipe.ingredient import IngredientFoodModel, IngredientUnitModel
-from mealie.repos.all_repositories import get_repositories
-from mealie.repos.repository_factory import AllRepositories
+
+
 from mealie.schema.recipe import RecipeIngredient
 from mealie.schema.recipe.recipe_ingredient import (
     MAX_INGREDIENT_DENOMINATOR,
     CreateIngredientFood,
     CreateIngredientUnit,
     IngredientConfidence,
-    IngredientFood,
-    IngredientUnit,
     ParsedIngredient,
     RegisteredParser,
 )
-from mealie.schema.response.pagination import PaginationQuery
+
 
 from . import brute, crfpp, openai
 
 logger = get_logger(__name__)
-T = TypeVar("T", bound=BaseModel)
-
-
-class ABCIngredientParser(ABC):
-    """
-    Abstract class for ingredient parsers.
-    """
-
-    def __init__(self, group_id: UUID4, session: Session) -> None:
-        self.group_id = group_id
-        self.session = session
-
-        self._foods_by_alias: dict[str, IngredientFood] | None = None
-        self._units_by_alias: dict[str, IngredientUnit] | None = None
-
-    @property
-    def _repos(self) -> AllRepositories:
-        return get_repositories(self.session)
-
-    @property
-    def foods_by_alias(self) -> dict[str, IngredientFood]:
-        if self._foods_by_alias is None:
-            foods_repo = self._repos.ingredient_foods.by_group(self.group_id)
-            query = PaginationQuery(page=1, per_page=-1)
-            all_foods = foods_repo.page_all(query).items
-
-            foods_by_alias: dict[str, IngredientFood] = {}
-            for food in all_foods:
-                if food.name:
-                    foods_by_alias[IngredientFoodModel.normalize(food.name)] = food
-                if food.plural_name:
-                    foods_by_alias[IngredientFoodModel.normalize(food.plural_name)] = food
-
-                for alias in food.aliases or []:
-                    if alias.name:
-                        foods_by_alias[IngredientFoodModel.normalize(alias.name)] = food
-
-            self._foods_by_alias = foods_by_alias
-
-        return self._foods_by_alias
-
-    @property
-    def units_by_alias(self) -> dict[str, IngredientUnit]:
-        if self._units_by_alias is None:
-            units_repo = self._repos.ingredient_units.by_group(self.group_id)
-            query = PaginationQuery(page=1, per_page=-1)
-            all_units = units_repo.page_all(query).items
-
-            units_by_alias: dict[str, IngredientUnit] = {}
-            for unit in all_units:
-                if unit.name:
-                    units_by_alias[IngredientUnitModel.normalize(unit.name)] = unit
-                if unit.plural_name:
-                    units_by_alias[IngredientUnitModel.normalize(unit.plural_name)] = unit
-                if unit.abbreviation:
-                    units_by_alias[IngredientUnitModel.normalize(unit.abbreviation)] = unit
-                if unit.plural_abbreviation:
-                    units_by_alias[IngredientUnitModel.normalize(unit.plural_abbreviation)] = unit
-
-                for alias in unit.aliases or []:
-                    if alias.name:
-                        units_by_alias[IngredientUnitModel.normalize(alias.name)] = unit
-
-            self._units_by_alias = units_by_alias
-
-        return self._units_by_alias
-
-    @property
-    def food_fuzzy_match_threshold(self) -> int:
-        """Minimum threshold to fuzzy match against a database food search"""
-
-        return 85
-
-    @property
-    def unit_fuzzy_match_threshold(self) -> int:
-        """Minimum threshold to fuzzy match against a database unit search"""
-
-        return 70
-
-    @abstractmethod
-    async def parse_one(self, ingredient_string: str) -> ParsedIngredient: ...
-
-    @abstractmethod
-    async def parse(self, ingredients: list[str]) -> list[ParsedIngredient]: ...
-
-    @classmethod
-    def find_match(cls, match_value: str, *, store_map: dict[str, T], fuzzy_match_threshold: int = 0) -> T | None:
-        # check for literal matches
-        if match_value in store_map:
-            return store_map[match_value]
-
-        # fuzzy match against food store
-        fuzz_result = process.extractOne(
-            match_value, store_map.keys(), scorer=fuzz.ratio, score_cutoff=fuzzy_match_threshold
-        )
-        if fuzz_result is None:
-            return None
-
-        return store_map[fuzz_result[0]]
-
-    def find_food_match(self, food: IngredientFood | CreateIngredientFood | str) -> IngredientFood | None:
-        if isinstance(food, IngredientFood):
-            return food
-
-        food_name = food if isinstance(food, str) else food.name
-        match_value = IngredientFoodModel.normalize(food_name)
-        return self.find_match(
-            match_value,
-            store_map=self.foods_by_alias,
-            fuzzy_match_threshold=self.food_fuzzy_match_threshold,
-        )
-
-    def find_unit_match(self, unit: IngredientUnit | CreateIngredientUnit | str) -> IngredientUnit | None:
-        if isinstance(unit, IngredientUnit):
-            return unit
-
-        unit_name = unit if isinstance(unit, str) else unit.name
-        match_value = IngredientUnitModel.normalize(unit_name)
-        return self.find_match(
-            match_value,
-            store_map=self.units_by_alias,
-            fuzzy_match_threshold=self.unit_fuzzy_match_threshold,
-        )
-
-    def find_ingredient_match(self, ingredient: ParsedIngredient) -> ParsedIngredient:
-        if ingredient.ingredient.food and (food_match := self.find_food_match(ingredient.ingredient.food)):
-            ingredient.ingredient.food = food_match
-
-        if ingredient.ingredient.unit and (unit_match := self.find_unit_match(ingredient.ingredient.unit)):
-            ingredient.ingredient.unit = unit_match
-
-        # Parser might have wrongly split a food into a unit and food.
-        if isinstance(ingredient.ingredient.food, CreateIngredientFood) and isinstance(
-            ingredient.ingredient.unit, CreateIngredientUnit
-        ):
-            if food_match := self.find_food_match(
-                f"{ingredient.ingredient.unit.name} {ingredient.ingredient.food.name}"
-            ):
-                ingredient.ingredient.food = food_match
-                ingredient.ingredient.unit = None
-
-        return ingredient
 
 
 class BruteForceParser(ABCIngredientParser):
@@ -242,37 +94,10 @@ async def parse_one(self, ingredient_string: str) -> ParsedIngredient:
         return items[0]
 
 
-class OpenAIParser(ABCIngredientParser):
-    def _convert_ingredient(self, openai_ing: openai.OpenAIIngredient) -> ParsedIngredient:
-        ingredient = RecipeIngredient(
-            original_text=openai_ing.input,
-            quantity=openai_ing.quantity,
-            unit=CreateIngredientUnit(name=openai_ing.unit) if openai_ing.unit else None,
-            food=CreateIngredientFood(name=openai_ing.food) if openai_ing.food else None,
-            note=openai_ing.note,
-        )
-
-        parsed_ingredient = ParsedIngredient(
-            input=openai_ing.input,
-            confidence=IngredientConfidence(average=openai_ing.confidence),
-            ingredient=ingredient,
-        )
-
-        return self.find_ingredient_match(parsed_ingredient)
-
-    async def parse_one(self, ingredient_string: str) -> ParsedIngredient:
-        items = await self.parse([ingredient_string])
-        return items[0]
-
-    async def parse(self, ingredients: list[str]) -> list[ParsedIngredient]:
-        response = await openai.parse(ingredients)
-        return [self._convert_ingredient(ing) for ing in response.ingredients]
-
-
 __registrar: dict[RegisteredParser, type[ABCIngredientParser]] = {
     RegisteredParser.nlp: NLPParser,
     RegisteredParser.brute: BruteForceParser,
-    RegisteredParser.openai: OpenAIParser,
+    RegisteredParser.openai: openai.OpenAIParser,
 }
 
 
diff --git a/mealie/services/parser_services/openai/__init__.py b/mealie/services/parser_services/openai/__init__.py
index 609f6ccd770..92510a2cf72 100644
--- a/mealie/services/parser_services/openai/__init__.py
+++ b/mealie/services/parser_services/openai/__init__.py
@@ -1,6 +1,5 @@
-from .process import parse, OpenAIIngredient
+from .parser import OpenAIParser
 
 __all__ = [
-    "OpenAIIngredient",
-    "parse",
+    "OpenAIParser",
 ]
diff --git a/mealie/services/parser_services/openai/parser.py b/mealie/services/parser_services/openai/parser.py
new file mode 100644
index 00000000000..44a3d645946
--- /dev/null
+++ b/mealie/services/parser_services/openai/parser.py
@@ -0,0 +1,119 @@
+import asyncio
+import json
+from typing import Awaitable
+
+from pydantic import BaseModel
+from mealie.schema.recipe.recipe_ingredient import (
+    CreateIngredientFood,
+    CreateIngredientUnit,
+    IngredientConfidence,
+    ParsedIngredient,
+    RecipeIngredient,
+)
+from mealie.services.openai import OpenAIDataInjection, OpenAIService
+from ..ingredient_parser import ABCIngredientParser
+
+
+class OpenAIIngredient(BaseModel):
+    input: str
+    confidence: float | None = None
+
+    quantity: float | None = 0
+    unit: str | None = None
+    food: str | None = None
+    note: str | None = None
+
+
+class OpenAIIngredients(BaseModel):
+    ingredients: list[OpenAIIngredient] = []
+
+
+class OpenAIParser(ABCIngredientParser):
+    def _convert_ingredient(self, openai_ing: OpenAIIngredient) -> ParsedIngredient:
+        ingredient = RecipeIngredient(
+            original_text=openai_ing.input,
+            quantity=openai_ing.quantity,
+            unit=CreateIngredientUnit(name=openai_ing.unit) if openai_ing.unit else None,
+            food=CreateIngredientFood(name=openai_ing.food) if openai_ing.food else None,
+            note=openai_ing.note,
+        )
+
+        parsed_ingredient = ParsedIngredient(
+            input=openai_ing.input,
+            confidence=IngredientConfidence(average=openai_ing.confidence),
+            ingredient=ingredient,
+        )
+
+        return self.find_ingredient_match(parsed_ingredient)
+
+    def _get_prompt(self, service: OpenAIService) -> str:
+        data_injections = [
+            OpenAIDataInjection(
+                description=(
+                    "This is the JSON response schema. You must respond in valid JSON that follows this schema. "
+                    "Your payload should be as compact as possible, eliminating unncessesary whitespace. Any fields "
+                    "with default values which you do not populate should not be in the payload."
+                ),
+                value=OpenAIIngredients,
+            ),
+        ]
+
+        if service.send_db_data:
+            description_template = (
+                "Below is a list of {plural} found in the {plural} database. While parsing, you should "
+                "reference this list when determining which part of the input is the {singular}. You may "
+                "find a {singular} in the input that does not exist in this list. This should not prevent "
+                "you from parsing that text as a {singular}, however it may lower your confidence level."
+            )
+
+            data_injections.extend(
+                [
+                    OpenAIDataInjection(
+                        description=description_template.format(singular="unit", plural="units"),
+                        value=list(set(self.units_by_alias)),
+                    ),
+                    OpenAIDataInjection(
+                        description=description_template.format(singular="food", plural="foods"),
+                        value=list(set(self.foods_by_alias)),
+                    ),
+                ]
+            )
+
+        return service.get_prompt("recipes.parse-recipe-ingredients", data_injections=data_injections)
+
+    @staticmethod
+    def _chunk_messages(messages: list[str], n=1) -> list[list[str]]:
+        if n < 1:
+            n = 1
+        return [messages[i : i + n] for i in range(0, len(messages), n)]
+
+    async def _parse(self, ingredients: list[str]) -> OpenAIIngredients:
+        service = OpenAIService()
+        prompt = self._get_prompt(service)
+
+        # chunk ingredients and send each chunk to its own worker
+        ingredient_chunks = self._chunk_messages(ingredients, n=service.workers)
+        tasks: list[Awaitable[str | None]] = []
+        for ingredient_chunk in ingredient_chunks:
+            message = json.dumps(ingredient_chunk, separators=(",", ":"))
+            tasks.append(service.get_response(prompt, message, force_json_response=True))
+
+        # re-combine chunks into one response
+        responses_json = await asyncio.gather(*tasks)
+        responses = [
+            OpenAIIngredients.model_validate_json(response_json) for response_json in responses_json if responses_json
+        ]
+        if not responses:
+            raise Exception("No response from OpenAI")
+
+        return OpenAIIngredients(
+            ingredients=[ingredient for response in responses for ingredient in response.ingredients]
+        )
+
+    async def parse_one(self, ingredient_string: str) -> ParsedIngredient:
+        items = await self.parse([ingredient_string])
+        return items[0]
+
+    async def parse(self, ingredients: list[str]) -> list[ParsedIngredient]:
+        response = await self._parse(ingredients)
+        return [self._convert_ingredient(ing) for ing in response.ingredients]
diff --git a/mealie/services/parser_services/openai/process.py b/mealie/services/parser_services/openai/process.py
deleted file mode 100644
index 4c6e4edead1..00000000000
--- a/mealie/services/parser_services/openai/process.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import json
-
-from pydantic import BaseModel
-from mealie.services.openai import OpenAIDataInjection, OpenAIService
-
-
-class OpenAIIngredient(BaseModel):
-    input: str
-    confidence: float | None = None
-
-    quantity: float | None = 0
-    unit: str | None = None
-    food: str | None = None
-    note: str | None = None
-
-
-class OpenAIIngredients(BaseModel):
-    ingredients: list[OpenAIIngredient] = []
-
-
-async def parse(ingredients: list[str]) -> OpenAIIngredients:
-    service = OpenAIService()
-    data_injections = [
-        OpenAIDataInjection(
-            description=(
-                "This is the JSON response schema. You must respond in valid JSON that follows this schema. "
-                "Your payload should be as compact as possible, eliminating unncessesary whitespace. Any fields "
-                "with default values which you do not populate should not be in the payload."
-            ),
-            value=OpenAIIngredients,
-        ),
-    ]
-
-    prompt = service.get_prompt("recipes.parse-recipe-ingredients", data_injections=data_injections)
-    response = await service.get_response(
-        prompt, json.dumps(ingredients, separators=(",", ":")), force_json_response=True
-    )
-    if not response:
-        raise Exception("No response from OpenAI")
-
-    return OpenAIIngredients.model_validate_json(response)

From 8fa252dfec06457291dc9e3fe250396806a6e9d1 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 19:37:05 +0000
Subject: [PATCH 12/29] docs

---
 .../getting-started/installation/backend-config.md     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/docs/documentation/getting-started/installation/backend-config.md b/docs/docs/documentation/getting-started/installation/backend-config.md
index 085780c6360..4fb4b05d6d2 100644
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -104,10 +104,12 @@ For usage, see [Usage - OpenID Connect](../authentication/oidc.md)
 
 ### OpenAI
 
-| Variables             |     Default   | Description                                                             |
-| --------------------- |    :------:   | ----------------------------------------------------------------------- |
-| OPENAI_API_KEY        |      None     | Your OpenAI API Key. Enables OpenAI-related features                    |
-| OPENAI_MODEL          |  gpt-4-turbo  | Which OpenAI model to use. If you're not sure, leave this empty         |
+| Variables                 |     Default   | Description                                                                                                                    |
+| ------------------------- |    :------:   | ------------------------------------------------------------------------------------------------------------------------------ |
+| OPENAI_API_KEY            |      None     | Your OpenAI API Key. Enables OpenAI-related features                                                                           |
+| OPENAI_MODEL              |  gpt-4-turbo  | Which OpenAI model to use. If you're not sure, leave this empty                                                                |
+| OPENAI_WORKERS            |       4       | Number of OpenAI workers per request. Higher values may increase processing speed, but will incur additional API costs         |
+| OPENAI_SEND_DATABASE_DATA |      True     | Whether to send Mealie data to OpenAI to improve request accuracy. This will incur additional API costs                        |
 
 ### Themeing
 

From 2e0bffdbbe41545d17ada4a853bb9798c0e05520 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 20:17:05 +0000
Subject: [PATCH 13/29] hide openai parser if openai is disabled

---
 .../components/global/BaseOverflowButton.vue  | 55 +++++++++++--------
 frontend/lib/api/types/admin.ts               |  3 +
 .../_groupSlug/r/_slug/ingredient-parser.vue  | 41 ++++++++------
 mealie/routes/admin/admin_about.py            |  2 +
 mealie/routes/app/app_about.py                |  1 +
 mealie/schema/admin/about.py                  |  2 +
 6 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/frontend/components/global/BaseOverflowButton.vue b/frontend/components/global/BaseOverflowButton.vue
index 28a4ef58eb5..775770b423e 100644
--- a/frontend/components/global/BaseOverflowButton.vue
+++ b/frontend/components/global/BaseOverflowButton.vue
@@ -11,44 +11,50 @@
         </v-icon>
       </v-btn>
     </template>
-    <!--  Model -->
+    <!-- Model -->
     <v-list v-if="mode === MODES.model" dense>
       <v-list-item-group v-model="itemGroup">
         <template v-for="(item, index) in items">
-          <v-list-item :key="index" @click="setValue(item)">
-            <v-list-item-icon v-if="item.icon">
-              <v-icon>{{ item.icon }}</v-icon>
-            </v-list-item-icon>
-            <v-list-item-title>{{ item.text }}</v-list-item-title>
-          </v-list-item>
-          <v-divider v-if="item.divider" :key="`divider-${index}`" class="my-1" ></v-divider>
+          <div v-if="!item.hide">
+            <v-list-item :key="index" @click="setValue(item)">
+              <v-list-item-icon v-if="item.icon">
+                <v-icon>{{ item.icon }}</v-icon>
+              </v-list-item-icon>
+              <v-list-item-title>{{ item.text }}</v-list-item-title>
+            </v-list-item>
+            <v-divider v-if="item.divider" :key="`divider-${index}`" class="my-1" ></v-divider>
+          </div>
         </template>
       </v-list-item-group>
     </v-list>
-    <!--  Links -->
+    <!-- Links -->
     <v-list v-else-if="mode === MODES.link" dense>
       <v-list-item-group v-model="itemGroup">
         <template v-for="(item, index) in items">
-          <v-list-item :key="index" :to="item.to">
-          <v-list-item-icon v-if="item.icon">
-            <v-icon>{{ item.icon }}</v-icon>
-          </v-list-item-icon>
-          <v-list-item-title>{{ item.text }}</v-list-item-title>
-          </v-list-item>
-          <v-divider v-if="item.divider" :key="`divider-${index}`" class="my-1" ></v-divider>
+          <div v-if="!item.hide">
+            <v-list-item :key="index" :to="item.to">
+            <v-list-item-icon v-if="item.icon">
+              <v-icon>{{ item.icon }}</v-icon>
+            </v-list-item-icon>
+            <v-list-item-title>{{ item.text }}</v-list-item-title>
+            </v-list-item>
+            <v-divider v-if="item.divider" :key="`divider-${index}`" class="my-1" ></v-divider>\
+          </div>
         </template>
       </v-list-item-group>
     </v-list>
-    <!--  Event -->
+    <!-- Event -->
     <v-list v-else-if="mode === MODES.event" dense>
       <template v-for="(item, index) in items">
-        <v-list-item :key="index" @click="$emit(item.event)">
-          <v-list-item-icon v-if="item.icon">
-            <v-icon>{{ item.icon }}</v-icon>
-          </v-list-item-icon>
-          <v-list-item-title>{{ item.text }}</v-list-item-title>
-        </v-list-item>
-        <v-divider v-if="item.divider" :key="`divider-${index}`" class="my-1" ></v-divider>
+        <div v-if="!item.hide">
+          <v-list-item :key="index" @click="$emit(item.event)">
+            <v-list-item-icon v-if="item.icon">
+              <v-icon>{{ item.icon }}</v-icon>
+            </v-list-item-icon>
+            <v-list-item-title>{{ item.text }}</v-list-item-title>
+          </v-list-item>
+          <v-divider v-if="item.divider" :key="`divider-${index}`" class="my-1" ></v-divider>
+        </div>
       </template>
     </v-list>
   </v-menu>
@@ -74,6 +80,7 @@ export interface MenuItem {
   value?: string;
   event?: string;
   divider?: boolean;
+  hide?:boolean;
 }
 
 export default defineComponent({
diff --git a/frontend/lib/api/types/admin.ts b/frontend/lib/api/types/admin.ts
index 36c255b3c22..6fdeec6a2ba 100644
--- a/frontend/lib/api/types/admin.ts
+++ b/frontend/lib/api/types/admin.ts
@@ -13,6 +13,7 @@ export interface AdminAboutInfo {
   enableOidc: boolean;
   oidcRedirect: boolean;
   oidcProviderName: string;
+  enableOpenai: boolean;
   versionLatest: string;
   apiPort: number;
   apiDocs: boolean;
@@ -40,6 +41,7 @@ export interface AppInfo {
   enableOidc: boolean;
   oidcRedirect: boolean;
   oidcProviderName: string;
+  enableOpenai: boolean;
 }
 export interface AppStartupInfo {
   isFirstLogin: boolean;
@@ -80,6 +82,7 @@ export interface CheckAppConfig {
   emailReady: boolean;
   ldapReady: boolean;
   oidcReady: boolean;
+  enableOpenai: boolean;
   baseUrlSet: boolean;
   isUpToDate: boolean;
 }
diff --git a/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue b/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
index f455d7bb871..08e65139c22 100644
--- a/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
+++ b/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
@@ -19,20 +19,7 @@
           <BaseOverflowButton
             v-model="parser"
             btn-class="mx-2 mb-4"
-            :items="[
-              {
-                text: $tc('recipe.parser.natural-language-processor'),
-                value: 'nlp',
-              },
-              {
-                text: $tc('recipe.parser.brute-parser'),
-                value: 'brute',
-              },
-              {
-                text: $tc('recipe.parser.openai-parser'),
-                value: 'openai',
-              },
-            ]"
+            :items="availableParsers"
           />
         </div>
       </BaseCardSectionTitle>
@@ -105,7 +92,7 @@ import { computed, defineComponent, ref, useContext, useRoute, useRouter, watch
 import { invoke, until } from "@vueuse/core";
 import draggable from "vuedraggable";
 import RecipeIngredientEditor from "~/components/Domain/Recipe/RecipeIngredientEditor.vue";
-import { useUserApi } from "~/composables/api";
+import { useAppInfo, useUserApi } from "~/composables/api";
 import { useRecipe } from "~/composables/recipes";
 import { useFoodData, useFoodStore, useUnitData, useUnitStore } from "~/composables/store";
 import { useParsingPreferences } from "~/composables/use-users/preferences";
@@ -135,7 +122,7 @@ export default defineComponent({
   },
   middleware: ["auth", "group-only"],
   setup() {
-    const { $auth } = useContext();
+    const { $auth, i18n } = useContext();
     const panels = ref<number[]>([]);
 
     const route = useRoute();
@@ -144,8 +131,7 @@ export default defineComponent({
     const router = useRouter();
     const slug = route.value.params.slug;
     const api = useUserApi();
-
-    const { i18n } = useContext();
+    const appInfo = useAppInfo();
 
     const { recipe, loading } = useRecipe(slug);
 
@@ -157,6 +143,24 @@ export default defineComponent({
 
     const ingredients = ref<any[]>([]);
 
+    const availableParsers = computed(() => {
+      return [
+        {
+          "text": i18n.tc("recipe.parser.natural-language-processor"),
+          "value": "nlp",
+        },
+        {
+          "text": i18n.tc("recipe.parser.brute-parser"),
+          "value": "brute",
+        },
+        {
+          "text": i18n.tc("recipe.parser.openai-parser"),
+          "value": "openai",
+          "hide": !appInfo.value?.enableOpenai,
+        },
+      ]
+    });
+
     // =========================================================
     // Parser Logic
     const parserPreferences = useParsingPreferences();
@@ -352,6 +356,7 @@ export default defineComponent({
 
     return {
       parser,
+      availableParsers,
       saveAll,
       createFood,
       createUnit,
diff --git a/mealie/routes/admin/admin_about.py b/mealie/routes/admin/admin_about.py
index f4457063311..edc69f2abf1 100644
--- a/mealie/routes/admin/admin_about.py
+++ b/mealie/routes/admin/admin_about.py
@@ -33,6 +33,7 @@ def get_app_info(self):
             enable_oidc=settings.OIDC_AUTH_ENABLED,
             oidc_redirect=settings.OIDC_AUTO_REDIRECT,
             oidc_provider_name=settings.OIDC_PROVIDER_NAME,
+            enable_openai=settings.OPENAI_ENABLED,
         )
 
     @router.get("/statistics", response_model=AppStatistics)
@@ -55,4 +56,5 @@ def check_app_config(self):
             base_url_set=settings.BASE_URL != "http://localhost:8080",
             is_up_to_date=APP_VERSION == "develop" or APP_VERSION == "nightly" or get_latest_version() == APP_VERSION,
             oidc_ready=settings.OIDC_READY,
+            enable_openai=settings.OPENAI_ENABLED,
         )
diff --git a/mealie/routes/app/app_about.py b/mealie/routes/app/app_about.py
index b54a739f223..6aff77c972f 100644
--- a/mealie/routes/app/app_about.py
+++ b/mealie/routes/app/app_about.py
@@ -32,6 +32,7 @@ def get_app_info(session: Session = Depends(generate_session)):
         enable_oidc=settings.OIDC_READY,
         oidc_redirect=settings.OIDC_AUTO_REDIRECT,
         oidc_provider_name=settings.OIDC_PROVIDER_NAME,
+        enable_openai=settings.OPENAI_ENABLED,
     )
 
 
diff --git a/mealie/schema/admin/about.py b/mealie/schema/admin/about.py
index 3e4a47febd6..e6451df9abb 100644
--- a/mealie/schema/admin/about.py
+++ b/mealie/schema/admin/about.py
@@ -18,6 +18,7 @@ class AppInfo(MealieModel):
     enable_oidc: bool
     oidc_redirect: bool
     oidc_provider_name: str
+    enable_openai: bool
 
 
 class AppTheme(MealieModel):
@@ -64,6 +65,7 @@ class CheckAppConfig(MealieModel):
     email_ready: bool
     ldap_ready: bool
     oidc_ready: bool
+    enable_openai: bool
     base_url_set: bool
     is_up_to_date: bool
 

From e03c2418e9fa902120924e6d0d1b7a732e82c298 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 20:19:36 +0000
Subject: [PATCH 14/29] lowered default workers to 2

---
 .../getting-started/installation/backend-config.md              | 2 +-
 mealie/core/settings/settings.py                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/documentation/getting-started/installation/backend-config.md b/docs/docs/documentation/getting-started/installation/backend-config.md
index 4fb4b05d6d2..53448ddb92a 100644
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -108,7 +108,7 @@ For usage, see [Usage - OpenID Connect](../authentication/oidc.md)
 | ------------------------- |    :------:   | ------------------------------------------------------------------------------------------------------------------------------ |
 | OPENAI_API_KEY            |      None     | Your OpenAI API Key. Enables OpenAI-related features                                                                           |
 | OPENAI_MODEL              |  gpt-4-turbo  | Which OpenAI model to use. If you're not sure, leave this empty                                                                |
-| OPENAI_WORKERS            |       4       | Number of OpenAI workers per request. Higher values may increase processing speed, but will incur additional API costs         |
+| OPENAI_WORKERS            |       2       | Number of OpenAI workers per request. Higher values may increase processing speed, but will incur additional API costs         |
 | OPENAI_SEND_DATABASE_DATA |      True     | Whether to send Mealie data to OpenAI to improve request accuracy. This will incur additional API costs                        |
 
 ### Themeing
diff --git a/mealie/core/settings/settings.py b/mealie/core/settings/settings.py
index f535100a1e6..f5fa245959a 100644
--- a/mealie/core/settings/settings.py
+++ b/mealie/core/settings/settings.py
@@ -214,7 +214,7 @@ def OIDC_READY(self) -> bool:
     """Your OpenAPI API key. Required to enable OpenAI features"""
     OPENAI_MODEL: str = "gpt-4-turbo"
     """Which OpenAPI model to send requests to. Leave this unset for most usecases"""
-    OPENAI_WORKERS: int = 4
+    OPENAI_WORKERS: int = 2
     """
     Number of OpenAI workers per request. Higher values may increase
     processing speed, but will incur additional API costs

From 70c6c398bfebc71c7ca8bf09be4bffbf45d637a9 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 20:20:35 +0000
Subject: [PATCH 15/29] added loading animation

---
 .../_groupSlug/r/_slug/ingredient-parser.vue  | 118 ++++++++++--------
 1 file changed, 66 insertions(+), 52 deletions(-)

diff --git a/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue b/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
index 08e65139c22..20ef11d76a8 100644
--- a/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
+++ b/frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
@@ -26,63 +26,72 @@
 
       <div class="d-flex mt-n3 mb-4 justify-end" style="gap: 5px">
         <BaseButton cancel class="mr-auto" @click="$router.go(-1)"></BaseButton>
-        <BaseButton color="info" @click="fetchParsed">
+        <BaseButton color="info" :disabled="parserLoading" @click="fetchParsed">
           <template #icon> {{ $globals.icons.foods }}</template>
           {{ $tc("recipe.parser.parse-all") }}
         </BaseButton>
-        <BaseButton save @click="saveAll" />
+        <BaseButton save :disabled="parserLoading" @click="saveAll" />
       </div>
 
-      <v-expansion-panels v-model="panels" multiple>
-        <draggable
-          v-if="parsedIng.length > 0"
-          v-model="parsedIng"
-          handle=".handle"
-          :style="{ width: '100%' }"
-          ghost-class="ghost"
-        >
-          <v-expansion-panel v-for="(ing, index) in parsedIng" :key="index">
-            <v-expansion-panel-header class="my-0 py-0" disable-icon-rotate>
-              <template #default="{ open }">
-                <v-fade-transition>
-                  <span v-if="!open" key="0"> {{ ing.input }} </span>
-                </v-fade-transition>
-              </template>
-              <template #actions>
-                <v-icon left :color="isError(ing) ? 'error' : 'success'">
-                  {{ isError(ing) ? $globals.icons.alert : $globals.icons.check }}
-                </v-icon>
-                <div class="my-auto" :color="isError(ing) ? 'error-text' : 'success-text'">
-                  {{ ing.confidence ? asPercentage(ing.confidence.average) : "" }}
-                </div>
-              </template>
-            </v-expansion-panel-header>
-            <v-expansion-panel-content class="pb-0 mb-0">
-              <RecipeIngredientEditor v-model="parsedIng[index].ingredient" allow-insert-ingredient @insert-ingredient="insertIngredient(index)"  @delete="deleteIngredient(index)" />
-              {{ ing.input }}
-              <v-card-actions>
-                <v-spacer />
-                <BaseButton
-                  v-if="errors[index].unitError && errors[index].unitErrorMessage !== ''"
-                  color="warning"
-                  small
-                  @click="createUnit(ing.ingredient.unit, index)"
-                >
-                  {{ errors[index].unitErrorMessage }}
-                </BaseButton>
-                <BaseButton
-                  v-if="errors[index].foodError && errors[index].foodErrorMessage !== ''"
-                  color="warning"
-                  small
-                  @click="createFood(ing.ingredient.food, index)"
-                >
-                  {{ errors[index].foodErrorMessage }}
-                </BaseButton>
-              </v-card-actions>
-            </v-expansion-panel-content>
-          </v-expansion-panel>
-        </draggable>
-      </v-expansion-panels>
+      <div v-if="parserLoading">
+        <AppLoader
+          v-if="parserLoading"
+          :loading="parserLoading"
+          waiting-text=""
+        />
+      </div>
+      <div v-else>
+        <v-expansion-panels v-model="panels" multiple>
+          <draggable
+            v-if="parsedIng.length > 0"
+            v-model="parsedIng"
+            handle=".handle"
+            :style="{ width: '100%' }"
+            ghost-class="ghost"
+          >
+            <v-expansion-panel v-for="(ing, index) in parsedIng" :key="index">
+              <v-expansion-panel-header class="my-0 py-0" disable-icon-rotate>
+                <template #default="{ open }">
+                  <v-fade-transition>
+                    <span v-if="!open" key="0"> {{ ing.input }} </span>
+                  </v-fade-transition>
+                </template>
+                <template #actions>
+                  <v-icon left :color="isError(ing) ? 'error' : 'success'">
+                    {{ isError(ing) ? $globals.icons.alert : $globals.icons.check }}
+                  </v-icon>
+                  <div class="my-auto" :color="isError(ing) ? 'error-text' : 'success-text'">
+                    {{ ing.confidence ? asPercentage(ing.confidence.average) : "" }}
+                  </div>
+                </template>
+              </v-expansion-panel-header>
+              <v-expansion-panel-content class="pb-0 mb-0">
+                <RecipeIngredientEditor v-model="parsedIng[index].ingredient" allow-insert-ingredient @insert-ingredient="insertIngredient(index)"  @delete="deleteIngredient(index)" />
+                {{ ing.input }}
+                <v-card-actions>
+                  <v-spacer />
+                  <BaseButton
+                    v-if="errors[index].unitError && errors[index].unitErrorMessage !== ''"
+                    color="warning"
+                    small
+                    @click="createUnit(ing.ingredient.unit, index)"
+                  >
+                    {{ errors[index].unitErrorMessage }}
+                  </BaseButton>
+                  <BaseButton
+                    v-if="errors[index].foodError && errors[index].foodErrorMessage !== ''"
+                    color="warning"
+                    small
+                    @click="createFood(ing.ingredient.food, index)"
+                  >
+                    {{ errors[index].foodErrorMessage }}
+                  </BaseButton>
+                </v-card-actions>
+              </v-expansion-panel-content>
+            </v-expansion-panel>
+          </draggable>
+        </v-expansion-panels>
+      </div>
     </v-container>
   </v-container>
 </template>
@@ -134,6 +143,7 @@ export default defineComponent({
     const appInfo = useAppInfo();
 
     const { recipe, loading } = useRecipe(slug);
+    const parserLoading = ref(false);
 
     invoke(async () => {
       await until(recipe).not.toBeNull();
@@ -208,7 +218,10 @@ export default defineComponent({
         return;
       }
       const raw = recipe.value.recipeIngredient.map((ing) => ing.note ?? "");
+
+      parserLoading.value = true;
       const { data } = await api.recipes.parseIngredients(parser.value, raw);
+      parserLoading.value = false;
 
       if (data) {
         // When we send the recipe ingredient text to be parsed, we lose the reference to the original unparsed ingredient.
@@ -372,6 +385,7 @@ export default defineComponent({
       parsedIng,
       recipe,
       loading,
+      parserLoading,
       ingredients,
     };
   },

From 5b5832f341a81a46ee751ad432003a25e8fece81 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 20:37:26 +0000
Subject: [PATCH 16/29] additional docs

---
 docs/docs/documentation/getting-started/faq.md                | 2 +-
 .../getting-started/installation/backend-config.md            | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/docs/documentation/getting-started/faq.md b/docs/docs/documentation/getting-started/faq.md
index b033eb4edf8..0716d9b48a0 100644
--- a/docs/docs/documentation/getting-started/faq.md
+++ b/docs/docs/documentation/getting-started/faq.md
@@ -26,7 +26,7 @@ Do the following for each recipe you want to intelligently handle ingredients.
 6. Click the Edit button/icon again
 7. Scroll to the ingredients and you should see new fields for Amount, Unit, Food, and Note. The Note in particular will contain the original text of the Recipe.
 8. Click `Parse` and you will be taken to the ingredient parsing page.
-9. Choose your parser. The `Natural Language Parser` works very well, but you can also use the `Brute Parser`, or the `OpenAI Parser` if you've enabled OpenAI support.
+9. Choose your parser. The `Natural Language Parser` works very well, but you can also use the `Brute Parser`, or the `OpenAI Parser` if you've [enabled OpenAI support](./installation/backend-config.md#openai).
 10. Click `Parse All`, and your ingredients should be separated out into Units and Foods based on your seeding in Step 1 above.
 11. For ingredients where the Unit or Food was not found, you can click a button to accept an automatically suggested Food to add to the database. Or, manually enter the Unit/Food and hit `Enter` (or click `Create`) to add it to the database
 12. When done, click `Save All` and you will be taken back to the recipe. Now the Unit and Food fields of the recipe should be filled out.
diff --git a/docs/docs/documentation/getting-started/installation/backend-config.md b/docs/docs/documentation/getting-started/installation/backend-config.md
index 53448ddb92a..19fe76f2070 100644
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -104,6 +104,10 @@ For usage, see [Usage - OpenID Connect](../authentication/oidc.md)
 
 ### OpenAI
 
+:octicons-tag-24: v1.7.0
+
+Mealie supports various integrations using OpenAI. To enable OpenAI, [you must provide your OpenAI API key](https://platform.openai.com/api-keys). You can tweak how OpenAI is used using these backend settings. Please note that while OpenAI usage is optimized to reduce API costs, you're unlikely to be able to use OpenAI features with the free tier limits.
+
 | Variables                 |     Default   | Description                                                                                                                    |
 | ------------------------- |    :------:   | ------------------------------------------------------------------------------------------------------------------------------ |
 | OPENAI_API_KEY            |      None     | Your OpenAI API Key. Enables OpenAI-related features                                                                           |

From f475f6b8f843ec7cf9f41de9e01b9a9dc4ab617e Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 20:51:58 +0000
Subject: [PATCH 17/29] removed food injection

---
 .../services/parser_services/openai/parser.py  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/mealie/services/parser_services/openai/parser.py b/mealie/services/parser_services/openai/parser.py
index 44a3d645946..24aff6aa063 100644
--- a/mealie/services/parser_services/openai/parser.py
+++ b/mealie/services/parser_services/openai/parser.py
@@ -59,23 +59,17 @@ def _get_prompt(self, service: OpenAIService) -> str:
         ]
 
         if service.send_db_data:
-            description_template = (
-                "Below is a list of {plural} found in the {plural} database. While parsing, you should "
-                "reference this list when determining which part of the input is the {singular}. You may "
-                "find a {singular} in the input that does not exist in this list. This should not prevent "
-                "you from parsing that text as a {singular}, however it may lower your confidence level."
-            )
-
             data_injections.extend(
                 [
                     OpenAIDataInjection(
-                        description=description_template.format(singular="unit", plural="units"),
+                        description=(
+                            "Below is a list of units found in the units database. While parsing, you should "
+                            "reference this list when determining which part of the input is the unit. You may "
+                            "find a unit in the input that does not exist in this list. This should not prevent "
+                            "you from parsing that text as a unit, however it may lower your confidence level."
+                        ),
                         value=list(set(self.units_by_alias)),
                     ),
-                    OpenAIDataInjection(
-                        description=description_template.format(singular="food", plural="foods"),
-                        value=list(set(self.foods_by_alias)),
-                    ),
                 ]
             )
 

From 334d1f87b7926f5a31493292f028c70f8b9345d9 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 20:52:07 +0000
Subject: [PATCH 18/29] tweaked prompt

---
 .../openai/prompts/recipes/parse-recipe-ingredients.txt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
index c04c757d600..cad5a85a9d1 100644
--- a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
+++ b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
@@ -13,7 +13,7 @@ While parsing the ingredients, there are some things to keep in mind:
     - It's possible for the input to contain typos. For instance, you might see the word "potatos" instead of "potatoes". If it is a common misspelling, you may correct it
     - Pay close attention to what can be considered a unit of measurement. There are common measurements such as tablespoon, teaspoon, and gram, abbreviations such as tsp, tbsp, and oz, and others such as can, sprig, bundle, bunch, unit, cube, package, and pinch
     - Sometimes quantities can be given a range, such as "3-5" or "1 to 2" or "three or four". In this instance, choose the lower quantity; do not try to average or otherwise calculate the quantity. For instance, if the input it "2-3 lbs of chicken breast" the quantity should be "2"
-    - Any text that does not appear in the unit or food must appear in the notes. No text should be left off
+    - Any text that does not appear in the unit or food must appear in the notes. No text should be left off. The only exception for this is if a quantity is converted from text into a number. For instance, if you convert "2 dozen" into the number "24", you should not put the word "dozen" into any other field
 
 It is imperative that you do not create any data or otherwise make up any information. Failure to adhere to this rule is illegal and will result in harsh punishment. If you are unsure, place the entire string into the note section of the response. Do not make things up.
 

From 32d5b892d7c94b1f7a79b84f6b8f51b567b5d814 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 21:17:17 +0000
Subject: [PATCH 19/29] add openai parse test

---
 tests/conftest.py                          |  1 +
 tests/unit_tests/test_ingredient_parser.py | 48 +++++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 1a9a8c41887..beb2f3668b6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -7,6 +7,7 @@
 mp.setenv("PRODUCTION", "True")
 mp.setenv("TESTING", "True")
 mp.setenv("ALLOW_SIGNUP", "True")
+mp.setenv("OPENAI_API_KEY", "dummy-api-key")
 from pathlib import Path
 
 from fastapi.testclient import TestClient
diff --git a/tests/unit_tests/test_ingredient_parser.py b/tests/unit_tests/test_ingredient_parser.py
index dde30376273..598cec2451d 100644
--- a/tests/unit_tests/test_ingredient_parser.py
+++ b/tests/unit_tests/test_ingredient_parser.py
@@ -1,3 +1,5 @@
+import asyncio
+import json
 import shutil
 from dataclasses import dataclass
 from fractions import Fraction
@@ -20,10 +22,11 @@
     SaveIngredientUnit,
 )
 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 mealie.services.parser_services.openai.parser import OpenAIIngredient, OpenAIIngredients
 from tests.utils.factories import random_int, random_string
-from tests.utils.fixture_schemas import TestUser
 
 
 @dataclass
@@ -223,8 +226,9 @@ def test_brute_parser(
     comment: str,
 ):
     with session_context() as session:
+        loop = asyncio.get_event_loop()
         parser = get_parser(RegisteredParser.brute, unique_local_group_id, session)
-        parsed = parser.parse_one(input)
+        parsed = loop.run_until_complete(parser.parse_one(input))
         ing = parsed.ingredient
 
         if ing.quantity:
@@ -430,3 +434,43 @@ def test_parser_ingredient_match(
             assert parsed_ingredient.ingredient.unit is None or isinstance(
                 parsed_ingredient.ingredient.unit, CreateIngredientUnit
             )
+
+
+def test_openai_parser(
+    unique_local_group_id: UUID4,
+    parsed_ingredient_data: tuple[list[IngredientFood], list[IngredientUnit]],  # required so database is populated
+    monkeypatch: pytest.MonkeyPatch,
+):
+    ingredient_count = random_int(10, 20)
+
+    async def mock_get_response(self, prompt: str, message: str, *args, **kwargs) -> str | None:
+        inputs = json.loads(message)
+        data = OpenAIIngredients(
+            ingredients=[
+                OpenAIIngredient(
+                    input=input,
+                    confidence=1,
+                    quantity=random_int(0, 10),
+                    unit=random_string(),
+                    food=random_string(),
+                    note=random_string(),
+                )
+                for input in inputs
+            ]
+        )
+        return data.model_dump_json()
+
+    monkeypatch.setattr(OpenAIService, "get_response", mock_get_response)
+
+    with session_context() as session:
+        loop = asyncio.get_event_loop()
+        parser = get_parser(RegisteredParser.openai, unique_local_group_id, session)
+
+        inputs = [random_string() for _ in range(ingredient_count)]
+        parsed = loop.run_until_complete(parser.parse(inputs))
+
+        # since OpenAI is mocked, we don't need to validate the data, we just need to make sure parsing works
+        # and that it preserves order
+        assert len(parsed) == ingredient_count
+        for input, output in zip(inputs, parsed, strict=True):
+            assert output.input == input

From b26e77575ddceed4bdbf636886f9ded9291ce144 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 21:41:23 +0000
Subject: [PATCH 20/29] typos

---
 mealie/core/settings/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mealie/core/settings/settings.py b/mealie/core/settings/settings.py
index f5fa245959a..cc07a9db32b 100644
--- a/mealie/core/settings/settings.py
+++ b/mealie/core/settings/settings.py
@@ -211,9 +211,9 @@ def OIDC_READY(self) -> bool:
     # OpenAI Configuration
 
     OPENAI_API_KEY: str | None = None
-    """Your OpenAPI API key. Required to enable OpenAI features"""
+    """Your OpenAI API key. Required to enable OpenAI features"""
     OPENAI_MODEL: str = "gpt-4-turbo"
-    """Which OpenAPI model to send requests to. Leave this unset for most usecases"""
+    """Which OpenAI model to send requests to. Leave this unset for most usecases"""
     OPENAI_WORKERS: int = 2
     """
     Number of OpenAI workers per request. Higher values may increase

From 798ff34019320fb5b5eed813b8c5bc7e1c1d798e Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 21:50:25 +0000
Subject: [PATCH 21/29] prompt tweaks

---
 .../openai/prompts/recipes/parse-recipe-ingredients.txt       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
index cad5a85a9d1..7cfb7826adb 100644
--- a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
+++ b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
@@ -11,14 +11,12 @@ While parsing the ingredients, there are some things to keep in mind:
     - Sometimes foods or units will be in their singular, plural, or other grammatical forms. You must interpret all of them appropriately
     - Sometimes ingredients will have text in parenthesis (like this). Parenthesis typically indicate something that should appear in the notes. For example: an input of "3 potatoes (roughly chopped)" would parse "roughly chopped" into the notes. Notice that when this occurs, the parenthesis are dropped, and you should use "roughly chopped" instead of "(roughly chopped)" in the note
     - It's possible for the input to contain typos. For instance, you might see the word "potatos" instead of "potatoes". If it is a common misspelling, you may correct it
-    - Pay close attention to what can be considered a unit of measurement. There are common measurements such as tablespoon, teaspoon, and gram, abbreviations such as tsp, tbsp, and oz, and others such as can, sprig, bundle, bunch, unit, cube, package, and pinch
+    - Pay close attention to what can be considered a unit of measurement. There are common measurements such as tablespoon, teaspoon, and gram, abbreviations such as tsp, tbsp, and oz, and others such as sprig, can, bundle, bunch, unit, cube, package, and pinch
     - Sometimes quantities can be given a range, such as "3-5" or "1 to 2" or "three or four". In this instance, choose the lower quantity; do not try to average or otherwise calculate the quantity. For instance, if the input it "2-3 lbs of chicken breast" the quantity should be "2"
     - Any text that does not appear in the unit or food must appear in the notes. No text should be left off. The only exception for this is if a quantity is converted from text into a number. For instance, if you convert "2 dozen" into the number "24", you should not put the word "dozen" into any other field
 
 It is imperative that you do not create any data or otherwise make up any information. Failure to adhere to this rule is illegal and will result in harsh punishment. If you are unsure, place the entire string into the note section of the response. Do not make things up.
 
-If you are not provided entires from the database to compare against, and you do not have any UUIDs to populate the schema with, so you should leave UUID fields empty. Do not create data out of thin air.
-
 In addition to calculating the recipe ingredient fields, you are also responsible for including a confidence value. This value is a float between 0 - 1, where 1 is full confidence that the result is correct, and 0 is no confidence that the result is correct. If you're unable to parse anything, and you put the entire string in the notes, you should return 0 confidence. If you can easily parse the string into each component, then you should return a confidence of 1. If you have to guess which part is the unit and which part is the food, your confidence should be lower, such as 0.6. Even if there is no unit or note, if you're able to determine the food, you may use a higher confidence. If the entire ingredient consists of only a food, you can use a confidence of 1.
 
 Below you will receive the JSON schema for your response. Your response must be in valid JSON in the below schema as provided. You must respond in this JSON schema; failure to do so is illegal. It is imperative that you follow the schema precisely to avoid punishment. You must follow the JSON schema.

From 594340230643d5c1939b615e7ba7f1827be6015f Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 22:01:08 +0000
Subject: [PATCH 22/29] lint

---
 mealie/services/openai/__init__.py             |  7 ++++++-
 mealie/services/openai/openai.py               | 18 ++++++++++--------
 mealie/services/parser_services/_base.py       |  2 +-
 .../parser_services/ingredient_parser.py       |  7 +++----
 .../services/parser_services/openai/parser.py  |  4 +++-
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/mealie/services/openai/__init__.py b/mealie/services/openai/__init__.py
index 0919383b5ba..8db69e2ebce 100644
--- a/mealie/services/openai/__init__.py
+++ b/mealie/services/openai/__init__.py
@@ -1 +1,6 @@
-from .openai import OpenAIService, OpenAIDataInjection
+from .openai import OpenAIDataInjection, OpenAIService
+
+__all__ = [
+    "OpenAIDataInjection",
+    "OpenAIService",
+]
diff --git a/mealie/services/openai/openai.py b/mealie/services/openai/openai.py
index e63f3f1e0eb..4ad331ada9b 100644
--- a/mealie/services/openai/openai.py
+++ b/mealie/services/openai/openai.py
@@ -1,14 +1,16 @@
-from mealie.core.config import get_app_settings
-from .._base_service import BaseService
-from openai import AsyncOpenAI, NOT_GIVEN
-
+import inspect
+import json
 import os
 from pathlib import Path
-from pydantic import BaseModel, field_validator
-import json
 from textwrap import dedent
-import inspect
+
+from openai import NOT_GIVEN, AsyncOpenAI
 from openai.resources.chat.completions import ChatCompletion
+from pydantic import BaseModel, field_validator
+
+from mealie.core.config import get_app_settings
+
+from .._base_service import BaseService
 
 
 class OpenAIDataInjection(BaseModel):
@@ -69,7 +71,7 @@ def get_prompt(cls, name: str, data_injections: list[OpenAIDataInjection] | None
         tree = name.split(".")
         prompt_dir = os.path.join(cls.PROMPTS_DIR, *tree[:-1], tree[-1] + ".txt")
         try:
-            with open(prompt_dir, "r") as f:
+            with open(prompt_dir) as f:
                 content = f.read()
         except OSError as e:
             raise OSError(f"Unable to load prompt {name}") from e
diff --git a/mealie/services/parser_services/_base.py b/mealie/services/parser_services/_base.py
index 82f28c7780f..4be2492ee4a 100644
--- a/mealie/services/parser_services/_base.py
+++ b/mealie/services/parser_services/_base.py
@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 from typing import TypeVar
+
 from pydantic import UUID4, BaseModel
 from rapidfuzz import fuzz, process
 from sqlalchemy.orm import Session
@@ -16,7 +17,6 @@
 )
 from mealie.schema.response.pagination import PaginationQuery
 
-
 T = TypeVar("T", bound=BaseModel)
 
 
diff --git a/mealie/services/parser_services/ingredient_parser.py b/mealie/services/parser_services/ingredient_parser.py
index 60a13e2ee07..5e1fe28867c 100644
--- a/mealie/services/parser_services/ingredient_parser.py
+++ b/mealie/services/parser_services/ingredient_parser.py
@@ -1,10 +1,9 @@
 from fractions import Fraction
+
 from pydantic import UUID4
 from sqlalchemy.orm import Session
-from ._base import ABCIngredientParser
-from mealie.core.root_logger import get_logger
-
 
+from mealie.core.root_logger import get_logger
 from mealie.schema.recipe import RecipeIngredient
 from mealie.schema.recipe.recipe_ingredient import (
     MAX_INGREDIENT_DENOMINATOR,
@@ -15,8 +14,8 @@
     RegisteredParser,
 )
 
-
 from . import brute, crfpp, openai
+from ._base import ABCIngredientParser
 
 logger = get_logger(__name__)
 
diff --git a/mealie/services/parser_services/openai/parser.py b/mealie/services/parser_services/openai/parser.py
index 24aff6aa063..1bfe641c767 100644
--- a/mealie/services/parser_services/openai/parser.py
+++ b/mealie/services/parser_services/openai/parser.py
@@ -1,8 +1,9 @@
 import asyncio
 import json
-from typing import Awaitable
+from collections.abc import Awaitable
 
 from pydantic import BaseModel
+
 from mealie.schema.recipe.recipe_ingredient import (
     CreateIngredientFood,
     CreateIngredientUnit,
@@ -11,6 +12,7 @@
     RecipeIngredient,
 )
 from mealie.services.openai import OpenAIDataInjection, OpenAIService
+
 from ..ingredient_parser import ABCIngredientParser
 
 

From 5607ca1b28265f067865c4c3b23fd871bbd0f935 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 22:03:48 +0000
Subject: [PATCH 23/29] fixed bad import

---
 mealie/services/parser_services/openai/parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mealie/services/parser_services/openai/parser.py b/mealie/services/parser_services/openai/parser.py
index 1bfe641c767..6b03ca04416 100644
--- a/mealie/services/parser_services/openai/parser.py
+++ b/mealie/services/parser_services/openai/parser.py
@@ -13,7 +13,7 @@
 )
 from mealie.services.openai import OpenAIDataInjection, OpenAIService
 
-from ..ingredient_parser import ABCIngredientParser
+from .._base import ABCIngredientParser
 
 
 class OpenAIIngredient(BaseModel):

From 5796c1fc98432401576c5282f0060a3232f5afd8 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 10 May 2024 22:12:45 +0000
Subject: [PATCH 24/29] more lint

---
 frontend/components/global/BaseOverflowButton.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/components/global/BaseOverflowButton.vue b/frontend/components/global/BaseOverflowButton.vue
index 775770b423e..5204bafb855 100644
--- a/frontend/components/global/BaseOverflowButton.vue
+++ b/frontend/components/global/BaseOverflowButton.vue
@@ -15,8 +15,8 @@
     <v-list v-if="mode === MODES.model" dense>
       <v-list-item-group v-model="itemGroup">
         <template v-for="(item, index) in items">
-          <div v-if="!item.hide">
-            <v-list-item :key="index" @click="setValue(item)">
+          <div v-if="!item.hide" :key="index">
+            <v-list-item @click="setValue(item)">
               <v-list-item-icon v-if="item.icon">
                 <v-icon>{{ item.icon }}</v-icon>
               </v-list-item-icon>
@@ -31,8 +31,8 @@
     <v-list v-else-if="mode === MODES.link" dense>
       <v-list-item-group v-model="itemGroup">
         <template v-for="(item, index) in items">
-          <div v-if="!item.hide">
-            <v-list-item :key="index" :to="item.to">
+          <div v-if="!item.hide" :key="index">
+            <v-list-item :to="item.to">
             <v-list-item-icon v-if="item.icon">
               <v-icon>{{ item.icon }}</v-icon>
             </v-list-item-icon>
@@ -46,8 +46,8 @@
     <!-- Event -->
     <v-list v-else-if="mode === MODES.event" dense>
       <template v-for="(item, index) in items">
-        <div v-if="!item.hide">
-          <v-list-item :key="index" @click="$emit(item.event)">
+        <div v-if="!item.hide" :key="index">
+          <v-list-item @click="$emit(item.event)">
             <v-list-item-icon v-if="item.icon">
               <v-icon>{{ item.icon }}</v-icon>
             </v-list-item-icon>

From 73e5332c123f5e46f2d0b7328f3187c840fff1ab Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Sat, 11 May 2024 17:22:55 +0000
Subject: [PATCH 25/29] prompt tweak

---
 .../openai/prompts/recipes/parse-recipe-ingredients.txt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
index 7cfb7826adb..33cb94f4298 100644
--- a/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
+++ b/mealie/services/openai/prompts/recipes/parse-recipe-ingredients.txt
@@ -2,7 +2,7 @@ You are a bot that parses user input into recipe ingredients. You will receive a
     - Food: the actual physical ingredient used in the recipe. For instance, if you receive "3 cups of onions, chopped", the food is "onions"
     - Unit: the unit of measurement for this ingredient. For instance, if you receive "2 lbs chicken breast", the unit is "lbs" (short for "pounds")
     - Quantity: the numerical representation of how much of this ingredient. For instance, if you receive "3 1/2 grams of minced garlic", the quantity is "3 1/2". Quantity may be represented as a whole number (integer), a float or decimal, or a fraction. You should output quantity in only whole numbers or floats, converting fractions into floats. Floats longer than 10 decimal places should be rounded to 10 decimal places.
-    - Note: the rest of the text that represents more detail on how to prepare the ingredient. Anything that is not one of the above should be the note. For instance, if you receive "one can of butter beans, drained" the note would be "drained". If you receive "3 cloves of garlic peeled and finely chopped", the note would be "finely chopped"
+    - Note: the rest of the text that represents more detail on how to prepare the ingredient. Anything that is not one of the above should be the note. For instance, if you receive "one can of butter beans, drained" the note would be "drained". If you receive "3 cloves of garlic peeled and finely chopped", the note would be "peeled and finely chopped"
     - Input: The input is simply the ingredient string you are processing as-is. It is forbidden to modify this at all, you must provide the input exactly as you received it
 
 While parsing the ingredients, there are some things to keep in mind:

From dbfa518970e549238ac31af5e12826aa320a8426 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Tue, 14 May 2024 15:20:09 +0000
Subject: [PATCH 26/29] changed default model to gpt-4o

---
 .../getting-started/installation/backend-config.md              | 2 +-
 mealie/core/settings/settings.py                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/documentation/getting-started/installation/backend-config.md b/docs/docs/documentation/getting-started/installation/backend-config.md
index 19fe76f2070..589745faf94 100644
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -111,7 +111,7 @@ Mealie supports various integrations using OpenAI. To enable OpenAI, [you must p
 | Variables                 |     Default   | Description                                                                                                                    |
 | ------------------------- |    :------:   | ------------------------------------------------------------------------------------------------------------------------------ |
 | OPENAI_API_KEY            |      None     | Your OpenAI API Key. Enables OpenAI-related features                                                                           |
-| OPENAI_MODEL              |  gpt-4-turbo  | Which OpenAI model to use. If you're not sure, leave this empty                                                                |
+| OPENAI_MODEL              |     gpt-4o    | Which OpenAI model to use. If you're not sure, leave this empty                                                                |
 | OPENAI_WORKERS            |       2       | Number of OpenAI workers per request. Higher values may increase processing speed, but will incur additional API costs         |
 | OPENAI_SEND_DATABASE_DATA |      True     | Whether to send Mealie data to OpenAI to improve request accuracy. This will incur additional API costs                        |
 
diff --git a/mealie/core/settings/settings.py b/mealie/core/settings/settings.py
index cc07a9db32b..7c0b6ab234a 100644
--- a/mealie/core/settings/settings.py
+++ b/mealie/core/settings/settings.py
@@ -212,7 +212,7 @@ def OIDC_READY(self) -> bool:
 
     OPENAI_API_KEY: str | None = None
     """Your OpenAI API key. Required to enable OpenAI features"""
-    OPENAI_MODEL: str = "gpt-4-turbo"
+    OPENAI_MODEL: str = "gpt-4o"
     """Which OpenAI model to send requests to. Leave this unset for most usecases"""
     OPENAI_WORKERS: int = 2
     """

From 36c991cf3f8b28e3c9acd351478ca4fb550d04d3 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Tue, 14 May 2024 19:18:41 +0000
Subject: [PATCH 27/29] added configurable base URL

---
 .../getting-started/installation/backend-config.md           | 1 +
 mealie/core/settings/settings.py                             | 2 ++
 mealie/services/openai/openai.py                             | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/docs/documentation/getting-started/installation/backend-config.md b/docs/docs/documentation/getting-started/installation/backend-config.md
index 589745faf94..baec1fa44d2 100644
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -110,6 +110,7 @@ Mealie supports various integrations using OpenAI. To enable OpenAI, [you must p
 
 | Variables                 |     Default   | Description                                                                                                                    |
 | ------------------------- |    :------:   | ------------------------------------------------------------------------------------------------------------------------------ |
+| OPENAI_BASE_URL           |      None     | The base URL for the OpenAI API. If you're not sure, leave this empty to use the standard OpenAI platform                      |
 | OPENAI_API_KEY            |      None     | Your OpenAI API Key. Enables OpenAI-related features                                                                           |
 | OPENAI_MODEL              |     gpt-4o    | Which OpenAI model to use. If you're not sure, leave this empty                                                                |
 | OPENAI_WORKERS            |       2       | Number of OpenAI workers per request. Higher values may increase processing speed, but will incur additional API costs         |
diff --git a/mealie/core/settings/settings.py b/mealie/core/settings/settings.py
index 7c0b6ab234a..8d6c6afea2c 100644
--- a/mealie/core/settings/settings.py
+++ b/mealie/core/settings/settings.py
@@ -210,6 +210,8 @@ def OIDC_READY(self) -> bool:
     # ===============================================
     # OpenAI Configuration
 
+    OPENAI_BASE_URL: str | None = None
+    """The base URL for the OpenAI API. Leave this unset for most usecases"""
     OPENAI_API_KEY: str | None = None
     """Your OpenAI API key. Required to enable OpenAI features"""
     OPENAI_MODEL: str = "gpt-4o"
diff --git a/mealie/services/openai/openai.py b/mealie/services/openai/openai.py
index 4ad331ada9b..961101ff8fc 100644
--- a/mealie/services/openai/openai.py
+++ b/mealie/services/openai/openai.py
@@ -51,7 +51,10 @@ def __init__(self) -> None:
         self.workers = settings.OPENAI_WORKERS
         self.send_db_data = settings.OPENAI_SEND_DATABASE_DATA
 
-        self.get_client = lambda: AsyncOpenAI(api_key=settings.OPENAI_API_KEY)
+        self.get_client = lambda: AsyncOpenAI(
+            base_url=settings.OPENAI_BASE_URL,
+            api_key=settings.OPENAI_API_KEY,
+        )
 
         super().__init__()
 

From d1e977d7e09a4703744142fea1c54717583483a5 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Tue, 14 May 2024 19:24:43 +0000
Subject: [PATCH 28/29] add openAI status to site settings

---
 frontend/lang/messages/en-US.json      | 5 ++++-
 frontend/pages/admin/site-settings.vue | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json
index 8514171bb37..3637a40ae54 100644
--- a/frontend/lang/messages/en-US.json
+++ b/frontend/lang/messages/en-US.json
@@ -765,7 +765,10 @@
     "recipe-scraper-version": "Recipe Scraper Version",
     "oidc-ready": "OIDC Ready",
     "oidc-ready-error-text": "Not all OIDC Values are configured. This can be ignored if you are not using OIDC Authentication.",
-    "oidc-ready-success-text": "Required OIDC variables are all set."
+    "oidc-ready-success-text": "Required OIDC variables are all set.",
+    "openai-ready": "OpenAI Ready",
+    "openai-ready-error-text": "Not all OpenAI Values are configured. This can be ignored if you are not using OpenAI features.",
+    "openai-ready-success-text": "Required OpenAI variables are all set."
   },
   "shopping-list": {
     "all-lists": "All Lists",
diff --git a/frontend/pages/admin/site-settings.vue b/frontend/pages/admin/site-settings.vue
index 49beba165e0..70bfb510a13 100644
--- a/frontend/pages/admin/site-settings.vue
+++ b/frontend/pages/admin/site-settings.vue
@@ -268,6 +268,15 @@ export default defineComponent({
                     color: appConfig.value.oidcReady ? goodColor : warningColor,
                     icon: appConfig.value.oidcReady ? goodIcon : warningIcon,
                 },
+                {
+                    id: "openai-ready",
+                    text: i18n.t("settings.openai-ready"),
+                    status: appConfig.value.enableOpenai,
+                    errorText: i18n.t("settings.openai-ready-error-text"),
+                    successText: i18n.t("settings.openai-ready-success-text"),
+                    color: appConfig.value.enableOpenai ? goodColor : warningColor,
+                    icon: appConfig.value.enableOpenai ? goodIcon : warningIcon,
+                },
             ];
             return data;
         });

From eec111d3ba32c01d3c6b1e5e925fa216e10e8db5 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Tue, 14 May 2024 23:20:29 +0000
Subject: [PATCH 29/29] added docstring

---
 mealie/services/parser_services/openai/parser.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mealie/services/parser_services/openai/parser.py b/mealie/services/parser_services/openai/parser.py
index 6b03ca04416..4d654541e5c 100644
--- a/mealie/services/parser_services/openai/parser.py
+++ b/mealie/services/parser_services/openai/parser.py
@@ -17,6 +17,13 @@
 
 
 class OpenAIIngredient(BaseModel):
+    """
+    This class defines the JSON schema sent to OpenAI. Its schema is
+    injected directly into the OpenAI prompt.
+    """
+
+    __doc__ = ""  # we don't want to include the docstring in the JSON schema
+
     input: str
     confidence: float | None = None