fix(deps): update dependency pydantic to v1.10.14 (#3008)

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

.devcontainer/Dockerfile

@@ -21,12 +21,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 \

.devcontainer/devcontainer.json

@@ -18,33 +18,35 @@
     "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",
+      },
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "matangover.mypy",
+        "ms-python.black-formatter",
+        "ms-python.isort",
+        "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,
+    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 && make setup",
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode",
   // "features": {

.dockerignore

@@ -1,6 +1,7 @@
 .git
 .github
 .dockerignore
+.gitattributes
 .gitignore
 .idea
 .vscode
@@ -12,6 +13,7 @@ __pycache__/
 htmlcov/
 .coverage
 .coverage.*
+.pylintrc
 .pytest_cache/
 .venv
 venv
@@ -28,3 +30,5 @@ venv
 */mealie/.temp
 
 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

.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/hay-kot/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/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/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,67 @@
+<!--
+  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.
+  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 type of PR is this?
+
+_(REQUIRED)_
+
+<!--
+  Delete any of the following that do not apply:
+ -->
+
+- bug
+- cleanup
+- documentation
+- feature
+
+## 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.
+-->
+
+## Which issue(s) this PR fixes:
+
+_(REQUIRED)_
+
+<!--
+If this PR fixes one of more issues, list them here.
+One line each, 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/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/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/codeql.yml

@@ -0,0 +1,81 @@
+# 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" ]
+  pull_request:
+    branches: [ "mealie-next" ]
+  schedule:
+    - cron: '36 9 * * 3'
+
+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@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      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@v2
+
+    # ℹ️ 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@v2
+      with:
+        category: "/language:${{matrix.language}}"

.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/nightly.yml

@@ -0,0 +1,47 @@
+name: Docker Nightly Production
+
+on:
+  push:
+    branches:
+      - mealie-next
+
+concurrency:
+  group: nightly-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  backend-tests:
+    name: "Backend Server Tests"
+    uses: ./.github/workflows/partial-backend.yml
+
+  frontend-tests:
+    name: "Frontend and End-to-End Tests"
+    uses: ./.github/workflows/partial-frontend.yml
+
+  build-release:
+    permissions:
+      contents: read
+      packages: write
+    name: Build Tagged Release
+    uses: ./.github/workflows/partial-builder.yml
+    needs:
+      - frontend-tests
+      - backend-tests
+    with:
+      tag: nightly
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  notify-discord:
+    name: Notify Discord
+    needs:
+      - build-release
+    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-backend.yml

@@ -1,12 +1,7 @@
-name: Backend Tests
+name: Backend Test/Lint
+
 on:
-  push:
-    branches:
-      - mealie-next
-  pull_request:
-    branches:
-      - mealie-next
-    types: [synchronize, opened, reopened, ready_for_review]
+  workflow_call:
 
 jobs:
   tests:
@@ -18,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        # Database ENV Variablse as Specified by Mealie
+        # Database ENV Variables as Specified by Mealie
         Database: [sqlite, postgres]
 
     # Services
@@ -32,61 +27,78 @@ jobs:
         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:
-      #----------------------------------------------
-      #       check-out repo and set-up python
-      #----------------------------------------------
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
       - name: Set up python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         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
+        uses: actions/cache@v3
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
-      #----------------------------------------------
-      # install dependencies if cache does not exist
-      #----------------------------------------------
+
+      - name: Check venv cache
+        id: cache-validate
+        if: steps.cached-poetry-dependencies.outputs.cache-hit == 'true'
+        run: |
+          echo "import black;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.8.6"
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' || steps.cache-validate.outputs.cache-hit-success != 'true'
 
-      #----------------------------------------------
-      #              run test suite
-      #----------------------------------------------
-      - name: Formatting (Black & isort)
+      - name: Formatting (Black)
         run: |
           poetry run black . --check
-          poetry run isort . --check-only
-      - name: Lint (Flake8)
+
+      - name: Lint (Ruff)
         run: |
           make backend-lint
+
       - name: Mypy Typecheck
         run: |
           make backend-typecheck
+
       - 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: |
           make backend-test

.github/workflows/partial-builder.yml

@@ -0,0 +1,63 @@
+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 }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Override __init__.py
+        run: |
+          echo "__version__ = \"${{ inputs.tag }}\"" > ./mealie/__init__.py
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          file: ./docker/Dockerfile
+          context: .
+          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 }}
+          # https://docs.docker.com/build/ci/github-actions/cache/#github-cache
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/partial-frontend.yml

@@ -1,38 +1,28 @@
-name: Frontend Lint
+name: Frontend Build/Lin
 
 on:
-  push:
-    branches:
-      - mealie-next
-  pull_request:
-    branches:
-      - mealie-next
+  workflow_call:
 
 jobs:
   lint:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node: [16]
+    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: 16
           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@v3.3.2
         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 }}
@@ -48,30 +38,29 @@ jobs:
         run: yarn lint
         working-directory: "frontend"
 
-  build:
-    runs-on: ${{ matrix.os }}
+      - name: Run tests 🧪
+        run: yarn test:ci
+        working-directory: "frontend"
 
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node: [16]
+  build:
+    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: 16
           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@v3.3.2
         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 }}

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

@@ -0,0 +1,31 @@
+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"
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: "trivy-results.sarif"

.github/workflows/pull-requests.yml

@@ -0,0 +1,19 @@
+name: PR CI
+
+on:
+  pull_request:
+    branches:
+      - mealie-next
+
+jobs:
+  backend-tests:
+    name: "Backend Server Tests"
+    uses: ./.github/workflows/partial-backend.yml
+
+  frontend-tests:
+    name: "Frontend and End-to-End Tests"
+    uses: ./.github/workflows/partial-frontend.yml
+
+  container-scanning:
+    name: "Trivy Container Scanning"
+    uses: ./.github/workflows/partial-trivy-container-scanning.yml

.github/workflows/release.yml

@@ -0,0 +1,45 @@
+name: Docker Build Production
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  backend-tests:
+    name: "Backend Server Tests"
+    uses: ./.github/workflows/partial-backend.yml
+
+  frontend-tests:
+    name: "Frontend and End-to-End Tests"
+    uses: ./.github/workflows/partial-frontend.yml
+
+  build-release:
+    permissions:
+      contents: read
+      packages: write
+    name: Build Tagged Release
+    uses: ./.github/workflows/partial-builder.yml
+    needs:
+      - backend-tests
+      - frontend-tests
+    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:
+      - build-release
+    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/hay-kot/mealie/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}"

.github/workflows/stale.yml

@@ -0,0 +1,40 @@
+# Documentation: https://github.com/marketplace/actions/close-stale-issues
+name: 'Stale: Flag and close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+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 not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          days-before-issue-stale: 30
+          days-before-issue-close: 5
+          stale-pr-label: 'stale'
+          stale-pr-message: 'This PR is stale because it has been open 45 days with no activity.'
+          days-before-pr-stale: 45
+          # 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
+          # For initial implementation - this stops any actual updates happening.
+          # We can review the output and then decide how to proceed. I will own this action.
+          debug-only: 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

.gitignore

@@ -12,6 +12,7 @@ docs/site/
 frontend/dist/
 
 dev/code-generation/generated/*
+dev/data/mealie.db-journal
 dev/data/backups/*
 dev/data/debug/*
 dev/data/img/*
@@ -55,7 +56,6 @@ develop-eggs/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 !frontend/src/components/Recipe/Parts/
@@ -87,6 +87,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+.ruff_cache/
 test.db
 
 # Translations
@@ -158,3 +159,6 @@ 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/

.pre-commit-config.yaml

@@ -9,22 +9,8 @@ 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
-    hooks:
-      - id: upgrade-type-hints
-  - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-        name: isort (python)
+        exclude: ^tests/data/
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.1.0
     hooks:
       - id: black
-  - repo: https://github.com/pycqa/flake8
-    rev: "4.0.1"
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - "flake8-print==4.0.0"

.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,13 @@
     "webp"
   ],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.organizeImports": false
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "never"
   },
   "editor.formatOnSave": true,
-  "eslint.workingDirectories": ["./frontend"],
+  "eslint.workingDirectories": [
+    "./frontend"
+  ],
   "files.exclude": {
     "**/__pycache__": true,
     "**/.DS_Store": true,
@@ -29,30 +29,39 @@
     "**/.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.defaultFormatter": "ms-python.black-formatter",
+  },
 }

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]
+[![AGPL 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)
 
 <!-- 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>
@@ -21,15 +21,14 @@
     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://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,7 +38,7 @@
 
 # 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 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.
 
 - [Remember to join the Discord](https://discord.gg/QuStdQGSGK)!
 - [Documentation](https://nightly.mealie.io)
@@ -48,23 +47,29 @@ Mealie is a self hosted recipe manager and meal planner with a RestAPI backend a
 <!-- 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 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.
 
@@ -77,17 +82,19 @@ Thanks to Linode for providing Hosting for the Demo, Beta, and Documentation sit
 
 <!-- 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
+[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
-[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/mealie-next/LICENSE
+[contributors-url]: https://github.com/mealie-recipes/mealie/graphs/contributors
+[forks-shield]: https://img.shields.io/github/forks/mealie-recipes/mealie.svg?style=flat-square
+[forks-url]: https://github.com/mealie-recipes/mealie/network/members
+[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.svg?style=flat-square
+[latest-release-url]: https://img.shields.io/github/v/release/mealie-recipes/mealie
+[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

alembic/versions/2022-03-23-17.43.34_263dd6707191_convert_quantity_from_integer_to_float.py

@@ -23,8 +23,8 @@ def is_postgres():
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
 
-    # SQLite doesn't require migration as types are not inforced.
-    # Postgres Specifc Migration
+    # SQLite doesn't require migration as types are not enforced.
+    # Postgres Specific Migration
     if is_postgres():
         op.alter_column(
             "recipes_ingredients",
@@ -38,8 +38,8 @@ def upgrade():
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
 
-    # SQLite doesn't require migration as types are not inforced.
-    # Postgres Specifc Migration
+    # SQLite doesn't require migration as types are not enforced.
+    # Postgres Specific Migration
     if is_postgres():
         op.alter_column(
             "recipes_ingredients",

alembic/versions/2022-08-12-19.05.59_188374910655_add_login_attemps_and_locked_at_field_.py

@@ -0,0 +1,26 @@
+"""add login_attemps and locked_at field to user table
+
+Revision ID: 188374910655
+Revises: f30cf048c228
+Create Date: 2022-08-12 19:05:59.776361
+
+"""
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "188374910655"
+down_revision = "f30cf048c228"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("users", sa.Column("login_attemps", sa.Integer(), nullable=True))
+    op.add_column("users", sa.Column("locked_at", sa.DateTime(), nullable=True))
+
+
+def downgrade():
+    op.drop_column("users", "locked_at")
+    op.drop_column("users", "login_attemps")

alembic/versions/2022-08-13-17.07.07_089bfa50d0ed_add_is_ocr_recipe_column_to_recipes.py

@@ -0,0 +1,27 @@
+"""Add is_ocr_recipe column to recipes
+
+Revision ID: 089bfa50d0ed
+Revises: 188374910655
+Create Date: 2022-08-05 17:07:07.389271
+
+"""
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "089bfa50d0ed"
+down_revision = "188374910655"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("recipes", sa.Column("is_ocr_recipe", sa.Boolean(), default=False, nullable=True))
+    op.execute("UPDATE recipes SET is_ocr_recipe = FALSE")
+    #  SQLITE does not support ALTER COLUMN, so the column will stay nullable to prevent making this migration a mess
+    #  The Recipe pydantic model and the SQL server use False as default value anyway for this column so Null should be a very rare sight
+
+
+def downgrade():
+    op.drop_column("recipes", "is_ocr_recipe")

alembic/versions/2022-08-29-13.57.40_44e8d670719d_add_extras_to_shopping_lists_list_items_.py

@@ -0,0 +1,72 @@
+"""add extras to shopping lists, list items, and ingredient foods
+
+Revision ID: 44e8d670719d
+Revises: 089bfa50d0ed
+Create Date: 2022-08-29 13:57:40.452245
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "44e8d670719d"
+down_revision = "089bfa50d0ed"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "shopping_list_extras",
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("key_name", sa.String(), nullable=True),
+        sa.Column("value", sa.String(), nullable=True),
+        sa.Column("shopping_list_id", mealie.db.migration_types.GUID(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["shopping_list_id"],
+            ["shopping_lists.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "ingredient_food_extras",
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("key_name", sa.String(), nullable=True),
+        sa.Column("value", sa.String(), nullable=True),
+        sa.Column("ingredient_food_id", mealie.db.migration_types.GUID(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["ingredient_food_id"],
+            ["ingredient_foods.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "shopping_list_item_extras",
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("key_name", sa.String(), nullable=True),
+        sa.Column("value", sa.String(), nullable=True),
+        sa.Column("shopping_list_item_id", mealie.db.migration_types.GUID(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["shopping_list_item_id"],
+            ["shopping_list_items.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("shopping_list_item_extras")
+    op.drop_table("ingredient_food_extras")
+    op.drop_table("shopping_list_extras")
+    # ### end Alembic commands ###

alembic/versions/2022-09-27-14.53.14_2ea7a807915c_add_recipe_timeline_events_table.py

@@ -0,0 +1,50 @@
+"""add recipe_timeline_events table
+
+Revision ID: 2ea7a807915c
+Revises: 44e8d670719d
+Create Date: 2022-09-27 14:53:14.111054
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "2ea7a807915c"
+down_revision = "44e8d670719d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "recipe_timeline_events",
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.Column("id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("user_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("subject", sa.String(), nullable=False),
+        sa.Column("message", sa.String(), nullable=True),
+        sa.Column("event_type", sa.String(), nullable=True),
+        sa.Column("image", sa.String(), nullable=True),
+        sa.Column("timestamp", sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["recipe_id"],
+            ["recipes.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["user_id"],
+            ["users.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("recipe_timeline_events")
+    # ### end Alembic commands ###

alembic/versions/2022-11-03-13.10.24_1923519381ad_renamed_timeline_event_message_and_.py

@@ -0,0 +1,28 @@
+"""added recipe last made timestamp
+
+Revision ID: 1923519381ad
+Revises: 2ea7a807915c
+Create Date: 2022-11-03 13:10:24.811134
+
+"""
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1923519381ad"
+down_revision = "2ea7a807915c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("recipes", sa.Column("last_made", sa.DateTime(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("recipes", "last_made")
+    # ### end Alembic commands ###

alembic/versions/2022-11-22-03.42.45_167eb69066ad_add_recipe_scale_to_shopping_list_item_.py

@@ -0,0 +1,29 @@
+"""add recipe_scale to shopping list item ref
+
+Revision ID: 167eb69066ad
+Revises: 1923519381ad
+Create Date: 2022-11-22 03:42:45.494567
+
+"""
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "167eb69066ad"
+down_revision = "1923519381ad"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("shopping_list_item_recipe_reference", sa.Column("recipe_scale", sa.Float(), nullable=True))
+    op.execute("UPDATE shopping_list_item_recipe_reference SET recipe_scale = 1")
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("shopping_list_item_recipe_reference", "recipe_scale")
+    # ### end Alembic commands ###

alembic/versions/2023-01-21-16.54.44_165d943c64ee_add_related_user_to_mealplan.py

@@ -0,0 +1,43 @@
+"""add related user to mealplan
+
+Revision ID: 165d943c64ee
+Revises: 167eb69066ad
+Create Date: 2023-01-21 16:54:44.368768
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "165d943c64ee"
+down_revision = "167eb69066ad"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("group_meal_plans", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("user_id", mealie.db.migration_types.GUID(), nullable=True))
+        batch_op.create_index(batch_op.f("ix_group_meal_plans_user_id"), ["user_id"], unique=False)
+        batch_op.create_foreign_key("fk_user_mealplans", "users", ["user_id"], ["id"])
+
+    with op.batch_alter_table("shopping_list_item_recipe_reference", schema=None) as batch_op:
+        batch_op.alter_column("recipe_scale", existing_type=sa.FLOAT(), nullable=False)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("shopping_list_item_recipe_reference", schema=None) as batch_op:
+        batch_op.alter_column("recipe_scale", existing_type=sa.FLOAT(), nullable=True)
+
+    with op.batch_alter_table("group_meal_plans", schema=None) as batch_op:
+        batch_op.drop_constraint("fk_user_mealplans", type_="foreignkey")
+        batch_op.drop_index(batch_op.f("ix_group_meal_plans_user_id"))
+        batch_op.drop_column("user_id")
+
+    # ### end Alembic commands ###

alembic/versions/2023-02-07-20.57.21_ff5f73b01a7a_add_missing_foreign_key_and_order_.py

@@ -0,0 +1,280 @@
+"""add missing foreign key and order indices
+
+Revision ID: ff5f73b01a7a
+Revises: 165d943c64ee
+Create Date: 2023-02-07 20:57:21.066927
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "ff5f73b01a7a"
+down_revision = "165d943c64ee"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index(op.f("ix_api_extras_created_at"), "api_extras", ["created_at"], unique=False)
+    op.create_index(op.f("ix_api_extras_recipee_id"), "api_extras", ["recipee_id"], unique=False)
+    op.create_index(op.f("ix_categories_created_at"), "categories", ["created_at"], unique=False)
+    op.create_index(op.f("ix_cookbooks_created_at"), "cookbooks", ["created_at"], unique=False)
+    op.create_index(op.f("ix_cookbooks_group_id"), "cookbooks", ["group_id"], unique=False)
+    op.create_index(op.f("ix_cookbooks_slug"), "cookbooks", ["slug"], unique=False)
+    op.create_index(
+        op.f("ix_cookbooks_to_categories_category_id"), "cookbooks_to_categories", ["category_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_cookbooks_to_categories_cookbook_id"), "cookbooks_to_categories", ["cookbook_id"], unique=False
+    )
+    op.create_index(op.f("ix_cookbooks_to_tags_cookbook_id"), "cookbooks_to_tags", ["cookbook_id"], unique=False)
+    op.create_index(op.f("ix_cookbooks_to_tags_tag_id"), "cookbooks_to_tags", ["tag_id"], unique=False)
+    op.create_index(op.f("ix_cookbooks_to_tools_cookbook_id"), "cookbooks_to_tools", ["cookbook_id"], unique=False)
+    op.create_index(op.f("ix_cookbooks_to_tools_tool_id"), "cookbooks_to_tools", ["tool_id"], unique=False)
+    op.create_index(op.f("ix_group_data_exports_created_at"), "group_data_exports", ["created_at"], unique=False)
+    op.create_index(
+        op.f("ix_group_events_notifier_options_created_at"),
+        "group_events_notifier_options",
+        ["created_at"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_group_events_notifiers_created_at"), "group_events_notifiers", ["created_at"], unique=False
+    )
+    op.create_index(op.f("ix_group_meal_plan_rules_created_at"), "group_meal_plan_rules", ["created_at"], unique=False)
+    op.create_index(op.f("ix_group_meal_plan_rules_group_id"), "group_meal_plan_rules", ["group_id"], unique=False)
+    op.create_index(op.f("ix_group_meal_plans_created_at"), "group_meal_plans", ["created_at"], unique=False)
+    op.create_index(op.f("ix_group_preferences_created_at"), "group_preferences", ["created_at"], unique=False)
+    op.create_index(op.f("ix_group_reports_created_at"), "group_reports", ["created_at"], unique=False)
+    op.create_index(op.f("ix_group_to_categories_category_id"), "group_to_categories", ["category_id"], unique=False)
+    op.create_index(op.f("ix_group_to_categories_group_id"), "group_to_categories", ["group_id"], unique=False)
+    op.create_index(op.f("ix_groups_created_at"), "groups", ["created_at"], unique=False)
+    op.create_index(
+        op.f("ix_ingredient_food_extras_created_at"), "ingredient_food_extras", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_ingredient_food_extras_ingredient_food_id"),
+        "ingredient_food_extras",
+        ["ingredient_food_id"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_ingredient_foods_created_at"), "ingredient_foods", ["created_at"], unique=False)
+    op.create_index(op.f("ix_ingredient_foods_group_id"), "ingredient_foods", ["group_id"], unique=False)
+    op.create_index(op.f("ix_ingredient_foods_label_id"), "ingredient_foods", ["label_id"], unique=False)
+    op.create_index(op.f("ix_ingredient_units_created_at"), "ingredient_units", ["created_at"], unique=False)
+    op.create_index(op.f("ix_ingredient_units_group_id"), "ingredient_units", ["group_id"], unique=False)
+    op.create_index(op.f("ix_invite_tokens_created_at"), "invite_tokens", ["created_at"], unique=False)
+    op.create_index(op.f("ix_invite_tokens_group_id"), "invite_tokens", ["group_id"], unique=False)
+    op.create_index(op.f("ix_long_live_tokens_created_at"), "long_live_tokens", ["created_at"], unique=False)
+    op.create_index(op.f("ix_long_live_tokens_token"), "long_live_tokens", ["token"], unique=False)
+    op.create_index(op.f("ix_long_live_tokens_user_id"), "long_live_tokens", ["user_id"], unique=False)
+    op.create_index(op.f("ix_multi_purpose_labels_created_at"), "multi_purpose_labels", ["created_at"], unique=False)
+    op.create_index(op.f("ix_notes_created_at"), "notes", ["created_at"], unique=False)
+    op.create_index(op.f("ix_notes_recipe_id"), "notes", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_password_reset_tokens_created_at"), "password_reset_tokens", ["created_at"], unique=False)
+    op.create_index(op.f("ix_password_reset_tokens_user_id"), "password_reset_tokens", ["user_id"], unique=False)
+    op.create_index(
+        op.f("ix_plan_rules_to_categories_category_id"), "plan_rules_to_categories", ["category_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_plan_rules_to_categories_group_plan_rule_id"),
+        "plan_rules_to_categories",
+        ["group_plan_rule_id"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_plan_rules_to_tags_plan_rule_id"), "plan_rules_to_tags", ["plan_rule_id"], unique=False)
+    op.create_index(op.f("ix_plan_rules_to_tags_tag_id"), "plan_rules_to_tags", ["tag_id"], unique=False)
+    op.create_index(op.f("ix_recipe_assets_created_at"), "recipe_assets", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_assets_recipe_id"), "recipe_assets", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_comments_created_at"), "recipe_comments", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_comments_recipe_id"), "recipe_comments", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_comments_user_id"), "recipe_comments", ["user_id"], unique=False)
+    op.create_index(
+        op.f("ix_recipe_ingredient_ref_link_created_at"), "recipe_ingredient_ref_link", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_recipe_ingredient_ref_link_instruction_id"),
+        "recipe_ingredient_ref_link",
+        ["instruction_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_recipe_ingredient_ref_link_reference_id"), "recipe_ingredient_ref_link", ["reference_id"], unique=False
+    )
+    op.create_index(op.f("ix_recipe_instructions_created_at"), "recipe_instructions", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_instructions_position"), "recipe_instructions", ["position"], unique=False)
+    op.create_index(op.f("ix_recipe_instructions_recipe_id"), "recipe_instructions", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_nutrition_created_at"), "recipe_nutrition", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_nutrition_recipe_id"), "recipe_nutrition", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_settings_created_at"), "recipe_settings", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_settings_recipe_id"), "recipe_settings", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_share_tokens_created_at"), "recipe_share_tokens", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_share_tokens_recipe_id"), "recipe_share_tokens", ["recipe_id"], unique=False)
+    op.create_index(
+        op.f("ix_recipe_timeline_events_created_at"), "recipe_timeline_events", ["created_at"], unique=False
+    )
+    op.create_index(op.f("ix_recipe_timeline_events_recipe_id"), "recipe_timeline_events", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_timeline_events_timestamp"), "recipe_timeline_events", ["timestamp"], unique=False)
+    op.create_index(op.f("ix_recipe_timeline_events_user_id"), "recipe_timeline_events", ["user_id"], unique=False)
+    op.create_index(op.f("ix_recipes_created_at"), "recipes", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipes_name"), "recipes", ["name"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_created_at"), "recipes_ingredients", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_food_id"), "recipes_ingredients", ["food_id"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_position"), "recipes_ingredients", ["position"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_unit_id"), "recipes_ingredients", ["unit_id"], unique=False)
+    op.create_index(
+        op.f("ix_recipes_to_categories_category_id"), "recipes_to_categories", ["category_id"], unique=False
+    )
+    op.create_index(op.f("ix_recipes_to_categories_recipe_id"), "recipes_to_categories", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipes_to_tags_recipe_id"), "recipes_to_tags", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipes_to_tags_tag_id"), "recipes_to_tags", ["tag_id"], unique=False)
+    op.create_index(op.f("ix_recipes_to_tools_recipe_id"), "recipes_to_tools", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipes_to_tools_tool_id"), "recipes_to_tools", ["tool_id"], unique=False)
+    op.create_index(op.f("ix_report_entries_created_at"), "report_entries", ["created_at"], unique=False)
+    op.create_index(op.f("ix_report_entries_report_id"), "report_entries", ["report_id"], unique=False)
+    op.create_index(op.f("ix_server_tasks_created_at"), "server_tasks", ["created_at"], unique=False)
+    op.create_index(op.f("ix_shopping_list_extras_created_at"), "shopping_list_extras", ["created_at"], unique=False)
+    op.create_index(
+        op.f("ix_shopping_list_extras_shopping_list_id"), "shopping_list_extras", ["shopping_list_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_shopping_list_item_extras_created_at"), "shopping_list_item_extras", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_shopping_list_item_extras_shopping_list_item_id"),
+        "shopping_list_item_extras",
+        ["shopping_list_item_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_shopping_list_item_recipe_reference_created_at"),
+        "shopping_list_item_recipe_reference",
+        ["created_at"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_shopping_list_items_created_at"), "shopping_list_items", ["created_at"], unique=False)
+    op.create_index(op.f("ix_shopping_list_items_position"), "shopping_list_items", ["position"], unique=False)
+    op.create_index(
+        op.f("ix_shopping_list_items_shopping_list_id"), "shopping_list_items", ["shopping_list_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_shopping_list_recipe_reference_created_at"),
+        "shopping_list_recipe_reference",
+        ["created_at"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_shopping_lists_created_at"), "shopping_lists", ["created_at"], unique=False)
+    op.create_index(op.f("ix_tags_created_at"), "tags", ["created_at"], unique=False)
+    op.create_index(op.f("ix_tools_created_at"), "tools", ["created_at"], unique=False)
+    op.create_index(op.f("ix_tools_group_id"), "tools", ["group_id"], unique=False)
+    op.create_index(op.f("ix_users_created_at"), "users", ["created_at"], unique=False)
+    op.create_index(op.f("ix_users_to_favorites_recipe_id"), "users_to_favorites", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_users_to_favorites_user_id"), "users_to_favorites", ["user_id"], unique=False)
+    op.create_index(op.f("ix_webhook_urls_created_at"), "webhook_urls", ["created_at"], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_webhook_urls_created_at"), table_name="webhook_urls")
+    op.drop_index(op.f("ix_users_to_favorites_user_id"), table_name="users_to_favorites")
+    op.drop_index(op.f("ix_users_to_favorites_recipe_id"), table_name="users_to_favorites")
+    op.drop_index(op.f("ix_users_created_at"), table_name="users")
+    op.drop_index(op.f("ix_tools_group_id"), table_name="tools")
+    op.drop_index(op.f("ix_tools_created_at"), table_name="tools")
+    op.drop_index(op.f("ix_tags_created_at"), table_name="tags")
+    op.drop_index(op.f("ix_shopping_lists_created_at"), table_name="shopping_lists")
+    op.drop_index(op.f("ix_shopping_list_recipe_reference_created_at"), table_name="shopping_list_recipe_reference")
+    op.drop_index(op.f("ix_shopping_list_items_shopping_list_id"), table_name="shopping_list_items")
+    op.drop_index(op.f("ix_shopping_list_items_position"), table_name="shopping_list_items")
+    op.drop_index(op.f("ix_shopping_list_items_created_at"), table_name="shopping_list_items")
+    op.drop_index(
+        op.f("ix_shopping_list_item_recipe_reference_created_at"), table_name="shopping_list_item_recipe_reference"
+    )
+    op.drop_index(op.f("ix_shopping_list_item_extras_shopping_list_item_id"), table_name="shopping_list_item_extras")
+    op.drop_index(op.f("ix_shopping_list_item_extras_created_at"), table_name="shopping_list_item_extras")
+    op.drop_index(op.f("ix_shopping_list_extras_shopping_list_id"), table_name="shopping_list_extras")
+    op.drop_index(op.f("ix_shopping_list_extras_created_at"), table_name="shopping_list_extras")
+    op.drop_index(op.f("ix_server_tasks_created_at"), table_name="server_tasks")
+    op.drop_index(op.f("ix_report_entries_report_id"), table_name="report_entries")
+    op.drop_index(op.f("ix_report_entries_created_at"), table_name="report_entries")
+    op.drop_index(op.f("ix_recipes_to_tools_tool_id"), table_name="recipes_to_tools")
+    op.drop_index(op.f("ix_recipes_to_tools_recipe_id"), table_name="recipes_to_tools")
+    op.drop_index(op.f("ix_recipes_to_tags_tag_id"), table_name="recipes_to_tags")
+    op.drop_index(op.f("ix_recipes_to_tags_recipe_id"), table_name="recipes_to_tags")
+    op.drop_index(op.f("ix_recipes_to_categories_recipe_id"), table_name="recipes_to_categories")
+    op.drop_index(op.f("ix_recipes_to_categories_category_id"), table_name="recipes_to_categories")
+    op.drop_index(op.f("ix_recipes_ingredients_unit_id"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_position"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_food_id"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_created_at"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_name"), table_name="recipes")
+    op.drop_index(op.f("ix_recipes_created_at"), table_name="recipes")
+    op.drop_index(op.f("ix_recipe_timeline_events_user_id"), table_name="recipe_timeline_events")
+    op.drop_index(op.f("ix_recipe_timeline_events_timestamp"), table_name="recipe_timeline_events")
+    op.drop_index(op.f("ix_recipe_timeline_events_recipe_id"), table_name="recipe_timeline_events")
+    op.drop_index(op.f("ix_recipe_timeline_events_created_at"), table_name="recipe_timeline_events")
+    op.drop_index(op.f("ix_recipe_share_tokens_recipe_id"), table_name="recipe_share_tokens")
+    op.drop_index(op.f("ix_recipe_share_tokens_created_at"), table_name="recipe_share_tokens")
+    op.drop_index(op.f("ix_recipe_settings_recipe_id"), table_name="recipe_settings")
+    op.drop_index(op.f("ix_recipe_settings_created_at"), table_name="recipe_settings")
+    op.drop_index(op.f("ix_recipe_nutrition_recipe_id"), table_name="recipe_nutrition")
+    op.drop_index(op.f("ix_recipe_nutrition_created_at"), table_name="recipe_nutrition")
+    op.drop_index(op.f("ix_recipe_instructions_recipe_id"), table_name="recipe_instructions")
+    op.drop_index(op.f("ix_recipe_instructions_position"), table_name="recipe_instructions")
+    op.drop_index(op.f("ix_recipe_instructions_created_at"), table_name="recipe_instructions")
+    op.drop_index(op.f("ix_recipe_ingredient_ref_link_reference_id"), table_name="recipe_ingredient_ref_link")
+    op.drop_index(op.f("ix_recipe_ingredient_ref_link_instruction_id"), table_name="recipe_ingredient_ref_link")
+    op.drop_index(op.f("ix_recipe_ingredient_ref_link_created_at"), table_name="recipe_ingredient_ref_link")
+    op.drop_index(op.f("ix_recipe_comments_user_id"), table_name="recipe_comments")
+    op.drop_index(op.f("ix_recipe_comments_recipe_id"), table_name="recipe_comments")
+    op.drop_index(op.f("ix_recipe_comments_created_at"), table_name="recipe_comments")
+    op.drop_index(op.f("ix_recipe_assets_recipe_id"), table_name="recipe_assets")
+    op.drop_index(op.f("ix_recipe_assets_created_at"), table_name="recipe_assets")
+    op.drop_index(op.f("ix_plan_rules_to_tags_tag_id"), table_name="plan_rules_to_tags")
+    op.drop_index(op.f("ix_plan_rules_to_tags_plan_rule_id"), table_name="plan_rules_to_tags")
+    op.drop_index(op.f("ix_plan_rules_to_categories_group_plan_rule_id"), table_name="plan_rules_to_categories")
+    op.drop_index(op.f("ix_plan_rules_to_categories_category_id"), table_name="plan_rules_to_categories")
+    op.drop_index(op.f("ix_password_reset_tokens_user_id"), table_name="password_reset_tokens")
+    op.drop_index(op.f("ix_password_reset_tokens_created_at"), table_name="password_reset_tokens")
+    op.drop_index(op.f("ix_notes_recipe_id"), table_name="notes")
+    op.drop_index(op.f("ix_notes_created_at"), table_name="notes")
+    op.drop_index(op.f("ix_multi_purpose_labels_created_at"), table_name="multi_purpose_labels")
+    op.drop_index(op.f("ix_long_live_tokens_user_id"), table_name="long_live_tokens")
+    op.drop_index(op.f("ix_long_live_tokens_token"), table_name="long_live_tokens")
+    op.drop_index(op.f("ix_long_live_tokens_created_at"), table_name="long_live_tokens")
+    op.drop_index(op.f("ix_invite_tokens_group_id"), table_name="invite_tokens")
+    op.drop_index(op.f("ix_invite_tokens_created_at"), table_name="invite_tokens")
+    op.drop_index(op.f("ix_ingredient_units_group_id"), table_name="ingredient_units")
+    op.drop_index(op.f("ix_ingredient_units_created_at"), table_name="ingredient_units")
+    op.drop_index(op.f("ix_ingredient_foods_label_id"), table_name="ingredient_foods")
+    op.drop_index(op.f("ix_ingredient_foods_group_id"), table_name="ingredient_foods")
+    op.drop_index(op.f("ix_ingredient_foods_created_at"), table_name="ingredient_foods")
+    op.drop_index(op.f("ix_ingredient_food_extras_ingredient_food_id"), table_name="ingredient_food_extras")
+    op.drop_index(op.f("ix_ingredient_food_extras_created_at"), table_name="ingredient_food_extras")
+    op.drop_index(op.f("ix_groups_created_at"), table_name="groups")
+    op.drop_index(op.f("ix_group_to_categories_group_id"), table_name="group_to_categories")
+    op.drop_index(op.f("ix_group_to_categories_category_id"), table_name="group_to_categories")
+    op.drop_index(op.f("ix_group_reports_created_at"), table_name="group_reports")
+    op.drop_index(op.f("ix_group_preferences_created_at"), table_name="group_preferences")
+    op.drop_index(op.f("ix_group_meal_plans_created_at"), table_name="group_meal_plans")
+    op.drop_index(op.f("ix_group_meal_plan_rules_group_id"), table_name="group_meal_plan_rules")
+    op.drop_index(op.f("ix_group_meal_plan_rules_created_at"), table_name="group_meal_plan_rules")
+    op.drop_index(op.f("ix_group_events_notifiers_created_at"), table_name="group_events_notifiers")
+    op.drop_index(op.f("ix_group_events_notifier_options_created_at"), table_name="group_events_notifier_options")
+    op.drop_index(op.f("ix_group_data_exports_created_at"), table_name="group_data_exports")
+    op.drop_index(op.f("ix_cookbooks_to_tools_tool_id"), table_name="cookbooks_to_tools")
+    op.drop_index(op.f("ix_cookbooks_to_tools_cookbook_id"), table_name="cookbooks_to_tools")
+    op.drop_index(op.f("ix_cookbooks_to_tags_tag_id"), table_name="cookbooks_to_tags")
+    op.drop_index(op.f("ix_cookbooks_to_tags_cookbook_id"), table_name="cookbooks_to_tags")
+    op.drop_index(op.f("ix_cookbooks_to_categories_cookbook_id"), table_name="cookbooks_to_categories")
+    op.drop_index(op.f("ix_cookbooks_to_categories_category_id"), table_name="cookbooks_to_categories")
+    op.drop_index(op.f("ix_cookbooks_slug"), table_name="cookbooks")
+    op.drop_index(op.f("ix_cookbooks_group_id"), table_name="cookbooks")
+    op.drop_index(op.f("ix_cookbooks_created_at"), table_name="cookbooks")
+    op.drop_index(op.f("ix_categories_created_at"), table_name="categories")
+    op.drop_index(op.f("ix_api_extras_recipee_id"), table_name="api_extras")
+    op.drop_index(op.f("ix_api_extras_created_at"), table_name="api_extras")
+    # ### end Alembic commands ###

alembic/versions/2023-02-10-21.18.32_16160bf731a0_add_more_indices_necessary_for_search.py

@@ -0,0 +1,37 @@
+"""add more indices necessary for search
+
+Revision ID: 16160bf731a0
+Revises: ff5f73b01a7a
+Create Date: 2023-02-10 21:18:32.405130
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "16160bf731a0"
+down_revision = "ff5f73b01a7a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index(op.f("ix_recipe_instructions_text"), "recipe_instructions", ["text"], unique=False)
+    op.create_index(op.f("ix_recipes_description"), "recipes", ["description"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_note"), "recipes_ingredients", ["note"], unique=False)
+    op.create_index(
+        op.f("ix_recipes_ingredients_original_text"), "recipes_ingredients", ["original_text"], unique=False
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_recipes_ingredients_original_text"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_note"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_description"), table_name="recipes")
+    op.drop_index(op.f("ix_recipe_instructions_text"), table_name="recipe_instructions")
+    # ### end Alembic commands ###

alembic/versions/2023-02-14-20.45.41_5ab195a474eb_add_normalized_search_properties.py

@@ -0,0 +1,133 @@
+"""add normalized search properties
+
+Revision ID: 5ab195a474eb
+Revises: 16160bf731a0
+Create Date: 2023-02-14 20:45:41.102571
+
+"""
+import sqlalchemy as sa
+from sqlalchemy import orm, select
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
+from text_unidecode import unidecode
+
+import mealie.db.migration_types
+from alembic import op
+from mealie.db.models._model_utils import GUID
+
+# revision identifiers, used by Alembic.
+revision = "5ab195a474eb"
+down_revision = "16160bf731a0"
+branch_labels = None
+depends_on = None
+
+
+class SqlAlchemyBase(DeclarativeBase):
+    pass
+
+
+# Intermediate table definitions
+class RecipeModel(SqlAlchemyBase):
+    __tablename__ = "recipes"
+
+    id: Mapped[GUID] = mapped_column(GUID, primary_key=True, default=GUID.generate)
+    name: Mapped[str] = mapped_column(sa.String, nullable=False)
+    description: Mapped[str | None] = mapped_column(sa.String)
+    name_normalized: Mapped[str] = mapped_column(sa.String, nullable=False, index=True)
+    description_normalized: Mapped[str | None] = mapped_column(sa.String, index=True)
+
+
+class RecipeIngredient(SqlAlchemyBase):
+    __tablename__ = "recipes_ingredients"
+
+    id: Mapped[int] = mapped_column(sa.Integer, primary_key=True)
+    note: Mapped[str | None] = mapped_column(sa.String)
+    original_text: Mapped[str | None] = mapped_column(sa.String)
+    note_normalized: Mapped[str | None] = mapped_column(sa.String, index=True)
+    original_text_normalized: Mapped[str | None] = mapped_column(sa.String, index=True)
+
+
+def do_data_migration():
+    bind = op.get_bind()
+    session = orm.Session(bind=bind)
+
+    recipes = session.execute(select(RecipeModel)).scalars().all()
+    for recipe in recipes:
+        if recipe.name is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {RecipeModel.__tablename__} SET name_normalized=:name_normalized WHERE id=:id"
+                ).bindparams(name_normalized=unidecode(recipe.name).lower().strip(), id=recipe.id)
+            )
+
+        if recipe.description is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {RecipeModel.__tablename__} SET description_normalized=:description_normalized WHERE id=:id"
+                ).bindparams(description_normalized=unidecode(recipe.description).lower().strip(), id=recipe.id)
+            )
+
+    ingredients = session.execute(select(RecipeIngredient)).scalars().all()
+    for ingredient in ingredients:
+        if ingredient.note is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {RecipeIngredient.__tablename__} SET note_normalized=:note_normalized WHERE id=:id"
+                ).bindparams(note_normalized=unidecode(ingredient.note).lower().strip(), id=ingredient.id)
+            )
+
+        if ingredient.original_text is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {RecipeIngredient.__tablename__} SET original_text_normalized=:original_text_normalized WHERE id=:id"
+                ).bindparams(
+                    original_text_normalized=unidecode(ingredient.original_text).lower().strip(), id=ingredient.id
+                )
+            )
+    session.commit()
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    # Set column default first, since we do not have values here yet
+    op.add_column("recipes", sa.Column("name_normalized", sa.String(), nullable=False, server_default=""))
+    op.add_column("recipes", sa.Column("description_normalized", sa.String(), nullable=True))
+    op.drop_index("ix_recipes_description", table_name="recipes")
+    op.drop_index("ix_recipes_name", table_name="recipes")
+    op.create_index(op.f("ix_recipes_description_normalized"), "recipes", ["description_normalized"], unique=False)
+    op.create_index(op.f("ix_recipes_name_normalized"), "recipes", ["name_normalized"], unique=False)
+    op.add_column("recipes_ingredients", sa.Column("note_normalized", sa.String(), nullable=True))
+    op.add_column("recipes_ingredients", sa.Column("original_text_normalized", sa.String(), nullable=True))
+    op.drop_index("ix_recipes_ingredients_note", table_name="recipes_ingredients")
+    op.drop_index("ix_recipes_ingredients_original_text", table_name="recipes_ingredients")
+    op.create_index(
+        op.f("ix_recipes_ingredients_note_normalized"), "recipes_ingredients", ["note_normalized"], unique=False
+    )
+    op.create_index(
+        op.f("ix_recipes_ingredients_original_text_normalized"),
+        "recipes_ingredients",
+        ["original_text_normalized"],
+        unique=False,
+    )
+    do_data_migration()
+    # Remove server default now that column should be filled for all rows
+    with op.batch_alter_table("recipes", schema=None) as batch_op:
+        batch_op.alter_column("name_normalized", existing_type=sa.String(), server_default=None)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_recipes_ingredients_original_text_normalized"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_note_normalized"), table_name="recipes_ingredients")
+    op.create_index("ix_recipes_ingredients_original_text", "recipes_ingredients", ["original_text"], unique=False)
+    op.create_index("ix_recipes_ingredients_note", "recipes_ingredients", ["note"], unique=False)
+    op.drop_column("recipes_ingredients", "original_text_normalized")
+    op.drop_column("recipes_ingredients", "note_normalized")
+    op.drop_index(op.f("ix_recipes_name_normalized"), table_name="recipes")
+    op.drop_index(op.f("ix_recipes_description_normalized"), table_name="recipes")
+    op.create_index("ix_recipes_name", "recipes", ["name"], unique=False)
+    op.create_index("ix_recipes_description", "recipes", ["description"], unique=False)
+    op.drop_column("recipes", "description_normalized")
+    op.drop_column("recipes", "name_normalized")
+    # ### end Alembic commands ###

alembic/versions/2023-02-21-22.03.19_b04a08da2108_added_shopping_list_label_settings.py

@@ -0,0 +1,69 @@
+"""added shopping list label settings
+
+Revision ID: b04a08da2108
+Revises: 5ab195a474eb
+Create Date: 2023-21-02 22:03:19.837244
+
+"""
+from uuid import uuid4
+
+import sqlalchemy as sa
+from sqlalchemy.orm.session import Session
+
+import mealie.db.migration_types
+from alembic import op
+from mealie.db.models.group.shopping_list import ShoppingList
+from mealie.db.models.labels import MultiPurposeLabel
+
+# revision identifiers, used by Alembic.
+revision = "b04a08da2108"
+down_revision = "5ab195a474eb"
+branch_labels = None
+depends_on = None
+
+
+def populate_shopping_lists_multi_purpose_labels(shopping_lists_multi_purpose_labels_table: sa.Table, session: Session):
+    shopping_lists = session.query(ShoppingList).all()
+
+    shopping_lists_labels_data: list[dict] = []
+    for shopping_list in shopping_lists:
+        labels = session.query(MultiPurposeLabel).filter(MultiPurposeLabel.group_id == ShoppingList.group_id).all()
+        for i, label in enumerate(labels):
+            shopping_lists_labels_data.append(
+                {"id": uuid4(), "shopping_list_id": shopping_list.id, "label_id": label.id, "position": i}
+            )
+
+    op.bulk_insert(shopping_lists_multi_purpose_labels_table, shopping_lists_labels_data)
+    session.commit()
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    shopping_lists_multi_purpose_labels_table = op.create_table(
+        "shopping_lists_multi_purpose_labels",
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.Column("id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("shopping_list_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("label_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("position", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["label_id"],
+            ["multi_purpose_labels.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["shopping_list_id"],
+            ["shopping_lists.id"],
+        ),
+        sa.PrimaryKeyConstraint("id", "shopping_list_id", "label_id"),
+    )
+    # ### end Alembic commands ###
+
+    session = Session(bind=op.get_bind())
+    populate_shopping_lists_multi_purpose_labels(shopping_lists_multi_purpose_labels_table, session)
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("shopping_lists_multi_purpose_labels")
+    # ### end Alembic commands ###

alembic/versions/2023-02-22-21.45.52_38514b39a824_add_auth_method_to_user_table.py

@@ -0,0 +1,43 @@
+"""add auth_method to user table
+
+Revision ID: 38514b39a824
+Revises: b04a08da2108
+Create Date: 2023-02-22 21:45:52.900964
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "38514b39a824"
+down_revision = "b04a08da2108"
+branch_labels = None
+depends_on = None
+
+
+def is_postgres():
+    return op.get_context().dialect.name == "postgresql"
+
+
+authMethod = sa.Enum("MEALIE", "LDAP", name="authmethod")
+
+
+def upgrade():
+    if is_postgres():
+        authMethod.create(op.get_bind())
+
+    op.add_column(
+        "users",
+        sa.Column("auth_method", authMethod, nullable=False, server_default="MEALIE"),
+    )
+    op.execute("UPDATE users SET auth_method = 'LDAP' WHERE password = 'LDAP'")
+
+
+def downgrade():
+    with op.batch_alter_table("users", schema=None) as batch_op:
+        batch_op.drop_column("auth_method")
+
+    if is_postgres():
+        authMethod.drop(op.get_bind())

alembic/versions/2023-04-13-06.47.04_b3dbb554ba53_postgres_fuzzy_search.py

@@ -0,0 +1,89 @@
+"""postgres fuzzy search
+
+Revision ID: b3dbb554ba53
+Revises: 38514b39a824
+Create Date: 2023-04-13 06:47:04.617131
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+import alembic.context as context
+from mealie.core.config import get_app_settings
+
+# revision identifiers, used by Alembic.
+revision = "b3dbb554ba53"
+down_revision = "38514b39a824"
+branch_labels = None
+depends_on = None
+
+
+def get_db_type():
+    return op.get_context().dialect.name
+
+
+def setup_postgres_trigrams():
+    op.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm;")
+    op.create_index(
+        "ix_recipes_name_normalized_gin",
+        table_name="recipes",
+        columns=["name_normalized"],
+        unique=False,
+        postgresql_using="gin",
+        postgresql_ops={
+            "name_normalized": "gin_trgm_ops",
+        },
+    )
+    op.create_index(
+        "ix_recipes_description_normalized_gin",
+        table_name="recipes",
+        columns=["description_normalized"],
+        unique=False,
+        postgresql_using="gin",
+        postgresql_ops={
+            "description_normalized": "gin_trgm_ops",
+        },
+    )
+    op.create_index(
+        "ix_recipes_ingredients_note_normalized_gin",
+        table_name="recipes_ingredients",
+        columns=["note_normalized"],
+        unique=False,
+        postgresql_using="gin",
+        postgresql_ops={
+            "note_normalized": "gin_trgm_ops",
+        },
+    )
+    op.create_index(
+        "ix_recipes_ingredients_original_text_normalized_gin",
+        table_name="recipes_ingredients",
+        columns=["original_text_normalized"],
+        unique=False,
+        postgresql_using="gin",
+        postgresql_ops={
+            "original_text_normalized": "gin_trgm_ops",
+        },
+    )
+
+
+def remove_postgres_trigrams():
+    op.execute("DROP EXTENSION IF EXISTS pg_trgm;")
+    op.drop_index("ix_recipes_name_normalized_gin", table_name="recipe")
+    op.drop_index("ix_recipes_description_normalized_gin", table_name="recipe")
+    op.drop_index("ix_recipes_ingredients_note_normalized_gin", table_name="recipes_ingredients")
+    op.drop_index("ix_recipes_ingredients_original_text_normalized_gin", table_name="recipes_ingredients")
+
+
+def upgrade():
+    if get_db_type() == "postgresql":
+        setup_postgres_trigrams()
+    else:
+        pass
+
+
+def downgrade():
+    if get_db_type() == "postgres":
+        remove_postgres_trigrams()
+    else:
+        pass

alembic/versions/2023-08-06-21.00.34_04ac51cbe9a4_added_group_slug.py

@@ -0,0 +1,61 @@
+"""added group slug
+
+Revision ID: 04ac51cbe9a4
+Revises: b3dbb554ba53
+Create Date: 2023-08-06 21:00:34.582905
+
+"""
+import sqlalchemy as sa
+from slugify import slugify
+from sqlalchemy.orm import Session
+
+from alembic import op
+from mealie.db.models.group.group import Group
+
+# revision identifiers, used by Alembic.
+revision = "04ac51cbe9a4"
+down_revision = "b3dbb554ba53"
+branch_labels = None
+depends_on = None
+
+
+def populate_group_slugs(session: Session):
+    groups: list[Group] = session.query(Group).all()
+    seen_slugs: set[str] = set()
+    for group in groups:
+        original_name = group.name
+        new_name = original_name
+        attempts = 0
+        while True:
+            slug = slugify(new_name)
+            if slug not in seen_slugs:
+                break
+
+            attempts += 1
+            new_name = f"{original_name} ({attempts})"
+
+        seen_slugs.add(slug)
+        session.execute(
+            sa.text(f"UPDATE {Group.__tablename__} SET name=:name, slug=:slug WHERE id=:id").bindparams(
+                name=new_name, slug=slug, id=group.id
+            )
+        )
+
+    session.commit()
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("groups", sa.Column("slug", sa.String(), nullable=True))
+    op.create_index(op.f("ix_groups_slug"), "groups", ["slug"], unique=True)
+    # ### end Alembic commands ###
+
+    session = Session(bind=op.get_bind())
+    populate_group_slugs(session)
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_groups_slug"), table_name="groups")
+    op.drop_column("groups", "slug")
+    # ### end Alembic commands ###

alembic/versions/2023-08-14-19.30.49_1825b5225403_added_recipe_note_to_shopping_list_.py

@@ -0,0 +1,28 @@
+"""added recipe note to shopping list recipe ref
+
+Revision ID: 1825b5225403
+Revises: 04ac51cbe9a4
+Create Date: 2023-08-14 19:30:49.103185
+
+"""
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1825b5225403"
+down_revision = "04ac51cbe9a4"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("shopping_list_item_recipe_reference", sa.Column("recipe_note", sa.String(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("shopping_list_item_recipe_reference", "recipe_note")
+    # ### end Alembic commands ###

alembic/versions/2023-08-15-16.25.07_bcfdad6b7355_remove_tool_name_and_slug_unique_.py

@@ -0,0 +1,32 @@
+"""remove tool name and slug unique contraints
+
+Revision ID: bcfdad6b7355
+Revises: 1825b5225403
+Create Date: 2023-08-15 16:25:07.058929
+
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "bcfdad6b7355"
+down_revision = "1825b5225403"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index("ix_tools_name", table_name="tools")
+    op.create_index(op.f("ix_tools_name"), "tools", ["name"], unique=False)
+    op.drop_index("ix_tools_slug", table_name="tools")
+    op.create_index(op.f("ix_tools_slug"), "tools", ["slug"], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_tools_slug"), table_name="tools")
+    op.create_index("ix_tools_slug", "tools", ["slug"], unique=True)
+    op.drop_index(op.f("ix_tools_name"), table_name="tools")
+    op.create_index("ix_tools_name", "tools", ["name"], unique=True)
+    # ### end Alembic commands ###

alembic/versions/2023-09-01-14.55.42_0341b154f79a_added_normalized_unit_and_food_names.py

@@ -0,0 +1,89 @@
+"""added normalized unit and food names
+
+Revision ID: 0341b154f79a
+Revises: bcfdad6b7355
+Create Date: 2023-09-01 14:55:42.166766
+
+"""
+import sqlalchemy as sa
+from sqlalchemy import orm, select
+
+from alembic import op
+from mealie.db.models.recipe.ingredient import IngredientFoodModel, IngredientUnitModel
+
+# revision identifiers, used by Alembic.
+revision = "0341b154f79a"
+down_revision = "bcfdad6b7355"
+branch_labels = None
+depends_on = None
+
+
+def populate_normalized_fields():
+    bind = op.get_bind()
+    session = orm.Session(bind=bind)
+
+    units = (
+        session.execute(
+            select(IngredientUnitModel).options(
+                orm.load_only(IngredientUnitModel.name, IngredientUnitModel.abbreviation)
+            )
+        )
+        .scalars()
+        .all()
+    )
+    for unit in units:
+        if unit.name is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {IngredientUnitModel.__tablename__} SET name_normalized=:name_normalized WHERE id=:id"
+                ).bindparams(name_normalized=IngredientUnitModel.normalize(unit.name), id=unit.id)
+            )
+
+        if unit.abbreviation is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {IngredientUnitModel.__tablename__} SET abbreviation_normalized=:abbreviation_normalized WHERE id=:id"
+                ).bindparams(abbreviation_normalized=IngredientUnitModel.normalize(unit.abbreviation), id=unit.id)
+            )
+
+    foods = (
+        session.execute(select(IngredientFoodModel).options(orm.load_only(IngredientFoodModel.name))).scalars().all()
+    )
+    for food in foods:
+        if food.name is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {IngredientFoodModel.__tablename__} SET name_normalized=:name_normalized WHERE id=:id"
+                ).bindparams(name_normalized=IngredientFoodModel.normalize(food.name), id=food.id)
+            )
+
+    session.commit()
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("ingredient_foods", sa.Column("name_normalized", sa.String(), nullable=True))
+    op.create_index(op.f("ix_ingredient_foods_name_normalized"), "ingredient_foods", ["name_normalized"], unique=False)
+    op.add_column("ingredient_units", sa.Column("name_normalized", sa.String(), nullable=True))
+    op.add_column("ingredient_units", sa.Column("abbreviation_normalized", sa.String(), nullable=True))
+    op.create_index(
+        op.f("ix_ingredient_units_abbreviation_normalized"),
+        "ingredient_units",
+        ["abbreviation_normalized"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_ingredient_units_name_normalized"), "ingredient_units", ["name_normalized"], unique=False)
+    # ### end Alembic commands ###
+
+    populate_normalized_fields()
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_ingredient_units_name_normalized"), table_name="ingredient_units")
+    op.drop_index(op.f("ix_ingredient_units_abbreviation_normalized"), table_name="ingredient_units")
+    op.drop_column("ingredient_units", "abbreviation_normalized")
+    op.drop_column("ingredient_units", "name_normalized")
+    op.drop_index(op.f("ix_ingredient_foods_name_normalized"), table_name="ingredient_foods")
+    op.drop_column("ingredient_foods", "name_normalized")
+    # ### end Alembic commands ###

alembic/versions/2023-10-04-14.29.26_dded3119c1fe_added_unique_constraints.py

@@ -0,0 +1,259 @@
+"""added unique constraints
+
+Revision ID: dded3119c1fe
+Revises: 0341b154f79a
+Create Date: 2023-10-04 14:29:26.688065
+
+"""
+from collections import defaultdict
+from dataclasses import dataclass
+from typing import Any
+
+import sqlalchemy as sa
+from pydantic import UUID4
+from sqlalchemy.orm import Session, load_only
+
+from alembic import op
+from mealie.db.models._model_base import SqlAlchemyBase
+from mealie.db.models.group.shopping_list import ShoppingListItem
+from mealie.db.models.labels import MultiPurposeLabel
+from mealie.db.models.recipe.ingredient import IngredientFoodModel, IngredientUnitModel, RecipeIngredientModel
+
+# revision identifiers, used by Alembic.
+revision = "dded3119c1fe"
+down_revision = "0341b154f79a"
+branch_labels = None
+depends_on = None
+
+
+@dataclass
+class TableMeta:
+    tablename: str
+    pk_1: str
+    pk_2: str
+
+    @classmethod
+    def composite_pk(self, pk_1_val: Any, pk_2_val: Any) -> str:
+        return "$$".join([pk_1_val, pk_2_val])
+
+
+def _is_postgres():
+    return op.get_context().dialect.name == "postgresql"
+
+
+def _get_duplicates(session: Session, model: SqlAlchemyBase) -> defaultdict[str, list]:
+    duplicate_map: defaultdict[str, list] = defaultdict(list)
+
+    query = session.execute(sa.text(f"SELECT id, group_id, name FROM {model.__tablename__}"))
+    for row in query.all():
+        id, group_id, name = row
+        key = f"{group_id}$${name}"
+        duplicate_map[key].append(id)
+
+    return duplicate_map
+
+
+def _resolve_duplicate_food(
+    session: Session,
+    keep_food_id: UUID4,
+    dupe_food_id: UUID4,
+):
+    for shopping_list_item in session.query(ShoppingListItem).filter_by(food_id=dupe_food_id).all():
+        shopping_list_item.food_id = keep_food_id
+
+    for recipe_ingredient in (
+        session.query(RecipeIngredientModel)
+        .options(load_only(RecipeIngredientModel.id, RecipeIngredientModel.food_id))
+        .filter_by(food_id=dupe_food_id)
+        .all()
+    ):
+        recipe_ingredient.food_id = keep_food_id
+
+    session.commit()
+    session.execute(
+        sa.text(f"DELETE FROM {IngredientFoodModel.__tablename__} WHERE id=:id").bindparams(id=dupe_food_id)
+    )
+    session.commit()
+
+
+def _resolve_duplicate_unit(
+    session: Session,
+    keep_unit_id: UUID4,
+    dupe_unit_id: UUID4,
+):
+    for shopping_list_item in session.query(ShoppingListItem).filter_by(unit_id=dupe_unit_id).all():
+        shopping_list_item.unit_id = keep_unit_id
+
+    for recipe_ingredient in session.query(RecipeIngredientModel).filter_by(unit_id=dupe_unit_id).all():
+        recipe_ingredient.unit_id = keep_unit_id
+
+    session.commit()
+    session.execute(
+        sa.text(f"DELETE FROM {IngredientUnitModel.__tablename__} WHERE id=:id").bindparams(id=dupe_unit_id)
+    )
+    session.commit()
+
+
+def _resolve_duplicate_label(
+    session: Session,
+    keep_label_id: UUID4,
+    dupe_label_id: UUID4,
+):
+    for shopping_list_item in session.query(ShoppingListItem).filter_by(label_id=dupe_label_id).all():
+        shopping_list_item.label_id = keep_label_id
+
+    for ingredient_food in session.query(IngredientFoodModel).filter_by(label_id=dupe_label_id).all():
+        ingredient_food.label_id = keep_label_id
+
+    session.commit()
+    session.execute(sa.text(f"DELETE FROM {MultiPurposeLabel.__tablename__} WHERE id=:id").bindparams(id=dupe_label_id))
+    session.commit()
+
+
+def _resolve_duplicate_foods_units_labels(session: Session):
+    for model, resolve_func in [
+        (IngredientFoodModel, _resolve_duplicate_food),
+        (IngredientUnitModel, _resolve_duplicate_unit),
+        (MultiPurposeLabel, _resolve_duplicate_label),
+    ]:
+        duplicate_map = _get_duplicates(session, model)
+        for ids in duplicate_map.values():
+            if len(ids) < 2:
+                continue
+
+            keep_id = ids[0]
+            for dupe_id in ids[1:]:
+                resolve_func(session, keep_id, dupe_id)
+
+
+def _remove_duplicates_from_m2m_table(session: Session, table_meta: TableMeta):
+    if _is_postgres():
+        default_pk = "CTID"
+    else:
+        default_pk = "ROWID"
+
+    # some of these tables are missing defined unique pks, so we have to rely on the database default pk
+    query = sa.text(
+        f"""
+        DELETE FROM {table_meta.tablename}
+        WHERE EXISTS (
+            SELECT 1 FROM {table_meta.tablename} t2
+            WHERE {table_meta.tablename}.{table_meta.pk_1} = t2.{table_meta.pk_1}
+            AND {table_meta.tablename}.{table_meta.pk_2} = t2.{table_meta.pk_2}
+            AND {table_meta.tablename}.{default_pk} > t2.{default_pk}
+        )
+        """
+    )
+
+    session.execute(query)
+    session.commit()
+
+
+def _remove_duplicates_from_m2m_tables(session: Session, table_metas: list[TableMeta]):
+    for table_meta in table_metas:
+        _remove_duplicates_from_m2m_table(session, table_meta)
+
+
+def upgrade():
+    bind = op.get_bind()
+    session = Session(bind=bind)
+
+    _resolve_duplicate_foods_units_labels(session)
+    _remove_duplicates_from_m2m_tables(
+        session,
+        [
+            TableMeta("cookbooks_to_categories", "cookbook_id", "category_id"),
+            TableMeta("cookbooks_to_tags", "cookbook_id", "tag_id"),
+            TableMeta("cookbooks_to_tools", "cookbook_id", "tool_id"),
+            TableMeta("group_to_categories", "group_id", "category_id"),
+            TableMeta("plan_rules_to_categories", "group_plan_rule_id", "category_id"),
+            TableMeta("plan_rules_to_tags", "plan_rule_id", "tag_id"),
+            TableMeta("recipes_to_categories", "recipe_id", "category_id"),
+            TableMeta("recipes_to_tags", "recipe_id", "tag_id"),
+            TableMeta("recipes_to_tools", "recipe_id", "tool_id"),
+            TableMeta("users_to_favorites", "user_id", "recipe_id"),
+            TableMeta("shopping_lists_multi_purpose_labels", "shopping_list_id", "label_id"),
+        ],
+    )
+
+    session.commit()
+
+    # ### commands auto generated by Alembic - please adjust! ###
+    # we use batch_alter_table here because otherwise this fails on sqlite
+    # M2M
+    with op.batch_alter_table("cookbooks_to_categories") as batch_op:
+        batch_op.create_unique_constraint("cookbook_id_category_id_key", ["cookbook_id", "category_id"])
+
+    with op.batch_alter_table("cookbooks_to_tags") as batch_op:
+        batch_op.create_unique_constraint("cookbook_id_tag_id_key", ["cookbook_id", "tag_id"])
+
+    with op.batch_alter_table("cookbooks_to_tools") as batch_op:
+        batch_op.create_unique_constraint("cookbook_id_tool_id_key", ["cookbook_id", "tool_id"])
+
+    with op.batch_alter_table("group_to_categories") as batch_op:
+        batch_op.create_unique_constraint("group_id_category_id_key", ["group_id", "category_id"])
+
+    with op.batch_alter_table("plan_rules_to_categories") as batch_op:
+        batch_op.create_unique_constraint("group_plan_rule_id_category_id_key", ["group_plan_rule_id", "category_id"])
+
+    with op.batch_alter_table("plan_rules_to_tags") as batch_op:
+        batch_op.create_unique_constraint("plan_rule_id_tag_id_key", ["plan_rule_id", "tag_id"])
+
+    with op.batch_alter_table("recipes_to_categories") as batch_op:
+        batch_op.create_unique_constraint("recipe_id_category_id_key", ["recipe_id", "category_id"])
+
+    with op.batch_alter_table("recipes_to_tags") as batch_op:
+        batch_op.create_unique_constraint("recipe_id_tag_id_key", ["recipe_id", "tag_id"])
+
+    with op.batch_alter_table("recipes_to_tools") as batch_op:
+        batch_op.create_unique_constraint("recipe_id_tool_id_key", ["recipe_id", "tool_id"])
+
+    with op.batch_alter_table("users_to_favorites") as batch_op:
+        batch_op.create_unique_constraint("user_id_recipe_id_key", ["user_id", "recipe_id"])
+
+    with op.batch_alter_table("shopping_lists_multi_purpose_labels") as batch_op:
+        batch_op.create_unique_constraint("shopping_list_id_label_id_key", ["shopping_list_id", "label_id"])
+
+    # Foods/Units/Labels
+    with op.batch_alter_table("ingredient_foods") as batch_op:
+        batch_op.create_unique_constraint("ingredient_foods_name_group_id_key", ["name", "group_id"])
+
+    with op.batch_alter_table("ingredient_units") as batch_op:
+        batch_op.create_unique_constraint("ingredient_units_name_group_id_key", ["name", "group_id"])
+
+    with op.batch_alter_table("multi_purpose_labels") as batch_op:
+        batch_op.create_unique_constraint("multi_purpose_labels_name_group_id_key", ["name", "group_id"])
+
+    op.create_index(
+        op.f("ix_shopping_lists_multi_purpose_labels_created_at"),
+        "shopping_lists_multi_purpose_labels",
+        ["created_at"],
+        unique=False,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    # M2M
+    op.drop_constraint("user_id_recipe_id_key", "users_to_favorites", type_="unique")
+    op.drop_index(
+        op.f("ix_shopping_lists_multi_purpose_labels_created_at"), table_name="shopping_lists_multi_purpose_labels"
+    )
+    op.drop_constraint("recipe_id_tool_id_key", "recipes_to_tools", type_="unique")
+    op.drop_constraint("recipe_id_tag_id_key", "recipes_to_tags", type_="unique")
+    op.drop_constraint("recipe_id_category_id_key", "recipes_to_categories", type_="unique")
+    op.drop_constraint("plan_rule_id_tag_id_key", "plan_rules_to_tags", type_="unique")
+    op.drop_constraint("group_plan_rule_id_category_id_key", "plan_rules_to_categories", type_="unique")
+    op.drop_constraint("group_id_category_id_key", "group_to_categories", type_="unique")
+    op.drop_constraint("cookbook_id_tool_id_key", "cookbooks_to_tools", type_="unique")
+    op.drop_constraint("cookbook_id_tag_id_key", "cookbooks_to_tags", type_="unique")
+    op.drop_constraint("cookbook_id_category_id_key", "cookbooks_to_categories", type_="unique")
+    op.drop_constraint("shopping_list_id_label_id_key", "shopping_lists_multi_purpose_labels", type_="unique")
+
+    # Foods/Units/Labels
+    op.drop_constraint("multi_purpose_labels_name_group_id_key", "multi_purpose_labels", type_="unique")
+    op.drop_constraint("ingredient_units_name_group_id_key", "ingredient_units", type_="unique")
+    op.drop_constraint("ingredient_foods_name_group_id_key", "ingredient_foods", type_="unique")
+    # ### end Alembic commands ###

alembic/versions/2023-10-19-19.22.55_ba1e4a6cfe99_added_plural_names_and_alias_tables_for_.py

@@ -0,0 +1,106 @@
+"""added plural names and alias tables for foods and units
+
+Revision ID: ba1e4a6cfe99
+Revises: dded3119c1fe
+Create Date: 2023-10-19 19:22:55.369319
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "ba1e4a6cfe99"
+down_revision = "dded3119c1fe"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "ingredient_units_aliases",
+        sa.Column("id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("unit_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.Column("name_normalized", sa.String(), nullable=True),
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["unit_id"],
+            ["ingredient_units.id"],
+        ),
+        sa.PrimaryKeyConstraint("id", "unit_id"),
+    )
+    op.create_index(
+        op.f("ix_ingredient_units_aliases_created_at"), "ingredient_units_aliases", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_ingredient_units_aliases_name_normalized"),
+        "ingredient_units_aliases",
+        ["name_normalized"],
+        unique=False,
+    )
+    op.create_table(
+        "ingredient_foods_aliases",
+        sa.Column("id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("food_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.Column("name_normalized", sa.String(), nullable=True),
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["food_id"],
+            ["ingredient_foods.id"],
+        ),
+        sa.PrimaryKeyConstraint("id", "food_id"),
+    )
+    op.create_index(
+        op.f("ix_ingredient_foods_aliases_created_at"), "ingredient_foods_aliases", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_ingredient_foods_aliases_name_normalized"),
+        "ingredient_foods_aliases",
+        ["name_normalized"],
+        unique=False,
+    )
+    op.add_column("ingredient_foods", sa.Column("plural_name", sa.String(), nullable=True))
+    op.add_column("ingredient_foods", sa.Column("plural_name_normalized", sa.String(), nullable=True))
+    op.create_index(
+        op.f("ix_ingredient_foods_plural_name_normalized"), "ingredient_foods", ["plural_name_normalized"], unique=False
+    )
+    op.add_column("ingredient_units", sa.Column("plural_name", sa.String(), nullable=True))
+    op.add_column("ingredient_units", sa.Column("plural_name_normalized", sa.String(), nullable=True))
+    op.create_index(
+        op.f("ix_ingredient_units_plural_name_normalized"), "ingredient_units", ["plural_name_normalized"], unique=False
+    )
+    op.add_column("ingredient_units", sa.Column("plural_abbreviation", sa.String(), nullable=True))
+    op.add_column("ingredient_units", sa.Column("plural_abbreviation_normalized", sa.String(), nullable=True))
+    op.create_index(
+        op.f("ix_ingredient_units_plural_abbreviation_normalized"),
+        "ingredient_units",
+        ["plural_abbreviation_normalized"],
+        unique=False,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_ingredient_units_plural_abbreviation_normalized"), table_name="ingredient_units")
+    op.drop_column("ingredient_units", "plural_abbreviation_normalized")
+    op.drop_column("ingredient_units", "plural_abbreviation")
+    op.drop_index(op.f("ix_ingredient_units_plural_name_normalized"), table_name="ingredient_units")
+    op.drop_column("ingredient_units", "plural_name_normalized")
+    op.drop_column("ingredient_units", "plural_name")
+    op.drop_index(op.f("ix_ingredient_foods_plural_name_normalized"), table_name="ingredient_foods")
+    op.drop_column("ingredient_foods", "plural_name_normalized")
+    op.drop_column("ingredient_foods", "plural_name")
+    op.drop_index(op.f("ix_ingredient_foods_aliases_name_normalized"), table_name="ingredient_foods_aliases")
+    op.drop_index(op.f("ix_ingredient_foods_aliases_created_at"), table_name="ingredient_foods_aliases")
+    op.drop_table("ingredient_foods_aliases")
+    op.drop_index(op.f("ix_ingredient_units_aliases_name_normalized"), table_name="ingredient_units_aliases")
+    op.drop_index(op.f("ix_ingredient_units_aliases_created_at"), table_name="ingredient_units_aliases")
+    op.drop_table("ingredient_units_aliases")
+    # ### end Alembic commands ###

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_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)
@@ -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,82 @@
+import json
+from pathlib import Path
+
+from fastapi import FastAPI
+from jinja2 import Template
+from pydantic import BaseModel
+from utils import PROJECT_DIR, CodeTemplates, HTTPRequest, RouteObject
+
+CWD = Path(__file__).parent
+
+OUTFILE = PROJECT_DIR / "tests" / "utils" / "api_routes" / "__init__.py"
+
+
+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) 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,199 @@
+import pathlib
+from dataclasses import dataclass
+from pathlib import Path
+
+import dotenv
+import requests
+from jinja2 import Template
+from pydantic import Extra
+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")
+
+
+@dataclass
+class LocaleData:
+    name: str
+    dir: str = "ltr"
+
+
+LOCALE_DATA: dict[str, LocaleData] = {
+    "en-US": LocaleData(name="American English"),
+    "en-GB": LocaleData(name="British English"),
+    "af-ZA": LocaleData(name="Afrikaans (Afrikaans)"),
+    "ar-SA": LocaleData(name="العربية (Arabic)", dir="rtl"),
+    "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)"),
+    "es-ES": LocaleData(name="Español (Spanish)"),
+    "fi-FI": LocaleData(name="Suomi (Finnish)"),
+    "fr-FR": LocaleData(name="Français (French)"),
+    "he-IL": LocaleData(name="עברית (Hebrew)", dir="rtl"),
+    "hu-HU": LocaleData(name="Magyar (Hungarian)"),
+    "it-IT": LocaleData(name="Italiano (Italian)"),
+    "ja-JP": LocaleData(name="日本語 (Japanese)"),
+    "ko-KR": LocaleData(name="한국어 (Korean)"),
+    "no-NO": LocaleData(name="Norsk (Norwegian)"),
+    "nl-NL": LocaleData(name="Nederlands (Dutch)"),
+    "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)"),
+    "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_global_components.py
+export const LOCALES = [{% for locale in locales %}
+  {
+    name: "{{ locale.name }}",
+    value: "{{ locale.locale }}",
+    progress: {{ locale.progress }},
+    dir: "{{ locale.dir }}",
+  },{% endfor %}
+]
+
+"""
+
+
+class TargetLanguage(MealieModel):
+    id: str
+    name: str
+    locale: str
+    dir: str = "ltr"
+    threeLettersCode: str
+    twoLettersCode: str
+    progress: float = 0.0
+
+    class Config:
+        extra = Extra.allow
+        allow_population_by_field_name = True
+
+
+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",
+                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.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 inject_nuxt_values():
+    all_date_locales = [
+        f'"{match.stem}": require("./lang/dateTimeFormats/{match.name}"),' for match in datetime_dir.glob("*.json")
+    ]
+
+    all_langs = []
+    for match in locales_dir.glob("*.json"):
+        lang_string = f'{{ code: "{match.stem}", file: "{match.name}" }},'
+        all_langs.append(lang_string)
+
+    log.debug(f"injecting locales into nuxt config -> {nuxt_config}")
+    inject_inline(nuxt_config, CodeKeys.nuxt_local_messages, all_langs)
+    inject_inline(nuxt_config, CodeKeys.nuxt_local_dates, all_date_locales)
+
+
+def generate_locales_ts_file():
+    api = CrowdinApi("")
+    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()
+
+
+if __name__ == "__main__":
+    main()

dev/code-generation/gen_ts_types.py

@@ -2,28 +2,28 @@ from pathlib import Path
 
 from jinja2 import Template
 from pydantic2ts import generate_typescript_defs
-from rich import print
+from utils import log
 
 # ============================================================
-# 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";
+{% for name in global %}import {{ name }} from "@/components/global/{{ name }}.vue";
+{% endfor %}{% for name in layout %}import {{ name }} from "@/components/layout/{{ 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 %}
-  }
+{% for name in global -%}
+    {{ "    " }}{{ name }}: typeof {{ name }};
+{% endfor -%}
+    {{ "    " }}// Layout Components
+{% for name in layout -%}
+    {{ "    " }}{{ name }}: typeof {{ name }};
+{% endfor -%}{{ "  }"}}
 }
 
 export {};
+
 """
 
 CWD = Path(__file__).parent
@@ -46,6 +46,7 @@ def generate_global_components_types() -> None:
         data = {}
         for name, path in component_paths.items():
             components = [component.stem for component in path.glob("*.vue")]
+            components.sort()
             data[name] = components
 
         return data
@@ -74,7 +75,7 @@ def generate_typescript_types() -> None:
         return str_path
 
     schema_path = PROJECT_DIR / "mealie" / "schema"
-    types_dir = PROJECT_DIR / "frontend" / "types" / "api-types"
+    types_dir = PROJECT_DIR / "frontend" / "lib" / "api" / "types"
 
     ignore_dirs = ["__pycache__", "static", "_mealie"]
 
@@ -99,26 +100,29 @@ def generate_typescript_types() -> None:
             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
+            log.error(f"Module Error: {e}")
 
-    print("\n📁 Skipped Directories:")  # noqa
+    log.debug("\n📁 Skipped Directories:")
     for skipped_dir in skipped_dirs:
-        print("   📁", skipped_dir.name)  # noqa
+        log.debug(f"   📁 {skipped_dir.name}")
 
-    print("📄 Skipped Files:")  # noqa
+    log.debug("📄 Skipped Files:")
     for f in skipped_files:
-        print("   📄", f.name)  # noqa
+        log.debug(f"   📄 {f.name}")
 
-    print("❌ Failed Modules:")  # noqa
-    for f in failed_modules:
-        print("   ❌", f.name)  # noqa
+    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__":
-    print("\n-- Starting Global Components Generator --")  # noqa
-    generate_global_components_types()
-
-    print("\n-- Starting Pydantic To Typescript Generator --")  # noqa
-    generate_typescript_types()
+    main()

dev/code-generation/main.py

@@ -0,0 +1,28 @@
+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():
+    items = [
+        (gen_py_schema_exports.main, "schema exports"),
+        (gen_ts_types.main, "frontend types"),
+        (gen_ts_locales.main, "locales"),
+        (gen_py_pytest_data_paths.main, "test data paths"),
+        (gen_py_pytest_routes.main, "pytest routes"),
+    ]
+
+    for func, name in items:
+        log.info(f"Generating {name}...")
+        func()
+
+
+if __name__ == "__main__":
+    main()

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

@@ -3,7 +3,7 @@ from enum import Enum
 from typing import Optional
 
 from humps import camelize
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Extra, Field
 from slugify import slugify
 
 
@@ -30,6 +30,7 @@ class RequestType(str, Enum):
 class ParameterIn(str, Enum):
     query = "query"
     path = "path"
+    header = "header"
 
 
 class RouterParameter(BaseModel):
@@ -37,10 +38,16 @@ class RouterParameter(BaseModel):
     name: str
     location: ParameterIn = Field(..., alias="in")
 
+    class Config:
+        extra = Extra.allow
+
 
 class RequestBody(BaseModel):
     required: bool = False
 
+    class Config:
+        extra = Extra.allow
+
 
 class HTTPRequest(BaseModel):
     request_type: RequestType
@@ -49,7 +56,10 @@ class HTTPRequest(BaseModel):
     requestBody: Optional[RequestBody]
 
     parameters: list[RouterParameter] = []
-    tags: list[str]
+    tags: list[str] | None = []
+
+    class Config:
+        extra = Extra.allow
 
     def list_as_js_object_string(self, parameters, braces=True):
         if len(parameters) == 0:

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,3 +1,4 @@
+import logging
 import re
 from dataclasses import dataclass
 from pathlib import Path
@@ -5,9 +6,15 @@ 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,7 +22,9 @@ 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)
 
@@ -37,7 +46,6 @@ 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._next_line += 1
 
@@ -46,7 +54,7 @@ def get_indentation_of_string(line: str, comment_char: str = "//") -> str:
     return re.sub(rf"{comment_char}.*", "", line).removesuffix("\n")
 
 
-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]:
     start = None
     end = None
     indentation = None
@@ -84,7 +92,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/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,219 @@ 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,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "ea3b6702-9532-4fbc-a40b-f99917831c26",
+            },
+            {
+                "title": None,
+                "note": "1 cup light brown sugar",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "c5bbfefb-1e23-4ffd-af88-c0363a0fae82",
+            },
+            {
+                "title": None,
+                "note": "1/2 cup granulated white sugar",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "034f481b-c426-4a17-b983-5aea9be4974b",
+            },
+            {
+                "title": None,
+                "note": "2 large eggs",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "37c1f796-3bdb-4856-859f-dbec90bc27e4",
+            },
+            {
+                "title": None,
+                "note": "2 tsp vanilla extract",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "85561ace-f249-401d-834c-e600a2f6280e",
+            },
+            {
+                "title": None,
+                "note": "1/2 cup creamy peanut butter",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "ac91bda0-e8a8-491a-976a-ae4e72418cfd",
+            },
+            {
+                "title": None,
+                "note": "1 tsp cornstarch",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "4d1256b3-115e-4475-83cd-464fbc304cb0",
+            },
+            {
+                "title": None,
+                "note": "1 tsp baking soda",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "64627441-39f9-4ee3-8494-bafe36451d12",
+            },
+            {
+                "title": None,
+                "note": "1/2 tsp salt",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "7ae212d0-3cd1-44b0-899e-ec5bd91fd384",
+            },
+            {
+                "title": None,
+                "note": "1 cup cake flour",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "06967994-8548-4952-a8cc-16e8db228ebd",
+            },
+            {
+                "title": None,
+                "note": "2 cups all-purpose flour",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "bdb33b23-c767-4465-acf8-3b8e79eb5691",
+            },
+            {
+                "title": None,
+                "note": "2 cups peanut butter chips",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "quantity": 1,
+                "originalText": None,
+                "referenceId": "12ba0af8-affd-4fb2-9cca-6f1b3e8d3aef",
+            },
+            {
+                "title": None,
+                "note": "1½ cups Reese's Pieces candies",
+                "unit": None,
+                "food": None,
+                "disableAmount": True,
+                "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",
+        "updateAt": "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,
+            "disableAmount": True,
+            "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 +246,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/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

@@ -1,5 +1,21 @@
+FROM node:16 as builder
+
+WORKDIR /app
+
+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
+# Base Image - Python
 ###############################################
 FROM python:3.10-slim as python-base
 
@@ -37,45 +53,19 @@ RUN apt-get update \
     # LDAP Dependencies
     libsasl2-dev libldap2-dev libssl-dev \
     gnupg gnupg2 gnupg1 \
+    && rm -rf /var/lib/apt/lists/* \
     && 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 -
+ENV POETRY_VERSION=1.3.1
+RUN curl -sSL https://install.python-poetry.org | python3 -
 
 # 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"
+RUN poetry install -E pgsql --only main
 
 ###############################################
 # CRFPP Image
@@ -94,20 +84,18 @@ 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 \
+    gosu \
+    iproute2 \
+    libldap-common \
+    libldap-2.5 \
     && 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
@@ -124,18 +112,30 @@ 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
+RUN . $VENV_PATH/bin/activate && poetry install -E pgsql --only main
 WORKDIR /
 
 # Grab CRF++ Model Release
-RUN curl -L0 $CRF_MODEL_URL --output $MEALIE_HOME/mealie/services/parser_services/crfpp/model.crfmodel
+RUN python $MEALIE_HOME/mealie/scripts/install_model.py
 
 VOLUME [ "$MEALIE_HOME/data/" ]
 ENV APP_PORT=9000
 
 EXPOSE ${APP_PORT}
 
-HEALTHCHECK CMD curl -f http://localhost:${APP_PORT}/docs || exit 1
+HEALTHCHECK CMD python $MEALIE_HOME/mealie/scripts/healthcheck.py || exit 1
 
-RUN chmod +x $MEALIE_HOME/mealie/run.sh
-ENTRYPOINT $MEALIE_HOME/mealie/run.sh
+# ----------------------------------
+# Copy Frontend
+
+# copying caddy into image
+ENV STATIC_FILES=/spa/static
+COPY --from=builder /app/dist  ${STATIC_FILES}
+
+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.yml

@@ -0,0 +1,45 @@
+version: "3.4"
+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"
+
+      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
+      WEB_GUNICORN: "false"
+      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=
+
+volumes:
+  mealie-data:
+    driver: local

docker/entry.sh

@@ -0,0 +1,52 @@
+#!/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 container is started as root then create a new user and switch to it
+    if [ "$(id -u)" = "0" ]; then
+        add_user
+        chown -R $PUID:$PGID /app
+
+        echo "Switching to dedicated user"
+        exec gosu $PUID "$BASH_SOURCE" "$@"
+    elif [ "$(id -u)" = $PUID ]; then
+        echo "
+        User uid:    $PUID
+        User gid:    $PGID
+        "
+    fi
+}
+
+init() {
+    # $MEALIE_HOME directory
+    cd /app
+
+    # Activate our virtual environment here
+    . /opt/pysetup/.venv/bin/activate
+
+    # Initialize Database Prerun
+    poetry run python /app/mealie/db/init_db.py
+}
+
+change_user
+init
+GUNICORN_PORT=${API_PORT:-9000}
+
+# Start API
+hostip=`/sbin/ip route|awk '/default/ { print $3 }'`
+if [ "$WEB_GUNICORN" = 'true' ]; then
+    echo "Starting Gunicorn"
+    exec gunicorn mealie.app:app -b 0.0.0.0:$GUNICORN_PORT --forwarded-allow-ips=$hostip -k uvicorn.workers.UvicornWorker -c /app/gunicorn_conf.py --preload
+else
+    exec uvicorn mealie.app:app --host 0.0.0.0 --forwarded-allow-ips=$hostip --port $GUNICORN_PORT
+fi

docs/docs/assets/stylesheets/custom.css

@@ -55,3 +55,20 @@ th {
 .md-button {
   padding: 0.2rem 0.75rem !important;
 }
+
+.announce-left {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 1rem;
+}
+
+.announce-left > a {
+  color: #e0e0e0;
+  font-weight: bold;
+}
+
+.announce-left > a:hover {
+  color: var(--md-primary-fg-color);
+  text-decoration: underline;
+}

docs/docs/changelog/v0.1.0.md

@@ -62,7 +62,7 @@ A quality update with major props to [zackbcom](https://github.com/zackbcom) for
 
 ### Recipes
   - Added user feedback on bad URL
-  - Better backend data validation for updating recipes, avoid small syntax errors corrupting database entry. [Closes #8](https://github.com/hay-kot/mealie/issues/8)
+  - Better backend data validation for updating recipes, avoid small syntax errors corrupting database entry. [Closes #8](https://github.com/mealie-recipes/mealie/issues/8)
   - Fixed spacing Closes while editing new recipes in JSON
 
 ## v0.0.0 - Initial Pre-release

docs/docs/changelog/v0.2.0.md

@@ -67,6 +67,6 @@ This is, what I think, is a big release! Tons of new features and some great qua
 ### Breaking Changes 
 
 !!! error "Breaking Changes"
-    - API endpoints have been refactored to adhear to a more consistent standard. This is a WIP and more changes are likely to occur. 
+    - API endpoints have been refactored to adhere to a more consistent standard. This is a WIP and more changes are likely to occur. 
     - Officially Dropped MongoDB Support
     - Database Breaks! We have not yet implemented a database migration service. As such, upgrades cannot be done by simply pulling the image. You must first export your recipes, update your deployment, and then import your recipes. This pattern is likely to be how upgrades take place prior to v1.0. After v1.0 migrations will be done automatically. 

docs/docs/changelog/v0.4.2.md

@@ -5,7 +5,7 @@
 **Database Version: v0.4.0**
 
 !!! error "Breaking Changes"
-    1. With a recent refactor some users been experiencing issues with an environmental variable not being set correct. If you are experiencing issues, please provide your comments [Here](https://github.com/hay-kot/mealie/issues/281).
+    1. With a recent refactor some users been experiencing issues with an environmental variable not being set correct. If you are experiencing issues, please provide your comments [Here](https://github.com/mealie-recipes/mealie/issues/281).
 
     2. If you are a developer, you may experience issues with development as a new environmental variable has been introduced. Setting `PRODUCTION=false` will allow you to develop as normal.
 
@@ -31,4 +31,4 @@
 - Unify Logger across the backend
 - mealie.log and last_recipe.json are now downloadable from the frontend from the /admin/about
 - New download schema where you request a token and then use that token to hit a single endpoint to download a file. This is a notable change if you are using the API to download backups. 
-- Recipe images can now be added directly from a URL - [See #117 for details](https://github.com/hay-kot/mealie/issues/117)
+- Recipe images can now be added directly from a URL - [See #117 for details](https://github.com/mealie-recipes/mealie/issues/117)

docs/docs/changelog/v0.5.0.md

@@ -73,7 +73,7 @@
     - See what's for dinner
     - Manage Long Live API Tokens (New)
 - New Admin Dashboard! 🎉
-    - Now you can get some insight on your application with application statics and events.
+    - Now you can get some insight on your application with application statistics and events.
     - See uncategorized/untagged recipes and organize them!
     - Backup/Restore right from your dashboard
     - See server side events. Now you can know who deleted your favorite recipe! 

docs/docs/changelog/v0.5.2.md

@@ -8,7 +8,7 @@
 - Fixed #617 - Section behavior when adding a step
 - Fixed #615 - Recipe Settings are not available when creating new recipe
 - Fixed #625 - API of today's image returns strange characters
-- Fixed [#590](https://github.com/hay-kot/mealie/issues/590) - Duplicate Events when using Gunicorn Workers
+- Fixed [#590](https://github.com/mealie-recipes/mealie/issues/590) - Duplicate Events when using Gunicorn Workers
 
 ## Features and Improvements
 

docs/docs/changelog/v1.0.0.md

@@ -6,14 +6,14 @@
     - FastAPI to 0.78.0
 
 - Recipe Ingredient Editor
-    - [#1140](https://github.com/hay-kot/mealie/issues/1140) - Error in processing the quantity of ingredients #1140 - UI Now prevents entering not-allowed characters in quantity field
+    - [#1140](https://github.com/mealie-recipes/mealie/issues/1140) - Error in processing the quantity of ingredients #1140 - UI Now prevents entering not-allowed characters in quantity field
     - UI now allows no value to be set in addition to a zero (0) value.
-    - [#1237](https://github.com/hay-kot/mealie/issues/1237) - UI: Saving a 0 quantity ingredient displays 0 until the page is refreshed #1237 - UI Now properly reacts to changes in the quantity field.
+    - [#1237](https://github.com/mealie-recipes/mealie/issues/1237) - UI: Saving a 0 quantity ingredient displays 0 until the page is refreshed #1237 - UI Now properly reacts to changes in the quantity field.
 
-- Fix Mealie v0.5.x migration issue [#1183](https://github.com/hay-kot/mealie/issues/1183)
+- Fix Mealie v0.5.x migration issue [#1183](https://github.com/mealie-recipes/mealie/issues/1183)
 - Consolidated Frontend Types thanks to [@PFischbeck](https://github.com/Fischbeck)
 - Added support for SSL/No Auth Email [@nkringle](https://github.com/nkringle)
-- [Implement several notifications for server actions ](https://github.com/hay-kot/mealie/pull/1234)[@miroito](https://github.com/Miroito)
+- [Implement several notifications for server actions ](https://github.com/mealie-recipes/mealie/pull/1234)[@miroito](https://github.com/Miroito)
 - Fix display issue for shared recipe rendering on server [@PFischbeck](https://github.com/Fischbeck)
 
 ## v1.0.0b - 2022-05-09
@@ -36,7 +36,7 @@
 
 - Mealie now stores the original text from parsed ingredients, with the ability to peak at the original text from a recipe. [@miroito](https://github.com/Miroito)
 - Added some management / utility functions for administrators to manage data and cleanup artifacts from the file system.
-- Fix clear url action in recipe creation [#1101](https://github.com/hay-kot/mealie/pull/1101) [@miroito](https://github.com/Miroito)
+- Fix clear url action in recipe creation [#1101](https://github.com/mealie-recipes/mealie/pull/1101) [@miroito](https://github.com/Miroito)
 - Add group statistics calculations and data storage measurements
     - No hard limits are currently imposed on groups - though this may be implemented in the future.
 
@@ -73,7 +73,7 @@
 
 - Site Settings has been completely revamped. All site-wide settings at defined on the server as ENV variables. The site settings page now only shows you the non-secret values for reference. It also has some helpers to let you know if something isn't configured correctly.
     - Server Side Bare URL will let you know if the BASE_URL env variable has been set
-    - Secure Site let's you know if you're serving via HTTPS or accessing by localhost. accessing without a secure site will render some of the features unusable.
+    - Secure Site let's you know if you're serving via HTTPS or accessing by localhost. Accessing without a secure site will render some of the features unusable.
     - Email Configuration Status will let you know if all the email settings have been provided and offer a way to send test emails.
 
 #### 👨‍👩‍👧‍👦 Users and Groups