fix: Ingredient Parser Drops Units Sometimes (#6150)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.devcontainer/Dockerfile

@@ -1,8 +1,8 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.224.2/containers/python-3/.devcontainer/base.Dockerfile
 
 # [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
-ARG VARIANT="3.10-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
+ARG VARIANT="3.12-bullseye"
+FROM mcr.microsoft.com/devcontainers/python:${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
 ARG NODE_VERSION="none"
@@ -14,6 +14,7 @@ RUN echo "export PROMPT_COMMAND='history -a'" >> /home/vscode/.bashrc \
     && echo "export HISTFILE=~/commandhistory/.bash_history" >> /home/vscode/.bashrc \
     && chown vscode:vscode -R /home/vscode/
 
+RUN npm install -g @go-task/cli
 
 ENV PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
@@ -21,12 +22,12 @@ ENV PYTHONUNBUFFERED=1 \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
     PIP_DEFAULT_TIMEOUT=100 \
     POETRY_HOME="/opt/poetry" \
-    POETRY_VIRTUALENVS_CREATE=false
+    POETRY_VIRTUALENVS_IN_PROJECT=true
 
 # prepend poetry and venv to path
 ENV PATH="$POETRY_HOME/bin:$PATH"
 
-RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python -
+RUN curl -sSL https://install.python-poetry.org | python3 -
 # RUN poetry config virtualenvs.create false
 
 RUN apt-get update \
@@ -37,4 +38,6 @@ RUN apt-get update \
     libwebp-dev \
     libsasl2-dev libldap2-dev libssl-dev \
     gnupg gnupg2 gnupg1
-#     && pip install -U --no-cache-dir pip
+
+# create directory used for Docker Secrets
+RUN mkdir -p /run/secrets

.devcontainer/devcontainer.json

@@ -9,45 +9,52 @@
       // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6
       // Append -bullseye or -buster to pin to an OS version.
       // Use -bullseye variants on local on arm64/Apple Silicon.
-      "VARIANT": "3.10-bullseye",
+      "VARIANT": "3.12-bullseye",
       // Options
-      "NODE_VERSION": "16"
+      "NODE_VERSION": "20"
     }
   },
   "mounts": [
     "source=mealie-devcontainer-workspace,target=/workspaces/mealie/frontend/node_modules,type=volume",
     "source=mealie-bashhistory,target=/home/vscode/commandhistory,type=volume"
   ],
-  // Set *default* container specific settings.json values on container create.
-  "settings": {
-    "python.defaultInterpreterPath": "/usr/local/bin/python",
-    "python.linting.enabled": true,
-    "python.linting.pylintEnabled": true,
-    "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-    "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-    "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-    "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-    "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-    "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-    "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-    "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-    "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "python.defaultInterpreterPath": "/usr/local/bin/python",
+        "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+        "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+        "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+        "mypy.runUsingActiveInterpreter": true
+      },
+      "extensions": [
+        "charliermarsh.ruff",
+        "dbaeumer.vscode-eslint",
+        "matangover.mypy",
+        "ms-python.black-formatter",
+        "ms-python.pylint",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "Vue.volar"
+      ]
+    }
   },
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": [
-    "ms-python.python",
-    "ms-python.vscode-pylance"
-  ],
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": [
     3000,
-    9000
+    9000,
+    9091, // used by docker production
+    24678 // used by nuxt when hot-reloading using polling
   ],
+  // Use 'onCreateCommand' to run commands at the end of container creation.
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "sudo chown -R vscode:vscode /workspaces/mealie/frontend/node_modules && make setup",
+  "onCreateCommand": "sudo chown -R vscode:vscode /workspaces/mealie/frontend/node_modules /home/vscode/commandhistory && task setup",
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode",
-  // "features": {
-  //   "git": "latest"
-  // }
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
+      "dockerDashComposeVersion": "v2"
+    }
+  },
+  "appPort": 3000
 }

.dockerignore

@@ -1,17 +1,19 @@
 .git
 .github
 .dockerignore
+.gitattributes
 .gitignore
 .idea
 .vscode
 
-__pycache__/
+**/__pycache__/
 *.py[cod]
 *$py.class
 *.so
 htmlcov/
 .coverage
 .coverage.*
+.pylintrc
 .pytest_cache/
 .venv
 venv
@@ -23,8 +25,10 @@ venv
 
 */node_modules
 */dist
+/dist/
 */data/db
-*/mealie/test 
+*/mealie/test
 */mealie/.temp
+/mealie/frontend/
 
-model.crfmodel
+crowdin.yml

.flake8

@@ -1,10 +0,0 @@
-[flake8]
-extend-ignore = [
-    E501 # Line Length - See Black Config in pyproject.toml
-    E402 # Import Not at Top of File
-]
-exclude = _all_models.py
-
-
-per-file-ignores = 
-    __init__.py:F403,F401

.gitattributes

@@ -1,2 +1,2 @@
 *.css linguist-detectable=false
-*.html linguist-detectable=false
+*.html linguist-detectable=false

.github/DISCUSSION_TEMPLATE/feature-request.yaml

@@ -0,0 +1,41 @@
+---
+title: "YOUR TITLE"
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: First Check
+      description: |
+        Please confirm and check all the following prior to submission. If you do not do this, your
+        issue may be closed.
+      options:
+        - label: I used the GitHub search to find a similar requests and didn't find it.
+          required: true
+        - label: Checked the [tasks tagged](https://github.com/mealie-recipes/mealie/issues?q=is%3Aissue+is%3Aopen+label%3Atask+) issues and verified my feature is not covered
+          required: true
+  - type: textarea
+    id: problem
+    attributes:
+      label: Please provide a concise description of the problem that would be addressed by this feature.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Please provide a concise description of the feature that would resolve your issue.
+    validations:
+      required: true
+  - type: textarea
+    id: considerations
+    attributes:
+      label: Please consider and list out some caveats or tradeoffs made in your design decision
+    validations:
+      required: true
+  - type: checkboxes
+    id: additional-information
+    attributes:
+      label: Additional Information
+      options:
+        - label: If this is accepted I'm willing to submit a PR to provide this feature
+        - label: If this is accepted I'm willing to help maintain this feature
+        - label: I'm willing to sponsor/pay a developer to do this work

.github/DISCUSSION_TEMPLATE/oauth-provider-example.yaml

@@ -0,0 +1,9 @@
+---
+title: OAuth setup with <PROVIDER>
+body:
+- type: textarea
+  attributes:
+    label: Configuration Example
+    description: Add your example configuration. You can provide code blocks, screenshots, and links.
+  validations:
+    required: true

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,16 +1,20 @@
 ---
-name: "[v0.5.x] Bug Report"
-description: "submit a bug report for the current release"
+name: Bug Report
+description: "Submit a bug for the latest version of Mealie"
+title: "[BUG] - YOUR DESCRIPTIVE TITLE GOES HERE"
+labels: ["bug", "triage"]
 body:
   - type: checkboxes
     id: checks
     attributes:
       label: First Check
-      description: Please confirm and check all the following options.
+      description: |
+        Please confirm and check all the following prior to submission. If you do not do this, your
+        issue may be closed.
       options:
-        - label: This is not a feature request
+        - label: This is not a feature request.
           required: true
-        - label: I added a very descriptive title to this issue.
+        - label: I added a very descriptive title to this issue (title field is above this).
           required: true
         - label: I used the GitHub search to find a similar issue and didn't find it.
           required: true
@@ -18,8 +22,8 @@ body:
           required: true
         - label: I already read the docs and didn't find an answer.
           required: true
-        - label: I have checked for existing issues that have been resolved in v1-beta
-          required: true
+        - label: This issue can be replicated on the demo site (https://demo.mealie.io/).
+          required: false
   - type: textarea
     id: description
     attributes:
@@ -27,6 +31,25 @@ body:
       placeholder: A clear and concise description of what the bug is.
     validations:
       required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to Reproduce
+      placeholder: 1) ... 2) ... 3) ...
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Please provide relevant logs
+      placeholder: For example from `docker compose logs` or other system logs.
+    validations:
+      required: true
+  - type: textarea
+    id: version
+    attributes:
+      label: Mealie Version
+      placeholder: Docker image, as well as 'Build' tag from https://yourmealieurl/admin/site-settings, if UI is working
   - type: dropdown
     id: os
     attributes:
@@ -38,17 +61,11 @@ body:
         - Docker (Windows)
         - Docker (Synology)
         - Unraid
-        - Other
+        - TrueNAS
+        - Other (please specify below)
     validations:
       required: true
   - type: textarea
-    id: os-details
+    id: other
     attributes:
-      label: Deployment Details
-      description: You can add more details about your operating system here, in particular if you chose "Other". If you are experiencing issues with deployment, please provide your docker-compose or docker commands
-  - type: input
-    id: mealie-version
-    attributes:
-      label: Mealie Version
-    validations:
-      required: true
+      label: Additional Deployment Details

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
 contact_links:
   - name: Feature Requests
-    url: https://github.com/hay-kot/mealie/issues/122
-    about: Please add any Feature Requests here.
+    url: https://github.com/mealie-recipes/mealie/discussions/new?category=feature-request
+    about: Please add any Feature Requests as a Github Discussion using the form in this issue.

.github/ISSUE_TEMPLATE/recipe-scraper-bug.yaml

@@ -0,0 +1,53 @@
+---
+name: Error Scraping Recipe
+description: "Submit a bug or issues related to scraping recipes"
+title: "[SCRAPER] - YOUR TITLE"
+labels: ["bug", "triage", "scraper"]
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: First Check
+      description: |
+        Please confirm and check all the following prior to submission. If you do not do this, your
+        issue may be closed.
+      options:
+        - label: I used the GitHub search to find a similar issue and didn't find it.
+          required: true
+        - label: |
+            I have verified that this issue _is not_ related to the underlying library
+            [hhyrsev/recipe-scrapers](https://github.com/hhursev/recipe-scrapers) by **1)** checking
+            the [debugger](https://demo.mealie.io/g/home/r/create/debug) and data is returned, **2)**
+            verifying that there _are_ errors in the log related to application level code, or
+            **3)** verified that the site provides recipe data, or is otherwise supported by
+            [hhyrsev/recipe-scrapers](https://github.com/hhursev/recipe-scrapers)
+          required: true
+        - label: This issue can be replicated on the demo site (https://demo.mealie.io/)
+          required: false
+  - type: textarea
+    id: urls
+    attributes:
+      label: Please provide 1-5 example URLs that are having errors
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: |
+        Please provide your logs for the Mealie container `docker logs <container-id> > mealie.logs`
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Deployment
+      description: What Deployment system are you using?
+      multiple: true
+      options:
+        - Docker (Linux)
+        - Docker (Windows)
+        - Docker (Synology)
+        - Unraid
+        - Other
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/task.yaml

@@ -1,27 +1,27 @@
 ---
-name: v1.0.0b Task
+name: Task
 description: "CONTRIBUTORS ONLY: Submit a Task that needs to be completed"
-title: "[v1.0.0b] [Task] - TASK DESCRIPTION"
+title: "[Task] - TASK DESCRIPTION"
 labels:
   - task
-  - v1
+  - v2
 body:
   - type: markdown
     attributes:
       value: |
         Thanks for your interest in Mealie! 🚀
 
-        This is a place for Mealie contributors to find tasks that need to get done around the repository. Tasks are different than issues as they are generally related to providing a new feature or improve an existing feature. They are _generally_ not related to an issue.
+        This is a place for Mealie contributors to find tasks that need to get done around the repository. Tasks are different than issues as they are generally related to providing a new feature or improving an existing feature. They are _generally_ not related to an issue.
 
         **DO NOT** create a task unless
-        - You are a contributors who has prior approval via discord/discussions
+        - You are a contributor who has prior approval via discord/discussions
         - You have otherwise been given approval to post the tasks
 
         Otherwise, your post will be closed/deleted.
 
         **Interested in Taking This?**
 
-        If you're interested in completing this tasks and it hasn't already been taken, comment below and to let others know you're working on it. As you work through the task, I ask that you submit a draft pull request as soon as possible, and tag this issue so we can all collaborate as best as possible.
+        If you're interested in completing this task and it hasn't already been taken, comment below and to let others know you're working on it. As you work through the task, I ask that you submit a draft pull request as soon as possible, and tag this issue so we can all collaborate as best as possible.
   - type: textarea
     id: problem
     attributes:
@@ -33,6 +33,6 @@ body:
     id: solution
     attributes:
       label: Proposed/Possible Solution(s)?
-      placeholder: Provide as much context around the idea as possible with potential files and roadblocks that may come up
+      placeholder: Provide as much context around the idea as possible with potential files and roadblocks that may come up.
     validations:
       required: true

.github/ISSUE_TEMPLATE/v1-bug-report.yaml

@@ -1,47 +0,0 @@
----
-name: v1.0.0b Bug Report
-description: "submit a bug report for the v1 beta"
-title: "[v1.0.0b] - YOUR TITLE"
-body:
-  - type: checkboxes
-    id: checks
-    attributes:
-      label: First Check
-      description: Please confirm and check all the following options.
-      options:
-        - label: This is not a feature request
-          required: true
-        - label: I added a very descriptive title to this issue.
-          required: true
-        - label: I used the GitHub search to find a similar issue and didn't find it.
-          required: true
-        - label: I searched the Mealie documentation, with the integrated search.
-          required: true
-        - label: I already read the docs and didn't find an answer.
-          required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: What is the issue you are experiencing?
-      placeholder: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Deployment
-      description: What Deployment system are you using?
-      multiple: true
-      options:
-        - Docker (Linux)
-        - Docker (Windows)
-        - Docker (Synology)
-        - Unraid
-        - Other
-    validations:
-      required: true
-  - type: textarea
-    id: os-details
-    attributes:
-      label: Deployment Details
-      description: You can add more details about your operating system here, in particular if you chose "Other". If you are experiencing issues with deployment, please provide your docker-compose or docker commands

.github/dependabot.yml

@@ -1,32 +0,0 @@
-version: 2
-updates:
-  # Fetch and update latest `npm` packages
-  - package-ecosystem: npm
-    directory: "/frontend"
-    schedule:
-      interval: daily
-      time: "00:00"
-    open-pull-requests-limit: 10
-    reviewers:
-      - hay-kot
-    assignees:
-      - hay-kot
-    commit-message:
-      prefix: fix
-      prefix-development: chore
-      include: scope
-  # Fetch and update latest `github-actions` pkgs
-  - package-ecosystem: github-actions
-    directory: "/frontend"
-    schedule:
-      interval: daily
-      time: "00:00"
-    open-pull-requests-limit: 10
-    reviewers:
-      - hay-kot
-    assignees:
-      - hay-kot
-    commit-message:
-      prefix: fix
-      prefix-development: chore
-      include: scope

.github/pull_request_template.md

@@ -0,0 +1,63 @@
+<!--
+  This template provides some ideas of things to include in your PR description.
+
+  To start, try providing a short summary of your changes in the Title above. We follow Conventional Commits syntax, please ensure your title is prefixed with one of:
+  - `feat: `
+  - `fix: `
+  - `docs: `
+  - `chore: `
+  - `dev:`
+
+  If a section of the PR template does not apply to this PR, then delete that section.
+
+  PLEASE READ:
+  -------------------------
+  Mealie is moving to a regular, automatic release schedule. This means that all PRs should be in a
+  stable state, ready for release. This includes:
+
+  - Ensuring new tests have been added to cover new features, or to prevent regressions.
+  - Work is fully complete and usable
+
+ -->
+
+## What this PR does / why we need it:
+
+_(REQUIRED)_
+
+<!--
+  What goal is this change working towards?
+  Provide a bullet pointed summary of how each file was changed.
+  Briefly explain any decisions you made with respect to the changes.
+  Include anything here that you didn't include in *Release Notes*
+  above, such as changes to CI or changes to internal methods.
+
+  If there is a UI component to the change, please include before/after images.
+-->
+
+## Which issue(s) this PR fixes:
+
+_(REQUIRED)_
+
+<!--
+If this PR fixes one of more issues, list them here.
+One per line, like so:
+Fixes #123
+Fixes #39
+-->
+
+## Special notes for your reviewer:
+
+_(fill-in or delete this section)_
+
+<!--
+   Is there any particular feedback you would / wouldn't like?
+   Which parts of the code should reviewers focus on?
+-->
+
+## Testing
+
+_(fill-in or delete this section)_
+
+<!--
+  Describe how you tested this change.
+-->

.github/release-drafter.yml

@@ -0,0 +1,88 @@
+---
+name-template: "v$RESOLVED_VERSION"
+tag-template: "v$RESOLVED_VERSION"
+change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
+sort-direction: ascending
+
+categories:
+  - title: "🚨 Breaking changes"
+    labels:
+      - "breaking-change"
+      - "major"
+  - title: "✨ New features"
+    labels:
+      - "feature"
+      - "minor"
+  - title: "🐛 Bug fixes"
+    labels:
+      - "bugfix"
+  - title: "🧰 Maintenance"
+    collapse-after: 3
+    labels:
+      - "ci"
+      - "chore"
+      - "l10n"
+  - title: "📚 Documentation"
+    labels:
+      - "documentation"
+  - title: "🔨 Internal development"
+    labels:
+      - "dev"
+  - title: "⬆️ Dependency updates"
+    collapse-after: 3
+    labels:
+      - "dependencies"
+
+version-resolver:
+  major:
+    labels:
+      - "major"
+      - "breaking-change"
+  minor:
+    labels:
+      - "minor"
+      - "feature"
+  patch:
+    labels:
+      - "bugfix"
+      - "chore"
+      - "ci"
+      - "dependencies"
+      - "documentation"
+      - "l10n"
+      - "dev"
+  default: patch
+
+template: |
+  # 🍴🍴🍴🍴🍴🍴
+
+  ## 🎉 Highlights
+
+  - Highlight 1
+
+  - Highlight 2
+
+  $CHANGES
+
+  ## 🙏 New Contributors
+
+  !!! Need to source this from GitHub's auto generated release notes !!!
+
+  # 🍴🍴🍴🍴🍴🍴
+
+autolabeler:
+  - label: 'feature'
+    title:
+      - '/feat/i'
+  - label: 'bugfix'
+    title:
+      - '/fix:/i'
+  - label: 'documentation'
+    title:
+      - '/docs:/i'
+  - label: 'chore'
+    title:
+      - '/chore:/i'
+  - label: 'dev'
+    title:
+      - '/dev:/i'

.github/stale.yml

@@ -1,21 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - early-stages
-  - "bug: confirmed"
-  - feedback
-  - task
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/workflows/backend-docker-nightly.yml

@@ -1,63 +0,0 @@
-name: Backend - Nightly Build
-
-on:
-  push:
-    branches:
-      - mealie-next
-
-concurrency:
-  group: backend-nightly-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      #
-      # Checkout
-      #
-      - name: checkout code
-        uses: actions/checkout@v2
-      #
-      # Setup QEMU
-      #
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v1
-        with:
-          image: tonistiigi/binfmt:latest
-          platforms: all
-      #
-      # Setup Buildx
-      #
-      - name: install buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          install: true
-      #
-      # Login to Docker Hub
-      #
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      #
-      # Build
-      #
-      - name: build the image
-        run: |
-          docker build --push --no-cache \
-            --tag hkotel/mealie:api-nightly \
-            --build-arg COMMIT=$(git rev-parse HEAD) \
-            --platform linux/amd64,linux/arm64 .
-      #
-      # Build Discord Notification
-      #
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_NIGHTLY_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.3.2
-        with:
-          args: "🚀  A New build of mealie:api-nightly  is available"

.github/workflows/backend-tests.yml

@@ -1,92 +0,0 @@
-name: Backend Tests
-on:
-  push:
-    branches:
-      - mealie-next
-  pull_request:
-    branches:
-      - mealie-next
-    types: [synchronize, opened, reopened, ready_for_review]
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-
-    env:
-      PRODUCTION: false
-
-    strategy:
-      fail-fast: true
-      matrix:
-        # Database ENV Variablse as Specified by Mealie
-        Database: [sqlite, postgres]
-
-    # Services
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: mealie
-          POSTGRES_PASSWORD: mealie
-          POSTGRES_DB: mealie
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-        ports:
-          - 5432:5432
-    # Steps
-    steps:
-      #----------------------------------------------
-      #       check-out repo and set-up python
-      #----------------------------------------------
-      - name: Check out repository
-        uses: actions/checkout@v2
-      - name: Set up python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.10"
-      #----------------------------------------------
-      #  -----  install & configure poetry  -----
-      #----------------------------------------------
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-      #----------------------------------------------
-      #       load cached venv if cache exists
-      #----------------------------------------------
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v2
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
-      #----------------------------------------------
-      # install dependencies if cache does not exist
-      #----------------------------------------------
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsasl2-dev libldap2-dev libssl-dev
-          poetry install
-          poetry add "psycopg2-binary==2.8.6"
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-
-      #----------------------------------------------
-      #              run test suite
-      #----------------------------------------------
-      - name: Formatting (Black & isort)
-        run: |
-          poetry run black . --check
-          poetry run isort . --check-only
-      - name: Lint (Flake8)
-        run: |
-          make backend-lint
-      - name: Mypy Typecheck
-        run: |
-          make backend-typecheck
-      - name: Pytest
-        env:
-          DB_ENGINE: ${{ matrix.Database }}
-          POSTGRES_SERVER: localhost
-        run: |
-          make backend-test

.github/workflows/beta-release.yml

@@ -1,75 +0,0 @@
-name: Docker Build Production
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      #
-      # Get Release Version
-      #
-      - uses: oprypin/find-latest-tag@v1
-        with:
-          repository: hay-kot/mealie # The repository to scan.
-          releases-only: true # We know that all relevant tags have a GitHub release for them.
-        id: mealie_version # The step ID to refer to later.
-      #
-      # Checkout
-      #
-      - name: checkout code
-        uses: actions/checkout@v2
-      #
-      # Setup QEMU
-      #
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v1
-        with:
-          image: tonistiigi/binfmt:latest
-          platforms: all
-      #
-      # Setup Buildx
-      #
-      - name: install buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          install: true
-      #
-      # Login to Docker Hub
-      #
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      #
-      # Build Backend
-      #
-      - name: build the image
-        run: |
-          docker build --push --no-cache \
-            --tag hkotel/mealie:api-${{ steps.mealie_version.outputs.tag }}  \
-            --build-arg COMMIT=$(git rev-parse HEAD) \
-            --platform linux/amd64,linux/arm64 .
-      #
-      # Build Frontend
-      #
-      - name: build the image
-        working-directory: "frontend"
-        run: |
-          docker build --push --no-cache \
-            --tag hkotel/mealie:frontend-${{ steps.mealie_version.outputs.tag }} \
-            --platform linux/amd64,linux/arm64 .
-      #
-      # Release Discord Notification
-      #
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.3.2
-        with:
-          args: '🚀  Version {{ EVENT_PAYLOAD.release.tag_name }} of Mealie has been released. See the release notes https://github.com/hay-kot/mealie/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}'

.github/workflows/build-package.yml

@@ -0,0 +1,102 @@
+name: Build Package
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        required: true
+        type: string
+
+jobs:
+  build-frontend:
+    name: Build frontend
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout 🛎
+        uses: actions/checkout@v4
+
+      - name: Setup node env 🏗
+        uses: actions/setup-node@v4.0.0
+        with:
+          node-version: 20
+          check-latest: true
+
+      - name: Get yarn cache directory path 🛠
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache node_modules 📦
+        uses: actions/cache@v4
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install dependencies 👨🏻‍💻
+        run: yarn
+        working-directory: "frontend"
+
+      - name: Run Build 🚚
+        run: yarn generate
+        working-directory: "frontend"
+
+      - name: Archive built frontend
+        uses: actions/upload-artifact@v4
+        with:
+          name: frontend-dist
+          path: frontend/dist
+          retention-days: 5
+
+  build-package:
+    name: Build Python package
+    needs: build-frontend
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install Task
+        uses: arduino/setup-task@v2
+        with:
+          version: 3.x
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          plugins: |
+            poetry-plugin-export
+
+      - name: Retrieve built frontend
+        uses: actions/download-artifact@v4
+        with:
+          name: frontend-dist
+          path: mealie/frontend
+
+      - name: Override __init__.py
+        run: |
+          echo "__version__ = \"${{ inputs.tag }}\"" > ./mealie/__init__.py
+
+      - name: Build package and requirements.txt
+        env:
+          SKIP_PACKAGE_DEPS: true
+        run: |
+          task py:package
+
+      - name: Archive built package
+        uses: actions/upload-artifact@v4
+        with:
+          name: backend-dist
+          path: dist
+          retention-days: 5

.github/workflows/codeql.yml

@@ -0,0 +1,80 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "mealie-next" ]
+  schedule:
+    - cron: '36 9 * * 3'
+  workflow_call:
+
+jobs:
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript-typescript', 'python' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/e2e.yml

@@ -0,0 +1,52 @@
+name: E2E Tests
+on:
+  workflow_call:
+
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./tests/e2e
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20
+        cache: 'yarn'
+        cache-dependency-path: ./tests/e2e/yarn.lock
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Retrieve Python package
+      uses: actions/download-artifact@v4
+      with:
+        name: backend-dist
+        path: dist
+    - name: Build Image
+      uses: docker/build-push-action@v5
+      with:
+        file: ./docker/Dockerfile
+        context: .
+        build-contexts: |
+          packages=dist
+        push: false
+        load: true
+        tags: mealie:e2e
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+    - name: Deploy E2E Test Environment
+      run: docker compose up -d
+      working-directory: ./tests/e2e/docker
+    - name: Install dependencies
+      run: npm install -g yarn && yarn
+    - name: Install Playwright Browsers
+      run: yarn playwright install --with-deps
+    - name: Check test environment
+      run: docker ps
+    - name: Run Playwright tests
+      run: yarn playwright test
+    - name: Destroy Test Environment
+      if: always()
+      run: docker compose down --volumes
+      working-directory: ./tests/e2e/docker

.github/workflows/frontend-docker-nightly.yml

@@ -1,63 +0,0 @@
-name: Frontend - Nightly Build
-
-on:
-  push:
-    branches:
-      - mealie-next
-
-concurrency:
-  group: frontend-nightly-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      #
-      # Checkout
-      #
-      - name: checkout code
-        uses: actions/checkout@v2
-      #
-      # Setup QEMU
-      #
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v1
-        with:
-          image: tonistiigi/binfmt:latest
-          platforms: all
-      #
-      # Setup Buildx
-      #
-      - name: install buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          install: true
-      #
-      # Login to Docker Hub
-      #
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      #
-      # Build
-      #
-      - name: build the image
-        working-directory: "frontend"
-        run: |
-          docker build --push --no-cache \
-            --tag hkotel/mealie:frontend-nightly \
-            --platform linux/amd64,linux/arm64 .
-      #
-      # Build Discord Notification
-      #
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_NIGHTLY_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.3.2
-        with:
-          args: "🚀  A New build of mealie:frontend-nightly is available"

.github/workflows/locale-sync.yml

@@ -0,0 +1,115 @@
+name: Automatic Locale Sync
+
+on:
+  schedule:
+    # Run every Sunday at 2 AM UTC
+    - cron: "0 2 * * 0"
+  workflow_dispatch:
+    # Allow manual triggering from the GitHub UI
+
+permissions:
+  contents: write # To checkout, commit, and push changes
+  pull-requests: write # To create pull requests
+
+jobs:
+  sync-locales:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v4
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+
+      - name: Check venv cache
+        id: cache-validate
+        if: steps.cached-poetry-dependencies.outputs.cache-hit == 'true'
+        run: |
+          echo "import fastapi;print('venv good?')" > test.py && poetry run python test.py && echo "cache-hit-success=true" >> $GITHUB_OUTPUT
+          rm test.py
+        continue-on-error: true
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install libsasl2-dev libldap2-dev libssl-dev
+          poetry install
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+
+      - name: Run locale generation
+        run: |
+          cd dev/code-generation
+          poetry run python main.py locales
+        env:
+          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
+
+      - name: Check for changes
+        id: changes
+        run: |
+          if git diff --quiet; then
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+          else
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Commit and create PR
+        if: steps.changes.outputs.has_changes == 'true'
+        run: |
+          # Configure git
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+
+          # Use the current branch as the base
+          BASE_BRANCH="${{ github.ref_name }}"
+          echo "Using base branch: $BASE_BRANCH"
+
+          # Create a new branch from the base branch
+          BRANCH_NAME="auto-locale-sync-$(date +%Y%m%d-%H%M%S)"
+          git checkout -b "$BRANCH_NAME"
+
+          # Add and commit changes
+          git add .
+          git commit -m "chore: crowdin locale sync"
+
+          # Push the branch
+          git push origin "$BRANCH_NAME"
+
+          sleep 2
+
+          # Create PR using GitHub CLI with explicit repository
+          gh pr create \
+            --repo "${{ github.repository }}" \
+            --title "chore(l10n): Crowdin locale sync" \
+            --base "$BASE_BRANCH" \
+            --head "$BRANCH_NAME" \
+            --label "l10n" \
+            --body "## Summary
+
+          Automatically generated locale updates from the weekly sync job.
+
+          ## Changes
+          - Updated frontend locale files
+          - Generated from latest translation sources" \
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: No changes detected
+        if: steps.changes.outputs.has_changes == 'false'
+        run: echo "No locale changes detected, skipping PR creation"

.github/workflows/nightly.yml

@@ -0,0 +1,67 @@
+name: Docker Nightly Production
+
+on:
+  push:
+    branches:
+      - mealie-next
+    paths-ignore:
+      - '*.md'
+      - '.devcontainer/**'
+      # I'm not excluding .github as changes in there might be to workflows etc
+      - '.vscode/**'
+      - 'docs/**'
+
+concurrency:
+  group: nightly-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  backend-tests:
+    name: "Backend Server Tests"
+    uses: ./.github/workflows/test-backend.yml
+
+  frontend-tests:
+    name: "Frontend Tests"
+    uses: ./.github/workflows/test-frontend.yml
+
+  build-package:
+    name: Build Package
+    uses: ./.github/workflows/build-package.yml
+    with:
+      tag: nightly
+
+  publish:
+    permissions:
+      contents: read
+      packages: write
+      # The id-token write permission is needed to connect to Depot.dev
+      # as part of the partial-builder.yml action. It needs to be declared
+      # in the parent action, as noted here:
+      # https://github.com/orgs/community/discussions/76409#discussioncomment-8131390
+      id-token: write
+    name: Build Tagged Release
+    if: github.repository == 'mealie-recipes/mealie'
+    uses: ./.github/workflows/publish.yml
+    needs:
+      - frontend-tests
+      - backend-tests
+      - build-package
+    with:
+      tag: nightly
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  notify-discord:
+    name: Notify Discord
+    if: github.repository == 'mealie-recipes/mealie'
+    needs:
+      - publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_NIGHTLY_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.2
+        with:
+          args: "🚀  New builds of ghcr.io/mealie-recipes/mealie:nightly"

.github/workflows/partial-trivy-container-scanning.yml

@@ -0,0 +1,33 @@
+name: Trivy Container Scanning
+
+on:
+  workflow_call:
+
+jobs:
+  build:
+    name: Build and Scan Container
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Build Dockerfile
+        run: |
+          docker build -t mealie --file=./docker/Dockerfile .
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          ignore-unfixed: true
+          image-ref: "mealie"
+          format: "sarif"
+          output: "trivy-results.sarif"
+        env:
+          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: "trivy-results.sarif"

.github/workflows/publish.yml

@@ -0,0 +1,61 @@
+name: Build Containers
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        required: true
+        type: string
+      tags:
+        required: false
+        type: string
+    secrets:
+      DOCKERHUB_USERNAME:
+        required: true
+      DOCKERHUB_TOKEN:
+        required: true
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the Container registry (ghcr.io)
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Log in to the Container registry (dockerhub)
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - uses: depot/setup-action@v1
+
+      - name: Retrieve Python package
+        uses: actions/download-artifact@v4
+        with:
+          name: backend-dist
+          path: dist
+
+      - name: Build and push Docker image, via Depot.dev
+        uses: depot/build-push-action@v1
+        with:
+          project: srzjb6mhzm
+          file: ./docker/Dockerfile
+          context: .
+          build-contexts: |
+            packages=dist
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            hkotel/mealie:${{ inputs.tag }}
+            ghcr.io/${{ github.repository }}:${{ inputs.tag }}
+            ${{ inputs.tags }}
+          build-args: |
+            COMMIT=${{ github.sha }}

.github/workflows/pull-request-lint.yml

@@ -0,0 +1,43 @@
+name: Pull Request Linter
+
+on:
+  workflow_call:
+  pull_request:
+    types: [edited] # This captures the PR title changing
+    branches:
+      - mealie-next
+
+jobs:
+  validate-title:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      # https://github.com/amannn/action-semantic-pull-request
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # Configure which types are allowed (newline-delimited).
+          # Default: https://github.com/commitizen/conventional-commit-types
+          types: |
+            feat
+            fix
+            docs
+            chore
+            dev
+          # Configure which scopes are allowed (newline-delimited).
+          # These are regex patterns auto-wrapped in `^ $`.
+          scopes: |
+            deps
+            auto
+            l10n
+            config
+          # Configure that a scope must always be provided.
+          requireScope: false
+          # If the PR contains one of these newline-delimited labels, the
+          # validation is skipped. If you want to rerun the validation when
+          # labels change, you might want to use the `labeled` and `unlabeled`
+          # event triggers in your workflow.
+          ignoreLabels: |
+            bot
+            ignore-semantic-pull-request

.github/workflows/pull-requests.yml

@@ -0,0 +1,65 @@
+name: PR CI
+
+on:
+  pull_request:
+    branches:
+      - mealie-next
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  pull-request-lint:
+    name: "Lint PR"
+    uses: ./.github/workflows/pull-request-lint.yml
+
+  backend-tests:
+    name: "Backend Server Tests"
+    uses: ./.github/workflows/test-backend.yml
+
+  frontend-tests:
+    name: "Frontend Tests"
+    uses: ./.github/workflows/test-frontend.yml
+
+  container-scanning:
+    name: "Trivy Container Scanning"
+    uses: ./.github/workflows/partial-trivy-container-scanning.yml
+
+  code-ql:
+    name: "CodeQL"
+    uses: ./.github/workflows/codeql.yml
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+  build-package:
+    name: "Build Python package"
+    uses: ./.github/workflows/build-package.yml
+    with:
+      tag: e2e
+
+  end-to-end:
+    name: "End-to-End Tests"
+    needs: build-package
+    uses: ./.github/workflows/e2e.yml
+
+  publish-image:
+    name: "Publish PR Image"
+    if: contains(github.event.pull_request.labels.*.name, 'build-image') && github.repository == 'mealie-recipes/mealie'
+    permissions:
+      contents: read
+      packages: write
+      # The id-token write permission is needed to connect to Depot.dev
+      # as part of the partial-builder.yml action. It needs to be declared
+      # in the parent action, as noted here:
+      # https://github.com/orgs/community/discussions/76409#discussioncomment-8131390
+      id-token: write
+    needs: build-package
+    uses: ./.github/workflows/publish.yml
+    with:
+      tag: pr-${{ github.event.pull_request.number }}
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/release-drafter.yml

@@ -0,0 +1,30 @@
+---
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - mealie-next
+  # pull_request event is required for autolabeler
+  pull_request:
+    types: [opened, labeled, unlabeled, reopened, synchronize]
+  # pull_request_target event is required for autolabeler to support PRs from forks
+  pull_request_target:
+    types: [opened, labeled, unlabeled, reopened, synchronize]
+  workflow_dispatch:
+
+jobs:
+  update_release_draft:
+    permissions:
+      # write permission is required to create a github release
+      contents: write
+      # write permission is required for autolabeler
+      # otherwise, read permission is required at least
+      pull-requests: write
+    name: ✏️ Draft release
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🚀 Run Release Drafter
+        uses: release-drafter/release-drafter@v6.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,95 @@
+name: Docker Build Production
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  backend-tests:
+    name: "Backend Server Tests"
+    uses: ./.github/workflows/test-backend.yml
+
+  frontend-tests:
+    name: "Frontend Tests"
+    uses: ./.github/workflows/test-frontend.yml
+
+  build-package:
+    name: Build Package
+    uses: ./.github/workflows/build-package.yml
+    with:
+      tag: ${{ github.event.release.tag_name }}
+
+  publish:
+    permissions:
+      contents: read
+      packages: write
+      # The id-token write permission is needed to connect to Depot.dev
+      # as part of the partial-builder.yml action. It needs to be declared
+      # in the parent action, as noted here:
+      # https://github.com/orgs/community/discussions/76409#discussioncomment-8131390
+      id-token: write
+    name: Build Tagged Release
+    uses: ./.github/workflows/publish.yml
+    needs:
+      - backend-tests
+      - frontend-tests
+      - build-package
+    with:
+      tag: ${{ github.event.release.tag_name }}
+      tags: |
+          hkotel/mealie:latest
+          ghcr.io/${{ github.repository }}:latest
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  notify-discord:
+    name: Notify Discord
+    needs:
+      - publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.2
+        with:
+          args: "🚀  Version {{ EVENT_PAYLOAD.release.tag_name }} of Mealie has been released. See the release notes https://github.com/mealie-recipes/mealie/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}"
+
+  update-image-tags:
+    name: Update image tag in sample docker-compose files
+    needs:
+      - publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout 🛎
+        uses: actions/checkout@v4
+
+      - name: Extract Version From Tag Name
+        run: echo "VERSION_NUM=$(echo ${{ github.event.release.tag_name }} | sed 's/^v//')" >> $GITHUB_ENV
+
+      - name: Modify version strings
+        run: |
+          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/installation-checklist.md
+          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/sqlite.md
+          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/postgres.md
+          sed -i 's/^version = "[^"]*"/version = "${{ env.VERSION_NUM }}"/' pyproject.toml
+          sed -i 's/^\s*"version": "[^"]*"/"version": "${{ env.VERSION_NUM }}"/' frontend/package.json
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6
+        # This doesn't currently work for us because it creates the PR but the workflows don't run.
+        # TODO: Provide a personal access token as a parameter here, that solves that problem.
+        # https://github.com/peter-evans/create-pull-request
+        with:
+          commit-message: "Update image tag, for release ${{ github.event.release.tag_name }}"
+          branch: "docs/newrelease-update-version-${{ github.event.release.tag_name }}"
+          labels: |
+            documentation
+          delete-branch: true
+          base: mealie-next
+          title: "docs(auto): Update image tag, for release ${{ github.event.release.tag_name }}"
+          body: "Auto-generated by `.github/workflows/release.yml`, on publish of release ${{ github.event.release.tag_name }}"

.github/workflows/scheduled-checks.yml

@@ -0,0 +1,56 @@
+name: Scheduled Checks
+
+on:
+  schedule:
+    # Every monday at 7 AM
+    - cron: 0 7 * * 1
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout 🛎
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Set PY
+        shell: bash
+        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/pre-commit
+            ~/.cache/pip
+          key: pre-commit-${{ env.PY }}-${{ hashFiles('.pre-commit-config.yaml') }}
+
+      - name: Install pre-commit
+        shell: bash
+        run: pip install -U pre-commit
+
+      - name: Run `pre-commit autoupdate`
+        shell: bash
+        run: pre-commit autoupdate --color=always
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6
+        # This doesn't currently work for us because it creates the PR but the workflows don't run.
+        # TODO: Provide a personal access token as a parameter here, that solves that problem.
+        # https://github.com/peter-evans/create-pull-request
+        with:
+          commit-message: "Update pre-commit hooks"
+          branch: "fix/update-pre-commit-hooks"
+          labels: |
+            chore
+          delete-branch: true
+          base: mealie-next
+          title: "chore(auto): Update pre-commit hooks"
+          body: "Auto-generated by `.github/workflows/scheduled-checks.yml`"

.github/workflows/stale.yml

@@ -0,0 +1,42 @@
+# Documentation: https://github.com/marketplace/actions/close-stale-issues
+name: 'Stale: Flag and close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-label: 'stale'
+          exempt-issue-labels: 'pinned,security,early-stages,bug: confirmed,feedback,task'
+          stale-issue-message: 'This issue has been automatically marked as stale because it has been open 90 days with no activity.'
+          days-before-issue-stale: 90
+          # This stops an issue from ever getting closed automatically.
+          days-before-issue-close: -1
+          stale-pr-label: 'stale'
+          stale-pr-message: 'This PR has been automatically marked as stale because it has been open 90 days with no activity.'
+          days-before-pr-stale: 90
+          # This stops a PR from ever getting closed automatically.
+          days-before-pr-close: -1
+          # If an issue/PR has a milestone, it's exempt from being marked as stale.
+          exempt-all-milestones: true
+          # How many API calls will we allow the action to make, essentially.
+          # Doco: https://github.com/actions/stale?tab=readme-ov-file#operations-per-run
+          operations-per-run: 150
+          ########################################################################
+          # The below are just default values, but populating here for reference #
+          ########################################################################
+          # Automatically remove the stale label when the issues or the pull requests are updated
+          remove-stale-when-updated: true
+          # The reason used when closing issues. Valid values are `completed` and `not_planned`.
+          close-issue-reason: 'not_planned'
+          # If true, PRs currently in draft will not be marked as stale automatically.
+          # We can mark them stale (after `days-before-pr-stale`), though we don't auto-close.
+          exempt-draft-pr: false

.github/workflows/test-backend.yml

@@ -0,0 +1,110 @@
+name: Backend Lint and Test
+
+on:
+  workflow_call:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    env:
+      PRODUCTION: false
+
+    strategy:
+      fail-fast: true
+      matrix:
+        # Database ENV Variables as Specified by Mealie
+        Database: [sqlite, postgres]
+
+    # Services
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: mealie
+          POSTGRES_PASSWORD: mealie
+          POSTGRES_DB: mealie
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        ports:
+          - 5432:5432
+      ldap:
+        image: rroemhild/test-openldap
+        ports:
+          - 10389:10389
+          - 10636:10636
+
+    # Steps
+    steps:
+      - name: Install Task
+        uses: arduino/setup-task@v2
+        with:
+          version: 3.x
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v4
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+
+      - name: Check venv cache
+        id: cache-validate
+        if: steps.cached-poetry-dependencies.outputs.cache-hit == 'true'
+        run: |
+          echo "import fastapi;print('venv good?')" > test.py && poetry run python test.py && echo "cache-hit-success=true" >> $GITHUB_OUTPUT
+          rm test.py
+        continue-on-error: true
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install libsasl2-dev libldap2-dev libssl-dev
+          poetry install
+          poetry add "psycopg2-binary==2.9.9"
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' || steps.cache-validate.outputs.cache-hit-success != 'true'
+
+      - name: Formatting (Ruff)
+        run: |
+          poetry run ruff format . --check
+
+      - name: Lint (Ruff)
+        run: |
+          task py:lint
+
+      - name: Mypy Typecheck
+        run: |
+          task py:mypy
+
+      - name: Pytest
+        env:
+          DB_ENGINE: ${{ matrix.Database }}
+          POSTGRES_SERVER: localhost
+          LDAP_AUTH_ENABLED: True
+          LDAP_SERVER_URL: ldap://localhost:10389
+          LDAP_TLS_INSECURE: true
+          LDAP_ENABLE_STARTTLS: false
+          LDAP_BASE_DN: "ou=people,dc=planetexpress,dc=com"
+          LDAP_QUERY_BIND: "cn=admin,dc=planetexpress,dc=com"
+          LDAP_QUERY_PASSWORD: "GoodNewsEveryone"
+          LDAP_USER_FILTER: "(&(|({id_attribute}={input})({mail_attribute}={input}))(|(memberOf=cn=ship_crew,ou=people,dc=planetexpress,dc=com)(memberOf=cn=admin_staff,ou=people,dc=planetexpress,dc=com)))"
+          LDAP_ADMIN_FILTER: "memberOf=cn=admin_staff,ou=people,dc=planetexpress,dc=com"
+          LDAP_ID_ATTRIBUTE: uid
+          LDAP_NAME_ATTRIBUTE: cn
+          LDAP_MAIL_ATTRIBUTE: mail
+        run: |
+          task py:test

.github/workflows/test-frontend.yml

@@ -1,38 +1,28 @@
-name: Frontend Lint
+name: Frontend Lint and Test
 
 on:
-  push:
-    branches:
-      - mealie-next
-  pull_request:
-    branches:
-      - mealie-next
+  workflow_call:
 
 jobs:
-  ci:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node: [16]
+  lint:
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout 🛎
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
 
       - name: Setup node env 🏗
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v4.0.0
         with:
-          node-version: ${{ matrix.node }}
+          node-version: 20
           check-latest: true
 
       - name: Get yarn cache directory path 🛠
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
       - name: Cache node_modules 📦
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -44,6 +34,14 @@ jobs:
         run: yarn
         working-directory: "frontend"
 
+      - name: Prepare nuxt 🚀
+        run: yarn nuxt prepare
+        working-directory: "frontend"
+
       - name: Run linter 👀
         run: yarn lint
         working-directory: "frontend"
+
+      - name: Run tests 🧪
+        run: yarn test:ci
+        working-directory: "frontend"

.gitignore

@@ -10,8 +10,12 @@ docs/site/
 *temp/*
 .secret
 frontend/dist/
+frontend/.output/*
+frontend/.yarn/*
+frontend/.yarnrc.yml
 
 dev/code-generation/generated/*
+dev/data/mealie.db-journal
 dev/data/backups/*
 dev/data/debug/*
 dev/data/img/*
@@ -51,11 +55,10 @@ pnpm-debug.log*
 env/
 build/
 develop-eggs/
-
+/dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 !frontend/src/components/Recipe/Parts/
@@ -66,6 +69,9 @@ wheels/
 .installed.cfg
 *.egg
 
+# frontend copied into Python module for packaging purposes
+/mealie/frontend/
+
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
@@ -87,6 +93,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+.ruff_cache/
 test.db
 
 # Translations
@@ -153,8 +160,12 @@ dev/data/backups/dev_sample_data*.zip
 dev/data/recipes/*
 dev/scripts/output/app_routes.py
 dev/scripts/output/javascriptAPI/*
-mealie/services/scraper/ingredient_nlp/model.crfmodel
 dev/code-generation/generated/openapi.json
 dev/code-generation/generated/test_routes.py
-mealie/services/parser_services/crfpp/model.crfmodel
 lcov.info
+dev/code-generation/openapi.json
+
+.run/
+.task/*
+.dev.env
+frontend/eslint.config.deprecated.js

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v6.0.0
     hooks:
       - id: check-yaml
         exclude: "mkdocs.yml"
@@ -9,22 +9,10 @@ repos:
       - id: check-toml
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://github.com/sondrelg/pep585-upgrade
-    rev: "v1.0.1" # Use the sha / tag you want to point at
+        exclude: ^tests/data/
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.12.12
     hooks:
-      - id: upgrade-type-hints
-  - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-        name: isort (python)
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-  - repo: https://github.com/pycqa/flake8
-    rev: "4.0.1"
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - "flake8-print==4.0.0"
+      - id: ruff
+      - id: ruff-format

.pylintrc

@@ -60,17 +60,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-disable=print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
-        raw-checker-failed,
+disable=raw-checker-failed,
         bad-inline-option,
         locally-disabled,
         file-ignored,
@@ -78,67 +68,10 @@ disable=print-statement,
         useless-suppression,
         deprecated-pragma,
         use-symbolic-message-instead,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape
+        missing-function-docstring,
+        missing-class-docstring,
+        missing-module-docstring,
+        too-few-public-methods
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -292,7 +225,9 @@ good-names=i,
            k,
            ex,
            Run,
-           _
+           _,
+           e,
+           db
 
 # Good variable names regexes, separated by a comma. If names match any regex,
 # they will always be accepted
@@ -455,7 +390,7 @@ indent-after-paren=4
 indent-string='    '
 
 # Maximum number of characters on a single line.
-max-line-length=100
+max-line-length=120
 
 # Maximum number of lines in a module.
 max-module-lines=1000
@@ -583,5 +518,5 @@ valid-metaclass-classmethod-first-arg=cls
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["lokalise.i18n-ally"]
+}

.vscode/settings.json

@@ -1,11 +1,9 @@
 {
-  "conventionalCommits.scopes": [
-    "frontend",
-    "docs",
-    "backend",
-    "code-generation"
+  "cSpell.enableFiletypes": [
+    "!javascript",
+    "!python",
+    "!yaml"
   ],
-  "cSpell.enableFiletypes": ["!javascript", "!python", "!yaml"],
   "cSpell.words": [
     "chowdown",
     "compression",
@@ -16,11 +14,14 @@
     "webp"
   ],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.organizeImports": false
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "never"
   },
   "editor.formatOnSave": true,
-  "eslint.workingDirectories": ["./frontend"],
+  "eslint.useFlatConfig": true,
+  "eslint.workingDirectories": [
+    "./frontend"
+  ],
   "files.exclude": {
     "**/__pycache__": true,
     "**/.DS_Store": true,
@@ -29,30 +30,40 @@
     "**/.svn": true,
     "**/CVS": true
   },
-  "i18n-ally.enabledFrameworks": ["vue"],
+  "i18n-ally.enabledFrameworks": [
+    "vue"
+  ],
   "i18n-ally.keystyle": "nested",
   "i18n-ally.localesPaths": "frontend/lang/messages",
   "i18n-ally.sourceLanguage": "en-US",
-  "python.formatting.provider": "black",
-  "python.linting.enabled": true,
-  "python.linting.flake8Enabled": true,
-  "python.linting.pylintEnabled": false,
-  "python.linting.pylintArgs": ["--rcfile=${workspaceFolder}/.pylintrc"],
+  "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
   "python.testing.autoTestDiscoverOnSaveEnabled": false,
-  "python.testing.pytestArgs": ["tests"],
+  "python.testing.pytestArgs": [
+    "tests"
+  ],
   "python.testing.pytestEnabled": true,
   "python.testing.unittestEnabled": false,
   "python.analysis.typeCheckingMode": "off",
-  "python.linting.mypyEnabled": true,
-  "python.sortImports.path": "${workspaceFolder}/.venv/bin/isort",
   "search.mode": "reuseEditor",
-  "python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "test_*.py"],
+  "python.testing.unittestArgs": [
+    "-v",
+    "-s",
+    "./tests",
+    "-p",
+    "test_*.py"
+  ],
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
     "package.json": "package-lock.json, yarn.lock, .eslintrc.js, tsconfig.json, .prettierrc, .editorconfig",
-    "pyproject.toml": "poetry.lock, alembic.ini, .pylintrc, .flake8",
+    "pyproject.toml": "poetry.lock, alembic.ini, .pylintrc",
     "netlify.toml": "runtime.txt",
-    "docker-compose.yml": "Dockerfile, .dockerignore, docker-compose.dev.yml, docker-compose.yml",
     "README.md": "LICENSE, SECURITY.md"
+  },
+  "[vue]": {
+    "editor.formatOnSave": false
+  },
+  "[python]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "charliermarsh.ruff"
   }
 }

.vscode/tasks.json

@@ -1,22 +1,9 @@
 {
   "version": "2.0.0",
   "tasks": [
-    {
-      "label": "DEV: Build and Start Docker Compose",
-      "command": "make docker-dev",
-      "type": "shell",
-      "args": [],
-      "problemMatcher": [
-        "$tsc"
-      ],
-      "presentation": {
-        "reveal": "always"
-      },
-      "group": "test"
-    },
     {
       "label": "Production: Build and Start Docker Compose",
-      "command": "make docker-prod",
+      "command": "task docker:prod",
       "type": "shell",
       "args": [],
       "problemMatcher": [
@@ -29,17 +16,7 @@
     },
     {
       "label": "Dev: Start Backend",
-      "command": "make backend",
-      "type": "shell",
-      "presentation": {
-        "reveal": "always",
-        "group": "groupA"
-      },
-      "problemMatcher": []
-    },
-    {
-      "label": "Init Database",
-      "command": "poetry run python mealie/db/init_db.py",
+      "command": "task py",
       "type": "shell",
       "presentation": {
         "reveal": "always",
@@ -49,7 +26,7 @@
     },
     {
       "label": "Dev: Start Frontend",
-      "command": "make frontend",
+      "command": "task ui",
       "type": "shell",
       "presentation": {
         "reveal": "always",
@@ -59,7 +36,7 @@
     },
     {
       "label": "Dev: Start Docs Server",
-      "command": "make docs",
+      "command": "task docs",
       "type": "shell",
       "presentation": {
         "reveal": "always",
@@ -69,7 +46,7 @@
     },
     {
       "label": "Run python tests",
-      "command": "make test",
+      "command": "task py:test",
       "type": "shell",
       "presentation": {
         "reveal": "always"

Dockerfile

@@ -1,141 +0,0 @@
-###############################################
-# Base Image
-###############################################
-FROM python:3.10-slim as python-base
-
-ENV MEALIE_HOME="/app"
-
-ENV PYTHONUNBUFFERED=1 \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PIP_NO_CACHE_DIR=off \
-    PIP_DISABLE_PIP_VERSION_CHECK=on \
-    PIP_DEFAULT_TIMEOUT=100 \
-    POETRY_HOME="/opt/poetry" \
-    POETRY_VIRTUALENVS_IN_PROJECT=true \
-    POETRY_NO_INTERACTION=1 \
-    PYSETUP_PATH="/opt/pysetup" \
-    VENV_PATH="/opt/pysetup/.venv"
-
-# prepend poetry and venv to path
-ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
-
-# create user account
-RUN useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc \
-    && usermod -G users abc \
-    && mkdir $MEALIE_HOME
-
-###############################################
-# Builder Image
-###############################################
-FROM python-base as builder-base
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    curl \
-    build-essential \
-    libpq-dev \
-    libwebp-dev \
-    # LDAP Dependencies
-    libsasl2-dev libldap2-dev libssl-dev \
-    gnupg gnupg2 gnupg1 \
-    && pip install -U --no-cache-dir pip
-
-# install poetry - respects $POETRY_VERSION & $POETRY_HOME
-ENV POETRY_VERSION=1.1.6
-RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python -
-
-# copy project requirement files here to ensure they will be cached.
-WORKDIR $PYSETUP_PATH
-COPY ./poetry.lock ./pyproject.toml ./
-
-# install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
-RUN poetry install -E pgsql --no-dev
-
-###############################################
-# Development Image
-###############################################
-FROM python-base as development
-ENV PRODUCTION=false
-ENV TESTING=false
-
-# copying poetry and venv into image
-COPY --from=builder-base $POETRY_HOME $POETRY_HOME
-COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
-
-# copy backend
-COPY ./mealie $MEALIE_HOME/mealie
-COPY ./poetry.lock ./pyproject.toml $MEALIE_HOME/
-
-# Alembic
-COPY ./alembic $MEALIE_HOME/alembic
-COPY ./alembic.ini $MEALIE_HOME/
-
-# venv already has runtime deps installed we get a quicker install
-WORKDIR $MEALIE_HOME
-RUN . $VENV_PATH/bin/activate && poetry install
-WORKDIR /
-
-RUN chmod +x $MEALIE_HOME/mealie/run.sh
-ENTRYPOINT $MEALIE_HOME/mealie/run.sh "reload"
-
-###############################################
-# CRFPP Image
-###############################################
-FROM hkotel/crfpp as crfpp
-
-RUN echo "crfpp-container"
-
-###############################################
-# Production Image
-###############################################
-FROM python-base as production
-ENV PRODUCTION=true
-ENV TESTING=false
-
-ARG COMMIT
-ENV GIT_COMMIT_HASH=$COMMIT
-
-# curl for used by healthcheck
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    curl \
-    && apt-get autoremove \
-    && rm -rf /var/lib/apt/lists/*
-
-# copying poetry and venv into image
-COPY --from=builder-base $POETRY_HOME $POETRY_HOME
-COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
-
-# copy CRF++ Binary from crfpp
-ENV CRF_MODEL_URL=https://github.com/mealie-recipes/nlp-model/releases/download/v1.0.0/model.crfmodel
-
-ENV LD_LIBRARY_PATH=/usr/local/lib
-COPY --from=crfpp /usr/local/lib/ /usr/local/lib
-COPY --from=crfpp /usr/local/bin/crf_learn /usr/local/bin/crf_learn
-COPY --from=crfpp /usr/local/bin/crf_test /usr/local/bin/crf_test
-
-# copy backend
-COPY ./mealie $MEALIE_HOME/mealie
-COPY ./poetry.lock ./pyproject.toml $MEALIE_HOME/
-COPY ./gunicorn_conf.py $MEALIE_HOME
-
-# Alembic
-COPY ./alembic $MEALIE_HOME/alembic
-COPY ./alembic.ini $MEALIE_HOME/
-
-# venv already has runtime deps installed we get a quicker install
-WORKDIR $MEALIE_HOME
-RUN . $VENV_PATH/bin/activate && poetry install -E pgsql --no-dev
-WORKDIR /
-
-# Grab CRF++ Model Release
-RUN curl -L0 $CRF_MODEL_URL --output $MEALIE_HOME/mealie/services/parser_services/crfpp/model.crfmodel
-
-VOLUME [ "$MEALIE_HOME/data/" ]
-ENV APP_PORT=9000
-
-EXPOSE ${APP_PORT}
-
-HEALTHCHECK CMD curl -f http://localhost:${APP_PORT}/docs || exit 1
-
-RUN chmod +x $MEALIE_HOME/mealie/run.sh
-ENTRYPOINT $MEALIE_HOME/mealie/run.sh

MAINTAINERS.md

@@ -0,0 +1,3 @@
+# Maintainers Guide
+
+See -> [/docs/docs/contributors/developers-guide/maintainers.md](/docs/docs/contributors/developers-guide/maintainers.md)

README.md

@@ -1,15 +1,15 @@
+[![Latest Release][latest-release-shield]][latest-release-url]
 [![Contributors][contributors-shield]][contributors-url]
-[![Forks][forks-shield]][forks-url]
 [![Stargazers][stars-shield]][stars-url]
 [![Issues][issues-shield]][issues-url]
-[![MIT License][license-shield]][license-url]
-[![Docker Pulls][docker-pull]][docker-pull]
-[![CodeFactor](https://www.codefactor.io/repository/github/hay-kot/mealie/badge)](https://www.codefactor.io/repository/github/hay-kot/mealie)
+[![AGPL License][license-shield]][license-url]
+[![Docker Pulls][docker-pull]][docker-url]
+[![GHCR Pulls][ghcr-pulls]][ghcr-url]
 
 <!-- PROJECT LOGO -->
 <br />
 <p align="center">
-  <a href="https://github.com/hay-kot/mealie">
+  <a href="https://github.com/mealie-recipes/mealie">
 <svg style="width:100px;height:100px" viewBox="0 0 24 24">
     <path fill="currentColor" d="M8.1,13.34L3.91,9.16C2.35,7.59 2.35,5.06 3.91,3.5L10.93,10.5L8.1,13.34M13.41,13L20.29,19.88L18.88,21.29L12,14.41L5.12,21.29L3.71,19.88L13.36,10.22L13.16,10C12.38,9.23 12.38,7.97 13.16,7.19L17.5,2.82L18.43,3.74L15.19,7L16.15,7.94L19.39,4.69L20.31,5.61L17.06,8.85L18,9.81L21.26,6.56L22.18,7.5L17.81,11.84C17.03,12.62 15.77,12.62 15,11.84L14.78,11.64L13.41,13Z" />
 </svg>
@@ -18,18 +18,17 @@
   <h3 align="center">Mealie</h3>
 
   <p align="center">
-    A Place for All Your Recipes
+    A Place For All Your Recipes
     <br />
-    <a href="https://nightly.mealie.io"><strong>Explore the docs »</strong></a>
-  <a href="https://github.com/hay-kot/mealie">
+    <a href="https://docs.mealie.io/"><strong>Explore the docs »</strong></a>
+  <a href="https://github.com/mealie-recipes/mealie">
   </a>
     <br />
     <a href="https://demo.mealie.io/">View Demo</a>
     ·
-    <a href="https://github.com/hay-kot/mealie/issues">Report Bug</a>
+    <a href="https://github.com/mealie-recipes/mealie/issues">Report Bug</a>
     ·
-    <a href="https://hub.docker.com/r/hkotel/mealie"> Docker Hub
-    </a>
+    <a href="https://github.com/mealie-recipes/mealie/pkgs/container/mealie">GitHub Container Registry</a>
 </p>
 
 
@@ -39,55 +38,69 @@
 
 # About The Project
 
-Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the url and Mealie will automatically import the relevant data or add a family recipe with the UI editor. Mealie also provides an API for interactions from 3rd party applications.
+Mealie is a self hosted recipe manager, meal planner and shopping list with a RestAPI backend and a reactive frontend built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the URL and Mealie will automatically import the relevant data, or add a family recipe with the UI editor. Mealie also provides an API for interactions from 3rd party applications.
 
 - [Remember to join the Discord](https://discord.gg/QuStdQGSGK)!
-- [Documentation](https://docs.mealie.io)
+- [Documentation](https://docs.mealie.io/)
 
 
+## Key Features
+- Recipe imports: Create recipes, by **importing from a URL** or entering data manually
+- Meal Planner: Use the **Meal Planner** to plan your what you'll cook for the next week
+- Shopping List: Put the necessary ingredients on your **Shopping List**, organised into sections of your local supermarket
+- Cookbooks: Group recipes into **Cookbooks** based on your own criteria
+- Docker: Easy **Docker** deployment
+- Localisation: **Translations** for 35+ languages
+
 <!-- CONTRIBUTING -->
 ## Contributing
 
-Contributions are what make the open source community such an amazing place to be learn, inspire, and create. Any contributions you make are **greatly appreciated**. If you're going to be working on the code-base you'll want to use the nightly documentation to ensure you get the latest information.
+Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**. If you're going to be working on the code-base, you'll want to use the nightly documentation to ensure you get the latest information.
 
 - See the [Contributors Guide](https://nightly.mealie.io/contributors/developers-guide/code-contributions/) for help getting started.
 - We use [VSCode Dev Containers](https://code.visualstudio.com/docs/remote/containers) to make it easy for contributors to get started!
 
-If you are not a coder, you can still contribute financially. financial contributions help me prioritize working on this project over others and helps me know that there is a real demand for project development.
+If you are not a coder, you can still contribute financially. Financial contributions help me prioritize working on this project over others and helps me know that there is a real demand for project development.
 
 <a href="https://www.buymeacoffee.com/haykot" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-green.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 107px !important;" ></a>
 
+### Translations
+
+Translations can be a great way for **non-coders** to contribute to the project. We use [Crowdin](https://crowdin.com/project/mealie) to allow several contributors to work on translating Mealie. You can simply help by voting for your preferred translations, or even by completely translating Mealie into a new language.
+
+For more information, check out the translation page on the [contributor's guide](https://nightly.mealie.io/contributors/translating/).
+
 <!-- LICENSE -->
 ## License
-Distributed under the MIT License. See `LICENSE` for more information.
+Distributed under the AGPL License. See `LICENSE` for more information.
 
 
 ## Sponsors
 
-Huge thanks to all the sponsors of this project on [Github Sponsors](https://github.com/sponsors/hay-kot) and Buy Me a Coffee. Without you this project would surely not be possible.
+Huge thanks to all the sponsors of this project on [Github Sponsors](https://github.com/sponsors/hay-kot) and Buy Me a Coffee. Without you, this project would surely not be possible.
 
-Thanks to Linode for providing Hosting for the Demo, Beta, and Documentation sites! Another big thanks to JetBrains for providing their IDEs for development.
+Thanks to Depot for providing build instances for our Docker image builds.
 
-<div align='center'>
-  <img height="100" src="docs/docs/assets/img/sponsors-linode.svg" />
-  <img height="100" src="docs/docs/assets/img/sponsors-jetbrains.png" />
-</div>
+[![Built with Depot](https://depot.dev/badges/built-with-depot.svg)](https://depot.dev?utm_source=Mealie)
 
 
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
-[contributors-shield]: https://img.shields.io/github/contributors/hay-kot/mealie.svg?style=flat-square
-[docker-pull]: https://img.shields.io/docker/pulls/hkotel/mealie
-[contributors-url]: https://github.com/hay-kot/mealie/graphs/contributors
-[forks-shield]: https://img.shields.io/github/forks/hay-kot/mealie.svg?style=flat-square
-[forks-url]: https://github.com/hay-kot/mealie/network/members
-[stars-shield]: https://img.shields.io/github/stars/hay-kot/mealie.svg?style=flat-square
-[stars-url]: https://github.com/hay-kot/mealie/stargazers
-[issues-shield]: https://img.shields.io/github/issues/hay-kot/mealie.svg?style=flat-square
-[issues-url]: https://github.com/hay-kot/mealie/issues
-[license-shield]: https://img.shields.io/github/license/hay-kot/mealie.svg?style=flat-square
-[license-url]: https://github.com/hay-kot/mealie/blob/master/LICENSE.txt
+[contributors-shield]: https://img.shields.io/github/contributors/mealie-recipes/mealie.svg?style=flat-square
+[docker-pull]: https://img.shields.io/docker/pulls/hkotel/mealie?style=flat-square
+[docker-url]: https://hub.docker.com/r/hkotel/mealie
+[ghcr-pulls]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fipitio.github.io%2Fbackage%2Fmealie-recipes%2Fmealie%2Fmealie.json&query=%24.downloads&style=flat-square&label=ghcr%20pulls
+[ghcr-url]: https://github.com/mealie-recipes/mealie/pkgs/container/mealie
+[contributors-url]: https://github.com/mealie-recipes/mealie/graphs/contributors
+[stars-shield]: https://img.shields.io/github/stars/mealie-recipes/mealie.svg?style=flat-square
+[stars-url]: https://github.com/mealie-recipes/mealie/stargazers
+[issues-shield]: https://img.shields.io/github/issues/mealie-recipes/mealie.svg?style=flat-square
+[issues-url]: https://github.com/mealie-recipes/mealie/issues
+[latest-release-shield]: https://img.shields.io/github/v/release/mealie-recipes/mealie?style=flat-square&label=latest%20release
+[latest-release-url]: https://github.com/mealie-recipes/mealie/releases
+[license-shield]: https://img.shields.io/github/license/mealie-recipes/mealie.svg?style=flat-square
+[license-url]: https://github.com/mealie-recipes/mealie/blob/mealie-next/LICENSE
 [linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=flat-square&logo=linkedin&colorB=555
 [linkedin-url]: https://linkedin.com/in/hay-kot
 [product-screenshot]: docs/docs/assets/img/home_screenshot.png

Taskfile.yml

@@ -0,0 +1,265 @@
+# https://taskfile.dev
+
+version: "3"
+vars:
+  GREETING: Hello, World!
+env:
+  DEFAULT_GROUP: Home
+  DEFAULT_HOUSEHOLD: Family
+  PRODUCTION: false
+  API_PORT: 9000
+  API_DOCS: True
+  TOKEN_TIME: 256 # hours
+  # mailplit SMTP config
+  # start dev:services to use mailpit
+  SMTP_HOST: localhost
+  SMTP_PORT: 1025
+  SMTP_FROM_NAME: MealieDev
+  SMTP_FROM_EMAIL: mealie@example.com
+  SMTP_AUTH_STRATEGY: NONE
+  BASE_URL: http://localhost:3000
+  LANG: en-US
+
+# loads .env file if it exists
+dotenv:
+  - .env
+  - .dev.env
+tasks:
+  docs:gen:
+    desc: runs the API documentation generator
+    cmds:
+      - poetry run python dev/code-generation/gen_docs_api.py
+
+  docs:
+    desc: runs the documentation server
+    dir: docs
+    deps:
+      - docs:gen
+    cmds:
+      - poetry run python -m mkdocs serve
+
+  setup:ui:
+    desc: setup frontend dependencies
+    dir: frontend
+    run: once
+    cmds:
+      - yarn install
+    sources:
+      - package.json
+      - yarn.lock
+    generates:
+      - node_modules/**
+
+  setup:py:
+    desc: setup python dependencies
+    run: once
+    cmds:
+      - poetry install --with main,dev,postgres
+      - poetry run pre-commit install
+    sources:
+      - poetry.lock
+      - pyproject.toml
+      - .pre-commit-config.yaml
+
+  setup:
+    desc: setup all dependencies
+    deps:
+      - setup:ui
+      - setup:py
+
+  dev:generate:
+    desc: run code generators
+    cmds:
+      - poetry run python dev/code-generation/main.py {{ .CLI_ARGS }}
+      - task: docs:gen
+      - task: py:format
+
+  dev:services:
+    desc: starts postgres and mailpit containers
+    dir: docker
+    cmds:
+      - docker compose -f docker-compose.dev.yml up
+
+  dev:clean:
+    desc: cleans up dev environment !! removes all data files !!
+    vars:
+      DEV_DATA: ""
+    cmds:
+      - rm -r ./dev/data/recipes/
+      - rm -r ./dev/data/users/
+      - rm -f ./dev/data/mealie*.db
+      - rm -f ./dev/data/mealie*.db-shm
+      - rm -f ./dev/data/mealie*.db-wal
+      - rm -f ./dev/data/mealie.log
+      - rm -f ./dev/data/.secret
+
+  py:mypy:
+    desc: runs python type checking
+    cmds:
+      - poetry run mypy mealie
+
+  py:test:
+    desc: runs python tests (support args after '--')
+    cmds:
+      - poetry run pytest {{ .CLI_ARGS }}
+
+  py:format:
+    desc: runs python code formatter
+    cmds:
+      - poetry run ruff format .
+
+  py:lint:
+    desc: runs python linter
+    cmds:
+      - poetry run ruff check mealie
+
+  py:check:
+    desc: runs all linters, type checkers, and formatters
+    deps:
+      - py:format
+      - py:lint
+      - py:mypy
+      - py:test
+
+  py:coverage:
+    desc: runs python coverage and generates html report
+    cmds:
+      - poetry run pytest
+      - poetry run coverage report -m
+      - poetry run coveragepy-lcov
+      - poetry run coverage html
+      - open htmlcov/index.html
+
+  py:package:copy-frontend:
+    desc: copy the frontend files into the Python package
+    internal: true
+    deps:
+      - ui:generate
+    cmds:
+      - rm -rf mealie/frontend
+      - cp -a frontend/dist mealie/frontend
+    sources:
+      - frontend/dist/**
+    generates:
+      - mealie/frontend/**
+
+  py:package:generate-requirements:
+    desc: Generate requirements file to pin all packages, effectively a "pip freeze" before installation begins
+    internal: true
+    cmds:
+      - poetry export -n --only=main --extras=pgsql --output=dist/requirements.txt
+      # Include mealie in the requirements, hashing the package that was just built to ensure it's the one installed
+      - echo "mealie[pgsql]=={{.MEALIE_VERSION}} \\" >> dist/requirements.txt
+      - poetry run pip hash dist/mealie-{{.MEALIE_VERSION}}-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt
+      - echo " \\" >> dist/requirements.txt
+      - poetry run pip hash dist/mealie-{{.MEALIE_VERSION}}.tar.gz | tail -n1 >> dist/requirements.txt
+    vars:
+      MEALIE_VERSION:
+         sh: poetry version --short
+    sources:
+      - poetry.lock
+      - pyproject.toml
+      - dist/mealie-*.whl
+      - dist/mealie-*.tar.gz
+    generates:
+      - dist/requirements.txt
+
+  py:package:deps-parallel:
+    desc: Run py:package dependencies in parallel
+    internal: true
+    deps:
+      - setup:py
+      - py:package:copy-frontend
+
+  py:package:deps:
+    desc: Dependencies of py:package, skippable by setting SKIP_PACKAGE_DEPS=true
+    internal: true
+    cmds:
+      - task: py:package:deps-parallel
+    status:
+      - '{{ .SKIP_PACKAGE_DEPS | default "false"}}'
+
+  py:package:
+    desc: builds Python packages (sdist and wheel) in top-level dist directory
+    deps:
+      - py:package:deps
+    cmds:
+      - poetry build -n --output=dist
+      - task: py:package:generate-requirements
+
+  py:
+    desc: runs the backend server
+    cmds:
+      - poetry run python mealie/app.py
+
+  py:postgres:
+    desc: runs the backend server configured for containerized postgres
+    env:
+      DB_ENGINE: postgres
+      POSTGRES_USER: mealie
+      POSTGRES_PASSWORD: mealie
+      POSTGRES_SERVER: localhost
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: mealie
+    cmds:
+      - poetry run python mealie/app.py
+
+  py:migrate:
+    desc: generates a new database migration file e.g. task py:migrate -- "add new column"
+    cmds:
+      - poetry run alembic --config mealie/alembic/alembic.ini revision --autogenerate -m "{{ .CLI_ARGS }}"
+      - task: py:format
+
+  ui:build:
+    desc: builds the frontend in frontend/dist
+    dir: frontend
+    cmds:
+      - yarn build
+
+  ui:generate:
+    desc: generates a static version of the frontend in frontend/dist
+    dir: frontend
+    deps:
+      - setup:ui
+    cmds:
+      - yarn generate
+
+  ui:lint:
+    desc: runs the frontend linter
+    dir: frontend
+    cmds:
+      - yarn lint
+
+  ui:test:
+    desc: runs the frontend tests
+    dir: frontend
+    cmds:
+      - yarn test
+
+  ui:check:
+    desc: runs all frontend checks
+    deps:
+      - ui:lint
+      - ui:test
+
+  ui:
+    desc: runs the frontend server
+    dir: frontend
+    cmds:
+      - yarn run dev --no-fork
+
+  docker:build-from-package:
+    desc: Builds the Docker image from the existing Python package in dist/
+    deps:
+       - py:package
+    cmds:
+       - docker build --tag mealie:dev --file docker/Dockerfile --build-arg COMMIT={{.GIT_COMMIT}} --build-context packages=dist .
+    vars:
+      GIT_COMMIT:
+        sh: git rev-parse HEAD
+
+  docker:prod:
+    desc: builds and runs the production docker image locally
+    dir: docker
+    cmds:
+      - docker compose -f docker-compose.yml -p mealie up -d --build

alembic/README

@@ -1 +0,0 @@
-Generic single-database configuration.

cliff.toml

@@ -35,7 +35,7 @@ conventional_commits = true
 filter_unconventional = true
 # regex for preprocessing the commit messages
 commit_preprocessors = [
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/hay-kot/mealie/issues/${2}))"},
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/mealie-recipes/mealie/issues/${2}))"},
 ]
 # regex for parsing and grouping commits
 commit_parsers = [

crowdin.yml

@@ -1,9 +1,11 @@
 preserve_hierarchy: false
+pull_request_title: "chore(l10n): New Crowdin updates"
+pull_request_labels: [
+  "l10n"
+]
 files:
   - source: /frontend/lang/messages/en-US.json
     translation: /frontend/lang/messages/%locale%.json
-  - source: /frontend/lang/dateTimeFormats/en-US.json
-    translation: /frontend/lang/dateTimeFormats/%locale%.json
   - source: /mealie/lang/messages/en-US.json
     translation: /mealie/lang/messages/%locale%.json
   - source: /mealie/repos/seed/resources/foods/locales/en-US.json

dev/code-generation/_static.py

@@ -1,26 +0,0 @@
-from pathlib import Path
-
-CWD = Path(__file__).parent
-PROJECT_DIR = Path(__file__).parent.parent.parent
-
-
-class Directories:
-    out_dir = CWD / "generated"
-
-
-class CodeTemplates:
-    interface = CWD / "templates" / "interface.js"
-    pytest_routes = CWD / "templates" / "test_routes.py.j2"
-
-
-class CodeDest:
-    interface = CWD / "generated" / "interface.js"
-    pytest_routes = CWD / "generated" / "test_routes.py"
-    use_locales = PROJECT_DIR / "frontend" / "composables" / "use-locales" / "available-locales.ts"
-
-
-class CodeKeys:
-    """Hard coded comment IDs that are used to generate code"""
-
-    nuxt_local_messages = "MESSAGE_LOCALES"
-    nuxt_local_dates = "DATE_LOCALES"

dev/code-generation/gen_docs_api.py

@@ -1,5 +1,8 @@
 import json
 
+from fastapi import FastAPI
+from freezegun import freeze_time
+
 from mealie.app import app
 from mealie.core.config import determine_data_dir
 
@@ -36,11 +39,12 @@ HTML_TEMPLATE = """<!-- Custom HTML site displayed as the Home chapter -->
 HTML_PATH = DATA_DIR.parent.parent.joinpath("docs/docs/overrides/api.html")
 
 
-def generate_api_docs(my_app):
+def generate_api_docs(my_app: FastAPI):
     with open(HTML_PATH, "w") as fd:
         text = HTML_TEMPLATE.replace("MY_SPECIFIC_TEXT", json.dumps(my_app.openapi()))
         fd.write(text)
 
 
 if __name__ == "__main__":
-    generate_api_docs(app)
+    with freeze_time("2024-01-20T17:00:55Z"):
+        generate_api_docs(app)

dev/code-generation/gen_frontend_types.py

@@ -1,124 +0,0 @@
-from pathlib import Path
-
-from jinja2 import Template
-from pydantic2ts import generate_typescript_defs
-from rich import print
-
-# ============================================================
-# Global Compoenents Generator
-
-template = """// This Code is auto generated by gen_global_components.py
-{% for name in global %} import {{ name }} from "@/components/global/{{ name }}.vue";
-{% endfor %}
-{% for name in layout %} import {{ name }} from "@/components/layout/{{ name }}.vue";
-{% endfor %}
-
-declare module "vue" {
-  export interface GlobalComponents {
-    // Global Components
-    {% for name in global %} {{ name }}: typeof {{ name }};
-    {% endfor %} // Layout Components
-    {% for name in layout %} {{ name }}: typeof {{ name }};
-    {% endfor %}
-  }
-}
-
-export {};
-"""
-
-CWD = Path(__file__).parent
-PROJECT_DIR = Path(__file__).parent.parent.parent
-
-
-def generate_global_components_types() -> None:
-    destination_file = PROJECT_DIR / "frontend" / "types" / "components.d.ts"
-
-    component_paths = {
-        "global": PROJECT_DIR / "frontend" / "components" / "global",
-        "layout": PROJECT_DIR / "frontend" / "components" / "Layout",
-    }
-
-    def render_template(template: str, data: dict) -> str | None:
-        tmpl = Template(template)
-        return tmpl.render(**data)
-
-    def build_data() -> dict:
-        data = {}
-        for name, path in component_paths.items():
-            components = [component.stem for component in path.glob("*.vue")]
-            data[name] = components
-
-        return data
-
-    def write_template(text: str) -> None:
-        destination_file.write_text(text)
-
-    text = render_template(template, build_data())
-
-    if text:
-        write_template(text)
-
-
-# ============================================================
-# Pydantic To Typescript Generator
-
-
-def generate_typescript_types() -> None:
-    def path_to_module(path: Path):
-        str_path: str = str(path)
-
-        str_path = str_path.removeprefix(str(PROJECT_DIR))
-        str_path = str_path.removeprefix("/")
-        str_path = str_path.replace("/", ".")
-
-        return str_path
-
-    schema_path = PROJECT_DIR / "mealie" / "schema"
-    types_dir = PROJECT_DIR / "frontend" / "types" / "api-types"
-
-    ignore_dirs = ["__pycache__", "static", "_mealie"]
-
-    skipped_files: list[Path] = []
-    skipped_dirs: list[Path] = []
-    failed_modules: list[Path] = []
-
-    for module in schema_path.iterdir():
-        if module.is_dir() and module.stem in ignore_dirs:
-            skipped_dirs.append(module)
-            continue
-
-        if not module.is_dir() or not module.joinpath("__init__.py").is_file():
-            skipped_files.append(module)
-            continue
-
-        ts_out_name = module.name.replace("_", "-") + ".ts"
-        out_path = types_dir.joinpath(ts_out_name)
-
-        try:
-            path_as_module = path_to_module(module)
-            generate_typescript_defs(path_as_module, str(out_path), exclude=("MealieModel"))  # type: ignore
-        except Exception as e:
-            failed_modules.append(module)
-            print("\nModule Errors:", module, "-----------------")  # noqa
-            print(e)  # noqa
-            print("Finished Module Errors:", module, "-----------------\n")  # noqa
-
-    print("\n📁 Skipped Directories:")  # noqa
-    for skipped_dir in skipped_dirs:
-        print("   📁", skipped_dir.name)  # noqa
-
-    print("📄 Skipped Files:")  # noqa
-    for f in skipped_files:
-        print("   📄", f.name)  # noqa
-
-    print("❌ Failed Modules:")  # noqa
-    for f in failed_modules:
-        print("   ❌", f.name)  # noqa
-
-
-if __name__ == "__main__":
-    print("\n-- Starting Global Components Generator --")  # noqa
-    generate_global_components_types()
-
-    print("\n-- Starting Pydantic To Typescript Generator --")  # noqa
-    generate_typescript_types()

dev/code-generation/gen_locales.py

@@ -1,144 +0,0 @@
-import pathlib
-
-import _static
-import dotenv
-import requests
-from jinja2 import Template
-from requests import Response
-from rich import print
-
-from mealie.schema._mealie import MealieModel
-
-BASE = pathlib.Path(__file__).parent.parent.parent
-
-API_KEY = dotenv.get_key(BASE / ".env", "CROWDIN_API_KEY")
-
-NAMES = {
-    "en-US": "American English",
-    "en-GB": "British English",
-    "af-ZA": "Afrikaans (Afrikaans)",
-    "ar-SA": "العربية (Arabic)",
-    "ca-ES": "Català (Catalan)",
-    "cs-CZ": "Čeština (Czech)",
-    "da-DK": "Dansk (Danish)",
-    "de-DE": "Deutsch (German)",
-    "el-GR": "Ελληνικά (Greek)",
-    "es-ES": "Español (Spanish)",
-    "fi-FI": "Suomi (Finnish)",
-    "fr-FR": "Français (French)",
-    "he-IL": "עברית (Hebrew)",
-    "hu-HU": "Magyar (Hungarian)",
-    "it-IT": "Italiano (Italian)",
-    "ja-JP": "日本語 (Japanese)",
-    "ko-KR": "한국어 (Korean)",
-    "no-NO": "Norsk (Norwegian)",
-    "nl-NL": "Nederlands (Dutch)",
-    "pl-PL": "Polski (Polish)",
-    "pt-BR": "Português do Brasil (Brazilian Portuguese)",
-    "pt-PT": "Português (Portugese)",
-    "ro-RO": "Română (Romanian)",
-    "ru-RU": "Pусский (Russian)",
-    "sr-SP": "српски (Serbian)",
-    "sv-SE": "Svenska (Swedish)",
-    "tr-TR": "Türkçe (Turkish)",
-    "uk-UA": "Українська (Ukrainian)",
-    "vi-VN": "Tiếng Việt (Vietnamese)",
-    "zh-CN": "简体中文 (Chinese simplified)",
-    "zh-TW": "繁體中文 (Chinese traditional)",
-}
-
-LOCALE_TEMPLATE = """// This Code is auto generated by gen_global_components.py
-export const LOCALES = [{% for locale in locales %}
-  {
-    name: "{{ locale.name }}",
-    value: "{{ locale.locale }}",
-    progress: {{ locale.progress }},
-  },{% endfor %}
-]
-"""
-
-
-class TargetLanguage(MealieModel):
-    id: str
-    name: str
-    locale: str
-    threeLettersCode: str
-    twoLettersCode: str
-    progress: float = 0.0
-
-
-class CrowdinApi:
-    project_name = "Mealie"
-    project_id = "451976"
-    api_key = API_KEY
-
-    def __init__(self, api_key: str):
-        api_key = api_key
-
-    @property
-    def headers(self) -> dict:
-        return {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {self.api_key}",
-        }
-
-    def get_projects(self) -> Response:
-        return requests.get("https://api.crowdin.com/api/v2/projects", headers=self.headers)
-
-    def get_project(self) -> Response:
-        return requests.get(f"https://api.crowdin.com/api/v2/projects/{self.project_id}", headers=self.headers)
-
-    def get_languages(self) -> list[TargetLanguage]:
-        response = self.get_project()
-        tls = response.json()["data"]["targetLanguages"]
-
-        models = [TargetLanguage(**t) for t in tls]
-
-        models.insert(
-            0,
-            TargetLanguage(
-                id="en-US", name="English", locale="en-US", threeLettersCode="en", twoLettersCode="en", progress=100
-            ),
-        )
-
-        progress: list[dict] = self.get_progress()["data"]
-
-        for model in models:
-            if model.locale in NAMES:
-                model.name = NAMES[model.locale]
-
-            for p in progress:
-                if p["data"]["languageId"] == model.id:
-                    model.progress = p["data"]["translationProgress"]
-
-        models.sort(key=lambda x: x.locale, reverse=True)
-        return models
-
-    def get_progress(self) -> dict:
-        response = requests.get(
-            f"https://api.crowdin.com/api/v2/projects/{self.project_id}/languages/progress?limit=500",
-            headers=self.headers,
-        )
-        return response.json()
-
-
-def main():
-    print("Starting...")  # noqa
-
-    if API_KEY is None:
-        print("CROWDIN_API_KEY is not set")  # noqa
-        return
-
-    api = CrowdinApi("")
-    models = api.get_languages()
-    tmpl = Template(LOCALE_TEMPLATE)
-    rendered = tmpl.render(locales=models)
-
-    with open(_static.CodeDest.use_locales, "w") as f:
-        f.write(rendered)  # type:ignore
-
-    print("Finished...")  # noqa
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/gen_nuxt_locales.py

@@ -1,39 +0,0 @@
-from pathlib import Path
-
-from _gen_utils import inject_inline
-from _static import CodeKeys
-
-PROJECT_DIR = Path(__file__).parent.parent.parent
-
-
-datetime_dir = PROJECT_DIR / "frontend" / "lang" / "dateTimeFormats"
-locales_dir = PROJECT_DIR / "frontend" / "lang" / "messages"
-nuxt_config = PROJECT_DIR / "frontend" / "nuxt.config.js"
-
-"""
-This snippet walks the message and dat locales directories and generates the import information
-for the nuxt.config.js file and automatically injects it into the nuxt.config.js file. Note that
-the code generation ID is hardcoded into the script and required in the nuxt config.
-"""
-
-
-def main():  # sourcery skip: list-comprehension
-    print("Starting...")
-
-    all_date_locales = []
-    for match in datetime_dir.glob("*.json"):
-        all_date_locales.append(f'"{match.stem}": require("./lang/dateTimeFormats/{match.name}"),')
-
-    all_langs = []
-    for match in locales_dir.glob("*.json"):
-        lang_string = f'{{ code: "{match.stem}", file: "{match.name}" }},'
-        all_langs.append(lang_string)
-
-    inject_inline(nuxt_config, CodeKeys.nuxt_local_messages, all_langs)
-    inject_inline(nuxt_config, CodeKeys.nuxt_local_dates, all_date_locales)
-
-    print("Finished...")
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/gen_py_pytest_data_paths.py

@@ -1,15 +1,13 @@
 from dataclasses import dataclass
 from pathlib import Path
 
-from _gen_utils import render_python_template
 from slugify import slugify
+from utils import render_python_template
 
 CWD = Path(__file__).parent
 
 TEMPLATE = CWD / "templates" / "test_data.py.j2"
-
 TEST_DATA = CWD.parent.parent / "tests" / "data"
-
 GENERATED = CWD / "generated"
 
 
@@ -27,9 +25,7 @@ class TestDataPath:
 
         # Remove any file extension
         var = var.split(".")[0]
-
         var = var.replace("'", "")
-
         var = slugify(var, separator="_")
 
         return cls(var, rel_path)
@@ -71,7 +67,7 @@ def rename_non_compliant_paths():
     kabab case.
     """
 
-    ignore_files = ["DS_Store", ".gitkeep"]
+    ignore_files = ["DS_Store", ".gitkeep", "af-ZA.json", "en-US.json"]
 
     ignore_extensions = [".pyc", ".pyo", ".py"]
 
@@ -99,8 +95,6 @@ def rename_non_compliant_paths():
 
 
 def main():
-    print("Starting Template Generation")
-
     rename_non_compliant_paths()
 
     GENERATED.mkdir(exist_ok=True)
@@ -117,8 +111,6 @@ def main():
         {"children": all_children},
     )
 
-    print("Finished Template Generation")
-
 
 if __name__ == "__main__":
     main()

dev/code-generation/gen_py_pytest_routes.py

@@ -0,0 +1,91 @@
+import json
+from pathlib import Path
+
+from fastapi import FastAPI
+from jinja2 import Template
+from pydantic import BaseModel, ConfigDict
+from utils import PROJECT_DIR, CodeTemplates, HTTPRequest, RouteObject
+
+CWD = Path(__file__).parent
+
+OUTFILE = PROJECT_DIR / "tests" / "utils" / "api_routes" / "__init__.py"
+
+
+class PathObject(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+    route_object: RouteObject
+    http_verbs: list[HTTPRequest]
+
+
+def force_include_in_schema(app: FastAPI):
+    # clear schema cache
+    app.openapi_schema = None
+    for route in app.routes:
+        route.include_in_schema = True
+
+
+def get_path_objects(app: FastAPI):
+    force_include_in_schema(app)
+    paths = []
+    for key, value in app.openapi().items():
+        if key == "paths":
+            for key, value2 in value.items():
+                verbs = []
+                for k, v in value2.items():
+                    verbs.append(HTTPRequest(request_type=k, **v))
+
+                paths.append(
+                    PathObject(
+                        route_object=RouteObject(key),
+                        http_verbs=verbs,
+                    )
+                )
+
+    return paths
+
+
+def dump_open_api(app: FastAPI):
+    """Writes the Open API as JSON to a json file"""
+    OPEN_API_FILE = CWD / "openapi.json"
+
+    with open(OPEN_API_FILE, "w") as f:
+        f.write(json.dumps(app.openapi()))
+
+
+def read_template(file: Path):
+    with open(file) as f:
+        return f.read()
+
+
+def generate_python_templates(static_paths: list[PathObject], function_paths: list[PathObject]):
+    template = Template(read_template(CodeTemplates.pytest_routes))
+    content = template.render(
+        paths={
+            "prefix": "/api",
+            "static_paths": static_paths,
+            "function_paths": function_paths,
+        }
+    )
+    with open(OUTFILE, "w") as f:
+        f.write(content)
+
+    return
+
+
+def main():
+    from mealie.app import app
+
+    dump_open_api(app)
+    paths = get_path_objects(app)
+
+    static_paths = [x.route_object for x in paths if not x.route_object.is_function]
+    function_paths = [x.route_object for x in paths if x.route_object.is_function]
+
+    static_paths.sort(key=lambda x: x.router_slug)
+    function_paths.sort(key=lambda x: x.router_slug)
+
+    generate_python_templates(static_paths, function_paths)
+
+
+if __name__ == "__main__":
+    main()

dev/code-generation/gen_py_schema_exports.py

@@ -0,0 +1,100 @@
+import pathlib
+import re
+from dataclasses import dataclass, field
+
+from utils import PROJECT_DIR, log, render_python_template
+
+template = """# This file is auto-generated by gen_schema_exports.py
+{% for file in data.module.files %}{{ file.import_str() }}
+{% endfor %}
+
+__all__ = [
+    {% for file in data.module.files %}
+    {%- for class in file.classes -%}
+    "{{ class }}",
+    {%- endfor -%}
+    {%- endfor %}
+]
+
+"""
+
+SCHEMA_PATH = PROJECT_DIR / "mealie" / "schema"
+
+SKIP = {"static", "__pycache__"}
+
+
+class PyFile:
+    import_path: str
+    """The import path of the file"""
+
+    classes: list[str]
+    """A list of classes in the file"""
+
+    def __init__(self, path: pathlib.Path):
+        self.import_path = path.stem
+        self.classes = []
+
+        self.classes = PyFile.extract_classes(path)
+        self.classes.sort()
+
+    def import_str(self) -> str:
+        """Returns a string that can be used to import the file"""
+        return f"from .{self.import_path} import {', '.join(self.classes)}"
+
+    @staticmethod
+    def extract_classes(file_path: pathlib.Path) -> list[str]:
+        name = file_path.stem
+
+        if name == "__init__" or name.startswith("_"):
+            return []
+
+        classes = re.findall(r"(?m)^class\s(\w+)", file_path.read_text())
+        return classes
+
+
+@dataclass
+class Modules:
+    directory: pathlib.Path
+    """The directory to search for modules"""
+
+    files: list[PyFile] = field(default_factory=list)
+    """A list of files in the directory"""
+
+    def __post_init__(self):
+        for file in self.directory.glob("*.py"):
+            if file.name.startswith("_"):
+                continue
+
+            pfile = PyFile(file)
+
+            if len(pfile.classes) > 0:
+                self.files.append(pfile)
+
+            else:
+                log.debug(f"Skipping {file.name} as it has no classes")
+
+
+def find_modules(root: pathlib.Path) -> list[Modules]:
+    """Finds all the top level modules in the provided folder"""
+    modules: list[Modules] = []
+    for file in root.iterdir():
+        if file.is_dir() and file.name not in SKIP:
+            modules.append(Modules(directory=file))
+
+    return modules
+
+
+def main():
+    modules = find_modules(SCHEMA_PATH)
+
+    for module in modules:
+        log.debug(f"Module: {module.directory.name}")
+        for file in module.files:
+            log.debug(f"  File: {file.import_path}")
+            log.debug(f"    Classes: [{', '.join(file.classes)}]")
+
+        render_python_template(template, module.directory / "__init__.py", {"module": module})
+
+
+if __name__ == "__main__":
+    main()

dev/code-generation/gen_pytest_routes.py

@@ -1,53 +0,0 @@
-import json
-from typing import Any
-
-from _gen_utils import render_python_template
-from _open_api_parser import OpenAPIParser
-from _static import CodeDest, CodeTemplates
-from rich.console import Console
-
-from mealie.app import app
-
-"""
-This code is used for generating route objects for each route in the OpenAPI Specification.
-Currently, they are NOT automatically injected into the test suite. As such, you'll need to copy
-the relavent contents of the generated file into the test suite where applicable. I am slowly
-migrating the test suite to use this new generated file and this process will be "automated" in the
-future.
-"""
-
-console = Console()
-
-
-def write_dict_to_file(file_name: str, data: dict[str, Any]):
-    with open(file_name, "w") as f:
-        f.write(json.dumps(data, indent=4))
-
-
-def main():
-    print("Starting...")
-    open_api = OpenAPIParser(app)
-    modules = open_api.get_by_module()
-
-    mods = []
-
-    for mod, value in modules.items():
-
-        routes = []
-        existings = set()
-        # Reduce routes by unique py_route attribute
-        for route in value:
-            if route.py_route not in existings:
-                existings.add(route.py_route)
-                routes.append(route)
-
-        module = {"name": mod, "routes": routes}
-        mods.append(module)
-
-    render_python_template(CodeTemplates.pytest_routes, CodeDest.pytest_routes, {"mods": mods})
-
-    print("Finished...")
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/gen_schema_exports.py

@@ -1,35 +0,0 @@
-from _gen_utils import render_python_template
-from _static import PROJECT_DIR
-
-template = """# GENERATED CODE - DO NOT MODIFY BY HAND
-{% for file in data.files %}from .{{ file }} import *
-{% endfor %}
-"""
-
-SCHEMA_PATH = PROJECT_DIR / "mealie" / "schema"
-
-
-def generate_init_files() -> None:
-
-    for schema in SCHEMA_PATH.iterdir():
-        if not schema.is_dir():
-            print(f"Skipping {schema}")
-            continue
-
-        print(f"Generating {schema}")
-        init_file = schema.joinpath("__init__.py")
-
-        module_files = [
-            f.stem for f in schema.iterdir() if f.is_file() and f.suffix == ".py" and not f.stem.startswith("_")
-        ]
-        render_python_template(template, init_file, {"files": module_files})
-
-
-def main():
-    print("Starting...")
-    generate_init_files()
-    print("Finished...")
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/gen_ts_locales.py

@@ -0,0 +1,246 @@
+import os
+import pathlib
+from dataclasses import dataclass
+from pathlib import Path
+
+import dotenv
+import requests
+from jinja2 import Template
+from pydantic import ConfigDict
+from requests import Response
+from utils import CodeDest, CodeKeys, inject_inline, log
+
+from mealie.schema._mealie import MealieModel
+
+BASE = pathlib.Path(__file__).parent.parent.parent
+
+API_KEY = dotenv.get_key(BASE / ".env", "CROWDIN_API_KEY") or os.environ.get("CROWDIN_API_KEY", "")
+
+
+@dataclass
+class LocaleData:
+    name: str
+    dir: str = "ltr"
+
+
+LOCALE_DATA: dict[str, LocaleData] = {
+    "af-ZA": LocaleData(name="Afrikaans (Afrikaans)"),
+    "ar-SA": LocaleData(name="العربية (Arabic)", dir="rtl"),
+    "bg-BG": LocaleData(name="Български (Bulgarian)"),
+    "ca-ES": LocaleData(name="Català (Catalan)"),
+    "cs-CZ": LocaleData(name="Čeština (Czech)"),
+    "da-DK": LocaleData(name="Dansk (Danish)"),
+    "de-DE": LocaleData(name="Deutsch (German)"),
+    "el-GR": LocaleData(name="Ελληνικά (Greek)"),
+    "en-GB": LocaleData(name="British English"),
+    "en-US": LocaleData(name="American English"),
+    "es-ES": LocaleData(name="Español (Spanish)"),
+    "et-EE": LocaleData(name="Eesti (Estonian)"),
+    "fi-FI": LocaleData(name="Suomi (Finnish)"),
+    "fr-BE": LocaleData(name="Belge (Belgian)"),
+    "fr-CA": LocaleData(name="Français canadien (Canadian French)"),
+    "fr-FR": LocaleData(name="Français (French)"),
+    "gl-ES": LocaleData(name="Galego (Galician)"),
+    "he-IL": LocaleData(name="עברית (Hebrew)", dir="rtl"),
+    "hr-HR": LocaleData(name="Hrvatski (Croatian)"),
+    "hu-HU": LocaleData(name="Magyar (Hungarian)"),
+    "is-IS": LocaleData(name="Íslenska (Icelandic)"),
+    "it-IT": LocaleData(name="Italiano (Italian)"),
+    "ja-JP": LocaleData(name="日本語 (Japanese)"),
+    "ko-KR": LocaleData(name="한국어 (Korean)"),
+    "lt-LT": LocaleData(name="Lietuvių (Lithuanian)"),
+    "lv-LV": LocaleData(name="Latviešu (Latvian)"),
+    "nl-NL": LocaleData(name="Nederlands (Dutch)"),
+    "no-NO": LocaleData(name="Norsk (Norwegian)"),
+    "pl-PL": LocaleData(name="Polski (Polish)"),
+    "pt-BR": LocaleData(name="Português do Brasil (Brazilian Portuguese)"),
+    "pt-PT": LocaleData(name="Português (Portuguese)"),
+    "ro-RO": LocaleData(name="Română (Romanian)"),
+    "ru-RU": LocaleData(name="Pусский (Russian)"),
+    "sk-SK": LocaleData(name="Slovenčina (Slovak)"),
+    "sl-SI": LocaleData(name="Slovenščina (Slovenian)"),
+    "sr-SP": LocaleData(name="српски (Serbian)"),
+    "sv-SE": LocaleData(name="Svenska (Swedish)"),
+    "tr-TR": LocaleData(name="Türkçe (Turkish)"),
+    "uk-UA": LocaleData(name="Українська (Ukrainian)"),
+    "vi-VN": LocaleData(name="Tiếng Việt (Vietnamese)"),
+    "zh-CN": LocaleData(name="简体中文 (Chinese simplified)"),
+    "zh-TW": LocaleData(name="繁體中文 (Chinese traditional)"),
+}
+
+LOCALE_TEMPLATE = """// This Code is auto generated by gen_ts_locales.py
+export const LOCALES = [{% for locale in locales %}
+  {
+    name: "{{ locale.name }}",
+    value: "{{ locale.locale }}",
+    progress: {{ locale.progress }},
+    dir: "{{ locale.dir }}",
+  },{% endfor %}
+];
+
+"""
+
+
+class TargetLanguage(MealieModel):
+    model_config = ConfigDict(populate_by_name=True, extra="allow")
+
+    id: str
+    name: str
+    locale: str
+    dir: str = "ltr"
+    threeLettersCode: str
+    twoLettersCode: str
+    progress: float = 0.0
+
+
+class CrowdinApi:
+    project_name = "Mealie"
+    project_id = "451976"
+    api_key = API_KEY
+
+    def __init__(self, api_key: str | None):
+        self.api_key = api_key or API_KEY
+
+    @property
+    def headers(self) -> dict:
+        return {
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.api_key}",
+        }
+
+    def get_projects(self) -> Response:
+        return requests.get("https://api.crowdin.com/api/v2/projects", headers=self.headers)
+
+    def get_project(self) -> Response:
+        return requests.get(f"https://api.crowdin.com/api/v2/projects/{self.project_id}", headers=self.headers)
+
+    def get_languages(self) -> list[TargetLanguage]:
+        response = self.get_project()
+        tls = response.json()["data"]["targetLanguages"]
+
+        models = [TargetLanguage(**t) for t in tls]
+
+        models.insert(
+            0,
+            TargetLanguage(
+                id="en-US",
+                name="English",
+                locale="en-US",
+                dir="ltr",
+                threeLettersCode="en",
+                twoLettersCode="en",
+                progress=100,
+            ),
+        )
+
+        progress: list[dict] = self.get_progress()["data"]
+
+        for model in models:
+            if model.locale in LOCALE_DATA:
+                locale_data = LOCALE_DATA[model.locale]
+                model.name = locale_data.name
+                model.dir = locale_data.dir
+
+            for p in progress:
+                if p["data"]["languageId"] == model.id:
+                    model.progress = p["data"]["translationProgress"]
+
+        models.sort(key=lambda x: x.locale, reverse=True)
+        return models
+
+    def get_progress(self) -> dict:
+        response = requests.get(
+            f"https://api.crowdin.com/api/v2/projects/{self.project_id}/languages/progress?limit=500",
+            headers=self.headers,
+        )
+        return response.json()
+
+
+PROJECT_DIR = Path(__file__).parent.parent.parent
+
+
+datetime_dir = PROJECT_DIR / "frontend" / "lang" / "dateTimeFormats"
+locales_dir = PROJECT_DIR / "frontend" / "lang" / "messages"
+nuxt_config = PROJECT_DIR / "frontend" / "nuxt.config.ts"
+i18n_config = PROJECT_DIR / "frontend" / "i18n.config.ts"
+reg_valid = PROJECT_DIR / "mealie" / "schema" / "_mealie" / "validators.py"
+
+"""
+This snippet walks the message and dat locales directories and generates the import information
+for the nuxt.config.ts file and automatically injects it into the nuxt.config.ts file. Note that
+the code generation ID is hardcoded into the script and required in the nuxt config.
+"""
+
+
+def inject_nuxt_values():
+    datetime_files = list(datetime_dir.glob("*.json"))
+    datetime_files.sort()
+
+    datetime_imports = []
+    datetime_object_entries = []
+
+    for match in datetime_files:
+        # Convert locale name to camelCase variable name (e.g., "en-US" -> "enUS")
+        var_name = match.stem.replace("-", "")
+
+        # Generate import statement
+        import_line = f'import * as {var_name} from "./lang/dateTimeFormats/{match.name}";'
+        datetime_imports.append(import_line)
+
+        # Generate object entry
+        object_entry = f'  "{match.stem}": {var_name},'
+        datetime_object_entries.append(object_entry)
+
+    all_date_locales = datetime_imports + ["", "const datetimeFormats = {"] + datetime_object_entries + ["};"]
+
+    all_langs = []
+    for match in locales_dir.glob("*.json"):
+        match_data = LOCALE_DATA.get(match.stem)
+        match_dir = match_data.dir if match_data else "ltr"
+
+        lang_string = f'{{ code: "{match.stem}", file: "{match.name.replace(".json", ".ts")}", dir: "{match_dir}" }},'
+        all_langs.append(lang_string)
+
+    all_langs.sort()
+
+    log.debug(f"injecting locales into nuxt config -> {nuxt_config}")
+    inject_inline(nuxt_config, CodeKeys.nuxt_local_messages, all_langs)
+    inject_inline(i18n_config, CodeKeys.nuxt_local_dates, all_date_locales)
+
+
+def inject_registration_validation_values():
+    all_langs = []
+    for match in locales_dir.glob("*.json"):
+        lang_string = f'"{match.stem}",'
+        all_langs.append(lang_string)
+
+    # sort
+    all_langs.sort()
+
+    log.debug(f"injecting locales into user registration validation -> {reg_valid}")
+    inject_inline(reg_valid, CodeKeys.nuxt_local_messages, all_langs)
+
+
+def generate_locales_ts_file():
+    api = CrowdinApi(None)
+    models = api.get_languages()
+    tmpl = Template(LOCALE_TEMPLATE)
+    rendered = tmpl.render(locales=models)
+
+    log.debug(f"generating locales ts file -> {CodeDest.use_locales}")
+    with open(CodeDest.use_locales, "w") as f:
+        f.write(rendered)  # type:ignore
+
+
+def main():
+    if API_KEY is None or API_KEY == "":
+        log.error("CROWDIN_API_KEY is not set")
+        return
+
+    generate_locales_ts_file()
+    inject_nuxt_values()
+    inject_registration_validation_values()
+
+
+if __name__ == "__main__":
+    main()

dev/code-generation/gen_ts_types.py

@@ -0,0 +1,235 @@
+import re
+from pathlib import Path
+
+from jinja2 import Template
+from pydantic2ts import generate_typescript_defs
+from utils import log
+
+# ============================================================
+
+template = """// This Code is auto generated by gen_ts_types.py
+{% for name in global %}import type {{ name }} from "@/components/global/{{ name }}.vue";
+{% endfor %}{% for name in layout %}import type {{ name }} from "@/components/layout/{{ name }}.vue";
+{% endfor %}
+declare module "vue" {
+  export interface GlobalComponents {
+    // Global Components
+{% for name in global -%}
+    {{ "    " }}{{ name }}: typeof {{ name }};
+{% endfor -%}
+    {{ "    " }}// Layout Components
+{% for name in layout -%}
+    {{ "    " }}{{ name }}: typeof {{ name }};
+{% endfor -%}{{ "  }"}}
+}
+
+export {};
+
+"""
+
+CWD = Path(__file__).parent
+PROJECT_DIR = Path(__file__).parent.parent.parent
+
+
+def generate_global_components_types() -> None:
+    destination_file = PROJECT_DIR / "frontend" / "types" / "components.d.ts"
+
+    component_paths = {
+        "global": PROJECT_DIR / "frontend" / "components" / "global",
+        "layout": PROJECT_DIR / "frontend" / "components" / "Layout",
+    }
+
+    def render_template(template: str, data: dict) -> str | None:
+        tmpl = Template(template)
+        return tmpl.render(**data)
+
+    def build_data() -> dict:
+        data = {}
+        for name, path in component_paths.items():
+            components = [component.stem for component in path.glob("*.vue")]
+            components.sort()
+            data[name] = components
+
+        return data
+
+    def write_template(text: str) -> None:
+        destination_file.write_text(text)
+
+    text = render_template(template, build_data())
+
+    if text:
+        write_template(text)
+
+
+# ============================================================
+# Pydantic To Typescript Generator
+
+
+def generate_typescript_types() -> None:  # noqa: C901
+    def contains_number(s: str) -> bool:
+        return bool(re.search(r"\d", s))
+
+    def remove_numbers(s: str) -> str:
+        return re.sub(r"\d", "", s)
+
+    def extract_type_name(line: str) -> str:
+        # Looking for "export type EnumName = enumVal1 | enumVal2 | ..."
+        if not (line.startswith("export type") and "=" in line):
+            return ""
+
+        return line.split(" ")[2]
+
+    def extract_property_type_name(line: str) -> str:
+        # Looking for " fieldName: FieldType;" or " fieldName: FieldType & string;"
+        if not (line.startswith("  ") and ":" in line):
+            return ""
+
+        return line.split(":")[1].strip().split(";")[0]
+
+    def extract_interface_name(line: str) -> str:
+        # Looking for "export interface InterfaceName {"
+        if not (line.startswith("export interface") and "{" in line):
+            return ""
+
+        return line.split(" ")[2]
+
+    def is_comment_line(line: str) -> bool:
+        s = line.strip()
+        return s.startswith("/*") or s.startswith("*")
+
+    def clean_output_file(file: Path) -> None:
+        """
+        json2ts generates duplicate types off of our enums and appends a number to the end of the type name.
+        Our Python code (hopefully) doesn't have any duplicate enum names, or types with numbers in them,
+        so we can safely remove the numbers.
+
+        To do this, we read the output line-by-line and replace any type names that contain numbers with
+        the same type name, but without the numbers.
+
+        Note: the issue arrises from the JSON package json2ts, not the Python package pydantic2ts,
+        otherwise we could just fix pydantic2ts.
+        """
+
+        # First pass: build a map of type names to their numberless counterparts and lines to skip
+        replacement_map = {}
+        lines_to_skip = set()
+        wait_for_semicolon = False
+        wait_for_close_bracket = False
+        skip_comments = False
+        with open(file) as f:
+            for i, line in enumerate(f.readlines()):
+                if wait_for_semicolon:
+                    if ";" in line:
+                        wait_for_semicolon = False
+                    lines_to_skip.add(i)
+                    continue
+                if wait_for_close_bracket:
+                    if "}" in line:
+                        wait_for_close_bracket = False
+                    lines_to_skip.add(i)
+                    continue
+
+                if type_name := extract_type_name(line):
+                    if not contains_number(type_name):
+                        continue
+
+                    replacement_map[type_name] = remove_numbers(type_name)
+                    if ";" not in line:
+                        wait_for_semicolon = True
+                    lines_to_skip.add(i)
+
+                elif type_name := extract_interface_name(line):
+                    if not contains_number(type_name):
+                        continue
+
+                    replacement_map[type_name] = remove_numbers(type_name)
+                    if "}" not in line:
+                        wait_for_close_bracket = True
+                    lines_to_skip.add(i)
+
+                elif skip_comments and is_comment_line(line):
+                    lines_to_skip.add(i)
+
+                # we've passed the opening comments and empty line at the header
+                elif not skip_comments and not line.strip():
+                    skip_comments = True
+
+        # Second pass: rewrite or remove lines as needed.
+        # We have to do two passes here because definitions don't always appear in the same order as their usage.
+        lines = []
+        with open(file) as f:
+            for i, line in enumerate(f.readlines()):
+                if i in lines_to_skip:
+                    continue
+
+                if type_name := extract_property_type_name(line):
+                    if type_name in replacement_map:
+                        line = line.replace(type_name, replacement_map[type_name])
+
+                lines.append(line)
+
+        with open(file, "w") as f:
+            f.writelines(lines)
+
+    def path_to_module(path: Path):
+        str_path: str = str(path)
+
+        str_path = str_path.removeprefix(str(PROJECT_DIR))
+        str_path = str_path.removeprefix("/")
+        str_path = str_path.replace("/", ".")
+
+        return str_path
+
+    schema_path = PROJECT_DIR / "mealie" / "schema"
+    types_dir = PROJECT_DIR / "frontend" / "lib" / "api" / "types"
+
+    ignore_dirs = ["__pycache__", "static", "_mealie"]
+
+    skipped_files: list[Path] = []
+    skipped_dirs: list[Path] = []
+    failed_modules: list[Path] = []
+
+    for module in schema_path.iterdir():
+        if module.is_dir() and module.stem in ignore_dirs:
+            skipped_dirs.append(module)
+            continue
+
+        if not module.is_dir() or not module.joinpath("__init__.py").is_file():
+            skipped_files.append(module)
+            continue
+
+        ts_out_name = module.name.replace("_", "-") + ".ts"
+        out_path = types_dir.joinpath(ts_out_name)
+
+        try:
+            path_as_module = path_to_module(module)
+            generate_typescript_defs(path_as_module, str(out_path), exclude=("MealieModel"))  # type: ignore
+            clean_output_file(out_path)
+        except Exception:
+            failed_modules.append(module)
+            log.exception(f"Module Error: {module}")
+
+    log.debug("\n📁 Skipped Directories:")
+    for skipped_dir in skipped_dirs:
+        log.debug(f"   📁 {skipped_dir.name}")
+
+    log.debug("📄 Skipped Files:")
+    for f in skipped_files:
+        log.debug(f"   📄 {f.name}")
+
+    if len(failed_modules) > 0:
+        log.error("❌ Failed Modules:")
+        for f in failed_modules:
+            log.error(f"   ❌ {f.name}")
+
+
+def main():
+    log.debug("\n-- Starting Global Components Generator --")
+    generate_global_components_types()
+
+    log.debug("\n-- Starting Pydantic To Typescript Generator --")
+    generate_typescript_types()
+
+
+if __name__ == "__main__":
+    main()

dev/code-generation/main.py

@@ -0,0 +1,53 @@
+import argparse
+from pathlib import Path
+
+import gen_py_pytest_data_paths
+import gen_py_pytest_routes
+import gen_py_schema_exports
+import gen_ts_locales
+import gen_ts_types
+from utils import log
+
+CWD = Path(__file__).parent
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Run code generators")
+    parser.add_argument(
+        "generators",
+        nargs="*",
+        help="Specific generators to run (schema, types, locales, data-paths, routes). If none specified, all will run.",  # noqa: E501 - long line
+    )
+    args = parser.parse_args()
+
+    # Define all available generators
+    all_generators = {
+        "schema": (gen_py_schema_exports.main, "schema exports"),
+        "types": (gen_ts_types.main, "frontend types"),
+        "locales": (gen_ts_locales.main, "locales"),
+        "data-paths": (gen_py_pytest_data_paths.main, "test data paths"),
+        "routes": (gen_py_pytest_routes.main, "pytest routes"),
+    }
+
+    # Determine which generators to run
+    if args.generators:
+        # Validate requested generators
+        invalid_generators = [g for g in args.generators if g not in all_generators]
+        if invalid_generators:
+            log.error(f"Invalid generator(s): {', '.join(invalid_generators)}")
+            log.info(f"Available generators: {', '.join(all_generators.keys())}")
+            return
+
+        generators_to_run = [(all_generators[g][0], all_generators[g][1]) for g in args.generators]
+    else:
+        # Run all generators (default behavior)
+        generators_to_run = list(all_generators.values())
+
+    # Run the selected generators
+    for func, name in generators_to_run:
+        log.info(f"Generating {name}...")
+        func()
+
+
+if __name__ == "__main__":
+    main()

dev/code-generation/templates/test_data.py.j2

@@ -4,4 +4,4 @@ CWD = Path(__file__).parent
 
 {% for f in data.children %}
 {{ f.var }} = CWD / "{{ f.path }}"
-{% endfor %}
+{% endfor %}

dev/code-generation/templates/test_routes.py.j2

@@ -1,9 +1,11 @@
-{% for mod in mods  %}
-class {{mod.name}}Routes:{% for route in mod.routes  %}{% if not route.path_is_func   %}
-    {{route.name_snake}} = "{{ route.py_route }}"{% endif %}{% endfor %}{% for route in mod.routes  %}
-{% if route.path_is_func   %}
-    @staticmethod
-    def {{route.name_snake}}({{ route.path_vars|join(", ") }}):
-        return f"{{route.py_route}}"       
-{% endif %}{% endfor %}
-{% endfor %}
+# This Content is Auto Generated for Pytest
+prefix = "{{paths.prefix}}"
+{% for path in paths.static_paths %}
+{{ path.router_slug }} = "{{path.prefix}}{{ path.route }}"
+"""`{{path.prefix}}{{ path.route }}`"""{% endfor %}
+{% for path in paths.function_paths  %}
+
+def {{path.router_slug}}({{path.var|join(", ")}}):
+    """`{{ paths.prefix }}{{ path.route }}`"""
+    return f"{prefix}{{ path.route }}"
+{% endfor %}

dev/code-generation/utils/__init__.py

@@ -0,0 +1,25 @@
+from .open_api_parser import OpenAPIParser
+from .route import HTTPRequest, ParameterIn, RequestBody, RequestType, RouteObject, RouterParameter
+from .static import PROJECT_DIR, CodeDest, CodeKeys, CodeTemplates, Directories
+from .template import CodeSlicer, find_start_end, get_indentation_of_string, inject_inline, log, render_python_template
+
+__all__ = [
+    "CodeDest",
+    "CodeKeys",
+    "CodeSlicer",
+    "CodeTemplates",
+    "Directories",
+    "find_start_end",
+    "get_indentation_of_string",
+    "HTTPRequest",
+    "inject_inline",
+    "log",
+    "OpenAPIParser",
+    "ParameterIn",
+    "PROJECT_DIR",
+    "render_python_template",
+    "RequestBody",
+    "RequestType",
+    "RouteObject",
+    "RouterParameter",
+]

dev/code-generation/utils/anonymize_backups.py

@@ -0,0 +1,74 @@
+import json
+import logging
+import random
+import string
+from datetime import datetime
+from uuid import UUID
+
+logger = logging.getLogger("anonymize_backups")
+
+
+def is_uuid4(value: str):
+    try:
+        UUID(value)
+        return True
+    except ValueError:
+        return False
+
+
+def is_iso_datetime(value: str):
+    try:
+        datetime.fromisoformat(value)
+        return True
+    except ValueError:
+        return False
+
+
+def random_string(length=10):
+    return "".join(random.choice(string.ascii_lowercase) for _ in range(length))
+
+
+def clean_value(value):
+    try:
+        match value:
+            # preserve non-strings
+            case int(value) | float(value):
+                return value
+            case None:
+                return value
+            # preserve UUIDs and datetimes
+            case str(value) if is_uuid4(value) or is_iso_datetime(value):
+                return value
+            # randomize strings
+            case str(value):
+                return random_string()
+            case _:
+                pass
+
+    except Exception as e:
+        logger.exception(e)
+
+    logger.error(f"Failed to anonymize value: {value}")
+    return value
+
+
+def walk_data_and_anonymize(data):
+    for k, v in data.items():
+        if isinstance(v, list):
+            for item in v:
+                walk_data_and_anonymize(item)
+        else:
+            # preserve alembic version number and enums
+            if k in ["auth_method", "version_num"]:
+                continue
+
+            data[k] = clean_value(v)
+
+
+def anonymize_database_json(input_filepath: str, output_filepath: str):
+    with open(input_filepath) as f:
+        data = json.load(f)
+
+    walk_data_and_anonymize(data)
+    with open(output_filepath, "w") as f:
+        json.dump(data, f)

dev/code-generation/utils/open_api_parser.py

@@ -3,11 +3,12 @@ import re
 from pathlib import Path
 from typing import Any
 
-from _static import Directories
 from fastapi import FastAPI
 from humps import camelize
 from slugify import slugify
 
+from .static import Directories
+
 
 def get_openapi_spec_by_ref(app, type_reference: str) -> dict:
     if not type_reference:

dev/code-generation/utils/route.py

@@ -1,9 +1,8 @@
 import re
 from enum import Enum
-from typing import Optional
 
 from humps import camelize
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 from slugify import slugify
 
 
@@ -30,26 +29,33 @@ class RequestType(str, Enum):
 class ParameterIn(str, Enum):
     query = "query"
     path = "path"
+    header = "header"
 
 
 class RouterParameter(BaseModel):
+    model_config = ConfigDict(extra="allow")
+
     required: bool = False
     name: str
     location: ParameterIn = Field(..., alias="in")
 
 
 class RequestBody(BaseModel):
+    model_config = ConfigDict(extra="allow")
+
     required: bool = False
 
 
 class HTTPRequest(BaseModel):
+    model_config = ConfigDict(extra="allow", populate_by_name=True)
+
     request_type: RequestType
     description: str = ""
     summary: str
-    requestBody: Optional[RequestBody]
+    request_body: RequestBody | None = None
 
     parameters: list[RouterParameter] = []
-    tags: list[str]
+    tags: list[str] | None = []
 
     def list_as_js_object_string(self, parameters, braces=True):
         if len(parameters) == 0:
@@ -61,11 +67,11 @@ class HTTPRequest(BaseModel):
             return ", ".join(parameters)
 
     def payload(self):
-        return "payload" if self.requestBody else ""
+        return "payload" if self.request_body else ""
 
     def function_args(self):
         all_params = [p.name for p in self.parameters]
-        if self.requestBody:
+        if self.request_body:
             all_params.append("payload")
         return self.list_as_js_object_string(all_params)
 

dev/code-generation/utils/static.py

@@ -0,0 +1,26 @@
+from pathlib import Path
+
+PARENT = Path(__file__).parent.parent
+PROJECT_DIR = Path(__file__).parent.parent.parent.parent
+
+
+class Directories:
+    out_dir = PARENT / "generated"
+
+
+class CodeTemplates:
+    interface = PARENT / "templates" / "interface.js"
+    pytest_routes = PARENT / "templates" / "test_routes.py.j2"
+
+
+class CodeDest:
+    interface = PARENT / "generated" / "interface.js"
+    pytest_routes = PARENT / "generated" / "test_routes.py"
+    use_locales = PROJECT_DIR / "frontend" / "composables" / "use-locales" / "available-locales.ts"
+
+
+class CodeKeys:
+    """Hard coded comment IDs that are used to generate code"""
+
+    nuxt_local_messages = "MESSAGE_LOCALES"
+    nuxt_local_dates = "DATE_LOCALES"

dev/code-generation/utils/template.py

@@ -1,13 +1,18 @@
-import re
+import logging
+import subprocess
 from dataclasses import dataclass
 from pathlib import Path
 
-import black
-import isort
 from jinja2 import Template
+from rich.logging import RichHandler
+
+FORMAT = "%(message)s"
+logging.basicConfig(level=logging.INFO, format=FORMAT, datefmt="[%X]", handlers=[RichHandler()])
+
+log = logging.getLogger("rich")
 
 
-def render_python_template(template_file: Path | str, dest: Path, data: dict) -> str:
+def render_python_template(template_file: Path | str, dest: Path, data: dict):
     """Render and Format a Jinja2 Template for Python Code"""
     if isinstance(template_file, Path):
         tplt = Template(template_file.read_text())
@@ -15,9 +20,13 @@ def render_python_template(template_file: Path | str, dest: Path, data: dict) ->
         tplt = Template(template_file)
 
     text = tplt.render(data=data)
-    text = black.format_str(text, mode=black.FileMode())
+
     dest.write_text(text)
-    isort.file(dest)
+
+    # lint/format file with Ruff
+    log.info(f"Formatting {dest}")
+    subprocess.run(["poetry", "run", "ruff", "check", str(dest), "--fix"])
+    subprocess.run(["poetry", "run", "ruff", "format", str(dest)])
 
 
 @dataclass
@@ -25,7 +34,7 @@ class CodeSlicer:
     start: int
     end: int
 
-    indentation: str
+    indentation: str | None
     text: list[str]
 
     _next_line = None
@@ -37,16 +46,24 @@ class CodeSlicer:
 
     def push_line(self, string: str) -> None:
         self._next_line = self._next_line or self.start + 1
-        print(self.indentation)
-        self.text.insert(self._next_line, self.indentation + string + "\n")
+        self.text.insert(self._next_line, (self.indentation or "") + string + "\n")
         self._next_line += 1
 
 
-def get_indentation_of_string(line: str, comment_char: str = "//") -> str:
-    return re.sub(rf"{comment_char}.*", "", line).removesuffix("\n")
+def get_indentation_of_string(line: str) -> str:
+    # Extract everything before the comment
+    if "//" in line:
+        indentation = line.split("//")[0]
+    elif "#" in line:
+        indentation = line.split("#")[0]
+    else:
+        indentation = line
+
+    # Keep only the whitespace, remove any non-whitespace characters
+    return "".join(c for c in indentation if c.isspace())
 
 
-def find_start_end(file_text: list[str], gen_id: str) -> tuple[int, int]:
+def find_start_end(file_text: list[str], gen_id: str) -> tuple[int, int, str | None]:
     start = None
     end = None
     indentation = None
@@ -84,7 +101,7 @@ def inject_inline(file_path: Path, key: str, code: list[str]) -> None:
 
     """
 
-    with open(file_path, "r") as f:
+    with open(file_path) as f:
         file_text = f.readlines()
 
     start, end, indentation = find_start_end(file_text, key)

dev/data/templates/recipes.md

@@ -1,24 +0,0 @@
-
-
-![Recipe Image](../../images/{{ recipe.slug }}/original.jpg)
-
-# {{ recipe.name }}
-{{ recipe.description }}
-
-## Ingredients
-{% for ingredient in recipe.recipeIngredient %} 
-- [ ] {{ ingredient }} {% endfor %}
-
-## Instructions
-{% for step in recipe.recipeInstructions %} 
-- [ ] {{ step.text }} {% endfor %}
-
-{% for note in recipe.notes %}
-**{{ note.title }}:** {{ note.text }}
-{% endfor %}
-
----
-
-Tags: {{ recipe.tags }}
-Categories: {{ recipe.categories }}
-Original URL: {{ recipe.orgURL }}

dev/scripts/all_recipes_stress_test.py

@@ -2,8 +2,13 @@ import json
 import random
 import string
 import time
+from dataclasses import dataclass
 
 import requests
+from rich.console import Console
+from rich.table import Table
+
+console = Console()
 
 
 def random_string(length: int) -> str:
@@ -14,8 +19,205 @@ def payload_factory() -> dict:
     return {"name": random_string(15)}
 
 
-def login(username="changeme@email.com", password="MyPassword"):
+def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dict:
+    return {
+        "id": id,
+        "userId": userId,
+        "groupId": groupId,
+        "name": name,
+        "slug": slug,
+        "image": "tNRG",
+        "recipeYield": "9 servings",
+        "totalTime": "33 Minutes",
+        "prepTime": "20 Minutes",
+        "cookTime": None,
+        "performTime": "13 Minutes",
+        "description": "These Levain Bakery-Style Peanut Butter Cookies are the ULTIMATE for serious PB lovers! Supremely thick and chewy with gooey centers and a soft texture, they're packed with peanut butter flavor and Reese's Pieces for the most amazing cookie ever!",
+        "recipeCategory": [],
+        "tags": [],
+        "tools": [],
+        "rating": None,
+        "orgURL": "https://thedomesticrebel.com/2021/04/28/levain-bakery-style-ultimate-peanut-butter-cookies/",
+        "recipeIngredient": [
+            {
+                "title": None,
+                "note": "1 cup unsalted butter, cut into cubes",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "ea3b6702-9532-4fbc-a40b-f99917831c26",
+            },
+            {
+                "title": None,
+                "note": "1 cup light brown sugar",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "c5bbfefb-1e23-4ffd-af88-c0363a0fae82",
+            },
+            {
+                "title": None,
+                "note": "1/2 cup granulated white sugar",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "034f481b-c426-4a17-b983-5aea9be4974b",
+            },
+            {
+                "title": None,
+                "note": "2 large eggs",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "37c1f796-3bdb-4856-859f-dbec90bc27e4",
+            },
+            {
+                "title": None,
+                "note": "2 tsp vanilla extract",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "85561ace-f249-401d-834c-e600a2f6280e",
+            },
+            {
+                "title": None,
+                "note": "1/2 cup creamy peanut butter",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "ac91bda0-e8a8-491a-976a-ae4e72418cfd",
+            },
+            {
+                "title": None,
+                "note": "1 tsp cornstarch",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "4d1256b3-115e-4475-83cd-464fbc304cb0",
+            },
+            {
+                "title": None,
+                "note": "1 tsp baking soda",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "64627441-39f9-4ee3-8494-bafe36451d12",
+            },
+            {
+                "title": None,
+                "note": "1/2 tsp salt",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "7ae212d0-3cd1-44b0-899e-ec5bd91fd384",
+            },
+            {
+                "title": None,
+                "note": "1 cup cake flour",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "06967994-8548-4952-a8cc-16e8db228ebd",
+            },
+            {
+                "title": None,
+                "note": "2 cups all-purpose flour",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "bdb33b23-c767-4465-acf8-3b8e79eb5691",
+            },
+            {
+                "title": None,
+                "note": "2 cups peanut butter chips",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "12ba0af8-affd-4fb2-9cca-6f1b3e8d3aef",
+            },
+            {
+                "title": None,
+                "note": "1½ cups Reese's Pieces candies",
+                "unit": None,
+                "food": None,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "4bdc0598-a3eb-41ee-8af0-4da9348fbfe2",
+            },
+        ],
+        "dateAdded": "2022-09-03",
+        "dateUpdated": "2022-09-10T15:18:19.866085",
+        "createdAt": "2022-09-03T18:31:17.488118",
+        "updatedAt": "2022-09-10T15:18:19.869630",
+        "recipeInstructions": [
+            {
+                "id": "60ae53a3-b3ff-40ee-bae3-89fea0b1c637",
+                "title": "",
+                "text": "Preheat oven to 410° degrees F. Line 2 baking sheets with parchment paper or silicone liners; set aside.",
+                "ingredientReferences": [],
+            },
+            {
+                "id": "4e1c30c2-2e96-4a0a-b750-23c9ea3640f8",
+                "title": "",
+                "text": "In the bowl of a stand mixer, cream together the cubed butter, brown sugar and granulated sugar with the paddle attachment for 30 seconds on low speed. Increase speed to medium and beat for another 30 seconds, then increase to medium-high speed and beat for another 30 seconds until mixture is creamy and smooth. Beat in the eggs, one at a time, followed by the vanilla extract and peanut butter, scraping down the sides and bottom of the bowl as needed.",
+                "ingredientReferences": [],
+            },
+            {
+                "id": "9fb8e2a2-d410-445c-bafc-c059203e6f4b",
+                "title": "",
+                "text": "Add in the cornstarch, baking soda, salt, cake flour, and all-purpose flour and mix on low speed until just combined. Fold in the peanut butter chips and Reese's Pieces candies by hand until fully incorporated. Chill the dough uncovered in the fridge for 15 minutes.",
+                "ingredientReferences": [],
+            },
+            {
+                "id": "1ceb9aa4-49f7-4d4a-996f-3c715eb74642",
+                "title": "",
+                "text": 'Using a digital kitchen scale for accuracy, weigh out 6 ounces of cookie dough in a loose, rough textured ball. I like to make my cookie dough balls kind of tall as well. You do not want the dough balls to be smooth and compacted. Place on the baking sheet. Repeat with remaining dough balls, staggering on the baking sheet at least 3" apart from one another, and only placing 4 dough balls per baking sheet.',
+                "ingredientReferences": [],
+            },
+            {
+                "id": "591993fc-72bb-4091-8a12-84640c523fc1",
+                "title": "",
+                "text": "Bake one baking sheet at a time in the center rack of the oven for 10-13 minutes or until the tops are light golden brown and the exterior is dry and dull looking. Centers will be slightly underdone and gooey; this is okay and the cookies will finish cooking some once removed from the oven. Let stand on the baking sheets for at least 30 minutes before serving; the cookies are very delicate and fragile once removed from the oven and need time to set before being moved. Keep remaining dough refrigerated while other cookies bake.",
+                "ingredientReferences": [],
+            },
+        ],
+        "nutrition": {
+            "calories": None,
+            "fatContent": None,
+            "proteinContent": None,
+            "carbohydrateContent": None,
+            "fiberContent": None,
+            "sodiumContent": None,
+            "sugarContent": None,
+        },
+        "settings": {
+            "public": True,
+            "showNutrition": False,
+            "showAssets": False,
+            "landscapeView": False,
+            "disableComments": False,
+            "locked": False,
+        },
+        "assets": [],
+        "notes": [],
+        "extras": {},
+        "comments": [],
+    }
 
+
+def login(username="changeme@example.com", password="MyPassword"):
     payload = {"username": username, "password": password}
     r = requests.post("http://localhost:9000/api/auth/token", payload)
 
@@ -30,32 +232,90 @@ def populate_data(token):
         r = requests.post("http://localhost:9000/api/recipes", json=payload, headers=token)
 
         if r.status_code != 201:
-            print(f"Error: {r.status_code}")
-            print(r.text)
+            console.print(f"Error: {r.status_code}")
+            console.print(r.text)
             exit()
 
-        else:
-            print(f"Created recipe: {payload}")
+        recipe_json = requests.get(f"http://localhost:9000/api/recipes/{payload['name']}", headers=token)
+
+        if recipe_json.status_code != 200:
+            console.print(f"Error: {recipe_json.status_code}")
+            console.print(recipe_json.text)
+            exit()
+
+        recipe = json.loads(recipe_json.text)
+        update_data = recipe_data(recipe["name"], recipe["slug"], recipe["id"], recipe["userId"], recipe["groupId"])
+
+        r = requests.put(f"http://localhost:9000/api/recipes/{update_data['slug']}", json=update_data, headers=token)
+        if r.status_code != 200:
+            console.print(f"Error: {r.status_code}")
+            console.print(r.text)
+            exit()
 
 
-def time_request(url, headers):
+@dataclass(slots=True)
+class Result:
+    recipes: int
+    time: float
+
+
+def time_request(url, headers) -> Result:
     start = time.time()
     r = requests.get(url, headers=headers)
-
-    print(f"Total Recipes {len(r.json())}")
     end = time.time()
-    print(end - start)
+
+    return Result(len(r.json()["items"]), end - start)
 
 
 def main():
-    print("Starting...")
     token = login()
     # populate_data(token)
 
-    for _ in range(10):
-        time_request("http://localhost:9000/api/recipes", token)
+    results: list[Result] = []
 
-    print("Finished...")
+    for _ in range(10):
+        result = time_request("http://localhost:9000/api/recipes?perPage=-1&page=1&loadFood=true", token)
+        results.append(result)
+
+    min, max, average = 99, 0, 0
+
+    for result in results:
+        if result.time < min:
+            min = result.time
+
+        if result.time > max:
+            max = result.time
+
+        average += result.time
+
+    tbl1 = Table(title="Requests")
+
+    tbl1.add_column("Recipes", justify="right", style="cyan", no_wrap=True)
+    tbl1.add_column("Time", justify="right", style="magenta")
+
+    for result in results:
+        tbl1.add_row(
+            str(result.recipes),
+            str(result.time),
+        )
+
+    tbl2 = Table(title="Summary")
+
+    tbl2.add_column("Min", justify="right", style="green")
+    tbl2.add_column("Max", justify="right", style="green")
+    tbl2.add_column("Average", justify="right", style="green")
+
+    tbl2.add_row(
+        str(round(min * 1000)) + "ms",
+        str(round(max * 1000)) + "ms",
+        str(round((average / len(results)) * 1000)) + "ms",
+    )
+
+    console = Console()
+    console.print(tbl1)
+    console.print(tbl2)
+
+    # Best Time 289 / 405/ 247
 
 
 if __name__ == "__main__":

dev/scripts/app_routes_gen.py

@@ -1,214 +0,0 @@
-import json
-import re
-from enum import Enum
-from itertools import groupby
-from pathlib import Path
-from typing import Optional
-
-from fastapi import FastAPI
-from humps import camelize
-from jinja2 import Template
-from pydantic import BaseModel, Field
-from slugify import slugify
-
-from mealie.app import app
-
-CWD = Path(__file__).parent
-OUT_DIR = CWD / "output"
-TEMPLATES_DIR = CWD / "templates"
-
-JS_DIR = OUT_DIR / "javascriptAPI"
-JS_DIR.mkdir(exist_ok=True, parents=True)
-
-
-class RouteObject:
-    def __init__(self, route_string) -> None:
-        self.prefix = "/" + route_string.split("/")[1]
-        self.route = "/" + route_string.split("/", 2)[2]
-        self.js_route = self.route.replace("{", "${")
-        self.parts = route_string.split("/")[1:]
-        self.var = re.findall(r"\{(.*?)\}", route_string)
-        self.is_function = "{" in self.route
-        self.router_slug = slugify("_".join(self.parts[1:]), separator="_")
-        self.router_camel = camelize(self.router_slug)
-
-
-class RequestType(str, Enum):
-    get = "get"
-    put = "put"
-    post = "post"
-    patch = "patch"
-    delete = "delete"
-
-
-class ParameterIn(str, Enum):
-    query = "query"
-    path = "path"
-
-
-class RouterParameter(BaseModel):
-    required: bool = False
-    name: str
-    location: ParameterIn = Field(..., alias="in")
-
-
-class RequestBody(BaseModel):
-    required: bool = False
-
-
-class HTTPRequest(BaseModel):
-    request_type: RequestType
-    description: str = ""
-    summary: str
-    requestBody: Optional[RequestBody]
-
-    parameters: list[RouterParameter] = []
-    tags: list[str]
-
-    def list_as_js_object_string(self, parameters, braces=True):
-        if len(parameters) == 0:
-            return ""
-
-        if braces:
-            return "{" + ", ".join(parameters) + "}"
-        else:
-            return ", ".join(parameters)
-
-    def payload(self):
-        return "payload" if self.requestBody else ""
-
-    def function_args(self):
-        all_params = [p.name for p in self.parameters]
-        if self.requestBody:
-            all_params.append("payload")
-        return self.list_as_js_object_string(all_params)
-
-    def query_params(self):
-        params = [param.name for param in self.parameters if param.location == ParameterIn.query]
-        return self.list_as_js_object_string(params)
-
-    def path_params(self):
-        params = [param.name for param in self.parameters if param.location == ParameterIn.path]
-        return self.list_as_js_object_string(parameters=params, braces=False)
-
-    @property
-    def summary_camel(self):
-        return camelize(slugify(self.summary))
-
-    @property
-    def js_docs(self):
-        return self.description.replace("\n", "  \n  * ")
-
-
-class PathObject(BaseModel):
-    route_object: RouteObject
-    http_verbs: list[HTTPRequest]
-
-    class Config:
-        arbitrary_types_allowed = True
-
-
-def get_path_objects(app: FastAPI):
-    paths = []
-
-    for key, value in app.openapi().items():
-        if key == "paths":
-            for key, value in value.items():
-
-                paths.append(
-                    PathObject(
-                        route_object=RouteObject(key),
-                        http_verbs=[HTTPRequest(request_type=k, **v) for k, v in value.items()],
-                    )
-                )
-
-    return paths
-
-
-def dump_open_api(app: FastAPI):
-    """Writes the Open API as JSON to a json file"""
-    OPEN_API_FILE = CWD / "openapi.json"
-
-    with open(OPEN_API_FILE, "w") as f:
-        f.write(json.dumps(app.openapi()))
-
-
-def read_template(file: Path):
-    with open(file, "r") as f:
-        return f.read()
-
-
-def generate_python_templates(static_paths: list[PathObject], function_paths: list[PathObject]):
-    PYTEST_TEMPLATE = TEMPLATES_DIR / "pytest_routes.j2"
-    PYTHON_OUT_FILE = OUT_DIR / "app_routes.py"
-
-    template = Template(read_template(PYTEST_TEMPLATE))
-    content = template.render(
-        paths={
-            "prefix": "/api",
-            "static_paths": static_paths,
-            "function_paths": function_paths,
-        }
-    )
-    with open(PYTHON_OUT_FILE, "w") as f:
-        f.write(content)
-
-    return
-
-
-def generate_js_templates(paths: list[PathObject]):
-    # Template Path
-    JS_API_INTERFACE = TEMPLATES_DIR / "js_api_interface.j2"
-    JS_INDEX = TEMPLATES_DIR / "js_index.j2"
-
-    INTERFACES_DIR = JS_DIR / "interfaces"
-    INTERFACES_DIR.mkdir(exist_ok=True, parents=True)
-
-    all_tags = []
-    for tag, tag_paths in groupby(paths, lambda x: x.http_verbs[0].tags[0]):
-        file_name = slugify(tag, separator="-")
-
-        tag = camelize(tag)
-
-        tag_paths: list[PathObject] = list(tag_paths)
-
-        template = Template(read_template(JS_API_INTERFACE))
-        content = template.render(
-            paths={
-                "prefix": "/api",
-                "static_paths": [x.route_object for x in tag_paths if not x.route_object.is_function],
-                "function_paths": [x.route_object for x in tag_paths if x.route_object.is_function],
-                "all_paths": tag_paths,
-                "export_name": tag,
-            }
-        )
-
-        tag: dict = {"camel": camelize(tag), "slug": file_name}
-        all_tags.append(tag)
-
-        with open(INTERFACES_DIR.joinpath(file_name + ".ts"), "w") as f:
-            f.write(content)
-
-    template = Template(read_template(JS_INDEX))
-    content = template.render(files={"files": all_tags})
-
-    with open(JS_DIR.joinpath("index.js"), "w") as f:
-        f.write(content)
-
-
-def generate_template(app):
-    dump_open_api(app)
-    paths = get_path_objects(app)
-
-    static_paths = [x.route_object for x in paths if not x.route_object.is_function]
-    function_paths = [x.route_object for x in paths if x.route_object.is_function]
-
-    static_paths.sort(key=lambda x: x.router_slug)
-    function_paths.sort(key=lambda x: x.router_slug)
-
-    generate_python_templates(static_paths, function_paths)
-    generate_js_templates(paths)
-
-
-if __name__ == "__main__":
-    generate_template(app)

dev/scripts/convert_seed_files_to_new_format.py

@@ -0,0 +1,75 @@
+import glob
+import json
+import pathlib
+
+
+def get_seed_locale_names() -> set[str]:
+    """Find all locales in the seed/resources/ folder
+
+    Returns:
+        A set of every file name where there's both a seed label and seed food file
+    """
+
+    LABELS_PATH = "/workspaces/mealie/mealie/repos/seed/resources/labels/locales/"
+    FOODS_PATH = "/workspaces/mealie/mealie/repos/seed/resources/foods/locales/"
+    label_locales = glob.glob("*.json", root_dir=LABELS_PATH)
+    foods_locales = glob.glob("*.json", root_dir=FOODS_PATH)
+
+    # ensure that a locale has both a label and a food seed file
+    return set(label_locales).intersection(foods_locales)
+
+
+def get_labels_from_file(locale: str) -> list[str]:
+    """Query a locale to get all of the labels so that they can be added to the new foods seed format
+
+    Returns:
+        All of the labels found within the seed file for a given locale
+    """
+
+    locale_path = pathlib.Path("/workspaces/mealie/mealie/repos/seed/resources/labels/locales/" + locale)
+    label_names = [label["name"] for label in json.loads(locale_path.read_text(encoding="utf-8"))]
+    return label_names
+
+
+def transform_foods(locale: str):
+    """
+    Convert the current food seed file for a locale into a new format which maps each food to a label
+
+    Existing format of foods seed file is a dictionary where each key is a food name and the values are a dictionary
+        of attributes such as name and plural_name
+
+    New format maps each food to a label. The top-level dictionary has each key as a label e.g. "Fruits".
+        Each label key as a value that is a dictionary with an element called "foods"
+        "Foods" is a dictionary of each food for that label, with a key of the english food name e.g. "baking-soda"
+        and a value of attributes, including the translated name of the item e.g. "bicarbonate of soda" for en-GB.
+    """
+
+    locale_path = pathlib.Path("/workspaces/mealie/mealie/repos/seed/resources/foods/locales/" + locale)
+
+    with open(locale_path, encoding="utf-8") as infile:
+        data = json.load(infile)
+
+    first_value = next(iter(data.values()))
+    if isinstance(first_value, dict) and "foods" in first_value:
+        # Locale is already in the new format, skipping transformation
+        return
+
+    transformed_data = {"": {"foods": dict(data.items())}}
+
+    # Seeding for labels now pulls from the foods file and parses the labels from there (as top-level keys),
+    #   thus we need to add all of the existing labels to the new food seed file and give them an empty foods dictionary
+    label_names = get_labels_from_file(locale)
+    for label in label_names:
+        transformed_data[label] = {"foods": {}}
+
+    with open(locale_path, "w", encoding="utf-8") as outfile:
+        json.dump(transformed_data, outfile, indent=4, ensure_ascii=False)
+
+
+def main():
+    for locale in get_seed_locale_names():
+        transform_foods(locale)
+
+
+if __name__ == "__main__":
+    main()

dev/scripts/dummy_users.py

@@ -1,26 +0,0 @@
-import json
-from pathlib import Path
-
-import requests
-
-CWD = Path(__file__).parent
-
-
-def login(username="changeme@email.com", password="MyPassword"):
-
-    payload = {"username": username, "password": password}
-    r = requests.post("http://localhost:9000/api/auth/token", payload)
-
-    # Bearer
-    token = json.loads(r.text).get("access_token")
-    return {"Authorization": f"Bearer {token}"}
-
-
-def main():
-    print("Starting...")
-
-    print("Finished...")
-
-
-if __name__ == "__main__":
-    main()

dev/scripts/gen_error_messages.py

@@ -1,159 +0,0 @@
-import json
-import re
-from dataclasses import dataclass
-from pathlib import Path
-
-from slugify import slugify
-
-CWD = Path(__file__).parent
-
-PROJECT_BASE = CWD.parent.parent
-
-server_side_msgs = PROJECT_BASE / "mealie" / "utils" / "error_messages.py"
-en_us_msgs = PROJECT_BASE / "frontend" / "lang" / "errors" / "en-US.json"
-client_side_msgs = PROJECT_BASE / "frontend" / "utils" / "error-messages.ts"
-
-GENERATE_MESSAGES = [
-    # User Related
-    "user",
-    "webhook",
-    "token",
-    # Group Related
-    "group",
-    "cookbook",
-    "mealplan",
-    # Recipe Related
-    "scraper",
-    "recipe",
-    "ingredient",
-    "food",
-    "unit",
-    # Admin Related
-    "backup",
-    "migration",
-    "event",
-]
-
-
-class ErrorMessage:
-    def __init__(self, prefix, verb) -> None:
-        self.message = f"{prefix.title()} {verb.title()} Failed"
-        self.snake = slugify(self.message, separator="_")
-        self.kabab = slugify(self.message, separator="-")
-
-    def factory(prefix) -> list["ErrorMessage"]:
-        verbs = ["Create", "Update", "Delete"]
-        return [ErrorMessage(prefix, verb) for verb in verbs]
-
-
-@dataclass
-class CodeGenLines:
-    start: int
-    end: int
-
-    indentation: str
-    text: list[str]
-
-    _next_line = None
-
-    def purge_lines(self) -> None:
-        start = self.start + 1
-        end = self.end
-        del self.text[start:end]
-
-    def push_line(self, string: str) -> None:
-        self._next_line = self._next_line or self.start + 1
-        self.text.insert(self._next_line, self.indentation + string)
-        self._next_line += 1
-
-
-def find_start(file_text: list[str], gen_id: str):
-    for x, line in enumerate(file_text):
-        if "CODE_GEN_ID:" in line and gen_id in line:
-            return x, line
-
-    return None
-
-
-def find_end(file_text: list[str], gen_id: str):
-    for x, line in enumerate(file_text):
-        if f"END {gen_id}" in line:
-            return x, line
-    return None
-
-
-def get_indentation_of_string(line: str):
-    return re.sub(r"#.*", "", line).removesuffix("\n")
-
-
-def get_messages(message_prefix: str) -> str:
-    prefix = message_prefix.lower()
-
-    return [
-        f'{prefix}_create_failure = "{prefix}-create-failure"\n',
-        f'{prefix}_update_failure = "{prefix}-update-failure"\n',
-        f'{prefix}_delete_failure = "{prefix}-delete-failure"\n',
-    ]
-
-
-def code_gen_factory(file_path: Path) -> CodeGenLines:
-    with open(file_path, "r") as file:
-        text = file.readlines()
-        start_num, line = find_start(text, "ERROR_MESSAGE_ENUMS")
-        indentation = get_indentation_of_string(line)
-        end_num, line = find_end(text, "ERROR_MESSAGE_ENUMS")
-
-    return CodeGenLines(
-        start=start_num,
-        end=end_num,
-        indentation=indentation,
-        text=text,
-    )
-
-
-def write_to_locals(messages: list[ErrorMessage]) -> None:
-    with open(en_us_msgs, "r") as f:
-        existing_msg = json.loads(f.read())
-
-    for msg in messages:
-        if msg.kabab in existing_msg:
-            continue
-
-        existing_msg[msg.kabab] = msg.message
-        print(f"Added Key {msg.kabab} to 'en-US.json'")
-
-    with open(en_us_msgs, "w") as f:
-        f.write(json.dumps(existing_msg, indent=4))
-
-
-def main():
-    print("Starting...")
-    GENERATE_MESSAGES.sort()
-
-    code_gen = code_gen_factory(server_side_msgs)
-    code_gen.purge_lines()
-
-    messages = []
-    for msg_type in GENERATE_MESSAGES:
-        messages += get_messages(msg_type)
-        messages.append("\n")
-
-    for msg in messages:
-        code_gen.push_line(msg)
-
-    with open(server_side_msgs, "w") as file:
-        file.writelines(code_gen.text)
-
-    # Locals
-
-    local_msgs = []
-    for msg_type in GENERATE_MESSAGES:
-        local_msgs += ErrorMessage.factory(msg_type)
-
-    write_to_locals(local_msgs)
-
-    print("Done!")
-
-
-if __name__ == "__main__":
-    main()

dev/scripts/github_get_release_issues.py

@@ -1,32 +0,0 @@
-import json
-
-import requests
-from pydantic import BaseModel
-
-
-class GithubIssue(BaseModel):
-    url: str
-    number: int
-    title: str
-
-
-def get_issues_by_label(label="fixed-pending-release") -> list[GithubIssue]:
-
-    issues_url = f"https://api.github.com/repos/hay-kot/mealie/issues?labels={label}"
-
-    response = requests.get(issues_url)
-    issues = json.loads(response.text)
-    return [GithubIssue(**issue) for issue in issues]
-
-
-def format_markdown_list(issues: list[GithubIssue]) -> str:
-    return "\n".join(f"- [{issue.number}]({issue.url}) - {issue.title}" for issue in issues)
-
-
-def main() -> None:
-    issues = get_issues_by_label()
-    print(format_markdown_list(issues))
-
-
-if __name__ == "__main__":
-    main()

dev/scripts/output/app_routes.py

@@ -1,156 +0,0 @@
-# This Content is Auto Generated for Pytest
-
-
-class AppRoutes:
-    def __init__(self) -> None:
-        self.prefix = '/api'
-
-        self.about_events = "/api/about/events"
-        self.about_events_notifications = "/api/about/events/notifications"
-        self.about_events_notifications_test = "/api/about/events/notifications/test"
-        self.about_recipes_defaults = "/api/about/recipes/defaults"
-        self.auth_refresh = "/api/auth/refresh"
-        self.auth_token = "/api/auth/token"
-        self.auth_token_long = "/api/auth/token/long"
-        self.backups_available = "/api/backups/available"
-        self.backups_export_database = "/api/backups/export/database"
-        self.backups_upload = "/api/backups/upload"
-        self.categories = "/api/categories"
-        self.categories_empty = "/api/categories/empty"
-        self.debug = "/api/debug"
-        self.debug_last_recipe_json = "/api/debug/last-recipe-json"
-        self.debug_log = "/api/debug/log"
-        self.debug_statistics = "/api/debug/statistics"
-        self.debug_version = "/api/debug/version"
-        self.groups = "/api/groups"
-        self.groups_self = "/api/groups/self"
-        self.meal_plans_all = "/api/meal-plans/all"
-        self.meal_plans_create = "/api/meal-plans/create"
-        self.meal_plans_this_week = "/api/meal-plans/this-week"
-        self.meal_plans_today = "/api/meal-plans/today"
-        self.meal_plans_today_image = "/api/meal-plans/today/image"
-        self.migrations = "/api/migrations"
-        self.recipes = "/api/recipes"
-        self.recipes_category = "/api/recipes/category"
-        self.recipes_create = "/api/recipes/create"
-        self.recipes_create_from_zip = "/api/recipes/create-from-zip"
-        self.recipes_create_url = "/api/recipes/create-url"
-        self.recipes_summary_uncategorized = "/api/recipes/summary/uncategorized"
-        self.recipes_summary_untagged = "/api/recipes/summary/untagged"
-        self.recipes_tag = "/api/recipes/tag"
-        self.recipes_test_scrape_url = "/api/recipes/test-scrape-url"
-        self.shopping_lists = "/api/shopping-lists"
-        self.site_settings = "/api/site-settings"
-        self.site_settings_custom_pages = "/api/site-settings/custom-pages"
-        self.site_settings_webhooks_test = "/api/site-settings/webhooks/test"
-        self.tags = "/api/tags"
-        self.tags_empty = "/api/tags/empty"
-        self.themes = "/api/themes"
-        self.themes_create = "/api/themes/create"
-        self.users = "/api/users"
-        self.users_api_tokens = "/api/users/api-tokens"
-        self.users_self = "/api/users/self"
-        self.users_sign_ups = "/api/users/sign-ups"
-        self.utils_download = "/api/utils/download"
-
-    def about_events_id(self, id):
-        return f"{self.prefix}/about/events/{id}"
-
-    def about_events_notifications_id(self, id):
-        return f"{self.prefix}/about/events/notifications/{id}"
-
-    def backups_file_name_delete(self, file_name):
-        return f"{self.prefix}/backups/{file_name}/delete"
-
-    def backups_file_name_download(self, file_name):
-        return f"{self.prefix}/backups/{file_name}/download"
-
-    def backups_file_name_import(self, file_name):
-        return f"{self.prefix}/backups/{file_name}/import"
-
-    def categories_category(self, category):
-        return f"{self.prefix}/categories/{category}"
-
-    def debug_log_num(self, num):
-        return f"{self.prefix}/debug/log/{num}"
-
-    def groups_id(self, id):
-        return f"{self.prefix}/groups/{id}"
-
-    def meal_plans_id(self, id):
-        return f"{self.prefix}/meal-plans/{id}"
-
-    def meal_plans_id_shopping_list(self, id):
-        return f"{self.prefix}/meal-plans/{id}/shopping-list"
-
-    def meal_plans_plan_id(self, plan_id):
-        return f"{self.prefix}/meal-plans/{plan_id}"
-
-    def media_recipes_recipe_slug_assets_file_name(self, recipe_slug, file_name):
-        return f"{self.prefix}/media/recipes/{recipe_slug}/assets/{file_name}"
-
-    def media_recipes_recipe_slug_images_file_name(self, recipe_slug, file_name):
-        return f"{self.prefix}/media/recipes/{recipe_slug}/images/{file_name}"
-
-    def migrations_import_type_file_name_delete(self, import_type, file_name):
-        return f"{self.prefix}/migrations/{import_type}/{file_name}/delete"
-
-    def migrations_import_type_file_name_import(self, import_type, file_name):
-        return f"{self.prefix}/migrations/{import_type}/{file_name}/import"
-
-    def migrations_import_type_upload(self, import_type):
-        return f"{self.prefix}/migrations/{import_type}/upload"
-
-    def recipes_recipe_slug(self, recipe_slug):
-        return f"{self.prefix}/recipes/{recipe_slug}"
-
-    def recipes_recipe_slug_assets(self, recipe_slug):
-        return f"{self.prefix}/recipes/{recipe_slug}/assets"
-
-    def recipes_recipe_slug_image(self, recipe_slug):
-        return f"{self.prefix}/recipes/{recipe_slug}/image"
-
-    def recipes_recipe_slug_zip(self, recipe_slug):
-        return f"{self.prefix}/recipes/{recipe_slug}/zip"
-
-    def recipes_slug_comments(self, slug):
-        return f"{self.prefix}/recipes/{slug}/comments"
-
-    def recipes_slug_comments_id(self, slug, id):
-        return f"{self.prefix}/recipes/{slug}/comments/{id}"
-
-    def shopping_lists_id(self, id):
-        return f"{self.prefix}/shopping-lists/{id}"
-
-    def site_settings_custom_pages_id(self, id):
-        return f"{self.prefix}/site-settings/custom-pages/{id}"
-
-    def tags_tag(self, tag):
-        return f"{self.prefix}/tags/{tag}"
-
-    def themes_id(self, id):
-        return f"{self.prefix}/themes/{id}"
-
-    def users_api_tokens_token_id(self, token_id):
-        return f"{self.prefix}/users/api-tokens/{token_id}"
-
-    def users_id(self, id):
-        return f"{self.prefix}/users/{id}"
-
-    def users_id_favorites(self, id):
-        return f"{self.prefix}/users/{id}/favorites"
-
-    def users_id_favorites_slug(self, id, slug):
-        return f"{self.prefix}/users/{id}/favorites/{slug}"
-
-    def users_id_image(self, id):
-        return f"{self.prefix}/users/{id}/image"
-
-    def users_id_password(self, id):
-        return f"{self.prefix}/users/{id}/password"
-
-    def users_id_reset_password(self, id):
-        return f"{self.prefix}/users/{id}/reset-password"
-
-    def users_sign_ups_token(self, token):
-        return f"{self.prefix}/users/sign-ups/{token}"

dev/scripts/publish-release-branch.sh

@@ -1,11 +0,0 @@
-git checkout dev
-git merge --strategy=ours master    # keep the content of this branch, but record a merge
-git checkout master
-git merge dev             # fast-forward master up to the merge
-
-
-## TODOs
-
-# Create New Branch v0.x.x
-# Push Branch Version to Github
-# Create Pull Request

dev/scripts/templates/js_api_interface.j2

@@ -1,17 +0,0 @@
-import { requests } from "../requests";
-
-const prefix = '{{paths.prefix}}'
-
-const routes = { {% for path in paths.static_paths %}
-  {{ path.router_camel }}: `${prefix}{{ path.route }}`,{% endfor %}
-{% for path in paths.function_paths  %}
-  {{path.router_camel}}: ({{path.var|join(", ")}}) => `${prefix}{{ path.js_route }}`,{% endfor %}
-}
-
-export const {{paths.export_name}}API = { {% for path in paths.all_paths  %} {% for verb in path.http_verbs  %}
-   {% if verb.js_docs %}/** {{ verb.js_docs }} 
-   */ {% endif %}
-  async {{ verb.summary_camel }}({{ verb.function_args() }}) {
-    return await requests.{{ verb.request_type.value }}(routes.{{ path.route_object.router_camel }}{% if path.route_object.is_function %}({{verb.path_params()}}){% endif %}, {{ verb.query_params() }} {{ verb.payload() }})
-  }, {% endfor %} {% endfor %}
-}

dev/scripts/templates/js_index.j2

@@ -1,7 +0,0 @@
-{% for api in files.files  %}
-import { {{ api.camel }}API } from "./interfaces/{{ api.slug }}" {% endfor %}
-
-export const api = {
-{% for api in files.files  %}
-    {{api.camel}}: {{api.camel}}API, {% endfor %}
-}

dev/scripts/templates/pytest_routes.j2

@@ -1,12 +0,0 @@
-# This Content is Auto Generated for Pytest
-
-
-class AppRoutes:
-    def __init__(self) -> None:
-        self.prefix = '{{paths.prefix}}'
-{% for path in paths.static_paths %}
-        self.{{ path.router_slug }} = "{{path.prefix}}{{ path.route }}"{% endfor %}
-{% for path in paths.function_paths  %}
-    def {{path.router_slug}}(self, {{path.var|join(", ")}}):
-        return f"{self.prefix}{{ path.route }}"
-{% endfor %}

docker-compose.dev.yml

@@ -1,48 +0,0 @@
-# WARNING: currently not functional, see #756, #1072
-# Use root/example as user/password credentials
-version: "3.4"
-services:
-  # Vue Frontend
-  mealie-frontend:
-    container_name: mealie-frontend
-    image: mealie-frontend:dev
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile.frontend
-    restart: always
-    ports:
-      - 9920:8080
-    environment:
-      - GLOBAL_MIDDLEWARE=null
-      - BASE_URL=""
-      - ALLOW_SIGNUP=true
-    volumes:
-      - ./frontend/:/app
-      - /app/node_modules
-
-  # Fast API
-  mealie-api:
-    container_name: mealie-api
-    image: mealie-api:dev
-    build:
-      context: ./
-      target: development
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - 9921:9000
-    environment:
-      TZ: America/Anchorage # Specify Correct Timezone for Date/Time to line up correctly.
-    volumes:
-      - ./dev/data:/app/dev/data
-      - ./mealie:/app/mealie
-
-  # Mkdocs
-  mealie-docs:
-    container_name: mealie-docs
-    image: squidfunk/mkdocs-material
-    restart: always
-    ports:
-      - 9922:8000
-    volumes:
-      - ./docs:/docs

docker-compose.yml

@@ -1,84 +0,0 @@
-version: "3.4"
-services:
-  mealie-frontend:
-    container_name: mealie-frontend
-    image: mealie-frontend:dev
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile
-    restart: always
-    volumes:
-      - mealie-data:/app/data/
-    ports:
-      - 9091:3000
-    environment:
-      - API_URL=http://mealie-api:9000
-
-      # =====================================
-      # Light Mode Config
-      - THEME_LIGHT_PRIMARY=#E58325
-      - THEME_LIGHT_ACCENT=#007A99
-      - THEME_LIGHT_SECONDARY=#973542
-      - THEME_LIGHT_SUCCESS=#43A047
-      - THEME_LIGHT_INFO=#1976D2
-      - THEME_LIGHT_WARNING=#FF6D00
-      - THEME_LIGHT_ERROR=#EF5350
-      # =====================================
-      # Dark Mode Config
-      - THEME_DARK_PRIMARY=#E58325
-      - THEME_DARK_ACCENT=#007A99
-      - THEME_DARK_SECONDARY=#973542
-      - THEME_DARK_SUCCESS=#43A047
-      - THEME_DARK_INFO=#1976D2
-      - THEME_DARK_WARNING=#FF6D00
-      - THEME_DARK_ERROR=#EF5350
-  mealie:
-    container_name: mealie-api
-    build:
-      context: ./
-      target: production
-      dockerfile: Dockerfile
-    restart: always
-    volumes:
-      - mealie-data:/app/data/
-    ports:
-      - 9092:9000
-    environment:
-      ALLOW_SIGNUP: "false"
-
-      DB_ENGINE: sqlite # Optional: 'sqlite', 'postgres'
-      # =====================================
-      # Postgres Config
-      POSTGRES_USER: mealie
-      POSTGRES_PASSWORD: mealie
-      POSTGRES_SERVER: postgres
-      POSTGRES_PORT: 5432
-      POSTGRES_DB: mealie
-
-      # =====================================
-      # Web Concurrency
-      WORKERS_PER_CORE: 0.5
-      MAX_WORKERS: 1
-      WEB_CONCURRENCY: 1
-
-      # =====================================
-      # Email Configuration
-      # SMTP_HOST=
-      # SMTP_PORT=587
-      # SMTP_FROM_NAME=Mealie
-      # SMTP_AUTH_STRATEGY=TLS # Options: 'TLS', 'SSL', 'NONE'
-      # SMTP_FROM_EMAIL=
-      # SMTP_USER=
-      # SMTP_PASSWORD=
-
-  # postgres:
-  #   container_name: postgres
-  #   image: postgres
-  #   restart: always
-  #   environment:
-  #     POSTGRES_PASSWORD: mealie
-  #     POSTGRES_USER: mealie
-
-volumes:
-  mealie-data:
-    driver: local

docker/Dockerfile

@@ -0,0 +1,164 @@
+###############################################
+# Frontend Build
+###############################################
+FROM node:20@sha256:f3e50c7689a1b6982fab45b1b23ba5adf1fd725e233dc640918fb59f7a57b174 \
+    AS frontend-builder
+
+WORKDIR /frontend
+
+COPY frontend .
+
+RUN yarn install \
+    --prefer-offline \
+    --frozen-lockfile \
+    --non-interactive \
+    --production=false \
+    # https://github.com/docker/build-push-action/issues/471
+    --network-timeout 1000000
+
+RUN yarn generate
+
+###############################################
+# Base Image - Python
+###############################################
+FROM python:3.12-slim@sha256:2267adc248a477c1f1a852a07a5a224d42abe54c28aafa572efa157dfb001bba \
+    AS python-base
+
+ENV MEALIE_HOME="/app"
+
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PIP_NO_CACHE_DIR=off \
+    PIP_DISABLE_PIP_VERSION_CHECK=on \
+    PIP_DEFAULT_TIMEOUT=100 \
+    VENV_PATH="/opt/mealie"
+
+# prepend venv to path
+ENV PATH="$VENV_PATH/bin:$PATH"
+
+# create user account
+RUN useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc \
+    && usermod -G users abc \
+    && mkdir $MEALIE_HOME
+
+###############################################
+# Backend Package Build
+###############################################
+FROM python-base AS backend-builder
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POETRY_HOME="/opt/poetry" \
+    POETRY_NO_INTERACTION=1
+
+# prepend poetry to path
+ENV PATH="$POETRY_HOME/bin:$PATH"
+
+# install poetry - respects $POETRY_VERSION & $POETRY_HOME
+ENV POETRY_VERSION=2.0.1
+RUN curl -sSL https://install.python-poetry.org | python3 -
+
+# install poetry plugins needed to build the package
+RUN poetry self add "poetry-plugin-export>=1.9"
+
+WORKDIR /mealie
+
+# copy project files here to ensure they will be cached.
+COPY poetry.lock pyproject.toml ./
+COPY mealie ./mealie
+
+# Copy frontend to package it into the wheel
+COPY --from=frontend-builder /frontend/dist ./mealie/frontend
+
+# Build the source and binary package
+RUN poetry build --output=dist
+
+# Create the requirements file, which is used to install the built package and
+# its pinned dependencies later. mealie is included to ensure the built one is
+# what's installed.
+RUN export MEALIE_VERSION=$(poetry version --short) \
+    && poetry export --only=main --extras=pgsql --output=dist/requirements.txt \
+    && echo "mealie[pgsql]==$MEALIE_VERSION \\" >> dist/requirements.txt \
+    && poetry run pip hash dist/mealie-$MEALIE_VERSION-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt \
+    && echo " \\" >> dist/requirements.txt \
+    && poetry run pip hash dist/mealie-$MEALIE_VERSION.tar.gz | tail -n1 >> dist/requirements.txt
+
+###############################################
+# Package Container
+# Only role is to hold the packages, or be overriden by a --build-context flag.
+###############################################
+FROM scratch AS packages
+COPY --from=backend-builder /mealie/dist /
+
+###############################################
+# Python Virtual Environment Build
+###############################################
+# Install packages required to build the venv, in parallel to building the wheel
+FROM python-base AS venv-builder-base
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    build-essential \
+    libpq-dev \
+    libwebp-dev \
+    # LDAP Dependencies
+    libsasl2-dev libldap2-dev libssl-dev \
+    gnupg gnupg2 gnupg1 \
+    && rm -rf /var/lib/apt/lists/*
+RUN python3 -m venv --upgrade-deps $VENV_PATH
+
+# Install the wheel and all dependencies into the venv
+FROM venv-builder-base AS venv-builder
+
+# Copy built package (wheel) and its dependency requirements
+COPY --from=packages * /dist/
+
+# Install the wheel with exact versions of dependencies into the venv
+RUN . $VENV_PATH/bin/activate \
+    && pip install --require-hashes -r /dist/requirements.txt --find-links /dist
+
+###############################################
+# Production Image
+###############################################
+FROM python-base AS production
+LABEL org.opencontainers.image.source="https://github.com/mealie-recipes/mealie"
+ENV PRODUCTION=true
+ENV TESTING=false
+
+ARG COMMIT
+ENV GIT_COMMIT_HASH=$COMMIT
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    gosu \
+    iproute2 \
+    libldap-common \
+    libldap2 \
+    && rm -rf /var/lib/apt/lists/*
+
+# create directory used for Docker Secrets
+RUN mkdir -p /run/secrets
+
+# Copy venv into image. It contains a fully-installed mealie backend and frontend.
+COPY --from=venv-builder $VENV_PATH $VENV_PATH
+
+# install nltk data for the ingredient parser
+ENV NLTK_DATA="/nltk_data/"
+RUN mkdir -p $NLTK_DATA
+RUN python -m nltk.downloader -d $NLTK_DATA averaged_perceptron_tagger_eng
+
+VOLUME [ "$MEALIE_HOME/data/" ]
+ENV APP_PORT=9000
+
+EXPOSE ${APP_PORT}
+
+HEALTHCHECK CMD python -m mealie.scripts.healthcheck || exit 1
+
+ENV HOST 0.0.0.0
+
+EXPOSE ${APP_PORT}
+COPY ./docker/entry.sh $MEALIE_HOME/run.sh
+
+RUN chmod +x $MEALIE_HOME/run.sh
+ENTRYPOINT ["/app/run.sh"]

docker/docker-compose.dev.yml

@@ -0,0 +1,20 @@
+services:
+  mailpit:
+    image: axllent/mailpit:latest
+    container_name: mealie_dev_mailpit
+    restart: no
+    environment:
+      - "MP_SMTP_AUTH_ACCEPT_ANY=true"
+      - "MP_SMTP_AUTH_ALLOW_INSECURE=true"
+    ports:
+      - "8025:8025"
+      - "1025:1025"
+  postgres:
+    container_name: mealie_dev_postgres
+    image: postgres:15
+    restart: no
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_PASSWORD: mealie
+      POSTGRES_USER: mealie

docker/docker-compose.yml

@@ -0,0 +1,38 @@
+services:
+  mealie:
+    container_name: mealie
+    image: mealie:dev
+    build:
+      context: ../
+      target: production
+      dockerfile: ./docker/Dockerfile
+    restart: always
+    volumes:
+      - mealie-data:/app/data/
+    ports:
+      - 9091:9000
+    environment:
+      ALLOW_SIGNUP: "false"
+      LOG_LEVEL: "DEBUG"
+
+      DB_ENGINE: sqlite # Optional: 'sqlite', 'postgres'
+      # =====================================
+      # Postgres Config
+      POSTGRES_USER: mealie
+      POSTGRES_PASSWORD: mealie
+      POSTGRES_SERVER: postgres
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: mealie
+      # =====================================
+      # Email Configuration
+      # SMTP_HOST=
+      # SMTP_PORT=587
+      # SMTP_FROM_NAME=Mealie
+      # SMTP_AUTH_STRATEGY=TLS # Options: 'TLS', 'SSL', 'NONE'
+      # SMTP_FROM_EMAIL=
+      # SMTP_USER=
+      # SMTP_PASSWORD=
+
+volumes:
+  mealie-data:
+    driver: local

docker/entry.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+# Start Backend API
+
+# Get PUID/PGID
+PUID=${PUID:-911}
+PGID=${PGID:-911}
+BASH_SOURCE=${BASH_SOURCE:-$0}
+
+add_user() {
+    groupmod -o -g "$PGID" abc
+    usermod -o -u "$PUID" abc
+}
+
+change_user() {
+    if [ "$(id -u)" = $PUID ]; then
+        echo "
+        User uid:    $PUID
+        User gid:    $PGID
+        "
+    elif [ "$(id -u)" = "0" ]; then
+        # If container is started as root then create a new user and switch to it
+        add_user
+        chown -R $PUID:$PGID /app
+
+        echo "Switching to dedicated user"
+        exec gosu $PUID "$BASH_SOURCE" "$@"
+    fi
+}
+
+init() {
+    # $MEALIE_HOME directory
+    cd /app
+
+    # Activate our virtual environment here
+    . /opt/mealie/bin/activate
+}
+
+load_secrets() {
+    # Each of these environment variables will support a `_FILE` suffix that allows
+    # for setting the environment variable through the Docker Compose secret
+    # pattern.
+    local -a secret_supported_vars=(
+        "POSTGRES_USER"
+        "POSTGRES_PASSWORD"
+        "POSTGRES_SERVER"
+        "POSTGRES_PORT"
+        "POSTGRES_DB"
+        "POSTGRES_URL_OVERRIDE"
+
+        "SMTP_HOST"
+        "SMTP_PORT"
+        "SMTP_USER"
+        "SMTP_PASSWORD"
+
+        "LDAP_SERVER_URL"
+        "LDAP_QUERY_PASSWORD"
+
+        "OIDC_CONFIGURATION_URL"
+        "OIDC_CLIENT_ID"
+        "OIDC_CLIENT_SECRET"
+
+        "OPENAI_BASE_URL"
+        "OPENAI_API_KEY"
+    )
+
+    # If any secrets are set, prefer them over base environment variables.
+    for var in "${secret_supported_vars[@]}"; do
+        file_var="${var}_FILE"
+        if [ -n "${!file_var}" ]; then
+            export "$var=$(<"${!file_var}")"
+        fi
+    done
+}
+
+change_user
+init
+load_secrets
+
+# Start API
+HOST_IP=`/sbin/ip route|awk '/default/ { print $3 }'`
+
+exec mealie

docs/docs/assets/img/sponsors-linode.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 230 90" width="2500" height="978"><path d="M93.8 27.8l5.8-1.4v28c0 3.1.9 4.9 2.7 5.5-.9 1.7-2.4 2.6-4.6 2.6-2.6 0-4-1.8-4-5.5V27.8zM108.4 62V41.8h-3.2V37h9.1v25h-5.9zm3-34.6c.9 0 1.7.3 2.4 1s1 1.5 1 2.4c0 .9-.3 1.7-1 2.4s-1.5 1-2.4 1c-.9 0-1.7-.3-2.4-1s-1-1.5-1-2.4c0-.9.3-1.7 1-2.4s1.5-1 2.4-1zM137.1 62V47.6c0-2.1-.4-3.7-1.2-4.6-.8-1-2.1-1.5-4-1.5-.9 0-1.8.2-2.7.7-1 .5-1.7 1.1-2.3 1.8v18h-5.8V37.1h4.2l1.1 2.3c1.6-1.9 3.9-2.8 7-2.8 3 0 5.3.9 7 2.7 1.7 1.8 2.6 4.3 2.6 7.4V62h-5.9zM147.5 49.5c0-3.8 1.1-6.9 3.3-9.3 2.2-2.4 5.1-3.6 8.7-3.6 3.8 0 6.7 1.1 8.8 3.4 2.1 2.3 3.1 5.4 3.1 9.4s-1.1 7.1-3.2 9.5c-2.1 2.3-5 3.5-8.8 3.5-3.8 0-6.7-1.2-8.8-3.5-2-2.4-3.1-5.5-3.1-9.4zm6.1 0c0 5.5 2 8.2 5.9 8.2 1.8 0 3.2-.7 4.3-2.1 1.1-1.4 1.6-3.5 1.6-6.1 0-5.4-2-8.1-5.9-8.1-1.8 0-3.3.7-4.3 2.1-1.1 1.4-1.6 3.4-1.6 6zM192.1 62v-1.5c-.5.5-1.3 1-2.4 1.4-1.1.4-2.3.6-3.6.6-3.5 0-6.2-1.1-8.2-3.3-2-2.2-3-5.3-3-9.2 0-3.9 1.1-7.1 3.4-9.6s5.1-3.7 8.6-3.7c1.9 0 3.6.4 5.2 1.2v-10l5.8-1.4V62h-5.8zm0-19c-1.2-1-2.5-1.5-3.9-1.5-2.3 0-4.1.7-5.4 2.1-1.3 1.4-1.9 3.5-1.9 6.1 0 5.2 2.5 7.8 7.5 7.8.6 0 1.2-.2 2.1-.5.8-.3 1.3-.7 1.6-1V43zM226 51.3h-17.8c.1 2 .8 3.5 2 4.6 1.3 1.1 2.9 1.7 5.1 1.7 2.6 0 4.7-.7 6-2.1l2.3 4.4c-2 1.7-5.1 2.5-9.2 2.5-3.8 0-6.8-1.1-9-3.3-2.2-2.2-3.3-5.3-3.3-9.3 0-3.9 1.2-7.1 3.6-9.5 2.4-2.4 5.3-3.6 8.7-3.6 3.6 0 6.5 1.1 8.7 3.2 2.2 2.2 3.3 4.9 3.3 8.2.1.7-.1 1.7-.4 3.2zm-17.6-4.4h12.2c-.4-3.6-2.4-5.5-6-5.5-3.3.1-5.4 1.9-6.2 5.5z"/><g><path fill="#004712" d="M65.9 47.4l-1 11.5-3.3-2.3.4-5.8v-.1-.1l-.1-.1-.1-.1-7.1-4.7.1-5.1 11.1 6.8zM48.5 59.9L43.4 56v.9c0 .2-.1.4-.2.5L39.4 60l4.2 3.4.1.1v.2l.2 4 4.7 3.9-.1-11.7zm-32.1 5l2.4 11.5 9.9 10.5L27 75.3 16.4 64.9zm9.3 1.7l-2.4-16.1-12-10 3.2 15.6 11.2 10.5zm-3.8-26l-3.3-22.8L4.8 9.2l4.5 21.5 12.6 9.9z"/><path fill="#00B259" d="M75.7 41.2l-1.5 10.9-8.2 6.6 1-11.2 8.7-6.3zM49.6 59.9l.1 11.8 10.5-8.4.7-11.5-11.3 8.1zm-6.8 4.8L28 75.3l1.8 12.2 13.4-10.7-.4-12.1zm-.4-8l-.7-16-17.3 9.9 2.4 16.6 15.6-10.5zm-1.1-25.3l-.9-21.6-20.8 8L23 41l18.3-9.6z"/><path d="M76.9 40c0-.1 0-.1 0 0v-.2s0-.1-.1-.1c0 0-.1 0-.1-.1l-12-6.7c-.2-.1-.4-.1-.5 0L54 39.1h-.1v.6l-.1 5.4-4.1-2.7c-.2-.1-.4-.1-.6 0L43 45.8l-.3-6v-.1-.1-.1-.1-.1h-.1l-6.2-4.1 5.8-3c.2-.1.3-.3.3-.5L41.4 9v-.1s0-.1-.1-.1c0 0 0-.1-.1-.1L25.5 1.1c-.1-.1-.2-.1-.3-.1L3.9 7.6s-.1 0-.1.1c0 0-.1 0-.1.1v.6l4.7 22.9c0 .1.1.2.2.3l6.4 5-4.7 2.2s-.1 0-.1.1c0 0 0 .1-.1.1v.2l3.6 17.2c0 .1.1.2.2.3l4.5 4.2-3 1.8-.1.1s0 .1-.1.1V63.2L18 76.5c0 .1.1.2.1.3l10.9 12h.1s.1 0 .1.1h.5l14.4-11.5c.1-.1.2-.3.2-.4l-.3-7.9 4.8 4s.1 0 .1.1h.5L61 64c.1-.1.2-.2.2-.4l.4-5.8 3.5 2.4h.4s.1 0 .1-.1l9.4-7.5c.1-.1.2-.2.2-.3L76.9 40c0 .1 0 .1 0 0zM66 58.7l1-11.2 8.8-6.3-1.5 10.9-8.3 6.6zm-4.4-2.1l.4-5.8v-.1-.1l-.1-.1-.1-.1-7.1-4.7.1-5.1 11.1 6.9-1 11.5-3.3-2.4zm-1.5 6.7l-10.5 8.4-.1-11.8 11.3-8.1-.7 11.5zM43.3 76.8L29.8 87.5 28 75.3l14.7-10.5.6 12zm-24.6-.4l-2.4-11.5L27 75.3l1.7 11.6-10-10.5zm-.2-58.6l3.3 22.8-12.5-9.9L4.8 9.2l13.7 8.6zm21.9-8l.9 21.6L23 41l-3.4-23.2 20.8-8zm2 46.9L26.8 67.1l-2.4-16.6 17.3-9.9.7 16.1zm-19.1-6.1l2.4 16.1-11.2-10.6-3.2-15.6 12 10.1zm20.5 13.1v-.1-.1l-.1-.1-4.2-3.4 3.8-2.6c.2-.1.2-.3.2-.5V56l5.1 3.9.1 11.8-4.7-3.9-.2-4.1z"/></g></svg>

docs/docs/assets/other/n8n/n8n-mealie-backup.json

@@ -0,0 +1,386 @@
+{
+  "name": "Mealie Backup",
+  "nodes": [
+    {
+      "parameters": {
+        "rule": {
+          "interval": [
+            {}
+          ]
+        }
+      },
+      "id": "2ec440b4-0668-4bc0-aa66-4023d6379f28",
+      "name": "Schedule Trigger",
+      "type": "n8n-nodes-base.scheduleTrigger",
+      "typeVersion": 1.1,
+      "position": [
+        240,
+        660
+      ]
+    },
+    {
+      "parameters": {
+        "method": "POST",
+        "url": "https://mealie.example/api/admin/backups",
+        "authentication": "genericCredentialType",
+        "genericAuthType": "httpHeaderAuth",
+        "options": {}
+      },
+      "id": "235f26f7-0f45-479e-a7e3-bf8cda7c8426",
+      "name": "Run Backup ",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        520,
+        520
+      ],
+      "notesInFlow": false,
+      "credentials": {
+        "httpHeaderAuth": {
+          "id": "GSL12tNi3MPvTZux",
+          "name": "Mealie API"
+        }
+      },
+      "notes": "Send an API call to run the backup"
+    },
+    {
+      "parameters": {
+        "method": "POST",
+        "url": "https://ntfy.example/backups",
+        "sendHeaders": true,
+        "headerParameters": {
+          "parameters": [
+            {
+              "name": "Title",
+              "value": "Meale Backup Failure"
+            },
+            {
+              "name": "Priority",
+              "value": "urgent"
+            },
+            {
+              "name": "Tags",
+              "value": "warning"
+            },
+            {
+              "name": "Actions",
+              "value": "view, Open Mealie, https://mealie.example/admin/backups; view, Open n8n, https://n8n.example"
+            }
+          ]
+        },
+        "sendBody": true,
+        "contentType": "raw",
+        "body": "\"Full Panic!\"",
+        "options": {}
+      },
+      "id": "40ba81a5-5741-4b15-98af-1a9e6b34f997",
+      "name": "Ntfy Warning",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        1000,
+        520
+      ],
+      "onError": "continueRegularOutput"
+    },
+    {
+      "parameters": {
+        "url": "https://mealie.example/api/admin/backups",
+        "authentication": "genericCredentialType",
+        "genericAuthType": "httpHeaderAuth",
+        "options": {}
+      },
+      "id": "b75571d0-d926-440c-897f-55b89c6a5080",
+      "name": "Get all backups",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        520,
+        820
+      ],
+      "credentials": {
+        "httpHeaderAuth": {
+          "id": "GSL12tNi3MPvTZux",
+          "name": "Mealie API"
+        }
+      }
+    },
+    {
+      "parameters": {
+        "fieldToSplitOut": "imports",
+        "options": {}
+      },
+      "id": "943d0e83-682b-4500-9faf-53284cfb02c6",
+      "name": "Split Out",
+      "type": "n8n-nodes-base.splitOut",
+      "typeVersion": 1,
+      "position": [
+        720,
+        820
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Get input data\nconst inputData = items.map(item => item.json);\n\n// Sort the data based on the 'date' field in descending order\ninputData.sort((a, b) => new Date(b.date) - new Date(a.date));\n\n// Get all records except the latest 7\nconst allExceptLatest7 = inputData.slice(7);\n\n// Map the output data back to the required format\nreturn allExceptLatest7.map(record => ({ json: record }));\n"
+      },
+      "id": "64eae81d-fdb6-44f7-9a2d-eff8d1763281",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        860,
+        820
+      ]
+    },
+    {
+      "parameters": {
+        "method": "DELETE",
+        "url": "=https://mealie.example/api/admin/backups/{{ $json.name }}",
+        "authentication": "genericCredentialType",
+        "genericAuthType": "httpHeaderAuth",
+        "options": {}
+      },
+      "id": "1148eeb8-4860-46df-8f61-0e85ea1e0e89",
+      "name": "Delete Oldies",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 4.1,
+      "position": [
+        1040,
+        820
+      ],
+      "credentials": {
+        "httpHeaderAuth": {
+          "id": "GSL12tNi3MPvTZux",
+          "name": "Mealie API"
+        }
+      }
+    },
+    {
+      "parameters": {
+        "content": "Sends API Call to run backup",
+        "height": 225,
+        "width": 226,
+        "color": 4
+      },
+      "id": "cd2cb5db-87c1-40d8-a746-e61ace231987",
+      "name": "Sticky Note",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        460,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "content": "Is there an error?",
+        "height": 225,
+        "width": 231,
+        "color": 3
+      },
+      "id": "0bebecbe-903e-4a69-bb1a-35619e68b540",
+      "name": "Sticky Note1",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        700,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "content": "Send alert to NTFY",
+        "height": 225,
+        "width": 229
+      },
+      "id": "0b732adb-8a84-456d-b26d-5fc5ee5a4cae",
+      "name": "Sticky Note2",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        940,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "content": "Gets all backups in Mealie",
+        "height": 225,
+        "width": 226,
+        "color": 4
+      },
+      "id": "99c6886b-6a07-4b51-b395-d4bbcbde7d18",
+      "name": "Sticky Note3",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        460,
+        760
+      ]
+    },
+    {
+      "parameters": {
+        "content": "Splits the data, and parses the output",
+        "height": 225,
+        "width": 281
+      },
+      "id": "549555f8-0aed-42c0-9693-9c0d93902796",
+      "name": "Sticky Note4",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        700,
+        760
+      ]
+    },
+    {
+      "parameters": {
+        "content": "Deletes all but the last 7 backups",
+        "height": 225,
+        "width": 229
+      },
+      "id": "bcc5f0ba-73e9-42d7-b01b-c32f9f69f2f7",
+      "name": "Sticky Note5",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        1000,
+        760
+      ]
+    },
+    {
+      "parameters": {
+        "content": "Run every day a 01:00",
+        "height": 225,
+        "width": 226,
+        "color": 4
+      },
+      "id": "ce797062-d727-43e3-a27f-e29b13ad3c9a",
+      "name": "Sticky Note6",
+      "type": "n8n-nodes-base.stickyNote",
+      "typeVersion": 1,
+      "position": [
+        180,
+        600
+      ]
+    },
+    {
+      "parameters": {
+        "conditions": {
+          "options": {
+            "caseSensitive": true,
+            "leftValue": "",
+            "typeValidation": "strict"
+          },
+          "conditions": [
+            {
+              "id": "8b00bb85-827f-4f2f-813e-db0d25e927d3",
+              "leftValue": "={{ $json.error }}",
+              "rightValue": "",
+              "operator": {
+                "type": "boolean",
+                "operation": "true",
+                "singleValue": true
+              }
+            }
+          ],
+          "combinator": "and"
+        },
+        "options": {}
+      },
+      "id": "fefd3e8b-9b71-490a-82e3-25e5468a4135",
+      "name": "Error?",
+      "type": "n8n-nodes-base.filter",
+      "typeVersion": 2,
+      "position": [
+        760,
+        520
+      ]
+    }
+  ],
+  "pinData": {},
+  "connections": {
+    "Schedule Trigger": {
+      "main": [
+        [
+          {
+            "node": "Run Backup ",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Get all backups",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Run Backup ": {
+      "main": [
+        [
+          {
+            "node": "Error?",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Get all backups": {
+      "main": [
+        [
+          {
+            "node": "Split Out",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Split Out": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "Delete Oldies",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Error?": {
+      "main": [
+        [
+          {
+            "node": "Ntfy Warning",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "68e3e469-3ddb-4838-b09d-3c69fdd851f5",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "630eefaa8c490b9c5221d83a182af6450c2c3efaf4b580b8ac348631abfe1aeb"
+  },
+  "id": "whloxeXkdBWWi2Uj",
+  "tags": []
+}