Merge branch 'develop'

Update en.json

.dockerignore

@@ -3,7 +3,6 @@ npm-debug.log
 Dockerfile*
 docker-compose*
 .dockerignore
-.git
 .gitignore
 README.md
 LICENSE

.env.template

@@ -100,10 +100,12 @@ GUNICORN_MEDIA=0
 # prefix used for account related emails (default "[Tandoor Recipes] ")
 # ACCOUNT_EMAIL_SUBJECT_PREFIX=
 
-# allow authentication via reverse proxy (e.g. authelia), leave off if you dont know what you are doing
-# see docs for more information https://docs.tandoor.dev/features/authentication/
+# allow authentication via the REMOTE-USER header (can be used for e.g. authelia).
+# ATTENTION: Leave off if you don't know what you are doing! Enabling this without proper configuration will enable anybody
+#   to login with any username!
+# See docs for additional information: https://docs.tandoor.dev/features/authentication/#reverse-proxy-authentication
 # when unset: 0 (false)
-REVERSE_PROXY_AUTH=0
+REMOTE_USER_AUTH=0
 
 # Default settings for spaces, apply per space and can be changed in the admin view
 # SPACE_DEFAULT_MAX_RECIPES=0 # 0=unlimited recipes

.github/workflows/build-docker-open-data.yml

@@ -34,16 +34,6 @@ jobs:
             echo VERSION=develop >> $GITHUB_OUTPUT
           fi
 
-      # Update Version number
-      - name: Update version file
-        uses: DamianReeves/write-file-action@v1.2
-        with:
-          path: recipes/version.py
-          contents: |
-            VERSION_NUMBER = '${{ steps.get_version.outputs.VERSION }}-open-data'
-            BUILD_REF = '${{ github.sha }}'
-          write-mode: overwrite
-
       # clone open data plugin
       - name: clone open data plugin repo
         uses: actions/checkout@master
@@ -55,7 +45,7 @@ jobs:
       # Build Vue frontend
       - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '18'
           cache: yarn
           cache-dependency-path: vue/yarn.lock
       - name: Install dependencies

.github/workflows/build-docker.yml

@@ -17,15 +17,9 @@ jobs:
           # Standard build config
           - name: Standard
             dockerfile: Dockerfile
-            platforms: linux/amd64,linux/arm64
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
             suffix: ""
             continue-on-error: false
-          # Raspi build config
-          - name: Raspi
-            dockerfile: Dockerfile-raspi
-            platforms: linux/arm/v7
-            suffix: "-raspi"
-            continue-on-error: true
     steps:
       - uses: actions/checkout@v3
 
@@ -40,20 +34,10 @@ jobs:
             echo VERSION=develop >> $GITHUB_OUTPUT
           fi
 
-      # Update Version number
-      - name: Update version file
-        uses: DamianReeves/write-file-action@v1.2
-        with:
-          path: recipes/version.py
-          contents: |
-            VERSION_NUMBER = '${{ steps.get_version.outputs.VERSION }}'
-            BUILD_REF = '${{ github.sha }}'
-          write-mode: overwrite
-
       # Build Vue frontend
       - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '18'
           cache: yarn
           cache-dependency-path: vue/yarn.lock
       - name: Install dependencies

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
     # Build Vue frontend
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
     - name: Install Vue dependencies
       working-directory: ./vue
       run: yarn install

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

Dockerfile

@@ -1,7 +1,7 @@
-FROM python:3.10-alpine3.15
+FROM python:3.10-alpine3.18
 
 #Install all dependencies.
-RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev py-cryptography openldap
+RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git
 
 #Print all logs without buffering it.
 ENV PYTHONUNBUFFERED 1
@@ -15,7 +15,11 @@ WORKDIR /opt/recipes
 
 COPY requirements.txt ./
 
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev git && \
+RUN \
+    if [ `apk --print-arch` = "armv7" ]; then \
+    printf "[global]\nextra-index-url=https://www.piwheels.org/simple\n" > /etc/pip.conf ; \
+    fi
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev && \
     echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
     python -m venv venv && \
     /opt/recipes/venv/bin/python -m pip install --upgrade pip && \
@@ -26,5 +30,11 @@ RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-de
 
 #Copy project and execute it.
 COPY . ./
+
+# collect information from git repositories
+RUN /opt/recipes/venv/bin/python version.py
+# delete git repositories to reduce image size
+RUN find . -type d -name ".git" | xargs rm -rf
+
 RUN chmod +x boot.sh
 ENTRYPOINT ["/opt/recipes/boot.sh"]

Dockerfile-raspi

@@ -1,33 +0,0 @@
-# builds of cryptography for raspberry pi (or better arm v7) fail for some
-FROM python:3.9-alpine3.15
-
-#Install all dependencies.
-RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev py-cryptography openldap gcompat
-
-#Print all logs without buffering it.
-ENV PYTHONUNBUFFERED 1
-
-#This port will be used by gunicorn.
-EXPOSE 8080
-
-#Create app dir and install requirements.
-RUN mkdir /opt/recipes
-WORKDIR /opt/recipes
-
-COPY requirements.txt ./
-RUN \
-    if [ `apk --print-arch` = "armv7" ]; then \
-    printf "[global]\nextra-index-url=https://www.piwheels.org/simple\n" > /etc/pip.conf ; \
-    fi
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev zlib-dev jpeg-dev libwebp-dev python3-dev git && \
-    echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
-    python -m venv venv && \
-    /opt/recipes/venv/bin/python -m pip install --upgrade pip && \
-    venv/bin/pip install wheel==0.37.1 && \
-    venv/bin/pip install -r requirements.txt --no-cache-dir --no-binary=Pillow && \
-    apk --purge del .build-deps
-
-#Copy project and execute it.
-COPY . ./
-RUN chmod +x boot.sh
-ENTRYPOINT ["/opt/recipes/boot.sh"]

cookbook/admin.py

@@ -10,12 +10,13 @@ from treebeard.forms import movenodeform_factory
 
 from cookbook.managers import DICTIONARY
 
-from .models import (BookmarkletImport, Comment, CookLog, Food, FoodInheritField, ImportLog,
-                     Ingredient, InviteLink, Keyword, MealPlan, MealType, NutritionInformation,
-                     Recipe, RecipeBook, RecipeBookEntry, RecipeImport, SearchPreference, ShareLink,
-                     ShoppingList, ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
-                     Supermarket, SupermarketCategory, SupermarketCategoryRelation, Sync, SyncLog,
-                     TelegramBot, Unit, UserFile, UserPreference, ViewLog, Automation, UserSpace)
+from .models import (Automation, BookmarkletImport, Comment, CookLog, Food, FoodInheritField,
+                     ImportLog, Ingredient, InviteLink, Keyword, MealPlan, MealType,
+                     NutritionInformation, Property, PropertyType, Recipe, RecipeBook,
+                     RecipeBookEntry, RecipeImport, SearchPreference, ShareLink, ShoppingList,
+                     ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage, Supermarket,
+                     SupermarketCategory, SupermarketCategoryRelation, Sync, SyncLog, TelegramBot,
+                     Unit, UnitConversion, UserFile, UserPreference, UserSpace, ViewLog)
 
 
 class CustomUserAdmin(UserAdmin):
@@ -38,6 +39,8 @@ def delete_space_action(modeladmin, request, queryset):
 class SpaceAdmin(admin.ModelAdmin):
     list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
     search_fields = ('name', 'created_by__username')
+    autocomplete_fields = ('created_by',)
+    filter_horizontal = ('food_inherit',)
     list_filter = ('max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
     date_hierarchy = 'created_at'
     actions = [delete_space_action]
@@ -49,6 +52,8 @@ admin.site.register(Space, SpaceAdmin)
 class UserSpaceAdmin(admin.ModelAdmin):
     list_display = ('user', 'space',)
     search_fields = ('user__username', 'space__name',)
+    filter_horizontal = ('groups',)
+    autocomplete_fields = ('user', 'space',)
 
 
 admin.site.register(UserSpace, UserSpaceAdmin)
@@ -59,6 +64,7 @@ class UserPreferenceAdmin(admin.ModelAdmin):
     search_fields = ('user__username',)
     list_filter = ('theme', 'nav_color', 'default_page',)
     date_hierarchy = 'created_at'
+    filter_horizontal = ('plan_share', 'shopping_share',)
 
     @staticmethod
     def name(obj):
@@ -150,9 +156,16 @@ class KeywordAdmin(TreeAdmin):
 admin.site.register(Keyword, KeywordAdmin)
 
 
+@admin.action(description='Delete Steps not part of a Recipe.')
+def delete_unattached_steps(modeladmin, request, queryset):
+    with scopes_disabled():
+        Step.objects.filter(recipe=None).delete()
+
+
 class StepAdmin(admin.ModelAdmin):
     list_display = ('name', 'order',)
     search_fields = ('name',)
+    actions = [delete_unattached_steps]
 
 
 admin.site.register(Step, StepAdmin)
@@ -201,9 +214,24 @@ class FoodAdmin(TreeAdmin):
 admin.site.register(Food, FoodAdmin)
 
 
+class UnitConversionAdmin(admin.ModelAdmin):
+    list_display = ('base_amount', 'base_unit', 'food', 'converted_amount', 'converted_unit')
+    search_fields = ('food__name', 'unit__name')
+
+
+admin.site.register(UnitConversion, UnitConversionAdmin)
+
+
+@admin.action(description='Delete Ingredients not part of a Recipe.')
+def delete_unattached_ingredients(modeladmin, request, queryset):
+    with scopes_disabled():
+        Ingredient.objects.filter(step__recipe=None).delete()
+
+
 class IngredientAdmin(admin.ModelAdmin):
     list_display = ('food', 'amount', 'unit')
     search_fields = ('food__name', 'unit__name')
+    actions = [delete_unattached_ingredients]
 
 
 admin.site.register(Ingredient, IngredientAdmin)
@@ -286,6 +314,7 @@ admin.site.register(InviteLink, InviteLinkAdmin)
 
 class CookLogAdmin(admin.ModelAdmin):
     list_display = ('recipe', 'created_by', 'created_at', 'rating', 'servings')
+    search_fields = ('recipe__name', 'space__name',)
 
 
 admin.site.register(CookLog, CookLogAdmin)
@@ -319,6 +348,20 @@ class ShareLinkAdmin(admin.ModelAdmin):
 admin.site.register(ShareLink, ShareLinkAdmin)
 
 
+class PropertyTypeAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name')
+
+
+admin.site.register(PropertyType, PropertyTypeAdmin)
+
+
+class PropertyAdmin(admin.ModelAdmin):
+    list_display = ('property_amount', 'property_type')
+
+
+admin.site.register(Property, PropertyAdmin)
+
+
 class NutritionInformationAdmin(admin.ModelAdmin):
     list_display = ('id',)
 

cookbook/forms.py

@@ -46,6 +46,7 @@ class UserPreferenceForm(forms.ModelForm):
         fields = (
             'default_unit', 'use_fractions', 'use_kj', 'theme', 'nav_color',
             'sticky_navbar', 'default_page', 'plan_share', 'ingredient_decimals', 'comments', 'left_handed',
+            'show_step_ingredients',
         )
 
         labels = {
@@ -60,7 +61,8 @@ class UserPreferenceForm(forms.ModelForm):
             'ingredient_decimals': _('Ingredient decimal places'),
             'shopping_auto_sync': _('Shopping list auto sync period'),
             'comments': _('Comments'),
-            'left_handed': _('Left-handed mode')
+            'left_handed': _('Left-handed mode'),
+            'show_step_ingredients': _('Show step ingredients table')
         }
 
         help_texts = {
@@ -82,7 +84,8 @@ class UserPreferenceForm(forms.ModelForm):
             'sticky_navbar': _('Makes the navbar stick to the top of the page.'),  
             'mealplan_autoadd_shopping': _('Automatically add meal plan ingredients to shopping list.'),
             'mealplan_autoexclude_onhand': _('Exclude ingredients that are on hand.'),
-            'left_handed': _('Will optimize the UI for use with your left hand.')
+            'left_handed': _('Will optimize the UI for use with your left hand.'),
+            'show_step_ingredients': _('Add ingredients table next to recipe steps. Applies at creation time for manually created and URL imported recipes. Individual steps can be overridden in the edit recipe view.')
         }
 
         widgets = {

cookbook/helper/cache_helper.py

@@ -0,0 +1,11 @@
+class CacheHelper:
+    space = None
+
+    BASE_UNITS_CACHE_KEY = None
+    PROPERTY_TYPE_CACHE_KEY = None
+
+    def __init__(self, space):
+        self.space = space
+
+        self.BASE_UNITS_CACHE_KEY = f'SPACE_{space.id}_BASE_UNITS'
+        self.PROPERTY_TYPE_CACHE_KEY = f'SPACE_{space.id}_PROPERTY_TYPES'

cookbook/helper/image_processing.py

@@ -40,7 +40,12 @@ def get_filetype(name):
 # TODO also add env variable to define which images sizes should be compressed
 # filetype argument can not be optional, otherwise this function will treat all images as if they were a jpeg
 # Because it's no longer optional, no reason to return it
-def handle_image(request, image_object, filetype): 
+def handle_image(request, image_object, filetype):
+    try:
+        Image.open(image_object).verify()
+    except Exception:
+        return None
+
     if (image_object.size / 1000) > 500:  # if larger than 500 kb compress
         if filetype == '.jpeg' or filetype == '.jpg':
             return rescale_image_jpeg(image_object)

cookbook/helper/ingredient_parser.py

@@ -3,8 +3,10 @@ import string
 import unicodedata
 
 from django.core.cache import caches
+from django.db.models import Q
+from django.db.models.functions import Lower
 
-from cookbook.models import Unit, Food, Automation, Ingredient
+from cookbook.models import Automation, Food, Ingredient, Unit
 
 
 class IngredientParser:
@@ -12,6 +14,8 @@ class IngredientParser:
     ignore_rules = False
     food_aliases = {}
     unit_aliases = {}
+    never_unit = {}
+    transpose_words = {}
 
     def __init__(self, request, cache_mode, ignore_automations=False):
         """
@@ -29,7 +33,7 @@ class IngredientParser:
                 caches['default'].touch(FOOD_CACHE_KEY, 30)
             else:
                 for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.FOOD_ALIAS).only('param_1', 'param_2').order_by('order').all():
-                    self.food_aliases[a.param_1] = a.param_2
+                    self.food_aliases[a.param_1.lower()] = a.param_2
                 caches['default'].set(FOOD_CACHE_KEY, self.food_aliases, 30)
 
             UNIT_CACHE_KEY = f'automation_unit_alias_{self.request.space.pk}'
@@ -38,11 +42,33 @@ class IngredientParser:
                 caches['default'].touch(UNIT_CACHE_KEY, 30)
             else:
                 for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.UNIT_ALIAS).only('param_1', 'param_2').order_by('order').all():
-                    self.unit_aliases[a.param_1] = a.param_2
+                    self.unit_aliases[a.param_1.lower()] = a.param_2
                 caches['default'].set(UNIT_CACHE_KEY, self.unit_aliases, 30)
+
+            NEVER_UNIT_CACHE_KEY = f'automation_never_unit_{self.request.space.pk}'
+            if c := caches['default'].get(NEVER_UNIT_CACHE_KEY, None):
+                self.never_unit = c
+                caches['default'].touch(NEVER_UNIT_CACHE_KEY, 30)
+            else:
+                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.NEVER_UNIT).only('param_1', 'param_2').order_by('order').all():
+                    self.never_unit[a.param_1.lower()] = a.param_2
+                caches['default'].set(NEVER_UNIT_CACHE_KEY, self.never_unit, 30)
+
+            TRANSPOSE_WORDS_CACHE_KEY = f'automation_transpose_words_{self.request.space.pk}'
+            if c := caches['default'].get(TRANSPOSE_WORDS_CACHE_KEY, None):
+                self.transpose_words = c
+                caches['default'].touch(TRANSPOSE_WORDS_CACHE_KEY, 30)
+            else:
+                i = 0
+                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.TRANSPOSE_WORDS).only('param_1', 'param_2').order_by('order').all():
+                    self.transpose_words[i] = [a.param_1.lower(), a.param_2.lower()]
+                    i += 1
+                caches['default'].set(TRANSPOSE_WORDS_CACHE_KEY, self.transpose_words, 30)
         else:
             self.food_aliases = {}
             self.unit_aliases = {}
+            self.never_unit = {}
+            self.transpose_words = {}
 
     def apply_food_automation(self, food):
         """
@@ -55,11 +81,11 @@ class IngredientParser:
         else:
             if self.food_aliases:
                 try:
-                    return self.food_aliases[food]
+                    return self.food_aliases[food.lower()]
                 except KeyError:
                     return food
             else:
-                if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1=food, disabled=False).order_by('order').first():
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1__iexact=food, disabled=False).order_by('order').first():
                     return automation.param_2
         return food
 
@@ -72,13 +98,13 @@ class IngredientParser:
         if self.ignore_rules:
             return unit
         else:
-            if self.unit_aliases:
+            if self.transpose_words:
                 try:
-                    return self.unit_aliases[unit]
+                    return self.unit_aliases[unit.lower()]
                 except KeyError:
                     return unit
             else:
-                if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1=unit, disabled=False).order_by('order').first():
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1__iexact=unit, disabled=False).order_by('order').first():
                     return automation.param_2
         return unit
 
@@ -133,10 +159,10 @@ class IngredientParser:
         end = 0
         while (end < len(x) and (x[end] in string.digits
                                  or (
-                                         (x[end] == '.' or x[end] == ',' or x[end] == '/')
-                                         and end + 1 < len(x)
-                                         and x[end + 1] in string.digits
-                                 ))):
+            (x[end] == '.' or x[end] == ',' or x[end] == '/')
+            and end + 1 < len(x)
+            and x[end + 1] in string.digits
+        ))):
             end += 1
         if end > 0:
             if "/" in x[:end]:
@@ -160,7 +186,8 @@ class IngredientParser:
         if unit is not None and unit.strip() == '':
             unit = None
 
-        if unit is not None and (unit.startswith('(') or unit.startswith('-')):  # i dont know any unit that starts with ( or - so its likely an alternative like 1L (500ml) Water or 2-3
+        if unit is not None and (unit.startswith('(') or unit.startswith(
+                '-')):  # i dont know any unit that starts with ( or - so its likely an alternative like 1L (500ml) Water or 2-3
             unit = None
             note = x
         return amount, unit, note
@@ -205,6 +232,67 @@ class IngredientParser:
             food, note = self.parse_food_with_comma(tokens)
         return food, note
 
+    def apply_never_unit_automations(self, tokens):
+        """
+        Moves a string that should never be treated as a unit to next token and optionally replaced with default unit
+        e.g. NEVER_UNIT: param1: egg, param2: None would modify ['1', 'egg', 'white'] to ['1', '', 'egg', 'white']
+        or NEVER_UNIT: param1: egg, param2: pcs would modify ['1', 'egg', 'yolk'] to ['1', 'pcs', 'egg', 'yolk']
+        :param1 string: string that should never be considered a unit, will be moved to token[2]
+        :param2 (optional) unit as string: will insert unit string into token[1]
+        :return: unit as string (possibly changed by automation)
+        """
+
+        if self.ignore_rules:
+            return tokens
+
+        new_unit = None
+        alt_unit = self.apply_unit_automation(tokens[1])
+        never_unit = False
+        if self.never_unit:
+            try:
+                new_unit = self.never_unit[tokens[1].lower()]
+                never_unit = True
+            except KeyError:
+                return tokens
+
+        else:
+            if automation := Automation.objects.annotate(param_1_lower=Lower('param_1')).filter(space=self.request.space, type=Automation.NEVER_UNIT, param_1_lower__in=[
+                    tokens[1].lower(), alt_unit.lower()], disabled=False).order_by('order').first():
+                new_unit = automation.param_2
+                never_unit = True
+
+        if never_unit:
+            tokens.insert(1, new_unit)
+
+        return tokens
+
+    def apply_transpose_words_automations(self, ingredient):
+        """
+        If two words (param_1 & param_2) are detected in sequence, swap their position in the ingredient string
+        :param 1: first word to detect
+        :param 2: second word to detect
+        return: new ingredient string
+        """
+
+        if self.ignore_rules:
+            return ingredient
+
+        else:
+            tokens = [x.lower() for x in ingredient.replace(',', ' ').split()]
+            if self.transpose_words:
+                filtered_rules = {}
+                for key, value in self.transpose_words.items():
+                    if value[0] in tokens and value[1] in tokens:
+                        filtered_rules[key] = value
+                for k, v in filtered_rules.items():
+                    ingredient = re.sub(rf"\b({v[0]})\W*({v[1]})\b", r"\2 \1", ingredient, flags=re.IGNORECASE)
+            else:
+                for rule in Automation.objects.filter(space=self.request.space, type=Automation.TRANSPOSE_WORDS, disabled=False) \
+                        .annotate(param_1_lower=Lower('param_1'), param_2_lower=Lower('param_2')) \
+                        .filter(Q(Q(param_1_lower__in=tokens) | Q(param_2_lower__in=tokens))).order_by('order'):
+                    ingredient = re.sub(rf"\b({rule.param_1})\W*({rule.param_1})\b", r"\2 \1", ingredient, flags=re.IGNORECASE)
+        return ingredient
+
     def parse(self, ingredient):
         """
         Main parsing function, takes an ingredient string (e.g. '1 l Water') and extracts amount, unit, food, ...
@@ -230,8 +318,8 @@ class IngredientParser:
 
         # if the string contains parenthesis early on remove it and place it at the end
         # because its likely some kind of note
-        if re.match('(.){1,6}\s\((.[^\(\)])+\)\s', ingredient):
-            match = re.search('\((.[^\(])+\)', ingredient)
+        if re.match('(.){1,6}\\s\\((.[^\\(\\)])+\\)\\s', ingredient):
+            match = re.search('\\((.[^\\(])+\\)', ingredient)
             ingredient = ingredient[:match.start()] + ingredient[match.end():] + ' ' + ingredient[match.start():match.end()]
 
         # leading spaces before commas result in extra tokens, clean them out
@@ -239,12 +327,14 @@ class IngredientParser:
 
         # handle "(from) - (to)" amounts by using the minimum amount and adding the range to the description
         # "10.5 - 200 g XYZ" => "100 g XYZ (10.5 - 200)"
-        ingredient = re.sub("^(\d+|\d+[\\.,]\d+) - (\d+|\d+[\\.,]\d+) (.*)", "\\1 \\3 (\\1 - \\2)", ingredient)
+        ingredient = re.sub("^(\\d+|\\d+[\\.,]\\d+) - (\\d+|\\d+[\\.,]\\d+) (.*)", "\\1 \\3 (\\1 - \\2)", ingredient)
 
         # if amount and unit are connected add space in between
-        if re.match('([0-9])+([A-z])+\s', ingredient):
+        if re.match('([0-9])+([A-z])+\\s', ingredient):
             ingredient = re.sub(r'(?<=([a-z])|\d)(?=(?(1)\d|[a-z]))', ' ', ingredient)
 
+        ingredient = self.apply_transpose_words_automations(ingredient)
+
         tokens = ingredient.split()  # split at each space into tokens
         if len(tokens) == 1:
             # there only is one argument, that must be the food
@@ -257,6 +347,7 @@ class IngredientParser:
                 # three arguments if it already has a unit there can't be
                 # a fraction for the amount
                 if len(tokens) > 2:
+                    tokens = self.apply_never_unit_automations(tokens)
                     try:
                         if unit is not None:
                             # a unit is already found, no need to try the second argument for a fraction

cookbook/helper/open_data_importer.py

@@ -0,0 +1,214 @@
+from django.db.models import Q
+
+from cookbook.models import Unit, SupermarketCategory, Property, PropertyType, Supermarket, SupermarketCategoryRelation, Food, Automation, UnitConversion, FoodProperty
+
+
+class OpenDataImporter:
+    request = None
+    data = {}
+    slug_id_cache = {}
+    update_existing = False
+    use_metric = True
+
+    def __init__(self, request, data, update_existing=False, use_metric=True):
+        self.request = request
+        self.data = data
+        self.update_existing = update_existing
+        self.use_metric = use_metric
+
+    def _update_slug_cache(self, object_class, datatype):
+        self.slug_id_cache[datatype] = dict(object_class.objects.filter(space=self.request.space, open_data_slug__isnull=False).values_list('open_data_slug', 'id', ))
+
+    def import_units(self):
+        datatype = 'unit'
+
+        insert_list = []
+        for u in list(self.data[datatype].keys()):
+            insert_list.append(Unit(
+                name=self.data[datatype][u]['name'],
+                plural_name=self.data[datatype][u]['plural_name'],
+                base_unit=self.data[datatype][u]['base_unit'] if self.data[datatype][u]['base_unit'] != '' else None,
+                open_data_slug=u,
+                space=self.request.space
+            ))
+
+        if self.update_existing:
+            return Unit.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('name', 'plural_name', 'base_unit', 'open_data_slug'), unique_fields=('space', 'name',))
+        else:
+            return Unit.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('open_data_slug',), unique_fields=('space', 'name',))
+
+    def import_category(self):
+        datatype = 'category'
+
+        insert_list = []
+        for k in list(self.data[datatype].keys()):
+            insert_list.append(SupermarketCategory(
+                name=self.data[datatype][k]['name'],
+                open_data_slug=k,
+                space=self.request.space
+            ))
+
+        return SupermarketCategory.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('open_data_slug',), unique_fields=('space', 'name',))
+
+    def import_property(self):
+        datatype = 'property'
+
+        insert_list = []
+        for k in list(self.data[datatype].keys()):
+            insert_list.append(PropertyType(
+                name=self.data[datatype][k]['name'],
+                unit=self.data[datatype][k]['unit'],
+                open_data_slug=k,
+                space=self.request.space
+            ))
+
+        return PropertyType.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('open_data_slug',), unique_fields=('space', 'name',))
+
+    def import_supermarket(self):
+        datatype = 'store'
+
+        self._update_slug_cache(SupermarketCategory, 'category')
+        insert_list = []
+        for k in list(self.data[datatype].keys()):
+            insert_list.append(Supermarket(
+                name=self.data[datatype][k]['name'],
+                open_data_slug=k,
+                space=self.request.space
+            ))
+
+        # always add open data slug if matching supermarket is found, otherwise relation might fail
+        supermarkets = Supermarket.objects.bulk_create(insert_list, unique_fields=('space', 'name',), update_conflicts=True, update_fields=('open_data_slug',))
+        self._update_slug_cache(Supermarket, 'store')
+
+        insert_list = []
+        for k in list(self.data[datatype].keys()):
+            relations = []
+            order = 0
+            for c in self.data[datatype][k]['categories']:
+                relations.append(
+                    SupermarketCategoryRelation(
+                        supermarket_id=self.slug_id_cache[datatype][k],
+                        category_id=self.slug_id_cache['category'][c],
+                        order=order,
+                    )
+                )
+                order += 1
+
+            SupermarketCategoryRelation.objects.bulk_create(relations, ignore_conflicts=True, unique_fields=('supermarket', 'category',))
+
+        return supermarkets
+
+    def import_food(self):
+        identifier_list = []
+        datatype = 'food'
+        for k in list(self.data[datatype].keys()):
+            identifier_list.append(self.data[datatype][k]['name'])
+            identifier_list.append(self.data[datatype][k]['plural_name'])
+
+        existing_objects_flat = []
+        existing_objects = {}
+        for f in Food.objects.filter(space=self.request.space).filter(name__in=identifier_list).values_list('id', 'name', 'plural_name'):
+            existing_objects_flat.append(f[1])
+            existing_objects_flat.append(f[2])
+            existing_objects[f[1]] = f
+            existing_objects[f[2]] = f
+
+        self._update_slug_cache(Unit, 'unit')
+        self._update_slug_cache(PropertyType, 'property')
+
+        # pref_unit_key = 'preferred_unit_metric'
+        # pref_shopping_unit_key = 'preferred_packaging_unit_metric'
+        # if not self.use_metric:
+        #     pref_unit_key = 'preferred_unit_imperial'
+        #     pref_shopping_unit_key = 'preferred_packaging_unit_imperial'
+
+        insert_list = []
+        update_list = []
+        update_field_list = []
+        for k in list(self.data[datatype].keys()):
+            if not (self.data[datatype][k]['name'] in existing_objects_flat or self.data[datatype][k]['plural_name'] in existing_objects_flat):
+                insert_list.append({'data': {
+                    'name': self.data[datatype][k]['name'],
+                    'plural_name': self.data[datatype][k]['plural_name'] if self.data[datatype][k]['plural_name'] != '' else None,
+                    # 'preferred_unit_id': self.slug_id_cache['unit'][self.data[datatype][k][pref_unit_key]],
+                    # 'preferred_shopping_unit_id': self.slug_id_cache['unit'][self.data[datatype][k][pref_shopping_unit_key]],
+                    'supermarket_category_id': self.slug_id_cache['category'][self.data[datatype][k]['store_category']],
+                    'fdc_id': self.data[datatype][k]['fdc_id'] if self.data[datatype][k]['fdc_id'] != '' else None,
+                    'open_data_slug': k,
+                    'space': self.request.space.id,
+                }})
+            else:
+                if self.data[datatype][k]['name'] in existing_objects:
+                    existing_food_id = existing_objects[self.data[datatype][k]['name']][0]
+                else:
+                    existing_food_id = existing_objects[self.data[datatype][k]['plural_name']][0]
+
+                if self.update_existing:
+                    update_field_list = ['name', 'plural_name', 'preferred_unit_id', 'preferred_shopping_unit_id', 'supermarket_category_id', 'fdc_id', 'open_data_slug', ]
+                    update_list.append(Food(
+                        id=existing_food_id,
+                        name=self.data[datatype][k]['name'],
+                        plural_name=self.data[datatype][k]['plural_name'] if self.data[datatype][k]['plural_name'] != '' else None,
+                        # preferred_unit_id=self.slug_id_cache['unit'][self.data[datatype][k][pref_unit_key]],
+                        # preferred_shopping_unit_id=self.slug_id_cache['unit'][self.data[datatype][k][pref_shopping_unit_key]],
+                        supermarket_category_id=self.slug_id_cache['category'][self.data[datatype][k]['store_category']],
+                        fdc_id=self.data[datatype][k]['fdc_id'] if self.data[datatype][k]['fdc_id'] != '' else None,
+                        open_data_slug=k,
+                    ))
+                else:
+                    update_field_list = ['open_data_slug', ]
+                    update_list.append(Food(id=existing_food_id, open_data_slug=k, ))
+
+        Food.load_bulk(insert_list, None)
+        if len(update_list) > 0:
+            Food.objects.bulk_update(update_list, update_field_list)
+
+        self._update_slug_cache(Food, 'food')
+
+        food_property_list = []
+        alias_list = []
+        for k in list(self.data[datatype].keys()):
+            for fp in self.data[datatype][k]['properties']['type_values']:
+                food_property_list.append(Property(
+                    property_type_id=self.slug_id_cache['property'][fp['property_type']],
+                    property_amount=fp['property_value'],
+                    import_food_id=self.slug_id_cache['food'][k],
+                    space=self.request.space,
+                ))
+
+            # for a in self.data[datatype][k]['alias']:
+            #     alias_list.append(Automation(
+            #         param_1=a,
+            #         param_2=self.data[datatype][k]['name'],
+            #         space=self.request.space,
+            #         created_by=self.request.user,
+            #     ))
+
+        Property.objects.bulk_create(food_property_list, ignore_conflicts=True, unique_fields=('space', 'import_food_id', 'property_type',))
+
+        property_food_relation_list = []
+        for p in Property.objects.filter(space=self.request.space, import_food_id__isnull=False).values_list('import_food_id', 'id', ):
+            property_food_relation_list.append(Food.properties.through(food_id=p[0], property_id=p[1]))
+
+        FoodProperty.objects.bulk_create(property_food_relation_list, ignore_conflicts=True, unique_fields=('food_id', 'property_id',))
+
+        # Automation.objects.bulk_create(alias_list, ignore_conflicts=True, unique_fields=('space', 'param_1', 'param_2',))
+        return insert_list + update_list
+
+    def import_conversion(self):
+        datatype = 'conversion'
+
+        insert_list = []
+        for k in list(self.data[datatype].keys()):
+            insert_list.append(UnitConversion(
+                base_amount=self.data[datatype][k]['base_amount'],
+                base_unit_id=self.slug_id_cache['unit'][self.data[datatype][k]['base_unit']],
+                converted_amount=self.data[datatype][k]['converted_amount'],
+                converted_unit_id=self.slug_id_cache['unit'][self.data[datatype][k]['converted_unit']],
+                food_id=self.slug_id_cache['food'][self.data[datatype][k]['food']],
+                open_data_slug=k,
+                space=self.request.space,
+                created_by=self.request.user,
+            ))
+
+        return UnitConversion.objects.bulk_create(insert_list, ignore_conflicts=True, unique_fields=('space', 'base_unit', 'converted_unit', 'food', 'open_data_slug'))

cookbook/helper/permission_helper.py

@@ -322,7 +322,7 @@ class CustomRecipePermission(permissions.BasePermission):
 
     def has_permission(self, request, view):  # user is either at least a guest or a share link is given and the request is safe
         share = request.query_params.get('share', None)
-        return has_group_permission(request.user, ['guest']) or (share and request.method in SAFE_METHODS and 'pk' in view.kwargs)
+        return ((has_group_permission(request.user, ['guest']) and request.method in SAFE_METHODS) or has_group_permission(request.user, ['user'])) or (share and request.method in SAFE_METHODS and 'pk' in view.kwargs)
 
     def has_object_permission(self, request, view, obj):
         share = request.query_params.get('share', None)
@@ -332,7 +332,7 @@ class CustomRecipePermission(permissions.BasePermission):
             if obj.private:
                 return ((obj.created_by == request.user) or (request.user in obj.shared.all())) and obj.space == request.space
             else:
-                return has_group_permission(request.user, ['guest']) and obj.space == request.space
+                return ((has_group_permission(request.user, ['guest']) and request.method in SAFE_METHODS) or has_group_permission(request.user, ['user'])) and obj.space == request.space
 
 
 class CustomUserPermission(permissions.BasePermission):
@@ -434,3 +434,10 @@ def switch_user_active_space(user, space):
             return us
     except ObjectDoesNotExist:
         return None
+
+
+class IsReadOnlyDRF(permissions.BasePermission):
+    message = 'You cannot interact with this object as it is not owned by you!'
+
+    def has_permission(self, request, view):
+        return request.method in SAFE_METHODS

cookbook/helper/property_helper.py

@@ -0,0 +1,71 @@
+from django.core.cache import caches
+
+from cookbook.helper.cache_helper import CacheHelper
+from cookbook.helper.unit_conversion_helper import UnitConversionHelper
+from cookbook.models import PropertyType, Unit, Food, Property, Recipe, Step
+
+
+class FoodPropertyHelper:
+    space = None
+
+    def __init__(self, space):
+        """
+        Helper to perform food property calculations
+        :param space: space to limit scope to
+        """
+        self.space = space
+
+    def calculate_recipe_properties(self, recipe):
+        """
+        Calculate all food properties for a given recipe.
+        :param recipe: recipe to calculate properties for
+        :return: dict of with property keys and total/food values for each property available
+        """
+        ingredients = []
+        computed_properties = {}
+
+        for s in recipe.steps.all():
+            ingredients += s.ingredients.all()
+
+        property_types = caches['default'].get(CacheHelper(self.space).PROPERTY_TYPE_CACHE_KEY, None)
+
+        if not property_types:
+            property_types = PropertyType.objects.filter(space=self.space).all()
+            caches['default'].set(CacheHelper(self.space).PROPERTY_TYPE_CACHE_KEY, property_types, 60 * 60)  # cache is cleared on property type save signal so long duration is fine
+
+        for fpt in property_types:
+            computed_properties[fpt.id] = {'id': fpt.id, 'name': fpt.name, 'icon': fpt.icon, 'description': fpt.description, 'unit': fpt.unit, 'order': fpt.order, 'food_values': {}, 'total_value': 0, 'missing_value': False}
+
+        uch = UnitConversionHelper(self.space)
+
+        for i in ingredients:
+            if i.food is not None:
+                conversions = uch.get_conversions(i)
+                for pt in property_types:
+                    found_property = False
+                    if i.food.properties_food_amount == 0 or i.food.properties_food_unit is None:
+                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
+                        computed_properties[pt.id]['missing_value'] = i.food.properties_food_unit is None
+                    else:
+                        for p in i.food.properties.all():
+                            if p.property_type == pt:
+                                for c in conversions:
+                                    if c.unit == i.food.properties_food_unit:
+                                        found_property = True
+                                        computed_properties[pt.id]['total_value'] += (c.amount / i.food.properties_food_amount) * p.property_amount
+                                        computed_properties[pt.id]['food_values'] = self.add_or_create(computed_properties[p.property_type.id]['food_values'], c.food.id, (c.amount / i.food.properties_food_amount) * p.property_amount, c.food)
+                    if not found_property:
+                        computed_properties[pt.id]['missing_value'] = True
+                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
+
+        return computed_properties
+
+    # small dict helper to add to existing key or create new, probably a better way of doing this
+    # TODO move to central helper ?
+    @staticmethod
+    def add_or_create(d, key, value, food):
+        if key in d:
+            d[key]['value'] += value
+        else:
+            d[key] = {'id': food.id, 'food': food.name, 'value': value}
+        return d

cookbook/helper/recipe_search.py

@@ -32,6 +32,9 @@ class RecipeSearch():
             if custom_filter:
                 self._params = {**json.loads(custom_filter.search)}
                 self._original_params = {**(params or {})}
+                # json.loads casts rating as an integer, expecting string
+                if isinstance(self._params.get('rating', None), int):
+                    self._params['rating'] = str(self._params['rating'])
             else:
                 self._params = {**(params or {})}
         else:
@@ -85,9 +88,9 @@ class RecipeSearch():
         self._viewedon = self._params.get('viewedon', None)
         self._makenow = self._params.get('makenow', None)
         # this supports hidden feature to find recipes missing X ingredients
-        if type(self._makenow) == bool and self._makenow == True:
+        if isinstance(self._makenow, bool) and self._makenow == True:
             self._makenow = 0
-        elif type(self._makenow) == str and self._makenow in ["yes", "true"]:
+        elif isinstance(self._makenow, str) and self._makenow in ["yes", "true"]:
             self._makenow = 0
         else:
             try:
@@ -150,7 +153,7 @@ class RecipeSearch():
         self.unit_filters(units=self._units)
         self._makenow_filter(missing=self._makenow)
         self.string_filters(string=self._string)
-        return self._queryset.filter(space=self._request.space).distinct().order_by(*self.orderby)
+        return self._queryset.filter(space=self._request.space).order_by(*self.orderby)
 
     def _sort_includes(self, *args):
         for x in args:
@@ -434,22 +437,21 @@ class RecipeSearch():
 
     def rating_filter(self, rating=None):
         if rating or self._sort_includes('rating'):
-            lessthan = self._sort_includes('-rating') or '-' in (rating or [])
-            if lessthan:
+            lessthan = '-' in (rating or [])
+            reverse = 'rating' in (self._sort_order or []) and '-rating' not in (self._sort_order or [])
+            if lessthan or reverse:
                 default = 100
             else:
                 default = 0
             # TODO make ratings a settings user-only vs all-users
-            self._queryset = self._queryset.annotate(rating=Round(Avg(Case(When(
-                cooklog__created_by=self._request.user, then='cooklog__rating'), default=default))))
+            self._queryset = self._queryset.annotate(rating=Round(Avg(Case(When(cooklog__created_by=self._request.user, then='cooklog__rating'), default=default))))
         if rating is None:
             return
 
         if rating == '0':
             self._queryset = self._queryset.filter(rating=0)
         elif lessthan:
-            self._queryset = self._queryset.filter(
-                rating__lte=int(rating[1:])).exclude(rating=0)
+            self._queryset = self._queryset.filter(rating__lte=int(rating[1:])).exclude(rating=0)
         else:
             self._queryset = self._queryset.filter(rating__gte=int(rating))
 
@@ -560,7 +562,7 @@ class RecipeSearch():
             self._filters += [Q(pk__in=self._fuzzy_match.values('pk'))]
 
     def _makenow_filter(self, missing=None):
-        if missing is None or (type(missing) == bool and missing == False):
+        if missing is None or (isinstance(missing, bool) and missing == False):
             return
         shopping_users = [
             *self._request.user.get_shopping_share(), self._request.user]

cookbook/helper/recipe_url_import.py

@@ -1,5 +1,6 @@
 # import random
 import re
+import traceback
 from html import unescape
 
 from django.core.cache import caches
@@ -12,7 +13,7 @@ from recipe_scrapers._utils import get_host_name, get_minutes
 
 # from cookbook.helper import recipe_url_import as helper
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.models import Automation, Keyword
+from cookbook.models import Automation, Keyword, PropertyType
 
 # from unicodedata import decomposition
 
@@ -33,6 +34,9 @@ def get_from_scraper(scrape, request):
         except Exception:
             recipe_json['name'] = ''
 
+    if isinstance(recipe_json['name'], list) and len(recipe_json['name']) > 0:
+        recipe_json['name'] = recipe_json['name'][0]
+
     try:
         description = scrape.description() or None
     except Exception:
@@ -46,7 +50,8 @@ def get_from_scraper(scrape, request):
     recipe_json['internal'] = True
 
     try:
-        servings = scrape.schema.data.get('recipeYield') or 1  # dont use scrape.yields() as this will always return "x servings" or "x items", should be improved in scrapers directly
+        # dont use scrape.yields() as this will always return "x servings" or "x items", should be improved in scrapers directly
+        servings = scrape.schema.data.get('recipeYield') or 1
     except Exception:
         servings = 1
 
@@ -142,7 +147,7 @@ def get_from_scraper(scrape, request):
     recipe_json['steps'] = []
     try:
         for i in parse_instructions(scrape.instructions()):
-            recipe_json['steps'].append({'instruction': i, 'ingredients': [], })
+            recipe_json['steps'].append({'instruction': i, 'ingredients': [], 'show_ingredients_table': request.user.userpreference.show_step_ingredients,})
     except Exception:
         pass
     if len(recipe_json['steps']) == 0:
@@ -151,7 +156,14 @@ def get_from_scraper(scrape, request):
     parsed_description = parse_description(description)
     # TODO notify user about limit if reached
     # limits exist to limit the attack surface for dos style attacks
-    automations = Automation.objects.filter(type=Automation.DESCRIPTION_REPLACE, space=request.space, disabled=False).only('param_1', 'param_2', 'param_3').all().order_by('order')[:512]
+    automations = Automation.objects.filter(
+        type=Automation.DESCRIPTION_REPLACE,
+        space=request.space,
+        disabled=False).only(
+        'param_1',
+        'param_2',
+        'param_3').all().order_by('order')[
+            :512]
     for a in automations:
         if re.match(a.param_1, (recipe_json['source_url'])[:512]):
             parsed_description = re.sub(a.param_2, a.param_3, parsed_description, count=1)
@@ -193,8 +205,22 @@ def get_from_scraper(scrape, request):
     except Exception:
         pass
 
-    if recipe_json['source_url']:
-        automations = Automation.objects.filter(type=Automation.INSTRUCTION_REPLACE, space=request.space, disabled=False).only('param_1', 'param_2', 'param_3').order_by('order').all()[:512]
+    try:
+        recipe_json['properties'] = get_recipe_properties(request.space, scrape.schema.nutrients())
+        print(recipe_json['properties'])
+    except Exception:
+        traceback.print_exc()
+        pass
+
+    if 'source_url' in recipe_json and recipe_json['source_url']:
+        automations = Automation.objects.filter(
+            type=Automation.INSTRUCTION_REPLACE,
+            space=request.space,
+            disabled=False).only(
+            'param_1',
+            'param_2',
+            'param_3').order_by('order').all()[
+            :512]
         for a in automations:
             if re.match(a.param_1, (recipe_json['source_url'])[:512]):
                 for s in recipe_json['steps']:
@@ -203,6 +229,30 @@ def get_from_scraper(scrape, request):
     return recipe_json
 
 
+def get_recipe_properties(space, property_data):
+    # {'servingSize': '1', 'calories': '302 kcal', 'proteinContent': '7,66g', 'fatContent': '11,56g', 'carbohydrateContent': '41,33g'}
+    properties = {
+        "property-calories": "calories",
+        "property-carbohydrates": "carbohydrateContent",
+        "property-proteins": "proteinContent",
+        "property-fats": "fatContent",
+    }
+    recipe_properties = []
+    for pt in PropertyType.objects.filter(space=space, open_data_slug__in=list(properties.keys())).all():
+        for p in list(properties.keys()):
+            if pt.open_data_slug == p:
+                if properties[p] in property_data:
+                    recipe_properties.append({
+                        'property_type': {
+                            'id': pt.id,
+                            'name': pt.name,
+                        },
+                        'property_amount': parse_servings(property_data[properties[p]]) / float(property_data['servingSize']),
+                    })
+
+    return recipe_properties
+
+
 def get_from_youtube_scraper(url, request):
     """A YouTube Information Scraper."""
     kw, created = Keyword.objects.get_or_create(name='YouTube', space=request.space)
@@ -236,7 +286,7 @@ def get_from_youtube_scraper(url, request):
 
 
 def parse_name(name):
-    if type(name) == list:
+    if isinstance(name, list):
         try:
             name = name[0]
         except Exception:
@@ -280,16 +330,16 @@ def parse_instructions(instructions):
     """
     instruction_list = []
 
-    if type(instructions) == list:
+    if isinstance(instructions, list):
         for i in instructions:
-            if type(i) == str:
+            if isinstance(i, str):
                 instruction_list.append(clean_instruction_string(i))
             else:
                 if 'text' in i:
                     instruction_list.append(clean_instruction_string(i['text']))
                 elif 'itemListElement' in i:
                     for ile in i['itemListElement']:
-                        if type(ile) == str:
+                        if isinstance(ile, str):
                             instruction_list.append(clean_instruction_string(ile))
                         elif 'text' in ile:
                             instruction_list.append(clean_instruction_string(ile['text']))
@@ -305,13 +355,13 @@ def parse_image(image):
     # check if list of images is returned, take first if so
     if not image:
         return None
-    if type(image) == list:
+    if isinstance(image, list):
         for pic in image:
-            if (type(pic) == str) and (pic[:4] == 'http'):
+            if (isinstance(pic, str)) and (pic[:4] == 'http'):
                 image = pic
             elif 'url' in pic:
                 image = pic['url']
-    elif type(image) == dict:
+    elif isinstance(image, dict):
         if 'url' in image:
             image = image['url']
 
@@ -322,12 +372,12 @@ def parse_image(image):
 
 
 def parse_servings(servings):
-    if type(servings) == str:
+    if isinstance(servings, str):
         try:
             servings = int(re.search(r'\d+', servings).group())
         except AttributeError:
             servings = 1
-    elif type(servings) == list:
+    elif isinstance(servings, list):
         try:
             servings = int(re.findall(r'\b\d+\b', servings[0])[0])
         except KeyError:
@@ -336,12 +386,12 @@ def parse_servings(servings):
 
 
 def parse_servings_text(servings):
-    if type(servings) == str:
+    if isinstance(servings, str):
         try:
-            servings = re.sub("\d+", '', servings).strip()
+            servings = re.sub("\\d+", '', servings).strip()
         except Exception:
             servings = ''
-    if type(servings) == list:
+    if isinstance(servings, list):
         try:
             servings = parse_servings_text(servings[1])
         except Exception:
@@ -358,7 +408,7 @@ def parse_time(recipe_time):
                 recipe_time = round(iso_parse_duration(recipe_time).seconds / 60)
             except ISO8601Error:
                 try:
-                    if (type(recipe_time) == list and len(recipe_time) > 0):
+                    if (isinstance(recipe_time, list) and len(recipe_time) > 0):
                         recipe_time = recipe_time[0]
                     recipe_time = round(parse_duration(recipe_time).seconds / 60)
                 except AttributeError:
@@ -373,11 +423,11 @@ def parse_keywords(keyword_json, space):
     # retrieve keyword automation cache if it exists, otherwise build from database
     KEYWORD_CACHE_KEY = f'automation_keyword_alias_{space.pk}'
     if c := caches['default'].get(KEYWORD_CACHE_KEY, None):
-        self.food_aliases = c
+        keyword_aliases = c
         caches['default'].touch(KEYWORD_CACHE_KEY, 30)
     else:
         for a in Automation.objects.filter(space=space, disabled=False, type=Automation.KEYWORD_ALIAS).only('param_1', 'param_2').order_by('order').all():
-            keyword_aliases[a.param_1] = a.param_2
+            keyword_aliases[a.param_1.lower()] = a.param_2
         caches['default'].set(KEYWORD_CACHE_KEY, keyword_aliases, 30)
 
     # keywords as list
@@ -388,7 +438,7 @@ def parse_keywords(keyword_json, space):
         if len(kw) != 0:
             if keyword_aliases:
                 try:
-                    kw = keyword_aliases[kw]
+                    kw = keyword_aliases[kw.lower()]
                 except KeyError:
                     pass
             if k := Keyword.objects.filter(name=kw, space=space).first():
@@ -402,15 +452,15 @@ def parse_keywords(keyword_json, space):
 def listify_keywords(keyword_list):
     # keywords as string
     try:
-        if type(keyword_list[0]) == dict:
+        if isinstance(keyword_list[0], dict):
             return keyword_list
     except (KeyError, IndexError):
         pass
-    if type(keyword_list) == str:
+    if isinstance(keyword_list, str):
         keyword_list = keyword_list.split(',')
 
     # keywords as string in list
-    if (type(keyword_list) == list and len(keyword_list) == 1 and ',' in keyword_list[0]):
+    if (isinstance(keyword_list, list) and len(keyword_list) == 1 and ',' in keyword_list[0]):
         keyword_list = keyword_list[0].split(',')
     return [x.strip() for x in keyword_list]
 
@@ -464,13 +514,13 @@ def get_images_from_soup(soup, url):
 
 
 def clean_dict(input_dict, key):
-    if type(input_dict) == dict:
+    if isinstance(input_dict, dict):
         for x in list(input_dict):
             if x == key:
                 del input_dict[x]
-            elif type(input_dict[x]) == dict:
+            elif isinstance(input_dict[x], dict):
                 input_dict[x] = clean_dict(input_dict[x], key)
-            elif type(input_dict[x]) == list:
+            elif isinstance(input_dict[x], list):
                 temp_list = []
                 for e in input_dict[x]:
                     temp_list.append(clean_dict(e, key))

cookbook/helper/template_helper.py

@@ -2,7 +2,6 @@ from gettext import gettext as _
 
 import bleach
 import markdown as md
-from bleach_allowlist import markdown_attrs, markdown_tags
 from jinja2 import Template, TemplateSyntaxError, UndefinedError
 from markdown.extensions.tables import TableExtension
 
@@ -53,9 +52,17 @@ class IngredientObject(object):
 def render_instructions(step):  # TODO deduplicate markdown cleanup code
     instructions = step.instruction
 
-    tags = markdown_tags + [
-        'pre', 'table', 'td', 'tr', 'th', 'tbody', 'style', 'thead', 'img'
-    ]
+    tags = {
+        "h1", "h2", "h3", "h4", "h5", "h6",
+        "b", "i", "strong", "em", "tt",
+        "p", "br",
+        "span", "div", "blockquote", "code", "pre", "hr",
+        "ul", "ol", "li", "dd", "dt",
+        "img",
+        "a",
+        "sub", "sup",
+        'pre', 'table', 'td', 'tr', 'th', 'tbody', 'style', 'thead'
+    }
     parsed_md = md.markdown(
         instructions,
         extensions=[
@@ -63,7 +70,11 @@ def render_instructions(step):  # TODO deduplicate markdown cleanup code
             UrlizeExtension(), MarkdownFormatExtension()
         ]
     )
-    markdown_attrs['*'] = markdown_attrs['*'] + ['class', 'width', 'height']
+    markdown_attrs = {
+        "*": ["id", "class", 'width', 'height'],
+        "img": ["src", "alt", "title"],
+        "a": ["href", "alt", "title"],
+    }
 
     instructions = bleach.clean(parsed_md, tags, markdown_attrs)
 

cookbook/helper/unit_conversion_helper.py

@@ -0,0 +1,141 @@
+from django.core.cache import caches
+from decimal import Decimal
+
+from cookbook.helper.cache_helper import CacheHelper
+from cookbook.models import Ingredient, Unit
+
+CONVERSION_TABLE = {
+    'weight': {
+        'g': 1000,
+        'kg': 1,
+        'ounce': 35.274,
+        'pound': 2.20462
+    },
+    'volume': {
+        'ml': 1000,
+        'l': 1,
+        'fluid_ounce': 33.814,
+        'pint': 2.11338,
+        'quart': 1.05669,
+        'gallon': 0.264172,
+        'tbsp': 67.628,
+        'tsp': 202.884,
+        'imperial_fluid_ounce': 35.1951,
+        'imperial_pint': 1.75975,
+        'imperial_quart': 0.879877,
+        'imperial_gallon': 0.219969,
+        'imperial_tbsp': 56.3121,
+        'imperial_tsp': 168.936,
+    },
+}
+
+BASE_UNITS_WEIGHT = list(CONVERSION_TABLE['weight'].keys())
+BASE_UNITS_VOLUME = list(CONVERSION_TABLE['volume'].keys())
+
+
+class ConversionException(Exception):
+    pass
+
+
+class UnitConversionHelper:
+    space = None
+
+    def __init__(self, space):
+        """
+        Initializes unit conversion helper
+        :param space: space to perform conversions on
+        """
+        self.space = space
+
+    @staticmethod
+    def convert_from_to(from_unit, to_unit, amount):
+        """
+        Convert from one base unit to another. Throws ConversionException if trying to convert between different systems (weight/volume) or if units are not supported.
+        :param from_unit: str unit to convert from
+        :param to_unit: str unit to convert to
+        :param amount: amount to convert
+        :return: Decimal converted amount
+        """
+        system = None
+        if from_unit in BASE_UNITS_WEIGHT and to_unit in BASE_UNITS_WEIGHT:
+            system = 'weight'
+        if from_unit in BASE_UNITS_VOLUME and to_unit in BASE_UNITS_VOLUME:
+            system = 'volume'
+
+        if not system:
+            raise ConversionException('Trying to convert units not existing or not in one unit system (weight/volume)')
+
+        return Decimal(amount / Decimal(CONVERSION_TABLE[system][from_unit] / CONVERSION_TABLE[system][to_unit]))
+
+    def base_conversions(self, ingredient_list):
+        """
+        Calculates all possible base unit conversions for each ingredient give.
+        Converts to all common base units IF they exist in the unit database of the space.
+        For useful results all ingredients passed should be of the same food, otherwise filtering afterwards might be required.
+        :param ingredient_list: list of ingredients to convert
+        :return: ingredient list with appended conversions
+        """
+        base_conversion_ingredient_list = ingredient_list.copy()
+        for i in ingredient_list:
+            try:
+                conversion_unit = i.unit.name
+                if i.unit.base_unit:
+                    conversion_unit = i.unit.base_unit
+
+                # TODO allow setting which units to convert to? possibly only once conversions become visible
+                units = caches['default'].get(CacheHelper(self.space).BASE_UNITS_CACHE_KEY, None)
+                if not units:
+                    units = Unit.objects.filter(space=self.space, base_unit__in=(BASE_UNITS_VOLUME + BASE_UNITS_WEIGHT)).all()
+                    caches['default'].set(CacheHelper(self.space).BASE_UNITS_CACHE_KEY, units, 60 * 60)  # cache is cleared on unit save signal so long duration is fine
+
+                for u in units:
+                    try:
+                        ingredient = Ingredient(amount=self.convert_from_to(conversion_unit, u.base_unit, i.amount), unit=u, food=ingredient_list[0].food, )
+                        if not any((x.unit.name == ingredient.unit.name or x.unit.base_unit == ingredient.unit.name) for x in base_conversion_ingredient_list):
+                            base_conversion_ingredient_list.append(ingredient)
+                    except ConversionException:
+                        pass
+            except Exception:
+                pass
+
+        return base_conversion_ingredient_list
+
+    def get_conversions(self, ingredient):
+        """
+        Converts an ingredient to all possible conversions based on the custom unit conversion database.
+        After that passes conversion to UnitConversionHelper.base_conversions() to get all base conversions possible.
+        :param ingredient: Ingredient object
+        :return: list of ingredients with all possible custom and base conversions
+        """
+        conversions = [ingredient]
+        if ingredient.unit:
+            for c in ingredient.unit.unit_conversion_base_relation.all():
+                if c.space == self.space:
+                    r = self._uc_convert(c, ingredient.amount, ingredient.unit, ingredient.food)
+                    if r and r not in conversions:
+                        conversions.append(r)
+            for c in ingredient.unit.unit_conversion_converted_relation.all():
+                if c.space == self.space:
+                    r = self._uc_convert(c, ingredient.amount, ingredient.unit, ingredient.food)
+                    if r and r not in conversions:
+                        conversions.append(r)
+
+        conversions = self.base_conversions(conversions)
+
+        return conversions
+
+    def _uc_convert(self, uc, amount, unit, food):
+        """
+        Helper to calculate values for custom unit conversions.
+        Converts given base values using the passed UnitConversion object into a converted Ingredient
+        :param uc: UnitConversion object
+        :param amount: base amount
+        :param unit: base unit
+        :param food: base food
+        :return: converted ingredient object from base amount/unit/food
+        """
+        if uc.food is None or uc.food == food:
+            if unit == uc.base_unit:
+                return Ingredient(amount=amount * (uc.converted_amount / uc.base_amount), unit=uc.converted_unit, food=food, space=self.space)
+            else:
+                return Ingredient(amount=amount * (uc.base_amount / uc.converted_amount), unit=uc.base_unit, food=food, space=self.space)

cookbook/integration/cheftap.py

@@ -36,7 +36,7 @@ class ChefTap(Integration):
 
         recipe = Recipe.objects.create(name=title, created_by=self.request.user, internal=True, space=self.request.space, )
 
-        step = Step.objects.create(instruction='\n'.join(directions), space=self.request.space,)
+        step = Step.objects.create(instruction='\n'.join(directions), space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,)
 
         if source_url != '':
             step.instruction += '\n' + source_url

cookbook/integration/chowdown.py

@@ -55,7 +55,7 @@ class Chowdown(Integration):
             recipe.keywords.add(keyword)
 
         step = Step.objects.create(
-            instruction='\n'.join(directions) + '\n\n' + '\n'.join(descriptions), space=self.request.space,
+            instruction='\n'.join(directions) + '\n\n' + '\n'.join(descriptions), space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
         )
 
         ingredient_parser = IngredientParser(self.request, True)

cookbook/integration/cookbookapp.py

@@ -47,7 +47,7 @@ class CookBookApp(Integration):
             pass
 
         # assuming import files only contain single step
-        step = Step.objects.create(instruction=recipe_json['steps'][0]['instruction'], space=self.request.space, )
+        step = Step.objects.create(instruction=recipe_json['steps'][0]['instruction'], space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
 
         if 'nutrition' in recipe_json:
             step.instruction = step.instruction + '\n\n' + recipe_json['nutrition']

cookbook/integration/cookmate.py

@@ -50,7 +50,7 @@ class Cookmate(Integration):
             for step in recipe_text.getchildren():
                 if step.text:
                     step = Step.objects.create(
-                        instruction=step.text.strip(), space=self.request.space,
+                        instruction=step.text.strip(), space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
                     )
                     recipe.steps.add(step)
 

cookbook/integration/copymethat.py

@@ -51,7 +51,7 @@ class CopyMeThat(Integration):
         except AttributeError:
             pass
 
-        step = Step.objects.create(instruction='', space=self.request.space, )
+        step = Step.objects.create(instruction='', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
 
         ingredient_parser = IngredientParser(self.request, True)
 

cookbook/integration/default.py

@@ -1,4 +1,5 @@
 import json
+import traceback
 from io import BytesIO, StringIO
 from re import match
 from zipfile import ZipFile
@@ -19,7 +20,10 @@ class Default(Integration):
         recipe = self.decode_recipe(recipe_string)
         images = list(filter(lambda v: match('image.*', v), recipe_zip.namelist()))
         if images:
-            self.import_recipe_image(recipe, BytesIO(recipe_zip.read(images[0])), filetype=get_filetype(images[0]))
+            try:
+                self.import_recipe_image(recipe, BytesIO(recipe_zip.read(images[0])), filetype=get_filetype(images[0]))
+            except AttributeError as e:
+                traceback.print_exc()
         return recipe
 
     def decode_recipe(self, string):

cookbook/integration/domestica.py

@@ -28,7 +28,7 @@ class Domestica(Integration):
         recipe.save()
 
         step = Step.objects.create(
-            instruction=file['directions'], space=self.request.space,
+            instruction=file['directions'], space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
         )
 
         if file['source'] != '':

cookbook/integration/mealie.py

@@ -25,7 +25,7 @@ class Mealie(Integration):
             created_by=self.request.user, internal=True, space=self.request.space)
 
         for s in recipe_json['recipe_instructions']:
-            step = Step.objects.create(instruction=s['text'], space=self.request.space, )
+            step = Step.objects.create(instruction=s['text'], space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
             recipe.steps.add(step)
 
         step = recipe.steps.first()

cookbook/integration/mealmaster.py

@@ -39,7 +39,7 @@ class MealMaster(Integration):
             recipe.keywords.add(keyword)
 
         step = Step.objects.create(
-            instruction='\n'.join(directions) + '\n\n', space=self.request.space,
+            instruction='\n'.join(directions) + '\n\n', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
         )
 
         ingredient_parser = IngredientParser(self.request, True)

cookbook/integration/melarecipes.py

@@ -67,7 +67,7 @@ class MelaRecipes(Integration):
                 f = ingredient_parser.get_food(food)
                 u = ingredient_parser.get_unit(unit)
                 step.ingredients.add(Ingredient.objects.create(
-                    food=f, unit=u, amount=amount, note=note, original_text=ingredient, space=self.request.space,
+                    food=f, unit=u, amount=amount, note=note, original_text=ingredient, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
                 ))
         recipe.steps.add(step)
 

cookbook/integration/nextcloud_cookbook.py

@@ -51,9 +51,15 @@ class NextcloudCookbook(Integration):
 
         ingredients_added = False
         for s in recipe_json['recipeInstructions']:
-            step = Step.objects.create(
-                instruction=s, space=self.request.space,
-            )
+            instruction_text = ''
+            if 'text' in s:
+                step = Step.objects.create(
+                    instruction=s['text'], name=s['name'], space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+                )
+            else:
+                step = Step.objects.create(
+                    instruction=s, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+                )
             if not ingredients_added:
                 if len(recipe_json['description'].strip()) > 500:
                     step.instruction = recipe_json['description'].strip() + '\n\n' + step.instruction
@@ -98,11 +104,10 @@ class NextcloudCookbook(Integration):
         return recipe
 
     def formatTime(self, min):
-        h = min//60
+        h = min // 60
         m = min % 60
         return f'PT{h}H{m}M0S'
 
-
     def get_file_from_recipe(self, recipe):
 
         export = {}
@@ -111,7 +116,7 @@ class NextcloudCookbook(Integration):
         export['url'] = recipe.source_url
         export['prepTime'] = self.formatTime(recipe.working_time)
         export['cookTime'] = self.formatTime(recipe.waiting_time)
-        export['totalTime'] = self.formatTime(recipe.working_time+recipe.waiting_time)
+        export['totalTime'] = self.formatTime(recipe.working_time + recipe.waiting_time)
         export['recipeYield'] = recipe.servings
         export['image'] = f'/Recipes/{recipe.name}/full.jpg'
         export['imageUrl'] = f'/Recipes/{recipe.name}/full.jpg'
@@ -133,7 +138,6 @@ class NextcloudCookbook(Integration):
         export['recipeIngredient'] = recipeIngredient
         export['recipeInstructions'] = recipeInstructions
 
-
         return "recipe.json", json.dumps(export)
 
     def get_files_from_recipes(self, recipes, el, cookie):
@@ -163,7 +167,7 @@ class NextcloudCookbook(Integration):
 
         export_zip_obj.close()
 
-        return [[ self.get_export_file_name(), export_zip_stream.getvalue() ]]
+        return [[self.get_export_file_name(), export_zip_stream.getvalue()]]
 
     def getJPEG(self, imageByte):
         image = Image.open(BytesIO(imageByte))
@@ -172,14 +176,14 @@ class NextcloudCookbook(Integration):
         bytes = BytesIO()
         image.save(bytes, "JPEG")
         return bytes.getvalue()
-    
+
     def getThumb(self, size, imageByte):
         image = Image.open(BytesIO(imageByte))
 
         w, h = image.size
-        m = min(w, h) 
+        m = min(w, h)
 
-        image = image.crop(((w-m)//2, (h-m)//2, (w+m)//2, (h+m)//2))
+        image = image.crop(((w - m) // 2, (h - m) // 2, (w + m) // 2, (h + m) // 2))
         image = image.resize([size, size], Image.Resampling.LANCZOS)
         image = image.convert('RGB')
 

cookbook/integration/openeats.py

@@ -51,7 +51,7 @@ class OpenEats(Integration):
             recipe.image = f'recipes/openeats-import/{file["photo"]}'
             recipe.save()
 
-        step = Step.objects.create(instruction=instructions, space=self.request.space,)
+        step = Step.objects.create(instruction=instructions, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,)
 
         ingredient_parser = IngredientParser(self.request, True)
         for ingredient in file['ingredients']:

cookbook/integration/paprika.py

@@ -58,7 +58,7 @@ class Paprika(Integration):
                 pass
 
             step = Step.objects.create(
-                instruction=instructions, space=self.request.space,
+                instruction=instructions, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
             )
 
             if 'description' in recipe_json and len(recipe_json['description'].strip()) > 500:

cookbook/integration/pepperplate.py

@@ -35,7 +35,7 @@ class Pepperplate(Integration):
         recipe = Recipe.objects.create(name=title, description=description, created_by=self.request.user, internal=True, space=self.request.space)
 
         step = Step.objects.create(
-            instruction='\n'.join(directions) + '\n\n', space=self.request.space,
+            instruction='\n'.join(directions) + '\n\n', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
         )
 
         ingredient_parser = IngredientParser(self.request, True)

cookbook/integration/plantoeat.py

@@ -1,6 +1,7 @@
 from io import BytesIO
 
 import requests
+import validators
 
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.integration.integration import Integration
@@ -45,7 +46,7 @@ class Plantoeat(Integration):
         recipe = Recipe.objects.create(name=title, description=description, created_by=self.request.user, internal=True, space=self.request.space)
 
         step = Step.objects.create(
-            instruction='\n'.join(directions) + '\n\n', space=self.request.space,
+            instruction='\n'.join(directions) + '\n\n', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
         )
 
         if tags:
@@ -67,8 +68,9 @@ class Plantoeat(Integration):
 
         if image_url:
             try:
-                response = requests.get(image_url)
-                self.import_recipe_image(recipe, BytesIO(response.content))
+                if validators.url(image_url, public=True):
+                    response = requests.get(image_url)
+                    self.import_recipe_image(recipe, BytesIO(response.content))
             except Exception as e:
                 print('failed to import image ', str(e))
 

cookbook/integration/recettetek.py

@@ -46,7 +46,7 @@ class RecetteTek(Integration):
         if not instructions:
             instructions = ''
 
-        step = Step.objects.create(instruction=instructions, space=self.request.space,)
+        step = Step.objects.create(instruction=instructions, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,)
 
         # Append the original import url to the step (if it exists)
         try:

cookbook/integration/recipekeeper.py

@@ -41,7 +41,7 @@ class RecipeKeeper(Integration):
         except AttributeError:
             pass
 
-        step = Step.objects.create(instruction='', space=self.request.space, )
+        step = Step.objects.create(instruction='', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
 
         ingredient_parser = IngredientParser(self.request, True)
         for ingredient in file.find("div", {"itemprop": "recipeIngredients"}).findChildren("p"):

cookbook/integration/recipesage.py

@@ -5,6 +5,7 @@ import requests
 import validators
 
 from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text, parse_time
 from cookbook.integration.integration import Integration
 from cookbook.models import Ingredient, Recipe, Step
 
@@ -18,19 +19,21 @@ class RecipeSage(Integration):
             created_by=self.request.user, internal=True,
             space=self.request.space)
 
+        if file['recipeYield'] != '':
+            recipe.servings = parse_servings(file['recipeYield'])
+            recipe.servings_text = parse_servings_text(file['recipeYield'])
+
         try:
-            if file['recipeYield'] != '':
-                recipe.servings = int(file['recipeYield'])
+            if 'totalTime' in file and file['totalTime'] != '':
+                recipe.working_time = parse_time(file['totalTime'])
 
-            if file['totalTime'] != '':
-                recipe.waiting_time = int(file['totalTime']) - int(file['timePrep'])
-
-            if file['prepTime'] != '':
-                recipe.working_time = int(file['timePrep'])
-
-            recipe.save()
+            if 'timePrep' in file and file['prepTime'] != '':
+                recipe.working_time = parse_time(file['timePrep'])
+                recipe.waiting_time = parse_time(file['totalTime']) - parse_time(file['timePrep'])
         except Exception as e:
-            print('failed to parse yield or time ', str(e))
+            print('failed to parse time ', str(e))
+
+        recipe.save()
 
         ingredient_parser = IngredientParser(self.request, True)
         ingredients_added = False
@@ -46,7 +49,7 @@ class RecipeSage(Integration):
                     f = ingredient_parser.get_food(food)
                     u = ingredient_parser.get_unit(unit)
                     step.ingredients.add(Ingredient.objects.create(
-                        food=f, unit=u, amount=amount, note=note, original_text=ingredient, space=self.request.space,
+                        food=f, unit=u, amount=amount, note=note, original_text=ingredient, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
                     ))
             recipe.steps.add(step)
 

cookbook/integration/rezeptsuitede.py

@@ -22,9 +22,12 @@ class Rezeptsuitede(Integration):
             name=recipe_xml.find('head').attrib['title'].strip(),
             created_by=self.request.user, internal=True, space=self.request.space)
 
-        if recipe_xml.find('head').attrib['servingtype']:
-            recipe.servings = parse_servings(recipe_xml.find('head').attrib['servingtype'].strip())
-            recipe.servings_text = parse_servings_text(recipe_xml.find('head').attrib['servingtype'].strip())
+        try:
+            if recipe_xml.find('head').attrib['servingtype']:
+                recipe.servings = parse_servings(recipe_xml.find('head').attrib['servingtype'].strip())
+                recipe.servings_text = parse_servings_text(recipe_xml.find('head').attrib['servingtype'].strip())
+        except KeyError:
+            pass
 
         if recipe_xml.find('remark') is not None:  # description is a list of <li>'s with text
             if recipe_xml.find('remark').find('line') is not None:
@@ -34,7 +37,7 @@ class Rezeptsuitede(Integration):
             try:
                 if prep.find('step').text:
                     step = Step.objects.create(
-                        instruction=prep.find('step').text.strip(), space=self.request.space,
+                        instruction=prep.find('step').text.strip(), space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
                     )
                     recipe.steps.add(step)
             except Exception:
@@ -50,7 +53,9 @@ class Rezeptsuitede(Integration):
             for ingredient in recipe_xml.find('part').findall('ingredient'):
                 f = ingredient_parser.get_food(ingredient.attrib['item'])
                 u = ingredient_parser.get_unit(ingredient.attrib['unit'])
-                amount, unit, note = ingredient_parser.parse_amount(ingredient.attrib['qty'])
+                amount = 0
+                if ingredient.attrib['qty'].strip() != '':
+                    amount, unit, note = ingredient_parser.parse_amount(ingredient.attrib['qty'])
                 ingredient_step.ingredients.add(Ingredient.objects.create(food=f, unit=u, amount=amount, space=self.request.space, ))
 
         try:

cookbook/integration/rezkonv.py

@@ -38,7 +38,7 @@ class RezKonv(Integration):
             recipe.keywords.add(keyword)
 
         step = Step.objects.create(
-            instruction='  \n'.join(directions) + '\n\n', space=self.request.space,
+            instruction='  \n'.join(directions) + '\n\n', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
         )
 
         ingredient_parser = IngredientParser(self.request, True)

cookbook/integration/saffron.py

@@ -43,7 +43,7 @@ class Saffron(Integration):
 
         recipe = Recipe.objects.create(name=title, description=description, created_by=self.request.user, internal=True, space=self.request.space, )
 
-        step = Step.objects.create(instruction='\n'.join(directions), space=self.request.space, )
+        step = Step.objects.create(instruction='\n'.join(directions), space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
 
         ingredient_parser = IngredientParser(self.request, True)
         for ingredient in ingredients:

cookbook/locale/ca/LC_MESSAGES/django.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-18 14:28+0200\n"
-"PO-Revision-Date: 2023-04-12 11:55+0000\n"
-"Last-Translator: noxonad <noxonad@proton.me>\n"
+"PO-Revision-Date: 2023-07-06 21:19+0000\n"
+"Last-Translator: Rubens <rubenixnagios@gmail.com>\n"
 "Language-Team: Catalan <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/ca/>\n"
 "Language: ca\n"
@@ -421,7 +421,7 @@ msgstr "Compartir Llista de la Compra"
 
 #: .\cookbook\forms.py:525
 msgid "Autosync"
-msgstr "Autosync"
+msgstr "Autosinc"
 
 #: .\cookbook\forms.py:526
 msgid "Auto Add Meal Plan"
@@ -477,7 +477,7 @@ msgstr "Mostra el recompte de receptes als filtres de cerca"
 
 #: .\cookbook\forms.py:559
 msgid "Use the plural form for units and food inside this space."
-msgstr ""
+msgstr "Empra el plural d'aquestes unitats i menjars dins de l'espai."
 
 #: .\cookbook\helper\AllAuthCustomAdapter.py:39
 msgid ""

cookbook/locale/cs/LC_MESSAGES/django.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-09 18:01+0100\n"
-"PO-Revision-Date: 2023-03-25 11:32+0000\n"
-"Last-Translator: Matěj Kubla <matykubla@gmail.com>\n"
+"PO-Revision-Date: 2023-07-31 14:19+0000\n"
+"Last-Translator: Mára Štěpánek <stepanekm7@gmail.com>\n"
 "Language-Team: Czech <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/cs/>\n"
 "Language: cs\n"
@@ -36,7 +36,7 @@ msgid ""
 "try them out!"
 msgstr ""
 "Barva horního navigačního menu. Některé barvy neladí se všemi tématy a je "
-"třeba je vyzkoušet."
+"třeba je vyzkoušet!"
 
 #: .\cookbook\forms.py:45
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
@@ -50,7 +50,7 @@ msgid ""
 "to fractions automatically)"
 msgstr ""
 "Povolit podporu zlomků u množství ingrediencí (desetinná čísla budou "
-"automaticky převedena na zlomky)."
+"automaticky převedena na zlomky)"
 
 #: .\cookbook\forms.py:47
 msgid ""

cookbook/locale/de/LC_MESSAGES/django.po

@@ -15,10 +15,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-18 14:28+0200\n"
-"PO-Revision-Date: 2023-02-09 13:55+0000\n"
-"Last-Translator: Marion Kämpfer <marion@murphyslantech.de>\n"
-"Language-Team: German <http://translate.tandoor.dev/projects/tandoor/recipes-"
-"backend/de/>\n"
+"PO-Revision-Date: 2023-08-13 08:19+0000\n"
+"Last-Translator: Fabian Flodman <fabian@flodman.de>\n"
+"Language-Team: German <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -600,9 +600,8 @@ msgid "Imported %s recipes."
 msgstr "%s Rezepte importiert."
 
 #: .\cookbook\integration\openeats.py:26
-#, fuzzy
 msgid "Recipe source:"
-msgstr "Rezept-Hauptseite"
+msgstr "Rezept-Quelle:"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"
@@ -1437,11 +1436,11 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"        <b>Password und Token</b> werden im <b>Klartext</b> in der Datenbank "
+"        <b>Passwort und Token</b> werden im <b>Klartext</b> in der Datenbank "
 "gespeichert.\n"
 "        Dies ist notwendig da Passwort oder Token benötigt werden, um API-"
-"Anfragen zu stellen, bringt jedoch auch ein Sicherheitsrisiko mit sich. <br/"
-">\n"
+"Anfragen zu stellen, bringt jedoch auch ein Sicherheitsrisiko mit sich. <br/>"
+"\n"
 "        Um das Risiko zu minimieren sollten, wenn möglich, Tokens oder "
 "Accounts mit limitiertem Zugriff verwendet werden.\n"
 "    "
@@ -2601,7 +2600,7 @@ msgstr "Ungültiges URL Schema."
 
 #: .\cookbook\views\api.py:1233
 msgid "No usable data could be found."
-msgstr "Es konnten keine nutzbaren Daten gefunden werden."
+msgstr "Es konnten keine passenden Daten gefunden werden."
 
 #: .\cookbook\views\api.py:1326 .\cookbook\views\import_export.py:117
 msgid "Importing is not implemented for this provider"

cookbook/locale/es/LC_MESSAGES/django.po

@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-18 14:28+0200\n"
-"PO-Revision-Date: 2023-03-13 06:55+0000\n"
-"Last-Translator: Amara Ude <apu24@drexel.edu>\n"
+"PO-Revision-Date: 2023-08-27 11:19+0000\n"
+"Last-Translator: Matias Laporte <laportematias+weblate@gmail.com>\n"
 "Language-Team: Spanish <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/es/>\n"
 "Language: es\n"
@@ -543,19 +543,19 @@ msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:268
 msgid "knead"
-msgstr ""
+msgstr "amasar"
 
 #: .\cookbook\helper\recipe_url_import.py:269
 msgid "thicken"
-msgstr ""
+msgstr "espesar"
 
 #: .\cookbook\helper\recipe_url_import.py:270
 msgid "warm up"
-msgstr ""
+msgstr "precalentar"
 
 #: .\cookbook\helper\recipe_url_import.py:271
 msgid "ferment"
-msgstr ""
+msgstr "fermentar"
 
 #: .\cookbook\helper\recipe_url_import.py:272
 msgid "sous-vide"
@@ -573,11 +573,11 @@ msgstr ""
 #: .\cookbook\integration\copymethat.py:44
 #: .\cookbook\integration\melarecipes.py:37
 msgid "Favorite"
-msgstr ""
+msgstr "Favorito"
 
 #: .\cookbook\integration\copymethat.py:50
 msgid "I made this"
-msgstr ""
+msgstr "Lo he preparado"
 
 #: .\cookbook\integration\integration.py:218
 msgid ""
@@ -603,10 +603,8 @@ msgid "Imported %s recipes."
 msgstr "Se importaron %s recetas."
 
 #: .\cookbook\integration\openeats.py:26
-#, fuzzy
-#| msgid "Recipe Home"
 msgid "Recipe source:"
-msgstr "Página de inicio"
+msgstr "Fuente de la receta:"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"
@@ -647,19 +645,21 @@ msgstr "Sección"
 
 #: .\cookbook\management\commands\rebuildindex.py:14
 msgid "Rebuilds full text search index on Recipe"
-msgstr ""
+msgstr "Reconstruye el índice de búsqueda por texto completo de la receta"
 
 #: .\cookbook\management\commands\rebuildindex.py:18
 msgid "Only Postgresql databases use full text search, no index to rebuild"
 msgstr ""
+"Solo las bases de datos Postgresql utilizan la búsqueda por texto completo, "
+"no hay índice para reconstruir"
 
 #: .\cookbook\management\commands\rebuildindex.py:29
 msgid "Recipe index rebuild complete."
-msgstr ""
+msgstr "Se reconstruyó el índice de la receta."
 
 #: .\cookbook\management\commands\rebuildindex.py:31
 msgid "Recipe index rebuild failed."
-msgstr ""
+msgstr "No fue posible reconstruir el índice de la receta."
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
@@ -701,23 +701,23 @@ msgstr "Libros"
 
 #: .\cookbook\models.py:580
 msgid " is part of a recipe step and cannot be deleted"
-msgstr ""
+msgstr " es parte del paso de una receta y no puede ser eliminado"
 
 #: .\cookbook\models.py:1181 .\cookbook\templates\search_info.html:28
 msgid "Simple"
-msgstr ""
+msgstr "Simple"
 
 #: .\cookbook\models.py:1182 .\cookbook\templates\search_info.html:33
 msgid "Phrase"
-msgstr ""
+msgstr "Frase"
 
 #: .\cookbook\models.py:1183 .\cookbook\templates\search_info.html:38
 msgid "Web"
-msgstr ""
+msgstr "Web"
 
 #: .\cookbook\models.py:1184 .\cookbook\templates\search_info.html:47
 msgid "Raw"
-msgstr ""
+msgstr "Crudo"
 
 #: .\cookbook\models.py:1231
 msgid "Food Alias"
@@ -764,49 +764,53 @@ msgstr "Palabra clave"
 
 #: .\cookbook\serializer.py:198
 msgid "File uploads are not enabled for this Space."
-msgstr ""
+msgstr "Las cargas de archivo no están habilitadas para esta Instancia."
 
 #: .\cookbook\serializer.py:209
 msgid "You have reached your file upload limit."
-msgstr ""
+msgstr "Has alcanzado el límite de cargas de archivo."
 
 #: .\cookbook\serializer.py:291
 msgid "Cannot modify Space owner permission."
-msgstr ""
+msgstr "No puedes modificar los permisos del propietario de la Instancia."
 
 #: .\cookbook\serializer.py:1093
 msgid "Hello"
-msgstr ""
+msgstr "Hola"
 
 #: .\cookbook\serializer.py:1093
 msgid "You have been invited by "
-msgstr ""
+msgstr "Has sido invitado por: "
 
 #: .\cookbook\serializer.py:1094
 msgid " to join their Tandoor Recipes space "
-msgstr ""
+msgstr " para unirte a su instancia de Tandoor Recipes "
 
 #: .\cookbook\serializer.py:1095
 msgid "Click the following link to activate your account: "
-msgstr ""
+msgstr "Haz click en el siguiente enlace para activar tu cuenta: "
 
 #: .\cookbook\serializer.py:1096
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
+"Si el enlace no funciona, utiliza el siguiente código para unirte "
+"manualmente a la instancia: "
 
 #: .\cookbook\serializer.py:1097
 msgid "The invitation is valid until "
-msgstr ""
+msgstr "La invitación es válida hasta "
 
 #: .\cookbook\serializer.py:1098
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
+"Tandoor Recipes es un administrador de recetas Open Source. Dale una ojeada "
+"en GitHub "
 
 #: .\cookbook\serializer.py:1101
 msgid "Tandoor Recipes Invite"
-msgstr ""
+msgstr "Invitación para Tandoor Recipes"
 
 #: .\cookbook\serializer.py:1242
 msgid "Existing shopping list to update"

cookbook/locale/fr/LC_MESSAGES/django.po

@@ -14,10 +14,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-18 14:28+0200\n"
-"PO-Revision-Date: 2023-04-12 11:55+0000\n"
-"Last-Translator: noxonad <noxonad@proton.me>\n"
-"Language-Team: French <http://translate.tandoor.dev/projects/tandoor/recipes-"
-"backend/fr/>\n"
+"PO-Revision-Date: 2023-08-16 21:19+0000\n"
+"Last-Translator: Alexandre Braure <alex@tkclab.ca>\n"
+"Language-Team: French <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -549,7 +549,7 @@ msgstr "Il est nécessaire de fournir soit le queryset, soit la clé de hachage"
 #, fuzzy
 #| msgid "Use fractions"
 msgid "reverse rotation"
-msgstr "Utiliser les fractions"
+msgstr "sens inverse"
 
 #: .\cookbook\helper\recipe_url_import.py:267
 msgid "careful rotation"
@@ -620,10 +620,8 @@ msgid "Imported %s recipes."
 msgstr "%s recettes importées."
 
 #: .\cookbook\integration\openeats.py:26
-#, fuzzy
-#| msgid "Recipe Home"
 msgid "Recipe source:"
-msgstr "Page d’accueil"
+msgstr "Source de la recette :"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"

cookbook/locale/nb_NO/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-04-11 15:09+0200\n"
-"PO-Revision-Date: 2023-04-17 20:55+0000\n"
-"Last-Translator: Espen Sellevåg <buskmenn.drammer03@icloud.com>\n"
+"PO-Revision-Date: 2023-08-19 21:36+0000\n"
+"Last-Translator: NeoID <neoid@animenord.com>\n"
 "Language-Team: Norwegian Bokmål <http://translate.tandoor.dev/projects/"
 "tandoor/recipes-backend/nb_NO/>\n"
 "Language: nb_NO\n"
@@ -31,6 +31,8 @@ msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
 msgstr ""
+"Farge på toppnavigasjonslinjen. Ikke alle farger fungerer med alle temaer, "
+"så bare prøv dem ut!"
 
 #: .\cookbook\forms.py:46
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
@@ -79,13 +81,15 @@ msgstr ""
 
 #: .\cookbook\forms.py:56
 msgid "Makes the navbar stick to the top of the page."
-msgstr ""
+msgstr "Fest navigasjonslinjen til toppen av siden."
 
 #: .\cookbook\forms.py:72
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
+"Begge feltene er valgfrie. Hvis ingen blir oppgitt, vil brukernavnet vises i "
+"stedet"
 
 #: .\cookbook\forms.py:93 .\cookbook\forms.py:315
 #: .\cookbook\templates\forms\edit_internal_recipe.html:45
@@ -97,15 +101,15 @@ msgstr "Navn"
 #: .\cookbook\templates\forms\edit_internal_recipe.html:81
 #: .\cookbook\templates\stats.html:24 .\cookbook\templates\url_import.html:202
 msgid "Keywords"
-msgstr ""
+msgstr "Nøkkelord"
 
 #: .\cookbook\forms.py:95
 msgid "Preparation time in minutes"
-msgstr ""
+msgstr "Forberedelsestid i minutter"
 
 #: .\cookbook\forms.py:96
 msgid "Waiting time (cooking/baking) in minutes"
-msgstr ""
+msgstr "Ventetid (til matlaging/baking) i minutter"
 
 #: .\cookbook\forms.py:97 .\cookbook\forms.py:317
 msgid "Path"
@@ -124,6 +128,8 @@ msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
+"For å unngå duplikater, blir oppskrifter med samme navn som eksisterende "
+"ignorert. Merk av denne boksen for å importere alt."
 
 #: .\cookbook\forms.py:149
 msgid "New Unit"
@@ -131,7 +137,7 @@ msgstr "Ny enhet"
 
 #: .\cookbook\forms.py:150
 msgid "New unit that other gets replaced by."
-msgstr ""
+msgstr "Ny enhet som erstatter den gamle."
 
 #: .\cookbook\forms.py:155
 msgid "Old Unit"
@@ -143,19 +149,19 @@ msgstr "Enhet som skal erstattes."
 
 #: .\cookbook\forms.py:172
 msgid "New Food"
-msgstr ""
+msgstr "Ny matvare"
 
 #: .\cookbook\forms.py:173
 msgid "New food that other gets replaced by."
-msgstr ""
+msgstr "Ny matvare som erstatter den gamle."
 
 #: .\cookbook\forms.py:178
 msgid "Old Food"
-msgstr ""
+msgstr "Gammel matvare"
 
 #: .\cookbook\forms.py:179
 msgid "Food that should be replaced."
-msgstr ""
+msgstr "Matvare som bør erstattes."
 
 #: .\cookbook\forms.py:197
 msgid "Add your comment: "
@@ -163,17 +169,19 @@ msgstr "Legg til din kommentar: "
 
 #: .\cookbook\forms.py:238
 msgid "Leave empty for dropbox and enter app password for nextcloud."
-msgstr ""
+msgstr "La det stå tomt for Dropbox og skriv inn app-passordet for Nextcloud."
 
 #: .\cookbook\forms.py:245
 msgid "Leave empty for nextcloud and enter api token for dropbox."
-msgstr ""
+msgstr "La det stå tomt for Nextcloud og skriv inn API-tokenet for Dropbox."
 
 #: .\cookbook\forms.py:253
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
+"La det stå tomt for Dropbox, og skriv bare inn grunn-URLen for Nextcloud "
+"(<code>/remote.php/webdav/</code> blir lagt til automatisk)"
 
 #: .\cookbook\forms.py:291
 msgid "Search String"
@@ -185,11 +193,12 @@ msgstr "Fil-ID"
 
 #: .\cookbook\forms.py:354
 msgid "You must provide at least a recipe or a title."
-msgstr ""
+msgstr "Du må oppgi minst en oppskrift eller en tittel."
 
 #: .\cookbook\forms.py:367
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
+"Du kan liste opp standardbrukere for å dele oppskrifter innen innstillingene."
 
 #: .\cookbook\forms.py:368
 #: .\cookbook\templates\forms\edit_internal_recipe.html:377
@@ -197,10 +206,14 @@ msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
+"Du kan bruke Markdown for å formatere dette feltet. Se <a href=\"/docs/"
+"markdown/\">dokumentasjonen her</a>"
 
 #: .\cookbook\forms.py:393
 msgid "A username is not required, if left blank the new user can choose one."
 msgstr ""
+"Et brukernavn er ikke påkrevd. Hvis det blir stående tomt, kan den nye "
+"brukeren velge ett selv."
 
 #: .\cookbook\helper\permission_helper.py:123
 #: .\cookbook\helper\permission_helper.py:129
@@ -222,26 +235,30 @@ msgstr "Du er ikke innlogget og kan derfor ikke vise siden!"
 #: .\cookbook\helper\permission_helper.py:167
 #: .\cookbook\helper\permission_helper.py:182
 msgid "You cannot interact with this object as it is not owned by you!"
-msgstr ""
+msgstr "Du kan ikke samhandle med dette objektet, da det ikke tilhører deg!"
 
 #: .\cookbook\helper\recipe_url_import.py:40 .\cookbook\views\api.py:549
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
+"Nettstedet du har forespurt, har levert feilformatert data som ikke kan "
+"leses."
 
 #: .\cookbook\helper\recipe_url_import.py:54
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
+"Det forespurte nettstedet gir ingen gjenkjennelig dataformat som kan "
+"importeres oppskriften fra."
 
 #: .\cookbook\helper\recipe_url_import.py:160
 msgid "Imported from"
-msgstr ""
+msgstr "Importert fra"
 
 #: .\cookbook\helper\template_helper.py:60
 #: .\cookbook\helper\template_helper.py:62
 msgid "Could not parse template code."
-msgstr ""
+msgstr "Kunne ikke analysere mal-koden."
 
 #: .\cookbook\integration\integration.py:102
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
@@ -250,50 +267,52 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:233 .\cookbook\views\delete.py:60
 #: .\cookbook\views\edit.py:190
 msgid "Import"
-msgstr ""
+msgstr "Importér"
 
 #: .\cookbook\integration\integration.py:131
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
+"Importøren forventet en .zip-fil. Har du valgt riktig type importør for "
+"dataene dine?"
 
 #: .\cookbook\integration\integration.py:134
 msgid "The following recipes were ignored because they already existed:"
-msgstr ""
+msgstr "Følgende oppskrifter ble ignorert fordi de allerede eksisterte:"
 
 #: .\cookbook\integration\integration.py:137
 #, python-format
 msgid "Imported %s recipes."
-msgstr ""
+msgstr "Importerte %s oppskrifter."
 
 #: .\cookbook\integration\paprika.py:44
 msgid "Notes"
-msgstr ""
+msgstr "Notater"
 
 #: .\cookbook\integration\paprika.py:47
 msgid "Nutritional Information"
-msgstr ""
+msgstr "Næringsinformasjon"
 
 #: .\cookbook\integration\paprika.py:50
 msgid "Source"
-msgstr ""
+msgstr "Kilde"
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\forms\edit_internal_recipe.html:75
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:84
 msgid "Servings"
-msgstr ""
+msgstr "Porsjoner"
 
 #: .\cookbook\integration\safron.py:25
 msgid "Waiting time"
-msgstr ""
+msgstr "Ventetid"
 
 #: .\cookbook\integration\safron.py:27
 #: .\cookbook\templates\forms\edit_internal_recipe.html:69
 msgid "Preparation Time"
-msgstr ""
+msgstr "Forberedelsestid"
 
 #: .\cookbook\integration\safron.py:29 .\cookbook\templates\base.html:71
 #: .\cookbook\templates\forms\ingredients.html:7
@@ -329,7 +348,7 @@ msgstr "Søk"
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
 #: .\cookbook\views\edit.py:224 .\cookbook\views\new.py:188
 msgid "Meal-Plan"
-msgstr ""
+msgstr "Måltidsplan"
 
 #: .\cookbook\models.py:112 .\cookbook\templates\base.html:82
 msgid "Books"
@@ -337,11 +356,11 @@ msgstr "Bøker"
 
 #: .\cookbook\models.py:119
 msgid "Small"
-msgstr ""
+msgstr "Liten"
 
 #: .\cookbook\models.py:119
 msgid "Large"
-msgstr ""
+msgstr "Stor"
 
 #: .\cookbook\models.py:327
 #: .\cookbook\templates\forms\edit_internal_recipe.html:198
@@ -1109,22 +1128,24 @@ msgstr ""
 
 #: .\cookbook\templates\markdown_info.html:125
 msgid "Images & Links"
-msgstr ""
+msgstr "Bilder og lenker"
 
 #: .\cookbook\templates\markdown_info.html:126
 msgid ""
 "Links can be formatted with Markdown. This application also allows to paste "
 "links directly into markdown fields without any formatting."
 msgstr ""
+"Lenker kan formateres med Markdown. Denne applikasjonen lar deg også lime "
+"inn lenker direkte i Markdown-felt uten noen formatering."
 
 #: .\cookbook\templates\markdown_info.html:132
 #: .\cookbook\templates\markdown_info.html:145
 msgid "This will become an image"
-msgstr ""
+msgstr "Dette vil bli til et bilde"
 
 #: .\cookbook\templates\markdown_info.html:152
 msgid "Tables"
-msgstr ""
+msgstr "Tabeller"
 
 #: .\cookbook\templates\markdown_info.html:153
 msgid ""
@@ -1132,124 +1153,130 @@ msgid ""
 "editor like <a href=\"https://www.tablesgenerator.com/markdown_tables\" rel="
 "\"noreferrer noopener\" target=\"_blank\">this one.</a>"
 msgstr ""
+"Markdown-tabeller er vanskelige å lage for hånd. Det anbefales å bruke en "
+"tabellredigerer som <a href=\"https://www.tablesgenerator.com/"
+"markdown_tables\" rel=\"noreferrer noopener\" target=\"_blank\">denne.</a>"
 
 #: .\cookbook\templates\markdown_info.html:155
 #: .\cookbook\templates\markdown_info.html:157
 #: .\cookbook\templates\markdown_info.html:171
 #: .\cookbook\templates\markdown_info.html:177
 msgid "Table"
-msgstr ""
+msgstr "Tabell"
 
 #: .\cookbook\templates\markdown_info.html:155
 #: .\cookbook\templates\markdown_info.html:172
 msgid "Header"
-msgstr ""
+msgstr "Overskrift"
 
 #: .\cookbook\templates\markdown_info.html:157
 #: .\cookbook\templates\markdown_info.html:178
 msgid "Cell"
-msgstr ""
+msgstr "Celle"
 
 #: .\cookbook\templates\meal_plan.html:101
 msgid "New Entry"
-msgstr ""
+msgstr "Ny oppføring"
 
 #: .\cookbook\templates\meal_plan.html:113
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search Recipe"
-msgstr ""
+msgstr "Søk oppskrift"
 
 #: .\cookbook\templates\meal_plan.html:139
 msgid "Title"
-msgstr ""
+msgstr "Tittel"
 
 #: .\cookbook\templates\meal_plan.html:141
 msgid "Note (optional)"
-msgstr ""
+msgstr "Merknad (valgfritt)"
 
 #: .\cookbook\templates\meal_plan.html:143
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\" target=\"_blank\" rel=\"noopener noreferrer\">docs here</a>"
 msgstr ""
+"Du kan bruke Markdown for å formatere dette feltet. Se <a href=\"/docs/"
+"markdown/\" target=\"_blank\" rel=\"noopener noreferrer\">dokumentasjonen "
+"her</a>"
 
 #: .\cookbook\templates\meal_plan.html:147
 #: .\cookbook\templates\meal_plan.html:251
 msgid "Serving Count"
-msgstr ""
+msgstr "Antall porsjoner"
 
 #: .\cookbook\templates\meal_plan.html:153
 msgid "Create only note"
-msgstr ""
+msgstr "Opprett kun en merknad"
 
 #: .\cookbook\templates\meal_plan.html:168
 #: .\cookbook\templates\shopping_list.html:7
 #: .\cookbook\templates\shopping_list.html:29
 #: .\cookbook\templates\shopping_list.html:705
 msgid "Shopping List"
-msgstr ""
+msgstr "Handleliste"
 
 #: .\cookbook\templates\meal_plan.html:172
 msgid "Shopping list currently empty"
-msgstr ""
+msgstr "Handlelisten er for øyeblikket tom"
 
 #: .\cookbook\templates\meal_plan.html:175
 msgid "Open Shopping List"
-msgstr ""
+msgstr "Åpne handlelisten"
 
 #: .\cookbook\templates\meal_plan.html:189
 msgid "Plan"
-msgstr ""
+msgstr "Plan"
 
 #: .\cookbook\templates\meal_plan.html:196
 msgid "Number of Days"
-msgstr ""
+msgstr "Antall dager"
 
 #: .\cookbook\templates\meal_plan.html:206
 msgid "Weekday offset"
-msgstr ""
+msgstr "Ukedagsforskyvning"
 
 #: .\cookbook\templates\meal_plan.html:209
 msgid ""
 "Number of days starting from the first day of the week to offset the default "
 "view."
-msgstr ""
+msgstr "Antall dager fra den første dagen i uken for å endre standardvisningen."
 
 #: .\cookbook\templates\meal_plan.html:217
 #: .\cookbook\templates\meal_plan.html:294
 msgid "Edit plan types"
-msgstr ""
+msgstr "Rediger plantyper"
 
 #: .\cookbook\templates\meal_plan.html:219
 msgid "Show help"
-msgstr ""
+msgstr "Vis hjelp"
 
 #: .\cookbook\templates\meal_plan.html:220
 msgid "Week iCal export"
-msgstr ""
+msgstr "Uke iCal-eksport"
 
 #: .\cookbook\templates\meal_plan.html:264
 #: .\cookbook\templates\meal_plan_entry.html:18
 msgid "Created by"
-msgstr ""
+msgstr "Opprettet av"
 
 #: .\cookbook\templates\meal_plan.html:270
 #: .\cookbook\templates\meal_plan_entry.html:20
 #: .\cookbook\templates\shopping_list.html:250
 msgid "Shared with"
-msgstr ""
+msgstr "Delt med"
 
 #: .\cookbook\templates\meal_plan.html:280
 msgid "Add to Shopping"
-msgstr ""
+msgstr "Legg til i handlelisten"
 
 #: .\cookbook\templates\meal_plan.html:323
 msgid "New meal type"
-msgstr ""
+msgstr "Ny måltidstype"
 
 #: .\cookbook\templates\meal_plan.html:338
 msgid "Meal Plan Help"
-msgstr ""
+msgstr "Hjelp for måltidsplanen"
 
 #: .\cookbook\templates\meal_plan.html:344
 msgid ""
@@ -1289,7 +1316,7 @@ msgstr ""
 
 #: .\cookbook\templates\meal_plan_entry.html:6
 msgid "Meal Plan View"
-msgstr ""
+msgstr "Visning av måltidsplanen"
 
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
@@ -1297,7 +1324,7 @@ msgstr ""
 
 #: .\cookbook\templates\meal_plan_entry.html:76
 msgid "Other meals on this day"
-msgstr ""
+msgstr "Andre måltider denne dagen"
 
 #: .\cookbook\templates\no_groups_info.html:5
 #: .\cookbook\templates\no_groups_info.html:12

cookbook/locale/nl/LC_MESSAGES/django.po

@@ -13,10 +13,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-18 14:28+0200\n"
-"PO-Revision-Date: 2023-02-27 13:55+0000\n"
-"Last-Translator: Jesse <jesse.kamps@pm.me>\n"
-"Language-Team: Dutch <http://translate.tandoor.dev/projects/tandoor/recipes-"
-"backend/nl/>\n"
+"PO-Revision-Date: 2023-08-15 19:19+0000\n"
+"Last-Translator: Jochum van der Heide <jochum@famvanderheide.com>\n"
+"Language-Team: Dutch <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -522,34 +522,32 @@ msgid "One of queryset or hash_key must be provided"
 msgstr "Er moet een queryset of hash_key opgegeven worden"
 
 #: .\cookbook\helper\recipe_url_import.py:266
-#, fuzzy
-#| msgid "Use fractions"
 msgid "reverse rotation"
-msgstr "Gebruik fracties"
+msgstr "omgekeerde rotatie"
 
 #: .\cookbook\helper\recipe_url_import.py:267
 msgid "careful rotation"
-msgstr ""
+msgstr "voorzichtige rotatie"
 
 #: .\cookbook\helper\recipe_url_import.py:268
 msgid "knead"
-msgstr ""
+msgstr "kneden"
 
 #: .\cookbook\helper\recipe_url_import.py:269
 msgid "thicken"
-msgstr ""
+msgstr "verdikken"
 
 #: .\cookbook\helper\recipe_url_import.py:270
 msgid "warm up"
-msgstr ""
+msgstr "opwarmen"
 
 #: .\cookbook\helper\recipe_url_import.py:271
 msgid "ferment"
-msgstr ""
+msgstr "gisten"
 
 #: .\cookbook\helper\recipe_url_import.py:272
 msgid "sous-vide"
-msgstr ""
+msgstr "sous-vide"
 
 #: .\cookbook\helper\shopping_helper.py:157
 msgid "You must supply a servings size"
@@ -594,10 +592,8 @@ msgid "Imported %s recipes."
 msgstr "%s recepten geïmporteerd."
 
 #: .\cookbook\integration\openeats.py:26
-#, fuzzy
-#| msgid "Recipe Home"
 msgid "Recipe source:"
-msgstr "Recept thuis"
+msgstr "Bron van het recept:"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"

cookbook/locale/sl/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-08 16:27+0100\n"
-"PO-Revision-Date: 2023-04-12 11:55+0000\n"
-"Last-Translator: noxonad <noxonad@proton.me>\n"
+"PO-Revision-Date: 2023-08-13 08:19+0000\n"
+"Last-Translator: Miha Perpar <miha.perpar2@gmail.com>\n"
 "Language-Team: Slovenian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/sl/>\n"
 "Language: sl\n"
@@ -964,7 +964,7 @@ msgstr ""
 
 #: .\cookbook\templates\base.html:275
 msgid "GitHub"
-msgstr ""
+msgstr "GitHub"
 
 #: .\cookbook\templates\base.html:277
 msgid "Translate Tandoor"
@@ -1961,7 +1961,7 @@ msgstr ""
 
 #: .\cookbook\templates\space.html:106
 msgid "user"
-msgstr ""
+msgstr "uporabnik"
 
 #: .\cookbook\templates\space.html:107
 msgid "guest"

cookbook/migrations/0189_property_propertytype_unitconversion_food_fdc_id_and_more.py

@@ -0,0 +1,163 @@
+# Generated by Django 4.1.9 on 2023-05-25 13:05
+
+import cookbook.models
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django_prometheus.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0188_space_no_sharing_limit'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Property',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('property_amount', models.DecimalField(decimal_places=4, default=0, max_digits=32)),
+            ],
+            bases=(models.Model, cookbook.models.PermissionModelMixin),
+        ),
+        migrations.CreateModel(
+            name='PropertyType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128)),
+                ('unit', models.CharField(blank=True, max_length=64, null=True)),
+                ('icon', models.CharField(blank=True, max_length=16, null=True)),
+                ('description', models.CharField(blank=True, max_length=512, null=True)),
+                ('category', models.CharField(blank=True, choices=[('NUTRITION', 'Nutrition'), ('ALLERGEN', 'Allergen'), ('PRICE', 'Price'), ('GOAL', 'Goal'), ('OTHER', 'Other')], max_length=64, null=True)),
+                ('open_data_slug', models.CharField(blank=True, default=None, max_length=128, null=True)),
+            ],
+            bases=(models.Model, cookbook.models.PermissionModelMixin),
+        ),
+        migrations.CreateModel(
+            name='UnitConversion',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('base_amount', models.DecimalField(decimal_places=16, default=0, max_digits=32)),
+                ('converted_amount', models.DecimalField(decimal_places=16, default=0, max_digits=32)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('open_data_slug', models.CharField(blank=True, default=None, max_length=128, null=True)),
+            ],
+            bases=(django_prometheus.models.ExportModelOperationsMixin('unit_conversion'), models.Model, cookbook.models.PermissionModelMixin),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='fdc_id',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='open_data_slug',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='preferred_shopping_unit',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='preferred_shopping_unit', to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='preferred_unit',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='preferred_unit', to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='properties_food_amount',
+            field=models.IntegerField(blank=True, default=100),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='properties_food_unit',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='supermarket',
+            name='open_data_slug',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='supermarketcategory',
+            name='open_data_slug',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='unit',
+            name='base_unit',
+            field=models.TextField(blank=True, default=None, max_length=256, null=True),
+        ),
+        migrations.AddField(
+            model_name='unit',
+            name='open_data_slug',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddConstraint(
+            model_name='supermarketcategoryrelation',
+            constraint=models.UniqueConstraint(fields=('supermarket', 'category'), name='unique_sm_category_relation'),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='base_unit',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unit_conversion_base_relation', to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='converted_unit',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unit_conversion_converted_relation', to='cookbook.unit'),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='created_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='food',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.food'),
+        ),
+        migrations.AddField(
+            model_name='unitconversion',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AddField(
+            model_name='propertytype',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AddField(
+            model_name='property',
+            name='property_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.propertytype'),
+        ),
+        migrations.AddField(
+            model_name='property',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AddField(
+            model_name='food',
+            name='properties',
+            field=models.ManyToManyField(blank=True, to='cookbook.property'),
+        ),
+        migrations.AddField(
+            model_name='recipe',
+            name='properties',
+            field=models.ManyToManyField(blank=True, to='cookbook.property'),
+        ),
+        migrations.AddConstraint(
+            model_name='unitconversion',
+            constraint=models.UniqueConstraint(fields=('space', 'base_unit', 'converted_unit', 'food'), name='f_unique_conversion_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='propertytype',
+            constraint=models.UniqueConstraint(fields=('space', 'name'), name='property_type_unique_name_per_space'),
+        ),
+    ]

cookbook/migrations/0190_auto_20230525_1506.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.1.9 on 2023-05-25 13:06
+
+from django.db import migrations
+from django_scopes import scopes_disabled
+from gettext import gettext as _
+
+def migrate_old_nutrition_data(apps, schema_editor):
+    print('Transforming nutrition information, this might take a while on large databases')
+    with scopes_disabled():
+        PropertyType = apps.get_model('cookbook', 'PropertyType')
+        RecipeProperty = apps.get_model('cookbook', 'Property')
+        Recipe = apps.get_model('cookbook', 'Recipe')
+        Space = apps.get_model('cookbook', 'Space')
+
+        # TODO respect space
+        for s in Space.objects.all():
+            property_fat = PropertyType.objects.get_or_create(name=_('Fat'), unit=_('g'), space=s, )[0]
+            property_carbohydrates = PropertyType.objects.get_or_create(name=_('Carbohydrates'), unit=_('g'), space=s, )[0]
+            property_proteins = PropertyType.objects.get_or_create(name=_('Proteins'), unit=_('g'), space=s, )[0]
+            property_calories = PropertyType.objects.get_or_create(name=_('Calories'), unit=_('kcal'), space=s, )[0]
+
+            for r in Recipe.objects.filter(nutrition__isnull=False, space=s).all():
+                rp_fat = RecipeProperty.objects.create(property_type=property_fat, property_amount=r.nutrition.fats, space=s)
+                rp_carbohydrates = RecipeProperty.objects.create(property_type=property_carbohydrates, property_amount=r.nutrition.carbohydrates, space=s)
+                rp_proteins = RecipeProperty.objects.create(property_type=property_proteins, property_amount=r.nutrition.proteins, space=s)
+                rp_calories = RecipeProperty.objects.create(property_type=property_calories, property_amount=r.nutrition.calories, space=s)
+                r.properties.add(rp_fat, rp_carbohydrates, rp_proteins, rp_calories)
+                r.nutrition = None
+                r.save()
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0189_property_propertytype_unitconversion_food_fdc_id_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_old_nutrition_data)
+    ]

cookbook/migrations/0191_foodproperty_property_import_food_id_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 4.1.9 on 2023-06-20 13:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('cookbook', '0190_auto_20230525_1506'),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            database_operations=[
+                migrations.RunSQL(
+                    sql="ALTER TABLE cookbook_food_properties RENAME TO cookbook_foodproperty",
+                    reverse_sql="ALTER TABLE cookbook_foodproperty RENAME TO cookbook_food_properties",
+                ),
+            ],
+            state_operations=[
+                migrations.CreateModel(
+                    name='FoodProperty',
+                    fields=[
+                        ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                        ('food', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.food')),
+                        ('property', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.property')),
+                    ],
+                ),
+                migrations.AlterField(
+                    model_name='food',
+                    name='properties',
+                    field=models.ManyToManyField(blank=True, through='cookbook.FoodProperty', to='cookbook.property'),
+                ),
+            ]
+        ),
+        migrations.AddConstraint(
+            model_name='foodproperty',
+            constraint=models.UniqueConstraint(fields=('food', 'property'), name='property_unique_food'),
+        ),
+        migrations.AddField(
+            model_name='property',
+            name='import_food_id',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddConstraint(
+            model_name='property',
+            constraint=models.UniqueConstraint(fields=('space', 'property_type', 'import_food_id'), name='property_unique_import_food_per_space'),
+        ),
+    ]

cookbook/migrations/0192_food_food_unique_open_data_slug_per_space_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.1.9 on 2023-06-20 13:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0191_foodproperty_property_import_food_id_and_more'),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name='food',
+            constraint=models.UniqueConstraint(fields=('space', 'open_data_slug'), name='food_unique_open_data_slug_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='propertytype',
+            constraint=models.UniqueConstraint(fields=('space', 'open_data_slug'), name='property_type_unique_open_data_slug_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='supermarket',
+            constraint=models.UniqueConstraint(fields=('space', 'open_data_slug'), name='supermarket_unique_open_data_slug_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='supermarketcategory',
+            constraint=models.UniqueConstraint(fields=('space', 'open_data_slug'), name='supermarket_category_unique_open_data_slug_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='unit',
+            constraint=models.UniqueConstraint(fields=('space', 'open_data_slug'), name='unit_unique_open_data_slug_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='unitconversion',
+            constraint=models.UniqueConstraint(fields=('space', 'open_data_slug'), name='unit_conversion_unique_open_data_slug_per_space'),
+        ),
+    ]

cookbook/migrations/0193_space_internal_note.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.9 on 2023-06-21 13:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0192_food_food_unique_open_data_slug_per_space_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='space',
+            name='internal_note',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

cookbook/migrations/0194_alter_food_properties_food_amount.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.9 on 2023-06-26 13:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0193_space_internal_note'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='food',
+            name='properties_food_amount',
+            field=models.DecimalField(blank=True, decimal_places=2, default=100, max_digits=16),
+        ),
+    ]

cookbook/migrations/0195_invitelink_internal_note_userspace_internal_note_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1.9 on 2023-06-30 20:34
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0194_alter_food_properties_food_amount'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='invitelink',
+            name='internal_note',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='userspace',
+            name='internal_note',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='userspace',
+            name='invite_link',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.invitelink'),
+        ),
+        migrations.AlterField(
+            model_name='userpreference',
+            name='theme',
+            field=models.CharField(choices=[('TANDOOR', 'Tandoor'), ('BOOTSTRAP', 'Bootstrap'), ('DARKLY', 'Darkly'), ('FLATLY', 'Flatly'), ('SUPERHERO', 'Superhero'), ('TANDOOR_DARK', 'Tandoor Dark (INCOMPLETE)')], default='TANDOOR', max_length=128),
+        ),
+    ]

cookbook/migrations/0196_food_url.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.10 on 2023-07-22 06:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0195_invitelink_internal_note_userspace_internal_note_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='food',
+            name='url',
+            field=models.CharField(blank=True, default='', max_length=1024, null=True),
+        ),
+    ]

cookbook/migrations/0197_step_show_ingredients_table_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.10 on 2023-08-24 08:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0196_food_url'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='step',
+            name='show_ingredients_table',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='userpreference',
+            name='show_step_ingredients',
+            field=models.BooleanField(default=True),
+        ),
+    ]

cookbook/migrations/0198_propertytype_order.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.10 on 2023-08-24 09:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0197_step_show_ingredients_table_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='propertytype',
+            name='order',
+            field=models.IntegerField(default=0),
+        ),
+    ]

cookbook/migrations/0199_alter_propertytype_options_alter_automation_type_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1.10 on 2023-08-25 13:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0198_propertytype_order'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='automation',
+            name='type',
+            field=models.CharField(
+                choices=[
+                    ('FOOD_ALIAS',
+                     'Food Alias'),
+                    ('UNIT_ALIAS',
+                     'Unit Alias'),
+                    ('KEYWORD_ALIAS',
+                     'Keyword Alias'),
+                    ('DESCRIPTION_REPLACE',
+                     'Description Replace'),
+                    ('INSTRUCTION_REPLACE',
+                     'Instruction Replace'),
+                    ('NEVER_UNIT',
+                     'Never Unit'),
+                    ('TRANSPOSE_WORDS',
+                     'Transpose Words')],
+                max_length=128),
+        ),
+    ]

cookbook/models.py

@@ -5,7 +5,6 @@ import uuid
 from datetime import date, timedelta
 
 import oauth2_provider.models
-from PIL import Image
 from annoying.fields import AutoOneToOneField
 from django.contrib import auth
 from django.contrib.auth.models import Group, User
@@ -14,13 +13,14 @@ from django.contrib.postgres.search import SearchVectorField
 from django.core.files.uploadedfile import InMemoryUploadedFile, UploadedFile
 from django.core.validators import MinLengthValidator
 from django.db import IntegrityError, models
-from django.db.models import Index, ProtectedError, Q, Avg, Max
+from django.db.models import Avg, Index, Max, ProtectedError, Q
 from django.db.models.fields.related import ManyToManyField
 from django.db.models.functions import Substr
 from django.utils import timezone
 from django.utils.translation import gettext as _
 from django_prometheus.models import ExportModelOperationsMixin
 from django_scopes import ScopedManager, scopes_disabled
+from PIL import Image
 from treebeard.mp_tree import MP_Node, MP_NodeManager
 
 from recipes.settings import (COMMENT_PREF_DEFAULT, FRACTION_PREF_DEFAULT, KJ_PREF_DEFAULT,
@@ -82,31 +82,34 @@ class TreeManager(MP_NodeManager):
     # model.Manager get_or_create() is not compatible with MP_Tree
     def get_or_create(self, *args, **kwargs):
         kwargs['name'] = kwargs['name'].strip()
-
-        if obj := self.filter(name__iexact=kwargs['name'], space=kwargs['space']).first():
-            return obj, False
+        if hasattr(self, 'space'):
+            if obj := self.filter(name__iexact=kwargs['name'], space=kwargs['space']).first():
+                return obj, False
         else:
-            with scopes_disabled():
-                try:
-                    defaults = kwargs.pop('defaults', None)
-                    if defaults:
-                        kwargs = {**kwargs, **defaults}
-                    # ManyToMany fields can't be set this way, so pop them out to save for later
-                    fields = [field.name for field in self.model._meta.get_fields() if issubclass(type(field), ManyToManyField)]
-                    many_to_many = {field: kwargs.pop(field) for field in list(kwargs) if field in fields}
-                    obj = self.model.add_root(**kwargs)
-                    for field in many_to_many:
-                        field_model = getattr(obj, field).model
-                        for related_obj in many_to_many[field]:
-                            if isinstance(related_obj, User):
-                                getattr(obj, field).add(field_model.objects.get(id=related_obj.id))
-                            else:
-                                getattr(obj, field).add(field_model.objects.get(**dict(related_obj)))
-                    return obj, True
-                except IntegrityError as e:
-                    if 'Key (path)' in e.args[0]:
-                        self.model.fix_tree(fix_paths=True)
-                        return self.model.add_root(**kwargs), True
+            if obj := self.filter(name__iexact=kwargs['name']).first():
+                return obj, False
+
+        with scopes_disabled():
+            try:
+                defaults = kwargs.pop('defaults', None)
+                if defaults:
+                    kwargs = {**kwargs, **defaults}
+                # ManyToMany fields can't be set this way, so pop them out to save for later
+                fields = [field.name for field in self.model._meta.get_fields() if issubclass(type(field), ManyToManyField)]
+                many_to_many = {field: kwargs.pop(field) for field in list(kwargs) if field in fields}
+                obj = self.model.add_root(**kwargs)
+                for field in many_to_many:
+                    field_model = getattr(obj, field).model
+                    for related_obj in many_to_many[field]:
+                        if isinstance(related_obj, User):
+                            getattr(obj, field).add(field_model.objects.get(id=related_obj.id))
+                        else:
+                            getattr(obj, field).add(field_model.objects.get(**dict(related_obj)))
+                return obj, True
+            except IntegrityError as e:
+                if 'Key (path)' in e.args[0]:
+                    self.model.fix_tree(fix_paths=True)
+                    return self.model.add_root(**kwargs), True
 
 
 class TreeModel(MP_Node):
@@ -267,6 +270,8 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
     food_inherit = models.ManyToManyField(FoodInheritField, blank=True)
     show_facet_count = models.BooleanField(default=False)
 
+    internal_note = models.TextField(blank=True, null=True)
+
     def safe_delete(self):
         """
         Safely deletes a space by deleting all objects belonging to the space first and then deleting the space itself
@@ -326,6 +331,7 @@ class UserPreference(models.Model, PermissionModelMixin):
     FLATLY = 'FLATLY'
     SUPERHERO = 'SUPERHERO'
     TANDOOR = 'TANDOOR'
+    TANDOOR_DARK = 'TANDOOR_DARK'
 
     THEMES = (
         (TANDOOR, 'Tandoor'),
@@ -333,6 +339,7 @@ class UserPreference(models.Model, PermissionModelMixin):
         (DARKLY, 'Darkly'),
         (FLATLY, 'Flatly'),
         (SUPERHERO, 'Superhero'),
+        (TANDOOR_DARK, 'Tandoor Dark (INCOMPLETE)'),
     )
 
     # Nav colors
@@ -387,6 +394,7 @@ class UserPreference(models.Model, PermissionModelMixin):
     shopping_add_onhand = models.BooleanField(default=False)
     filter_to_supermarket = models.BooleanField(default=False)
     left_handed = models.BooleanField(default=False)
+    show_step_ingredients = models.BooleanField(default=True)
     default_delay = models.DecimalField(default=4, max_digits=8, decimal_places=4)
     shopping_recent_days = models.PositiveIntegerField(default=7)
     csv_delim = models.CharField(max_length=2, default=",")
@@ -408,6 +416,9 @@ class UserSpace(models.Model, PermissionModelMixin):
     # that having more than one active space should just break certain parts of the application and not leak any data
     active = models.BooleanField(default=False)
 
+    invite_link = models.ForeignKey("InviteLink", on_delete=models.PROTECT, null=True, blank=True)
+    internal_note = models.TextField(blank=True, null=True)
+
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
@@ -454,6 +465,7 @@ class Sync(models.Model, PermissionModelMixin):
 class SupermarketCategory(models.Model, PermissionModelMixin):
     name = models.CharField(max_length=128, validators=[MinLengthValidator(1)])
     description = models.TextField(blank=True, null=True)
+    open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
 
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
     objects = ScopedManager(space='space')
@@ -463,7 +475,8 @@ class SupermarketCategory(models.Model, PermissionModelMixin):
 
     class Meta:
         constraints = [
-            models.UniqueConstraint(fields=['space', 'name'], name='smc_unique_name_per_space')
+            models.UniqueConstraint(fields=['space', 'name'], name='smc_unique_name_per_space'),
+            models.UniqueConstraint(fields=['space', 'open_data_slug'], name='supermarket_category_unique_open_data_slug_per_space')
         ]
 
 
@@ -471,6 +484,7 @@ class Supermarket(models.Model, PermissionModelMixin):
     name = models.CharField(max_length=128, validators=[MinLengthValidator(1)])
     description = models.TextField(blank=True, null=True)
     categories = models.ManyToManyField(SupermarketCategory, through='SupermarketCategoryRelation')
+    open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
 
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
     objects = ScopedManager(space='space')
@@ -480,7 +494,8 @@ class Supermarket(models.Model, PermissionModelMixin):
 
     class Meta:
         constraints = [
-            models.UniqueConstraint(fields=['space', 'name'], name='sm_unique_name_per_space')
+            models.UniqueConstraint(fields=['space', 'name'], name='sm_unique_name_per_space'),
+            models.UniqueConstraint(fields=['space', 'open_data_slug'], name='supermarket_unique_open_data_slug_per_space')
         ]
 
 
@@ -496,6 +511,9 @@ class SupermarketCategoryRelation(models.Model, PermissionModelMixin):
         return 'supermarket', 'space'
 
     class Meta:
+        constraints = [
+            models.UniqueConstraint(fields=['supermarket', 'category'], name='unique_sm_category_relation')
+        ]
         ordering = ('order',)
 
 
@@ -534,6 +552,8 @@ class Unit(ExportModelOperationsMixin('unit'), models.Model, PermissionModelMixi
     name = models.CharField(max_length=128, validators=[MinLengthValidator(1)])
     plural_name = models.CharField(max_length=128, null=True, blank=True, default=None)
     description = models.TextField(blank=True, null=True)
+    base_unit = models.TextField(max_length=256, null=True, blank=True, default=None)
+    open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
 
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
     objects = ScopedManager(space='space')
@@ -543,7 +563,8 @@ class Unit(ExportModelOperationsMixin('unit'), models.Model, PermissionModelMixi
 
     class Meta:
         constraints = [
-            models.UniqueConstraint(fields=['space', 'name'], name='u_unique_name_per_space')
+            models.UniqueConstraint(fields=['space', 'name'], name='u_unique_name_per_space'),
+            models.UniqueConstraint(fields=['space', 'open_data_slug'], name='unit_unique_open_data_slug_per_space')
         ]
 
 
@@ -559,6 +580,7 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin):
     name = models.CharField(max_length=128, validators=[MinLengthValidator(1)])
     plural_name = models.CharField(max_length=128, null=True, blank=True, default=None)
     recipe = models.ForeignKey('Recipe', null=True, blank=True, on_delete=models.SET_NULL)
+    url = models.CharField(max_length=1024, blank=True, null=True, default='')
     supermarket_category = models.ForeignKey(SupermarketCategory, null=True, blank=True, on_delete=models.SET_NULL)  # inherited field
     ignore_shopping = models.BooleanField(default=False)  # inherited field
     onhand_users = models.ManyToManyField(User, blank=True)
@@ -569,6 +591,15 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin):
     substitute_children = models.BooleanField(default=False)
     child_inherit_fields = models.ManyToManyField(FoodInheritField, blank=True, related_name='child_inherit')
 
+    properties = models.ManyToManyField("Property", blank=True, through='FoodProperty')
+    properties_food_amount = models.DecimalField(default=100, max_digits=16, decimal_places=2, blank=True)
+    properties_food_unit = models.ForeignKey(Unit, on_delete=models.PROTECT, blank=True, null=True)
+
+    preferred_unit = models.ForeignKey(Unit, on_delete=models.SET_NULL, null=True, blank=True, default=None, related_name='preferred_unit')
+    preferred_shopping_unit = models.ForeignKey(Unit, on_delete=models.SET_NULL, null=True, blank=True, default=None, related_name='preferred_shopping_unit')
+    fdc_id = models.CharField(max_length=128, null=True, blank=True, default=None)
+
+    open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
     objects = ScopedManager(space='space', _manager_class=TreeManager)
 
@@ -642,7 +673,8 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin):
 
     class Meta:
         constraints = [
-            models.UniqueConstraint(fields=['space', 'name'], name='f_unique_name_per_space')
+            models.UniqueConstraint(fields=['space', 'name'], name='f_unique_name_per_space'),
+            models.UniqueConstraint(fields=['space', 'open_data_slug'], name='food_unique_open_data_slug_per_space')
         ]
         indexes = (
             Index(fields=['id']),
@@ -650,6 +682,32 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin):
         )
 
 
+class UnitConversion(ExportModelOperationsMixin('unit_conversion'), models.Model, PermissionModelMixin):
+    base_amount = models.DecimalField(default=0, decimal_places=16, max_digits=32)
+    base_unit = models.ForeignKey('Unit', on_delete=models.CASCADE, related_name='unit_conversion_base_relation')
+    converted_amount = models.DecimalField(default=0, decimal_places=16, max_digits=32)
+    converted_unit = models.ForeignKey('Unit', on_delete=models.CASCADE, related_name='unit_conversion_converted_relation')
+
+    food = models.ForeignKey('Food', on_delete=models.CASCADE, null=True, blank=True)
+
+    created_by = models.ForeignKey(User, on_delete=models.PROTECT)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
+    space = models.ForeignKey(Space, on_delete=models.CASCADE)
+    objects = ScopedManager(space='space')
+
+    def __str__(self):
+        return f'{self.base_amount} {self.base_unit} -> {self.converted_amount} {self.converted_unit} {self.food}'
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(fields=['space', 'base_unit', 'converted_unit', 'food'], name='f_unique_conversion_per_space'),
+            models.UniqueConstraint(fields=['space', 'open_data_slug'], name='unit_conversion_unique_open_data_slug_per_space')
+        ]
+
+
 class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, PermissionModelMixin):
     # delete method on Food and Unit checks if they are part of a Recipe, if it is raises a ProtectedError instead of cascading the delete
     food = models.ForeignKey(Food, on_delete=models.CASCADE, null=True, blank=True)
@@ -663,30 +721,9 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
     order = models.IntegerField(default=0)
     original_text = models.CharField(max_length=512, null=True, blank=True, default=None)
 
-    original_text = models.CharField(max_length=512, null=True, blank=True, default=None)
-
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
     objects = ScopedManager(space='space')
 
-    def __str__(self):
-        food = ""
-        unit = ""
-        if self.always_use_plural_food and self.food.plural_name not in (None, "") and not self.no_amount:
-            food = self.food.plural_name
-        else:
-            if self.amount > 1 and self.food.plural_name not in (None, "") and not self.no_amount:
-                food = self.food.plural_name
-            else:
-                food = str(self.food)
-        if self.always_use_plural_unit and self.unit.plural_name not in (None, "") and not self.no_amount:
-            unit = self.unit.plural_name
-        else:
-            if self.amount > 1 and self.unit is not None and self.unit.plural_name not in (None, "") and not self.no_amount:
-                unit = self.unit.plural_name
-            else:
-                unit = str(self.unit)
-        return str(self.amount) + ' ' + str(unit) + ' ' + str(food)
-
     class Meta:
         ordering = ['order', 'pk']
         indexes = (
@@ -702,6 +739,7 @@ class Step(ExportModelOperationsMixin('step'), models.Model, PermissionModelMixi
     order = models.IntegerField(default=0)
     file = models.ForeignKey('UserFile', on_delete=models.PROTECT, null=True, blank=True)
     show_as_header = models.BooleanField(default=True)
+    show_ingredients_table = models.BooleanField(default=True)
     search_vector = SearchVectorField(null=True)
     step_recipe = models.ForeignKey('Recipe', default=None, blank=True, null=True, on_delete=models.PROTECT)
 
@@ -720,6 +758,67 @@ class Step(ExportModelOperationsMixin('step'), models.Model, PermissionModelMixi
         indexes = (GinIndex(fields=["search_vector"]),)
 
 
+class PropertyType(models.Model, PermissionModelMixin):
+    NUTRITION = 'NUTRITION'
+    ALLERGEN = 'ALLERGEN'
+    PRICE = 'PRICE'
+    GOAL = 'GOAL'
+    OTHER = 'OTHER'
+
+    name = models.CharField(max_length=128)
+    unit = models.CharField(max_length=64, blank=True, null=True)
+    icon = models.CharField(max_length=16, blank=True, null=True)
+    order = models.IntegerField(default=0)
+    description = models.CharField(max_length=512, blank=True, null=True)
+    category = models.CharField(max_length=64, choices=((NUTRITION, _('Nutrition')), (ALLERGEN, _('Allergen')),
+                                (PRICE, _('Price')), (GOAL, _('Goal')), (OTHER, _('Other'))), null=True, blank=True)
+    open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
+
+    # TODO show if empty property?
+    # TODO formatting property?
+
+    space = models.ForeignKey(Space, on_delete=models.CASCADE)
+    objects = ScopedManager(space='space')
+
+    def __str__(self):
+        return f'{self.name}'
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(fields=['space', 'name'], name='property_type_unique_name_per_space'),
+            models.UniqueConstraint(fields=['space', 'open_data_slug'], name='property_type_unique_open_data_slug_per_space')
+        ]
+        ordering = ('order',)
+
+
+class Property(models.Model, PermissionModelMixin):
+    property_amount = models.DecimalField(default=0, decimal_places=4, max_digits=32)
+    property_type = models.ForeignKey(PropertyType, on_delete=models.PROTECT)
+
+    import_food_id = models.IntegerField(null=True, blank=True)  # field to hold food id when importing properties from the open data project
+
+    space = models.ForeignKey(Space, on_delete=models.CASCADE)
+    objects = ScopedManager(space='space')
+
+    def __str__(self):
+        return f'{self.property_amount} {self.property_type.unit} {self.property_type.name}'
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(fields=['space', 'property_type', 'import_food_id'], name='property_unique_import_food_per_space')
+        ]
+
+
+class FoodProperty(models.Model):
+    food = models.ForeignKey(Food, on_delete=models.CASCADE)
+    property = models.ForeignKey(Property, on_delete=models.CASCADE)
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(fields=['food', 'property'], name='property_unique_food')
+        ]
+
+
 class NutritionInformation(models.Model, PermissionModelMixin):
     fats = models.DecimalField(default=0, decimal_places=16, max_digits=32)
     carbohydrates = models.DecimalField(
@@ -736,14 +835,6 @@ class NutritionInformation(models.Model, PermissionModelMixin):
         return f'Nutrition {self.pk}'
 
 
-# class NutritionType(models.Model, PermissionModelMixin):
-#     name = models.CharField(max_length=128)
-#     icon = models.CharField(max_length=16, blank=True, null=True)
-#     description = models.CharField(max_length=512, blank=True, null=True)
-#
-#     space = models.ForeignKey(Space, on_delete=models.CASCADE)
-#     objects = ScopedManager(space='space')
-
 class RecipeManager(models.Manager.from_queryset(models.QuerySet)):
     def get_queryset(self):
         return super(RecipeManager, self).get_queryset().annotate(rating=Avg('cooklog__rating')).annotate(last_cooked=Max('cooklog__created_at'))
@@ -766,6 +857,7 @@ class Recipe(ExportModelOperationsMixin('recipe'), models.Model, PermissionModel
     waiting_time = models.IntegerField(default=0)
     internal = models.BooleanField(default=False)
     nutrition = models.ForeignKey(NutritionInformation, blank=True, null=True, on_delete=models.CASCADE)
+    properties = models.ManyToManyField(Property, blank=True)
     show_ingredient_overview = models.BooleanField(default=True)
     private = models.BooleanField(default=False)
     shared = models.ManyToManyField(User, blank=True, related_name='recipe_shared_with')
@@ -1042,6 +1134,8 @@ class InviteLink(ExportModelOperationsMixin('invite_link'), models.Model, Permis
     created_by = models.ForeignKey(User, on_delete=models.CASCADE)
     created_at = models.DateTimeField(auto_now_add=True)
 
+    internal_note = models.TextField(blank=True, null=True)
+
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
     objects = ScopedManager(space='space')
 
@@ -1226,10 +1320,13 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis
     KEYWORD_ALIAS = 'KEYWORD_ALIAS'
     DESCRIPTION_REPLACE = 'DESCRIPTION_REPLACE'
     INSTRUCTION_REPLACE = 'INSTRUCTION_REPLACE'
+    NEVER_UNIT = 'NEVER_UNIT'
+    TRANSPOSE_WORDS = 'TRANSPOSE_WORDS'
 
     type = models.CharField(max_length=128,
                             choices=((FOOD_ALIAS, _('Food Alias')), (UNIT_ALIAS, _('Unit Alias')), (KEYWORD_ALIAS, _('Keyword Alias')),
-                                     (DESCRIPTION_REPLACE, _('Description Replace')), (INSTRUCTION_REPLACE, _('Instruction Replace')),))
+                                     (DESCRIPTION_REPLACE, _('Description Replace')), (INSTRUCTION_REPLACE, _('Instruction Replace')),
+                                     (NEVER_UNIT, _('Never Unit')), (TRANSPOSE_WORDS, _('Transpose Words')),))
     name = models.CharField(max_length=128, default='')
     description = models.TextField(blank=True, null=True)
 

cookbook/serializer.py

@@ -1,3 +1,4 @@
+import random
 import traceback
 import uuid
 from datetime import datetime, timedelta
@@ -7,6 +8,7 @@ from html import escape
 from smtplib import SMTPException
 
 from django.contrib.auth.models import Group, User, AnonymousUser
+from django.core.cache import caches
 from django.core.mail import send_mail
 from django.db.models import Avg, Q, QuerySet, Sum
 from django.http import BadHeaderError
@@ -21,15 +23,18 @@ from rest_framework.exceptions import NotFound, ValidationError
 
 from cookbook.helper.CustomStorageClass import CachedS3Boto3Storage
 from cookbook.helper.HelperFunctions import str2bool
+from cookbook.helper.property_helper import FoodPropertyHelper
 from cookbook.helper.permission_helper import above_space_limit
 from cookbook.helper.shopping_helper import RecipeShoppingEditor
+from cookbook.helper.unit_conversion_helper import UnitConversionHelper
 from cookbook.models import (Automation, BookmarkletImport, Comment, CookLog, CustomFilter,
                              ExportLog, Food, FoodInheritField, ImportLog, Ingredient, InviteLink,
                              Keyword, MealPlan, MealType, NutritionInformation, Recipe, RecipeBook,
                              RecipeBookEntry, RecipeImport, ShareLink, ShoppingList,
                              ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
                              Supermarket, SupermarketCategory, SupermarketCategoryRelation, Sync,
-                             SyncLog, Unit, UserFile, UserPreference, UserSpace, ViewLog)
+                             SyncLog, Unit, UserFile, UserPreference, UserSpace, ViewLog, UnitConversion, Property,
+                             PropertyType, Property)
 from cookbook.templatetags.custom_tags import markdown
 from recipes.settings import AWS_ENABLED, MEDIA_URL
 
@@ -74,6 +79,19 @@ class ExtendedRecipeMixin(serializers.ModelSerializer):
             return path
 
 
+class OpenDataModelMixin(serializers.ModelSerializer):
+
+    def create(self, validated_data):
+        if 'open_data_slug' in validated_data and validated_data['open_data_slug'] is not None and validated_data['open_data_slug'].strip() == '':
+            validated_data['open_data_slug'] = None
+        return super().create(validated_data)
+
+    def update(self, instance, validated_data):
+        if 'open_data_slug' in validated_data and validated_data['open_data_slug'] is not None and validated_data['open_data_slug'].strip() == '':
+            validated_data['open_data_slug'] = None
+        return super().update(instance, validated_data)
+
+
 class CustomDecimalField(serializers.Field):
     """
     Custom decimal field to normalize useless decimal places
@@ -92,7 +110,7 @@ class CustomDecimalField(serializers.Field):
             if data == '':
                 return 0
             try:
-                return float(data.replace(',', ''))
+                return float(data.replace(',', '.'))
             except ValueError:
                 raise ValidationError('A valid number is required')
 
@@ -102,15 +120,21 @@ class CustomOnHandField(serializers.Field):
         return instance
 
     def to_representation(self, obj):
-        shared_users = None
-        if request := self.context.get('request', None):
-            shared_users = getattr(request, '_shared_users', None)
-        if shared_users is None:
+        if not self.context["request"].user.is_authenticated:
+            return []
+        shared_users = []
+        if c := caches['default'].get(f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
+            shared_users = c
+        else:
             try:
                 shared_users = [x.id for x in list(self.context['request'].user.get_shopping_share())] + [
                     self.context['request'].user.id]
+                caches['default'].set(
+                    f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}',
+                    shared_users, timeout=5 * 60)
+                # TODO ugly hack that improves API performance significantly, should be done properly
             except AttributeError:  # Anonymous users (using share links) don't have shared users
-                shared_users = []
+                pass
         return obj.onhand_users.filter(id__in=shared_users).exists()
 
     def to_internal_value(self, data):
@@ -276,10 +300,13 @@ class SpaceSerializer(WritableNestedModelSerializer):
 
     class Meta:
         model = Space
-        fields = ('id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users',
-                  'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb',
-                  'image', 'use_plural',)
-        read_only_fields = ('id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo',)
+        fields = (
+            'id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users',
+            'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb',
+            'image', 'use_plural',)
+        read_only_fields = (
+            'id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing',
+            'demo',)
 
 
 class UserSpaceSerializer(WritableNestedModelSerializer):
@@ -296,8 +323,8 @@ class UserSpaceSerializer(WritableNestedModelSerializer):
 
     class Meta:
         model = UserSpace
-        fields = ('id', 'user', 'space', 'groups', 'active', 'created_at', 'updated_at',)
-        read_only_fields = ('id', 'created_at', 'updated_at', 'space')
+        fields = ('id', 'user', 'space', 'groups', 'active', 'internal_note', 'invite_link', 'created_at', 'updated_at',)
+        read_only_fields = ('id', 'invite_link', 'created_at', 'updated_at', 'space')
 
 
 class SpacedModelSerializer(serializers.ModelSerializer):
@@ -349,7 +376,7 @@ class UserPreferenceSerializer(WritableNestedModelSerializer):
             'food_inherit_default', 'default_delay',
             'mealplan_autoinclude_related', 'mealplan_autoexclude_onhand', 'shopping_share', 'shopping_recent_days',
             'csv_delim', 'csv_prefix',
-            'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'food_children_exist'
+            'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'show_step_ingredients', 'food_children_exist'
         )
 
 
@@ -427,7 +454,7 @@ class KeywordSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
         read_only_fields = ('id', 'label', 'numchild', 'parent', 'image')
 
 
-class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
+class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin, OpenDataModelMixin):
     recipe_filter = 'steps__ingredients__unit'
 
     def create(self, validated_data):
@@ -440,7 +467,8 @@ class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
             return unit
 
         space = validated_data.pop('space', self.context['request'].space)
-        obj, created = Unit.objects.get_or_create(name=name, plural_name=plural_name, space=space, defaults=validated_data)
+        obj, created = Unit.objects.get_or_create(name=name, plural_name=plural_name, space=space,
+                                                  defaults=validated_data)
         return obj
 
     def update(self, instance, validated_data):
@@ -451,11 +479,11 @@ class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
 
     class Meta:
         model = Unit
-        fields = ('id', 'name', 'plural_name', 'description', 'numrecipe', 'image')
+        fields = ('id', 'name', 'plural_name', 'description', 'base_unit', 'numrecipe', 'image', 'open_data_slug')
         read_only_fields = ('id', 'numrecipe', 'image')
 
 
-class SupermarketCategorySerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
+class SupermarketCategorySerializer(UniqueFieldsMixin, WritableNestedModelSerializer, OpenDataModelMixin):
 
     def create(self, validated_data):
         name = validated_data.pop('name').strip()
@@ -479,12 +507,41 @@ class SupermarketCategoryRelationSerializer(WritableNestedModelSerializer):
         fields = ('id', 'category', 'supermarket', 'order')
 
 
-class SupermarketSerializer(UniqueFieldsMixin, SpacedModelSerializer):
+class SupermarketSerializer(UniqueFieldsMixin, SpacedModelSerializer, OpenDataModelMixin):
     category_to_supermarket = SupermarketCategoryRelationSerializer(many=True, read_only=True)
 
     class Meta:
         model = Supermarket
-        fields = ('id', 'name', 'description', 'category_to_supermarket')
+        fields = ('id', 'name', 'description', 'category_to_supermarket', 'open_data_slug')
+
+
+class PropertyTypeSerializer(OpenDataModelMixin, WritableNestedModelSerializer, UniqueFieldsMixin):
+    id = serializers.IntegerField(required=False)
+
+    def create(self, validated_data):
+        validated_data['space'] = self.context['request'].space
+
+        if property_type := PropertyType.objects.filter(Q(name=validated_data['name'])).filter(space=self.context['request'].space).first():
+            return property_type
+
+        return super().create(validated_data)
+
+    class Meta:
+        model = PropertyType
+        fields = ('id', 'name', 'icon', 'unit', 'description', 'order', 'open_data_slug')
+
+
+class PropertySerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
+    property_type = PropertyTypeSerializer()
+    property_amount = CustomDecimalField()
+
+    def create(self, validated_data):
+        validated_data['space'] = self.context['request'].space
+        return super().create(validated_data)
+
+    class Meta:
+        model = Property
+        fields = ('id', 'property_amount', 'property_type')
 
 
 class RecipeSimpleSerializer(WritableNestedModelSerializer):
@@ -512,7 +569,7 @@ class FoodSimpleSerializer(serializers.ModelSerializer):
         fields = ('id', 'name', 'plural_name')
 
 
-class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedRecipeMixin):
+class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedRecipeMixin, OpenDataModelMixin):
     supermarket_category = SupermarketCategorySerializer(allow_null=True, required=False)
     recipe = RecipeSimpleSerializer(allow_null=True, required=False)
     # shopping = serializers.SerializerMethodField('get_shopping_status')
@@ -523,19 +580,30 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
     substitute_onhand = serializers.SerializerMethodField('get_substitute_onhand')
     substitute = FoodSimpleSerializer(many=True, allow_null=True, required=False)
 
+    properties = PropertySerializer(many=True, allow_null=True, required=False)
+    properties_food_unit = UnitSerializer(allow_null=True, required=False)
+    properties_food_amount = CustomDecimalField(required=False)
+
     recipe_filter = 'steps__ingredients__food'
     images = ['recipe__image']
 
     def get_substitute_onhand(self, obj):
-        shared_users = None
-        if request := self.context.get('request', None):
-            shared_users = getattr(request, '_shared_users', None)
-        if shared_users is None:
+        if not self.context["request"].user.is_authenticated:
+            return []
+        shared_users = []
+        if c := caches['default'].get(
+                f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
+            shared_users = c
+        else:
             try:
                 shared_users = [x.id for x in list(self.context['request'].user.get_shopping_share())] + [
                     self.context['request'].user.id]
-            except AttributeError:
-                shared_users = []
+                caches['default'].set(
+                    f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}',
+                    shared_users, timeout=5 * 60)
+                # TODO ugly hack that improves API performance significantly, should be done properly
+            except AttributeError:  # Anonymous users (using share links) don't have shared users
+                pass
         filter = Q(id__in=obj.substitute.all())
         if obj.substitute_siblings:
             filter |= Q(path__startswith=obj.path[:Food.steplen * (obj.depth - 1)], depth=obj.depth)
@@ -547,7 +615,7 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
     #     return ShoppingListEntry.objects.filter(space=obj.space, food=obj, checked=False).count() > 0
 
     def create(self, validated_data):
-        name = validated_data.pop('name').strip()
+        name = validated_data['name'].strip()
 
         if plural_name := validated_data.pop('plural_name', None):
             plural_name = plural_name.strip()
@@ -579,7 +647,18 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
             else:
                 validated_data['onhand_users'] = list(set(onhand_users) - set(shared_users))
 
-        obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space, defaults=validated_data)
+        if properties_food_unit := validated_data.pop('properties_food_unit', None):
+            properties_food_unit = Unit.objects.filter(name=properties_food_unit['name']).first()
+
+        properties = validated_data.pop('properties', None)
+
+        obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space, properties_food_unit=properties_food_unit,
+                                                  defaults=validated_data)
+
+        if properties and len(properties) > 0:
+            for p in properties:
+                obj.properties.add(Property.objects.create(property_type_id=p['property_type']['id'], property_amount=p['property_amount'], space=space))
+
         return obj
 
     def update(self, instance, validated_data):
@@ -606,9 +685,11 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
     class Meta:
         model = Food
         fields = (
-            'id', 'name', 'plural_name', 'description', 'shopping', 'recipe', 'food_onhand', 'supermarket_category',
+            'id', 'name', 'plural_name', 'description', 'shopping', 'recipe', 'url',
+            'properties', 'properties_food_amount', 'properties_food_unit',
+            'food_onhand', 'supermarket_category',
             'image', 'parent', 'numchild', 'numrecipe', 'inherit_fields', 'full_name', 'ignore_shopping',
-            'substitute', 'substitute_siblings', 'substitute_children', 'substitute_onhand', 'child_inherit_fields'
+            'substitute', 'substitute_siblings', 'substitute_children', 'substitute_onhand', 'child_inherit_fields', 'open_data_slug',
         )
         read_only_fields = ('id', 'numchild', 'parent', 'image', 'numrecipe')
 
@@ -618,9 +699,24 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer):
     unit = UnitSerializer(allow_null=True)
     used_in_recipes = serializers.SerializerMethodField('get_used_in_recipes')
     amount = CustomDecimalField()
+    conversions = serializers.SerializerMethodField('get_conversions')
 
     def get_used_in_recipes(self, obj):
-        return list(Recipe.objects.filter(steps__ingredients=obj.id).values('id', 'name'))
+        used_in = []
+        for s in obj.step_set.all():
+            for r in s.recipe_set.all():
+                used_in.append({'id': r.id, 'name': r.name})
+        return used_in
+
+    def get_conversions(self, obj):
+        if obj.unit and obj.food:
+            uch = UnitConversionHelper(self.context['request'].space)
+            conversions = []
+            for c in uch.get_conversions(obj):
+                conversions.append({'food': c.food.name, 'unit': c.unit.name, 'amount': c.amount})  # TODO do formatting in helper
+            return conversions
+        else:
+            return []
 
     def create(self, validated_data):
         validated_data['space'] = self.context['request'].space
@@ -633,10 +729,11 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer):
     class Meta:
         model = Ingredient
         fields = (
-            'id', 'food', 'unit', 'amount', 'note', 'order',
+            'id', 'food', 'unit', 'amount', 'conversions', 'note', 'order',
             'is_header', 'no_amount', 'original_text', 'used_in_recipes',
             'always_use_plural_unit', 'always_use_plural_food',
         )
+        read_only_fields = ['conversions', ]
 
 
 class IngredientSerializer(IngredientSimpleSerializer):
@@ -674,7 +771,8 @@ class StepSerializer(WritableNestedModelSerializer, ExtendedRecipeMixin):
         model = Step
         fields = (
             'id', 'name', 'instruction', 'ingredients', 'ingredients_markdown',
-            'ingredients_vue', 'time', 'order', 'show_as_header', 'file', 'step_recipe', 'step_recipe_data', 'numrecipe'
+            'ingredients_vue', 'time', 'order', 'show_as_header', 'file', 'step_recipe',
+            'step_recipe_data', 'numrecipe', 'show_ingredients_table'
         )
 
 
@@ -688,6 +786,30 @@ class StepRecipeSerializer(WritableNestedModelSerializer):
         )
 
 
+class UnitConversionSerializer(WritableNestedModelSerializer, OpenDataModelMixin):
+    name = serializers.SerializerMethodField('get_conversion_name')
+    base_unit = UnitSerializer()
+    converted_unit = UnitSerializer()
+    food = FoodSerializer(allow_null=True, required=False)
+    base_amount = CustomDecimalField()
+    converted_amount = CustomDecimalField()
+
+    def get_conversion_name(self, obj):
+        text = f'{round(obj.base_amount)} {obj.base_unit} '
+        if obj.food:
+            text += f' {obj.food}'
+        return text + f' = {round(obj.converted_amount)} {obj.converted_unit}'
+
+    def create(self, validated_data):
+        validated_data['space'] = self.context['request'].space
+        validated_data['created_by'] = self.context['request'].user
+        return super().create(validated_data)
+
+    class Meta:
+        model = UnitConversion
+        fields = ('id', 'name', 'base_amount', 'base_unit', 'converted_amount', 'converted_unit', 'food', 'open_data_slug')
+
+
 class NutritionInformationSerializer(serializers.ModelSerializer):
     carbohydrates = CustomDecimalField()
     fats = CustomDecimalField()
@@ -738,21 +860,28 @@ class RecipeOverviewSerializer(RecipeBaseSerializer):
 
 class RecipeSerializer(RecipeBaseSerializer):
     nutrition = NutritionInformationSerializer(allow_null=True, required=False)
+    properties = PropertySerializer(many=True, required=False)
     steps = StepSerializer(many=True)
     keywords = KeywordSerializer(many=True)
     shared = UserSerializer(many=True, required=False)
     rating = CustomDecimalField(required=False, allow_null=True, read_only=True)
     last_cooked = serializers.DateTimeField(required=False, allow_null=True, read_only=True)
+    food_properties = serializers.SerializerMethodField('get_food_properties')
+
+    def get_food_properties(self, obj):
+        fph = FoodPropertyHelper(obj.space)  # initialize with object space since recipes might be viewed anonymously
+        return fph.calculate_recipe_properties(obj)
 
     class Meta:
         model = Recipe
         fields = (
             'id', 'name', 'description', 'image', 'keywords', 'steps', 'working_time',
             'waiting_time', 'created_by', 'created_at', 'updated_at', 'source_url',
-            'internal', 'show_ingredient_overview', 'nutrition', 'servings', 'file_path', 'servings_text', 'rating', 'last_cooked',
+            'internal', 'show_ingredient_overview', 'nutrition', 'properties', 'food_properties', 'servings', 'file_path', 'servings_text', 'rating',
+            'last_cooked',
             'private', 'shared',
         )
-        read_only_fields = ['image', 'created_by', 'created_at']
+        read_only_fields = ['image', 'created_by', 'created_at', 'food_properties']
 
     def validate(self, data):
         above_limit, msg = above_space_limit(self.context['request'].space)
@@ -872,6 +1001,16 @@ class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
         read_only_fields = ('created_by',)
 
 
+class AutoMealPlanSerializer(serializers.Serializer):
+    start_date = serializers.DateField()
+    end_date = serializers.DateField()
+    meal_type_id = serializers.IntegerField()
+    keywords = KeywordSerializer(many=True)
+    servings = CustomDecimalField()
+    shared = UserSerializer(many=True, required=False, allow_null=True)
+    addshopping = serializers.BooleanField()
+
+
 class ShoppingListRecipeSerializer(serializers.ModelSerializer):
     name = serializers.SerializerMethodField('get_name')  # should this be done at the front end?
     recipe_name = serializers.ReadOnlyField(source='recipe.name')
@@ -1089,13 +1228,19 @@ class InviteLinkSerializer(WritableNestedModelSerializer):
 
         if obj.email:
             try:
-                if InviteLink.objects.filter(space=self.context['request'].space, created_at__gte=datetime.now() - timedelta(hours=4)).count() < 20:
-                    message = _('Hello') + '!\n\n' + _('You have been invited by ') + escape(self.context['request'].user.get_user_display_name())
-                    message += _(' to join their Tandoor Recipes space ') + escape(self.context['request'].space.name) + '.\n\n'
-                    message += _('Click the following link to activate your account: ') + self.context['request'].build_absolute_uri(reverse('view_invite', args=[str(obj.uuid)])) + '\n\n'
-                    message += _('If the link does not work use the following code to manually join the space: ') + str(obj.uuid) + '\n\n'
+                if InviteLink.objects.filter(space=self.context['request'].space,
+                                             created_at__gte=datetime.now() - timedelta(hours=4)).count() < 20:
+                    message = _('Hello') + '!\n\n' + _('You have been invited by ') + escape(
+                        self.context['request'].user.get_user_display_name())
+                    message += _(' to join their Tandoor Recipes space ') + escape(
+                        self.context['request'].space.name) + '.\n\n'
+                    message += _('Click the following link to activate your account: ') + self.context[
+                        'request'].build_absolute_uri(reverse('view_invite', args=[str(obj.uuid)])) + '\n\n'
+                    message += _('If the link does not work use the following code to manually join the space: ') + str(
+                        obj.uuid) + '\n\n'
                     message += _('The invitation is valid until ') + str(obj.valid_until) + '\n\n'
-                    message += _('Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub ') + 'https://github.com/vabene1111/recipes/'
+                    message += _(
+                        'Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub ') + 'https://github.com/vabene1111/recipes/'
 
                     send_mail(
                         _('Tandoor Recipes Invite'),
@@ -1112,7 +1257,7 @@ class InviteLinkSerializer(WritableNestedModelSerializer):
     class Meta:
         model = InviteLink
         fields = (
-            'id', 'uuid', 'email', 'group', 'valid_until', 'used_by', 'reusable', 'created_by', 'created_at',)
+            'id', 'uuid', 'email', 'group', 'valid_until', 'used_by', 'reusable', 'internal_note', 'created_by', 'created_at',)
         read_only_fields = ('id', 'uuid', 'created_by', 'created_at',)
 
 
@@ -1204,7 +1349,8 @@ class IngredientExportSerializer(WritableNestedModelSerializer):
 
     class Meta:
         model = Ingredient
-        fields = ('food', 'unit', 'amount', 'note', 'order', 'is_header', 'no_amount', 'always_use_plural_unit', 'always_use_plural_food')
+        fields = ('food', 'unit', 'amount', 'note', 'order', 'is_header', 'no_amount', 'always_use_plural_unit',
+                  'always_use_plural_food')
 
 
 class StepExportSerializer(WritableNestedModelSerializer):
@@ -1216,7 +1362,7 @@ class StepExportSerializer(WritableNestedModelSerializer):
 
     class Meta:
         model = Step
-        fields = ('name', 'instruction', 'ingredients', 'time', 'order', 'show_as_header')
+        fields = ('name', 'instruction', 'ingredients', 'time', 'order', 'show_as_header', 'show_ingredients_table')
 
 
 class RecipeExportSerializer(WritableNestedModelSerializer):
@@ -1228,7 +1374,7 @@ class RecipeExportSerializer(WritableNestedModelSerializer):
         model = Recipe
         fields = (
             'name', 'description', 'keywords', 'steps', 'working_time',
-            'waiting_time', 'internal', 'nutrition', 'servings', 'servings_text',
+            'waiting_time', 'internal', 'nutrition', 'servings', 'servings_text', 'source_url',
         )
 
     def create(self, validated_data):

cookbook/signals.py

@@ -4,15 +4,17 @@ from functools import wraps
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.postgres.search import SearchVector
+from django.core.cache import caches
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils import translation
 from django_scopes import scope, scopes_disabled
 
+from cookbook.helper.cache_helper import CacheHelper
 from cookbook.helper.shopping_helper import RecipeShoppingEditor
 from cookbook.managers import DICTIONARY
 from cookbook.models import (Food, FoodInheritField, Ingredient, MealPlan, Recipe,
-                             ShoppingListEntry, Step, UserPreference, SearchPreference, SearchFields)
+                             ShoppingListEntry, Step, UserPreference, SearchPreference, SearchFields, Unit, PropertyType)
 
 SQLITE = True
 if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
@@ -149,3 +151,15 @@ def auto_add_shopping(sender, instance=None, created=False, weak=False, **kwargs
             print("MEAL_AUTO_ADD Created SLR")
     except AttributeError:
         pass
+
+
+@receiver(post_save, sender=Unit)
+def clear_unit_cache(sender, instance=None, created=False, **kwargs):
+    if instance:
+        caches['default'].delete(CacheHelper(instance.space).BASE_UNITS_CACHE_KEY)
+
+
+@receiver(post_save, sender=PropertyType)
+def clear_property_type_cache(sender, instance=None, created=False, **kwargs):
+    if instance:
+        caches['default'].delete(CacheHelper(instance.space).PROPERTY_TYPE_CACHE_KEY)

cookbook/static/assets/spinner.svg

@@ -7,8 +7,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="2000px"
-   height="2000px"
+
    viewBox="0 0 2000 2000"
    version="1.1"
    id="SVGRoot"

cookbook/templates/base.html

@@ -9,7 +9,7 @@
     {% endblock %}</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="robots" content="noindex,nofollow" />
+    <meta name="robots" content="noindex,nofollow"/>
 
 
     <link rel="shortcut icon" type="image/x-icon" href="{% static 'assets/favicon.svg' %}">
@@ -29,6 +29,7 @@
     <meta name="msapplication-TileColor" content="#161616">
     <meta name="theme-color" content="#ffffff">
 
+    <meta name="apple-mobile-web-app-capable" content="yes"/>
 
     <!-- Bootstrap 4 -->
     <link id="id_main_css" href="{% theme_url request %}" rel="stylesheet">
@@ -50,7 +51,7 @@
     <script type="text/javascript">
         $.fn.select2.defaults.set("theme", "bootstrap");
         {% if request.user.is_authenticated %}
-        window.ACTIVE_SPACE_ID = '{{request.space.id}}';
+            window.ACTIVE_SPACE_ID = '{{request.space.id}}';
         {% endif %}
     </script>
 
@@ -73,7 +74,7 @@
 </head>
 <body>
 
-<nav class="navbar navbar-expand-lg navbar-dark bg-{% nav_color request %}"
+<nav class="navbar navbar-expand-lg {% nav_color request %}"
      id="id_main_nav"
      style="{% sticky_nav request %}">
 
@@ -118,6 +119,10 @@
                 <a class="nav-link" href="{% url 'view_books' %}"><i
                         class="fas fa-fw fa-book-open"></i> {% trans 'Books' %}</a>
             </li>
+            {% plugin_main_nav_templates as plugin_main_nav_templates %}
+            {% for pn in plugin_main_nav_templates %}
+                {% include pn %}
+            {% endfor %}
         </ul>
 
         <ul class="navbar-nav ml-auto">
@@ -270,6 +275,33 @@
                                     </div>
                                 </a>
                             </div>
+                            <div class="col-4">
+                                <a href="{% url 'list_property_type' %}" class="p-0 p-md-1">
+                                    <div class="card p-0 no-gutters border-0">
+                                        <div class="card-body text-center p-0 no-gutters">
+                                            <i class="fas fa-database fa-2x"></i>
+                                        </div>
+                                        <div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
+                                            {% trans 'Properties' %}
+                                        </div>
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+                        <div class="row m-0 mt-2 mt-md-0">
+                            <div class="col-4">
+                                <a href="{% url 'list_unit_conversion' %}" class="p-0 p-md-1">
+                                    <div class="card p-0 no-gutters border-0">
+                                        <div class="card-body text-center p-0 no-gutters">
+                                            <i class="fas fa-exchange-alt fa-2x"></i>
+                                        </div>
+                                        <div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
+                                            {% trans 'Unit Conversions' %}
+                                        </div>
+                                    </div>
+                                </a>
+                            </div>
+
                         </div>
                     </div>
                 </li>
@@ -323,6 +355,12 @@
                             <a class="dropdown-item" href="{% url 'view_space_overview' %}"><i
                                     class="fas fa-list"></i> {% trans 'Overview' %}</a>
                         {% endif %}
+                        {% plugin_dropdown_nav_templates as plugin_dropdown_nav_templates %}
+                        {% for pn in plugin_dropdown_nav_templates %}
+                            <div class="dropdown-divider"></div>
+                            {% include pn %}
+                        {% endfor %}
+
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item" href="{% url 'docs_markdown' %}"><i
                                 class="fab fa-markdown fa-fw"></i> {% trans 'Markdown Guide' %}</a>
@@ -349,6 +387,7 @@
     </div>
 </nav>
 
+
 {% message_of_the_day request as message_of_the_day %}
 {% if message_of_the_day %}
     <div class="bg-info" style=" width: 100%; text-align: center!important; color: #ffffff; padding: 8px">
@@ -413,7 +452,7 @@
     localStorage.setItem('STATIC_URL', "{% base_path request 'static_base' %}")
     localStorage.setItem('DEBUG', "{% is_debug %}")
     localStorage.setItem('USER_ID', "{{request.user.pk}}")
-    
+
     window.addEventListener("load", () => {
         if ("serviceWorker" in navigator) {
             navigator.serviceWorker.register("{% url 'service_worker' %}", {scope: "{% base_path request 'base' %}" + '/'}).then(function (reg) {

cookbook/templates/manifest.json

@@ -1,42 +1,52 @@
 {
-    "name": "Tandoor Recipes",
-    "short_name": "Tandoor",
-    "description": "Application to manage, tag and search recipes.",
-    "icons": [
-        {
-            "src": "/static/assets/logo_color144.png",
-            "type": "image/png",
-            "sizes": "144x144"
-        },
-        {
-            "src": "/static/assets/logo_color512.png",
-            "type": "image/png",
-            "sizes": "512x512"
-        }
-    ],
-    "start_url": "./search",
-    "background_color": "#ffcb76",
-    "display": "standalone",
-    "scope": ".",
-    "theme_color": "#ffcb76",
-    "shortcuts": [
-        {
-            "name": "Plan",
-            "short_name": "Plan",
-            "description": "View your meal Plan",
-            "url": "./plan"
-        },
-        {
-            "name": "Books",
-            "short_name": "Cookbooks",
-            "description": "View your cookbooks",
-            "url": "./books"
-        },
-        {
-            "name": "Shopping",
-            "short_name": "Shopping",
-            "description": "View your shopping lists",
-            "url": "./list/shopping-list/"
-        }
-    ]
+  "name": "Tandoor Recipes",
+  "short_name": "Tandoor",
+  "description": "Application to manage, tag and search recipes.",
+  "icons": [
+    {
+      "src": "/static/assets/logo_color144.png",
+      "type": "image/png",
+      "sizes": "144x144"
+    },
+    {
+      "src": "/static/assets/logo_color512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": "./search",
+  "background_color": "#ffcb76",
+  "display": "standalone",
+  "scope": ".",
+  "theme_color": "#ffcb76",
+  "shortcuts": [
+    {
+      "name": "Plan",
+      "short_name": "Plan",
+      "description": "View your meal Plan",
+      "url": "./plan"
+    },
+    {
+      "name": "Books",
+      "short_name": "Cookbooks",
+      "description": "View your cookbooks",
+      "url": "./books"
+    },
+    {
+      "name": "Shopping",
+      "short_name": "Shopping",
+      "description": "View your shopping lists",
+      "url": "./list/shopping-list/"
+    }
+  ],
+  "share_target": {
+    "action": "/data/import/url",
+    "method": "GET",
+    "params": {
+      "title": "title",
+      "url": "url",
+      "text": "text"
+
+    }
+  }
 }

cookbook/templates/system.html

@@ -11,29 +11,39 @@
 {% block content %}
 
     <h1>{% trans 'System' %}</h1>
-    
-    <br/>
-    <br/>
-    <br/>
-    <br/>
-
-    <h3>{% trans 'System Information' %}</h3>
-
     {% blocktrans %}
         Django Recipes is an open source free software application. It can be found on
         <a href="https://github.com/vabene1111/recipes">GitHub</a>.
         Changelogs can be found <a href="https://github.com/vabene1111/recipes/releases">here</a>.
     {% endblocktrans %}
-    <br/>
-    <br/>
-    Current Version: {% if version and version != '' %}
-    <a href="https://github.com/vabene1111/recipes/releases/tag/{{ version }}">{{ version }}</a>{% else %}
-    {{ version }}{% endif %}<br/>
-    Ref: <a href="https://github.com/vabene1111/recipes/commit/{{ ref }}">{{ ref }}</a>
-    <br/>
-    <br/>
-    <br/>
-    <h4>{% trans 'Media Serving' %} <span class="badge badge-{% if gunicorn_media %}danger{% else %}success{% endif %}">{% if gunicorn_media %}
+
+    <h3 class="mt-5">{% trans 'System Information' %}</h3>
+    {% if version_info %}
+        <div class="row">
+            <div class="col">
+                <div class="list-group">
+                    {% for v in version_info %}
+                        <div class="list-group-item list-group-item-action">
+                            <div class="d-flex w-100 justify-content-between">
+                                <h5 class="mb-1">{{ v.name }} ({{ v.branch }}) {% if v.tag %}- {{ v.tag }}{% endif %}</h5>
+                            </div>
+                            <pre class="card-text p-2" style="border: 1px solid lightgrey; border-radius: 5px" target="_blank">{{ v.version }}</pre>
+                            <a href="{{ v.website }}">Website</a>
+                            {% if v.commit_link %}
+                                - <a href="{{ v.commit_link }}" target="_blank">Commit</a>
+                            {% endif %}
+                        </div>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+    {% else %}
+        {% blocktrans %}
+            You need to execute <code>version.py</code> in your update script to generate version information (done automatically in docker).
+        {% endblocktrans %}
+    {% endif %}
+
+    <h4 class="mt-3">{% trans 'Media Serving' %} <span class="badge badge-{% if gunicorn_media %}danger{% else %}success{% endif %}">{% if gunicorn_media %}
         {% trans 'Warning' %}{% else %}{% trans 'Ok' %}{% endif %}</span></h4>
     {% if gunicorn_media %}
         {% blocktrans %}Serving media files directly using gunicorn/python is <b>not recommend</b>!
@@ -44,10 +54,9 @@
     {% else %}
         {% trans 'Everything is fine!' %}
     {% endif %}
-    <br/>
-    <br/>
 
-    <h4>{% trans 'Secret Key' %} <span
+
+    <h4 class="mt-3">{% trans 'Secret Key' %} <span
             class="badge badge-{% if secret_key %}danger{% else %}success{% endif %}">{% if secret_key %}
         {% trans 'Warning' %}{% else %}{% trans 'Ok' %}{% endif %}</span></h4>
     {% if secret_key %}
@@ -60,10 +69,8 @@
     {% else %}
         {% trans 'Everything is fine!' %}
     {% endif %}
-    <br/>
-    <br/>
 
-    <h4>{% trans 'Debug Mode' %} <span
+    <h4 class="mt-3">{% trans 'Debug Mode' %} <span
             class="badge badge-{% if debug %}danger{% else %}success{% endif %}">{% if debug %}
         {% trans 'Warning' %}{% else %}{% trans 'Ok' %}{% endif %}</span></h4>
     {% if debug %}
@@ -75,10 +82,8 @@
     {% else %}
         {% trans 'Everything is fine!' %}
     {% endif %}
-    <br/>
-    <br/>
 
-    <h4>{% trans 'Database' %} <span
+    <h4 class="mt-3">{% trans 'Database' %} <span
             class="badge badge-{% if postgres %}warning{% else %}success{% endif %}">{% if postgres %}
         {% trans 'Info' %}{% else %}{% trans 'Ok' %}{% endif %}</span></h4>
     {% if postgres %}
@@ -89,9 +94,8 @@
     {% else %}
         {% trans 'Everything is fine!' %}
     {% endif %}
-    <br/>
-    <br/>
-    <h4>Debug</h4>
+
+    <h4 class="mt-3">Debug</h4>
     <textarea class="form-control" rows="20">
 Gunicorn Media: {{ gunicorn_media }}
 Sqlite: {{ postgres }}
@@ -99,9 +103,9 @@ Debug: {{ debug }}
 
 {% for key,value in request.META.items %}{% if key in 'SERVER_PORT,REMOTE_HOST,REMOTE_ADDR,SERVER_PROTOCOL' %}{{ key }}:{{ value }}
 {% endif %}{% endfor %}
-{% for key,value in request.META.items %}{% if 'HTTP_' in key  %}{{ key }}:{{ value }}
+{% for key,value in request.META.items %}{% if 'HTTP_' in key %}{{ key }}:{{ value }}
 {% endif %}{% endfor %}
-{% for key,value in request.META.items %}{% if 'wsgi.' in key  %}{{ key }}:{{ value }}
+{% for key,value in request.META.items %}{% if 'wsgi.' in key %}{{ key }}:{{ value }}
 {% endif %}{% endfor %}
     </textarea>
     <br/>

cookbook/templatetags/custom_tags.py

@@ -5,7 +5,6 @@ import bleach
 import markdown as md
 from django_scopes import ScopeError
 from markdown.extensions.tables import TableExtension
-from bleach_allowlist import markdown_attrs, markdown_tags
 from django import template
 from django.db.models import Avg
 from django.templatetags.static import static
@@ -16,7 +15,7 @@ from cookbook.helper.mdx_attributes import MarkdownFormatExtension
 from cookbook.helper.mdx_urlize import UrlizeExtension
 from cookbook.models import Space, get_model_name
 from recipes import settings
-from recipes.settings import STATIC_URL
+from recipes.settings import STATIC_URL, PLUGINS
 
 register = template.Library()
 
@@ -46,9 +45,17 @@ def delete_url(model, pk):
 
 @register.filter()
 def markdown(value):
-    tags = markdown_tags + [
+    tags = {
+        "h1", "h2", "h3", "h4", "h5", "h6",
+        "b", "i", "strong", "em", "tt",
+        "p", "br",
+        "span", "div", "blockquote", "code", "pre", "hr",
+        "ul", "ol", "li", "dd", "dt",
+        "img",
+        "a",
+        "sub", "sup",
         'pre', 'table', 'td', 'tr', 'th', 'tbody', 'style', 'thead'
-    ]
+    }
     parsed_md = md.markdown(
         value,
         extensions=[
@@ -56,7 +63,12 @@ def markdown(value):
             UrlizeExtension(), MarkdownFormatExtension()
         ]
     )
-    markdown_attrs['*'] = markdown_attrs['*'] + ['class']
+    markdown_attrs = {
+        "*": ["id", "class"],
+        "img": ["src", "alt", "title"],
+        "a": ["href", "alt", "title"],
+    }
+
     parsed_md = parsed_md[3:] # remove outer paragraph
     parsed_md = parsed_md[:len(parsed_md)-4]
     return bleach.clean(parsed_md, tags, markdown_attrs)
@@ -132,6 +144,22 @@ def is_debug():
 def markdown_link():
     return f"{_('You can use markdown to format this field. See the ')}<a target='_blank' href='{reverse('docs_markdown')}'>{_('docs here')}</a>"
 
+@register.simple_tag
+def plugin_dropdown_nav_templates():
+    templates = []
+    for p in PLUGINS:
+        if p['nav_dropdown']:
+            templates.append(p['nav_dropdown'])
+    return templates
+
+@register.simple_tag
+def plugin_main_nav_templates():
+    templates = []
+    for p in PLUGINS:
+        if p['nav_main']:
+            templates.append(p['nav_main'])
+    return templates
+
 
 @register.simple_tag
 def bookmarklet(request):

cookbook/templatetags/theming_tags.py

@@ -16,6 +16,7 @@ def theme_url(request):
         UserPreference.DARKLY: 'themes/darkly.min.css',
         UserPreference.SUPERHERO: 'themes/superhero.min.css',
         UserPreference.TANDOOR: 'themes/tandoor.min.css',
+        UserPreference.TANDOOR_DARK: 'themes/tandoor_dark.min.css',
     }
     if request.user.userpreference.theme in themes:
         return static(themes[request.user.userpreference.theme])
@@ -26,8 +27,12 @@ def theme_url(request):
 @register.simple_tag
 def nav_color(request):
     if not request.user.is_authenticated:
-        return 'primary'
-    return request.user.userpreference.nav_color.lower()
+        return 'navbar-light bg-primary'
+
+    if request.user.userpreference.nav_color.lower() in ['light', 'warning', 'info', 'success']:
+        return f'navbar-light bg-{request.user.userpreference.nav_color.lower()}'
+    else:
+        return f'navbar-dark bg-{request.user.userpreference.nav_color.lower()}'
 
 
 @register.simple_tag

cookbook/tests/api/test_api_food.py

@@ -2,6 +2,7 @@ import json
 
 import pytest
 from django.contrib import auth
+from django.core.cache import caches
 from django.urls import reverse
 from django_scopes import scope, scopes_disabled
 from pytest_factoryboy import LazyFixture, register
@@ -28,7 +29,6 @@ if (Food.node_order_by):
 else:
     node_location = 'last-child'
 
-
 register(FoodFactory, 'obj_1', space=LazyFixture('space_1'))
 register(FoodFactory, 'obj_2', space=LazyFixture('space_1'))
 register(FoodFactory, 'obj_3', space=LazyFixture('space_2'))
@@ -475,6 +475,7 @@ def test_root_filter(obj_tree_1, obj_2, obj_3, u1_s1):
     with scope(space=obj_tree_1.space):
         # for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj
         obj_tree_1 = Food.objects.get(id=obj_tree_1.id)
+        obj_2 = Food.objects.get(id=obj_2.id)
         parent = obj_tree_1.get_parent()
 
     # should return root objects in the space (obj_1, obj_2), ignoring query filters
@@ -499,17 +500,16 @@ def test_tree_filter(obj_tree_1, obj_2, obj_3, u1_s1):
     with scope(space=obj_tree_1.space):
         # for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj
         obj_tree_1 = Food.objects.get(id=obj_tree_1.id)
+        obj_2 = Food.objects.get(id=obj_2.id)
         parent = obj_tree_1.get_parent()
         obj_2.move(parent, node_location)
         obj_2 = Food.objects.get(id=obj_2.id)
-        parent = Food.objects.get(id=parent.id)
 
-    # should return full tree starting at parent (obj_tree_1, obj_2), ignoring query filters
-    response = json.loads(
-        u1_s1.get(f'{reverse(LIST_URL)}?tree={parent.id}').content)
+    # should return full tree starting at, but excluding parent (obj_tree_1, obj_2), ignoring query filters
+    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?tree={parent.id}').content)
     assert response['count'] == 4
-    response = json.loads(u1_s1.get(
-        f'{reverse(LIST_URL)}?tree={parent.id}&query={obj_2.name[4:]}').content)
+    # filtering is ignored - should return identical results as ?tree=x
+    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?tree={parent.id}&query={obj_2.name[4:]}').content)
     assert response['count'] == 4
 
 
@@ -554,12 +554,13 @@ def test_inherit(request, obj_tree_1, field, inherit, new_val, u1_s1):
     assert (getattr(obj_tree_1, field) == new_val) == inherit
     assert (getattr(child, field) == new_val) == inherit
 
+
 # TODO add test_inherit with child_inherit
 
 
 @pytest.mark.parametrize("obj_tree_1", [
     ({'has_category': True, 'inherit': False, 'ignore_shopping': True,
-     'substitute_children': True, 'substitute_siblings': True}),
+      'substitute_children': True, 'substitute_siblings': True}),
 ], indirect=['obj_tree_1'])
 @pytest.mark.parametrize("global_reset", [True, False])
 @pytest.mark.parametrize("field", ['ignore_shopping', 'substitute_children', 'substitute_siblings', 'supermarket_category'])
@@ -599,7 +600,7 @@ def test_reset_inherit_space_fields(obj_tree_1, space_1, global_reset, field):
 
 @pytest.mark.parametrize("obj_tree_1", [
     ({'has_category': True, 'inherit': False, 'ignore_shopping': True,
-     'substitute_children': True, 'substitute_siblings': True}),
+      'substitute_children': True, 'substitute_siblings': True}),
 ], indirect=['obj_tree_1'])
 @pytest.mark.parametrize("field", ['ignore_shopping', 'substitute_children', 'substitute_siblings', 'supermarket_category'])
 def test_reset_inherit_no_food_instances(obj_tree_1, space_1, field):
@@ -613,11 +614,9 @@ def test_reset_inherit_no_food_instances(obj_tree_1, space_1, field):
         parent.reset_inheritance(space=space_1)
 
 
-def test_onhand(obj_1, u1_s1, u2_s1):
-    assert json.loads(u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
-        'food_onhand'] == False
-    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
-        'food_onhand'] == False
+def test_onhand(obj_1, u1_s1, u2_s1, space_1):
+    assert json.loads(u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] is False
+    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] is False
 
     u1_s1.patch(
         reverse(
@@ -627,13 +626,12 @@ def test_onhand(obj_1, u1_s1, u2_s1):
         {'food_onhand': True},
         content_type='application/json'
     )
-    assert json.loads(u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
-        'food_onhand'] == True
-    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
-        'food_onhand'] == False
+    assert json.loads(u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] is True
+    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] is False
 
     user1 = auth.get_user(u1_s1)
     user2 = auth.get_user(u2_s1)
     user1.userpreference.shopping_share.add(user2)
-    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
-        'food_onhand'] == True
+    caches['default'].set(f'shopping_shared_users_{space_1.id}_{user2.id}', None)
+
+    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] is True

cookbook/tests/api/test_api_property.py

@@ -0,0 +1,116 @@
+import json
+
+import pytest
+from django.contrib import auth
+from django.urls import reverse
+from django_scopes import scopes_disabled
+
+from cookbook.models import Food, MealType, PropertyType, Property
+
+LIST_URL = 'api:property-list'
+DETAIL_URL = 'api:property-detail'
+
+
+@pytest.fixture()
+def obj_1(space_1, u1_s1):
+    pt = PropertyType.objects.get_or_create(name='test_1', space=space_1)[0]
+    return Property.objects.get_or_create(property_amount=100, property_type=pt, space=space_1)[0]
+
+
+@pytest.fixture
+def obj_2(space_1, u1_s1):
+    pt = PropertyType.objects.get_or_create(name='test_2', space=space_1)[0]
+    return Property.objects.get_or_create(property_amount=100, property_type=pt, space=space_1)[0]
+
+
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 200],
+    ['a1_s1', 200],
+])
+def test_list_permission(arg, request):
+    c = request.getfixturevalue(arg[0])
+    assert c.get(reverse(LIST_URL)).status_code == arg[1]
+
+
+def test_list_space(obj_1, obj_2, u1_s1, u1_s2, space_2):
+    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)) == 2
+    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)) == 0
+
+    obj_1.space = space_2
+    obj_1.save()
+
+    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)) == 1
+    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)) == 1
+
+
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 200],
+    ['a1_s1', 200],
+    ['g1_s2', 403],
+    ['u1_s2', 404],
+    ['a1_s2', 404],
+])
+def test_update(arg, request, obj_1):
+    c = request.getfixturevalue(arg[0])
+    r = c.patch(
+        reverse(
+            DETAIL_URL,
+            args={obj_1.id}
+        ),
+        {'property_amount': 200},
+        content_type='application/json'
+    )
+    response = json.loads(r.content)
+    assert r.status_code == arg[1]
+    if r.status_code == 200:
+        assert response['property_amount'] == 200
+
+
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 201],
+    ['a1_s1', 201],
+])
+def test_add(arg, request, u1_s2, space_1):
+    with scopes_disabled():
+        pt = PropertyType.objects.get_or_create(name='test_1', space=space_1)[0]
+        c = request.getfixturevalue(arg[0])
+        r = c.post(
+            reverse(LIST_URL),
+            {'property_amount': 100, 'property_type': {'id': pt.id, 'name': pt.name}},
+            content_type='application/json'
+        )
+        response = json.loads(r.content)
+        assert r.status_code == arg[1]
+        if r.status_code == 201:
+            assert response['property_amount'] == 100
+            r = c.get(reverse(DETAIL_URL, args={response['id']}))
+            assert r.status_code == 200
+            r = u1_s2.get(reverse(DETAIL_URL, args={response['id']}))
+            assert r.status_code == 404
+
+
+def test_delete(u1_s1, u1_s2, obj_1):
+    r = u1_s2.delete(
+        reverse(
+            DETAIL_URL,
+            args={obj_1.id}
+        )
+    )
+    assert r.status_code == 404
+
+    r = u1_s1.delete(
+        reverse(
+            DETAIL_URL,
+            args={obj_1.id}
+        )
+    )
+
+    assert r.status_code == 204
+    with scopes_disabled():
+        assert MealType.objects.count() == 0

cookbook/tests/api/test_api_property_type.py

@@ -0,0 +1,132 @@
+import json
+
+import pytest
+from django.contrib import auth
+from django.urls import reverse
+from django_scopes import scopes_disabled
+
+from cookbook.models import Food, MealType, PropertyType
+
+LIST_URL = 'api:propertytype-list'
+DETAIL_URL = 'api:propertytype-detail'
+
+
+@pytest.fixture()
+def obj_1(space_1, u1_s1):
+    return PropertyType.objects.get_or_create(name='test_1', space=space_1)[0]
+
+
+@pytest.fixture
+def obj_2(space_1, u1_s1):
+    return PropertyType.objects.get_or_create(name='test_2', space=space_1)[0]
+
+
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 200],
+    ['a1_s1', 200],
+])
+def test_list_permission(arg, request):
+    c = request.getfixturevalue(arg[0])
+    assert c.get(reverse(LIST_URL)).status_code == arg[1]
+
+
+def test_list_space(obj_1, obj_2, u1_s1, u1_s2, space_2):
+    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)) == 2
+    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)) == 0
+
+    obj_1.space = space_2
+    obj_1.save()
+
+    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)) == 1
+    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)) == 1
+
+
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 200],
+    ['a1_s1', 200],
+    ['g1_s2', 403],
+    ['u1_s2', 404],
+    ['a1_s2', 404],
+])
+def test_update(arg, request, obj_1):
+    c = request.getfixturevalue(arg[0])
+    r = c.patch(
+        reverse(
+            DETAIL_URL,
+            args={obj_1.id}
+        ),
+        {'name': 'new'},
+        content_type='application/json'
+    )
+    response = json.loads(r.content)
+    assert r.status_code == arg[1]
+    if r.status_code == 200:
+        assert response['name'] == 'new'
+
+
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 201],
+    ['a1_s1', 201],
+])
+def test_add(arg, request, u1_s2):
+    c = request.getfixturevalue(arg[0])
+    r = c.post(
+        reverse(LIST_URL),
+        {'name': 'test'},
+        content_type='application/json'
+    )
+    response = json.loads(r.content)
+    assert r.status_code == arg[1]
+    if r.status_code == 201:
+        assert response['name'] == 'test'
+        r = c.get(reverse(DETAIL_URL, args={response['id']}))
+        assert r.status_code == 200
+        r = u1_s2.get(reverse(DETAIL_URL, args={response['id']}))
+        assert r.status_code == 404
+
+
+def test_add_duplicate(u1_s1, u1_s2, obj_1):
+    r = u1_s1.post(
+        reverse(LIST_URL),
+        {'name': obj_1.name},
+        content_type='application/json'
+    )
+    response = json.loads(r.content)
+    assert r.status_code == 201
+    assert response['id'] == obj_1.id
+
+    r = u1_s2.post(
+        reverse(LIST_URL),
+        {'name': obj_1.name},
+        content_type='application/json'
+    )
+    response = json.loads(r.content)
+    assert r.status_code == 201
+    assert response['id'] != obj_1.id
+
+
+def test_delete(u1_s1, u1_s2, obj_1):
+    r = u1_s2.delete(
+        reverse(
+            DETAIL_URL,
+            args={obj_1.id}
+        )
+    )
+    assert r.status_code == 404
+
+    r = u1_s1.delete(
+        reverse(
+            DETAIL_URL,
+            args={obj_1.id}
+        )
+    )
+
+    assert r.status_code == 204
+    with scopes_disabled():
+        assert MealType.objects.count() == 0

cookbook/tests/api/test_api_recipe.py

@@ -81,10 +81,10 @@ def test_share_permission(recipe_1_s1, u1_s1, u1_s2, u2_s1, a_u):
 
 @pytest.mark.parametrize("arg", [
     ['a_u', 403],
-    ['g1_s1', 200],
+    ['g1_s1', 403],
     ['u1_s1', 200],
     ['a1_s1', 200],
-    ['g1_s2', 404],
+    ['g1_s2', 403],
     ['u1_s2', 404],
     ['a1_s2', 404],
 ])
@@ -140,7 +140,7 @@ def test_update_private_recipe(u1_s1, u2_s1, recipe_1_s1):
 
 @pytest.mark.parametrize("arg", [
     ['a_u', 403],
-    ['g1_s1', 201],
+    ['g1_s1', 403],
     ['u1_s1', 201],
     ['a1_s1', 201],
 ])

cookbook/tests/api/test_api_shopping_recipe.py

@@ -48,7 +48,7 @@ def recipe(request, space_1, u1_s1):
 
 
 @pytest.mark.parametrize("arg", [
-    ['g1_s1', 204],
+    ['g1_s1', 403],
     ['u1_s1', 204],
     ['u1_s2', 404],
     ['a1_s1', 204],

cookbook/tests/api/test_api_space.py

@@ -15,9 +15,9 @@ DETAIL_URL = 'api:space-detail'
 @pytest.mark.parametrize("arg", [
     ['a_u', 403, 0],
     ['g1_s1', 403, 0],
-    ['u1_s1', 403, 0],
+    ['u1_s1', 200, 1],
     ['a1_s1', 200, 1],
-    ['a2_s1', 200, 0],
+    ['a2_s1', 200, 1],
 ])
 def test_list_permission(arg, request, space_1, a1_s1):
     space_1.created_by = auth.get_user(a1_s1)
@@ -29,16 +29,6 @@ def test_list_permission(arg, request, space_1, a1_s1):
         assert len(json.loads(result.content)) == arg[2]
 
 
-def test_list_permission_owner(u1_s1, a1_s1, space_1):
-    space_1.created_by = auth.get_user(a1_s1)
-    space_1.save()
-    assert len(json.loads(a1_s1.get(reverse(LIST_URL)).content)) == 1
-    assert u1_s1.get(reverse(LIST_URL)).status_code == 403
-    space_1.created_by = auth.get_user(u1_s1)
-    space_1.save()
-    assert u1_s1.get(reverse(LIST_URL)).status_code == 403
-
-
 @pytest.mark.parametrize("arg", [
     ['a_u', 403],
     ['g1_s1', 403],

cookbook/tests/api/test_api_supermarket.py

@@ -48,7 +48,7 @@ def test_list_filter(obj_1, obj_2, u1_s1):
     assert r.status_code == 200
     response = json.loads(r.content)
     assert len(response) == 2
-    assert response[0]['name'] == obj_1.name
+    # assert response[0]['name'] == obj_1.name   # assuming an order when it's not always valid
 
     response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?limit=1').content)
     assert len(response) == 1

cookbook/tests/api/test_api_unit_conversion.py

@@ -0,0 +1,163 @@
+import json
+
+import pytest
+from django.contrib import auth
+from django.urls import reverse
+from django_scopes import scopes_disabled
+
+from cookbook.models import Food, MealType, UnitConversion
+from cookbook.tests.conftest import get_random_food, get_random_unit
+
+LIST_URL = 'api:unitconversion-list'
+DETAIL_URL = 'api:unitconversion-detail'
+
+
+@pytest.fixture()
+def obj_1(space_1, u1_s1):
+    return UnitConversion.objects.get_or_create(
+        food=get_random_food(space_1, u1_s1),
+        base_amount=100,
+        base_unit=get_random_unit(space_1, u1_s1),
+        converted_amount=100,
+        converted_unit=get_random_unit(space_1, u1_s1),
+        created_by=auth.get_user(u1_s1),
+        space=space_1
+    )[0]
+
+
+@pytest.fixture
+def obj_2(space_1, u1_s1):
+    return UnitConversion.objects.get_or_create(
+        food=get_random_food(space_1, u1_s1),
+        base_amount=100,
+        base_unit=get_random_unit(space_1, u1_s1),
+        converted_amount=100,
+        converted_unit=get_random_unit(space_1, u1_s1),
+        created_by=auth.get_user(u1_s1),
+        space=space_1
+    )[0]
+
+
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 200],
+    ['a1_s1', 200],
+])
+def test_list_permission(arg, request):
+    c = request.getfixturevalue(arg[0])
+    assert c.get(reverse(LIST_URL)).status_code == arg[1]
+
+
+def test_list_space(obj_1, obj_2, u1_s1, u1_s2, space_2):
+    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)) == 2
+    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)) == 0
+
+    obj_1.space = space_2
+    obj_1.save()
+
+    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)) == 1
+    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)) == 1
+
+
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 200],
+    ['a1_s1', 200],
+    ['g1_s2', 403],
+    ['u1_s2', 404],
+    ['a1_s2', 404],
+])
+def test_update(arg, request, obj_1):
+    c = request.getfixturevalue(arg[0])
+    r = c.patch(
+        reverse(
+            DETAIL_URL,
+            args={obj_1.id}
+        ),
+        {'base_amount': 1000},
+        content_type='application/json'
+    )
+    response = json.loads(r.content)
+    assert r.status_code == arg[1]
+    if r.status_code == 200:
+        assert response['base_amount'] == 1000
+
+
+@pytest.mark.parametrize("arg", [
+    ['a_u', 403],
+    ['g1_s1', 403],
+    ['u1_s1', 201],
+    ['a1_s1', 201],
+])
+def test_add(arg, request, u1_s2, space_1, u1_s1):
+    with scopes_disabled():
+        c = request.getfixturevalue(arg[0])
+        random_unit_1 = get_random_unit(space_1, u1_s1)
+        random_unit_2 = get_random_unit(space_1, u1_s1)
+        random_food_1 = get_random_unit(space_1, u1_s1)
+        r = c.post(
+            reverse(LIST_URL),
+            {
+                'food': {'id': random_food_1.id, 'name': random_food_1.name},
+                'base_amount': 100,
+                'base_unit': {'id': random_unit_1.id, 'name': random_unit_1.name},
+                'converted_amount': 100,
+                'converted_unit': {'id': random_unit_2.id, 'name': random_unit_2.name}
+
+            },
+            content_type='application/json'
+        )
+
+        response = json.loads(r.content)
+        print(response)
+        assert r.status_code == arg[1]
+        if r.status_code == 201:
+            assert response['base_amount'] == 100
+            r = c.get(reverse(DETAIL_URL, args={response['id']}))
+            assert r.status_code == 200
+            r = u1_s2.get(reverse(DETAIL_URL, args={response['id']}))
+            assert r.status_code == 404
+
+
+# TODO make name in space unique
+# def test_add_duplicate(u1_s1, u1_s2, obj_1):
+#     r = u1_s1.post(
+#         reverse(LIST_URL),
+#         {'name': obj_1.name},
+#         content_type='application/json'
+#     )
+#     response = json.loads(r.content)
+#     assert r.status_code == 201
+#     assert response['id'] == obj_1.id
+#
+#     r = u1_s2.post(
+#         reverse(LIST_URL),
+#         {'name': obj_1.name},
+#         content_type='application/json'
+#     )
+#     response = json.loads(r.content)
+#     assert r.status_code == 201
+#     assert response['id'] != obj_1.id
+
+
+def test_delete(u1_s1, u1_s2, obj_1):
+    r = u1_s2.delete(
+        reverse(
+            DETAIL_URL,
+            args={obj_1.id}
+        )
+    )
+    assert r.status_code == 404
+
+    r = u1_s1.delete(
+        reverse(
+            DETAIL_URL,
+            args={obj_1.id}
+        )
+    )
+
+    assert r.status_code == 204
+    with scopes_disabled():
+        assert MealType.objects.count() == 0

cookbook/tests/api/test_api_userspace.py

@@ -27,7 +27,7 @@ def test_list_permission(arg, request, space_1, g1_s1, u1_s1, a1_s1):
     result = c.get(reverse(LIST_URL))
     assert result.status_code == arg[1]
     if arg[1] == 200:
-        assert len(json.loads(result.content)) == arg[2]
+        assert len(json.loads(result.content)['results']) == arg[2]
 
 
 @pytest.mark.parametrize("arg", [

cookbook/tests/conftest.py

@@ -13,6 +13,8 @@ from cookbook.tests.factories import SpaceFactory, UserFactory
 
 register(SpaceFactory, 'space_1')
 register(SpaceFactory, 'space_2')
+
+
 # register(FoodFactory, space=LazyFixture('space_2'))
 # TODO refactor clients to be factories
 
@@ -141,7 +143,7 @@ def validate_recipe(expected, recipe):
         for k in expected_lists[key]:
             try:
                 print('comparing ', any([dict_compare(k, i)
-                      for i in target_lists[key]]))
+                                         for i in target_lists[key]]))
                 assert any([dict_compare(k, i) for i in target_lists[key]])
             except AssertionError:
                 for result in [dict_compare(k, i, details=True) for i in target_lists[key]]:
@@ -169,7 +171,6 @@ def dict_compare(d1, d2, details=False):
 
 
 def transpose(text, number=2):
-
     # select random token
     tokens = text.split()
     positions = list(i for i, e in enumerate(tokens) if len(e) > 1)
@@ -212,6 +213,14 @@ def ext_recipe_1_s1(space_1, u1_s1):
     return r
 
 
+def get_random_food(space_1, u1_s1):
+    return Food.objects.get_or_create(name=str(uuid.uuid4()), space=space_1)[0]
+
+
+def get_random_unit(space_1, u1_s1):
+    return Unit.objects.get_or_create(name=str(uuid.uuid4()), space=space_1)[0]
+
+
 # ---------------------- USER FIXTURES -----------------------
 # maybe better with factories but this is very explict so ...
 

cookbook/tests/factories/__init__.py

@@ -334,6 +334,8 @@ class StepFactory(factory.django.DjangoModelFactory):
     order = factory.Sequence(lambda x: x)
     # file = models.ForeignKey('UserFile', on_delete=models.PROTECT, null=True, blank=True)
     show_as_header = True
+    # TODO: need to update to fetch from User's preferences
+    show_ingredients_table = True
     step_recipe__has_recipe = False
     ingredients__food_recipe_count = 0
     space = factory.SubFactory(SpaceFactory)

cookbook/tests/other/test_food_property.py

@@ -0,0 +1,129 @@
+from django.contrib import auth
+from django.core.cache import caches
+from django_scopes import scopes_disabled
+from decimal import Decimal
+
+from cookbook.helper.cache_helper import CacheHelper
+from cookbook.helper.property_helper import FoodPropertyHelper
+from cookbook.models import Unit, Food, PropertyType, Property, Recipe, Step, UnitConversion, Property
+
+
+def test_food_property(space_1, space_2, u1_s1):
+    with scopes_disabled():
+        unit_gram = Unit.objects.create(name='gram', base_unit='g', space=space_1)
+        unit_kg = Unit.objects.create(name='kg', base_unit='kg', space=space_1)
+        unit_pcs = Unit.objects.create(name='pcs', base_unit='', space=space_1)
+        unit_floz1 = Unit.objects.create(name='fl. oz 1', base_unit='imperial_fluid_ounce', space=space_1)  # US and UK use different volume systems (US vs imperial)
+        unit_floz2 = Unit.objects.create(name='fl. oz 2', base_unit='fluid_ounce', space=space_1)
+        unit_fantasy = Unit.objects.create(name='Fantasy Unit', base_unit='', space=space_1)
+
+        food_1 = Food.objects.create(name='food_1', space=space_1, properties_food_unit=unit_gram, properties_food_amount=100)
+        food_2 = Food.objects.create(name='food_2', space=space_1, properties_food_unit=unit_gram, properties_food_amount=100)
+
+        property_fat = PropertyType.objects.create(name='property_fat', space=space_1)
+        property_calories = PropertyType.objects.create(name='property_calories', space=space_1)
+        property_nuts = PropertyType.objects.create(name='property_nuts', space=space_1)
+        property_price = PropertyType.objects.create(name='property_price', space=space_1)
+
+        food_1_property_fat = Property.objects.create(property_amount=50, property_type=property_fat, space=space_1)
+        food_1_property_nuts = Property.objects.create(property_amount=1, property_type=property_nuts, space=space_1)
+        food_1_property_price = Property.objects.create(property_amount=7.50, property_type=property_price, space=space_1)
+        food_1.properties.add(food_1_property_fat, food_1_property_nuts, food_1_property_price)
+
+        food_2_property_fat = Property.objects.create(property_amount=25, property_type=property_fat, space=space_1)
+        food_2_property_nuts = Property.objects.create(property_amount=0, property_type=property_nuts, space=space_1)
+        food_2_property_price = Property.objects.create(property_amount=2.50, property_type=property_price, space=space_1)
+        food_2.properties.add(food_2_property_fat, food_2_property_nuts, food_2_property_price)
+
+        print('\n----------- TEST PROPERTY - PROPERTY CALCULATION MULTI STEP IDENTICAL UNIT ---------------')
+        recipe_1 = Recipe.objects.create(name='recipe_1', waiting_time=0, working_time=0, space=space_1, created_by=auth.get_user(u1_s1))
+
+        step_1 = Step.objects.create(instruction='instruction_step_1', space=space_1)
+        step_1.ingredients.create(amount=500, unit=unit_gram, food=food_1, space=space_1)
+        step_1.ingredients.create(amount=1000, unit=unit_gram, food=food_2, space=space_1)
+        recipe_1.steps.add(step_1)
+
+        step_2 = Step.objects.create(instruction='instruction_step_1', space=space_1)
+        step_2.ingredients.create(amount=50, unit=unit_gram, food=food_1, space=space_1)
+        recipe_1.steps.add(step_2)
+
+        property_values = FoodPropertyHelper(space_1).calculate_recipe_properties(recipe_1)
+
+        assert property_values[property_fat.id]['name'] == property_fat.name
+        assert abs(property_values[property_fat.id]['total_value'] - Decimal(525)) < 0.0001
+        assert abs(property_values[property_fat.id]['food_values'][food_1.id]['value'] - Decimal(275)) < 0.0001
+        assert abs(property_values[property_fat.id]['food_values'][food_2.id]['value'] - Decimal(250)) < 0.0001
+
+        print('\n----------- TEST PROPERTY - PROPERTY CALCULATION NO POSSIBLE CONVERSION ---------------')
+        recipe_2 = Recipe.objects.create(name='recipe_2', waiting_time=0, working_time=0, space=space_1, created_by=auth.get_user(u1_s1))
+
+        step_1 = Step.objects.create(instruction='instruction_step_1', space=space_1)
+        step_1.ingredients.create(amount=5, unit=unit_pcs, food=food_1, space=space_1)
+        step_1.ingredients.create(amount=10, unit=unit_pcs, food=food_2, space=space_1)
+        recipe_2.steps.add(step_1)
+
+        property_values = FoodPropertyHelper(space_1).calculate_recipe_properties(recipe_2)
+
+        assert property_values[property_fat.id]['name'] == property_fat.name
+        assert abs(property_values[property_fat.id]['total_value']) < 0.0001
+        assert abs(property_values[property_fat.id]['food_values'][food_1.id]['value']) < 0.0001
+
+        print('\n----------- TEST PROPERTY - PROPERTY CALCULATION UNIT CONVERSION ---------------')
+        uc1 = UnitConversion.objects.create(
+            base_amount=100,
+            base_unit=unit_gram,
+            converted_amount=1,
+            converted_unit=unit_pcs,
+            space=space_1,
+            created_by=auth.get_user(u1_s1),
+        )
+
+        property_values = FoodPropertyHelper(space_1).calculate_recipe_properties(recipe_2)
+
+        assert property_values[property_fat.id]['name'] == property_fat.name
+        assert abs(property_values[property_fat.id]['total_value'] - Decimal(500)) < 0.0001
+        assert abs(property_values[property_fat.id]['food_values'][food_1.id]['value'] - Decimal(250)) < 0.0001
+        assert abs(property_values[property_fat.id]['food_values'][food_2.id]['value'] - Decimal(250)) < 0.0001
+
+        print('\n----------- TEST PROPERTY - PROPERTY CALCULATION UNIT CONVERSION MULTIPLE ---------------')
+
+        uc1.delete()
+        uc1 = UnitConversion.objects.create(
+            base_amount=0.1,
+            base_unit=unit_kg,
+            converted_amount=1,
+            converted_unit=unit_pcs,
+            space=space_1,
+            created_by=auth.get_user(u1_s1),
+        )
+
+        property_values = FoodPropertyHelper(space_1).calculate_recipe_properties(recipe_2)
+
+        assert property_values[property_fat.id]['name'] == property_fat.name
+        assert abs(property_values[property_fat.id]['total_value'] - Decimal(500)) < 0.0001
+        assert abs(property_values[property_fat.id]['food_values'][food_1.id]['value'] - Decimal(250)) < 0.0001
+        assert abs(property_values[property_fat.id]['food_values'][food_2.id]['value'] - Decimal(250)) < 0.0001
+
+        print('\n----------- TEST PROPERTY - MISSING FOOD REFERENCE AMOUNT ---------------')
+        food_1.properties_food_unit = None
+        food_1.save()
+        food_2.properties_food_amount = 0
+        food_2.save()
+
+        property_values = FoodPropertyHelper(space_1).calculate_recipe_properties(recipe_1)
+
+        assert property_values[property_fat.id]['name'] == property_fat.name
+        assert property_values[property_fat.id]['total_value'] == 0
+
+        print('\n----------- TEST PROPERTY - SPACE SEPARATION ---------------')
+
+        property_fat.space = space_2
+        property_fat.save()
+
+        caches['default'].delete(CacheHelper(space_1).PROPERTY_TYPE_CACHE_KEY)  # clear cache as objects won't change space in reality
+
+        property_values = FoodPropertyHelper(space_1).calculate_recipe_properties(recipe_2)
+
+        assert property_fat.id not in property_values
+
+

cookbook/tests/other/test_unit_conversion.py

@@ -0,0 +1,187 @@
+from _decimal import Decimal
+
+from django.contrib import auth
+from django_scopes import scopes_disabled
+
+from cookbook.helper.unit_conversion_helper import UnitConversionHelper, ConversionException
+from cookbook.models import Unit, Food, Ingredient, UnitConversion
+
+
+def test_base_converter(space_1):
+    uch = UnitConversionHelper(space_1)
+    assert abs(uch.convert_from_to('g', 'kg', 1234) - Decimal(1.234)) < 0.0001
+    assert abs(uch.convert_from_to('kg', 'pound', 2) - Decimal(4.40924)) < 0.00001
+    assert abs(uch.convert_from_to('kg', 'g', 1) - Decimal(1000)) < 0.00001
+    assert abs(uch.convert_from_to('imperial_gallon', 'gallon', 1000) - Decimal(1200.95104)) < 0.00001
+    assert abs(uch.convert_from_to('tbsp', 'ml', 20) - Decimal(295.73549)) < 0.00001
+
+    try:
+        assert uch.convert_from_to('kg', 'tbsp', 2) == 1234
+        assert False
+    except ConversionException:
+        assert True
+
+    try:
+        assert uch.convert_from_to('kg', 'g2', 2) == 1234
+        assert False
+    except ConversionException:
+        assert True
+
+
+def test_unit_conversions(space_1, space_2, u1_s1):
+    with scopes_disabled():
+        uch = UnitConversionHelper(space_1)
+        uch_space_2 = UnitConversionHelper(space_2)
+
+        unit_gram = Unit.objects.create(name='gram', base_unit='g', space=space_1)
+        unit_kg = Unit.objects.create(name='kg', base_unit='kg', space=space_1)
+        unit_pcs = Unit.objects.create(name='pcs', base_unit='', space=space_1)
+        unit_floz1 = Unit.objects.create(name='fl. oz 1', base_unit='imperial_fluid_ounce', space=space_1)  # US and UK use different volume systems (US vs imperial)
+        unit_floz2 = Unit.objects.create(name='fl. oz 2', base_unit='fluid_ounce', space=space_1)
+        unit_fantasy = Unit.objects.create(name='Fantasy Unit', base_unit='', space=space_1)
+
+        food_1 = Food.objects.create(name='Test Food 1', space=space_1)
+        food_2 = Food.objects.create(name='Test Food 2', space=space_1)
+
+        print('\n----------- TEST BASE CONVERSIONS - GRAM ---------------')
+        ingredient_food_1_gram = Ingredient.objects.create(
+            food=food_1,
+            unit=unit_gram,
+            amount=100,
+            space=space_1,
+        )
+
+        conversions = uch.get_conversions(ingredient_food_1_gram)
+        print(conversions)
+        assert len(conversions) == 2
+        assert next(x for x in conversions if x.unit == unit_kg) is not None
+        assert abs(next(x for x in conversions if x.unit == unit_kg).amount - Decimal(0.1)) < 0.0001
+
+        print('\n----------- TEST BASE CONVERSIONS - VOLUMES ---------------')
+
+        ingredient_food_1_floz1 = Ingredient.objects.create(
+            food=food_1,
+            unit=unit_floz1,
+            amount=100,
+            space=space_1,
+        )
+
+        conversions = uch.get_conversions(ingredient_food_1_floz1)
+        assert len(conversions) == 2
+        assert next(x for x in conversions if x.unit == unit_floz2) is not None
+        assert abs(next(x for x in conversions if x.unit == unit_floz2).amount - Decimal(96.07599404038842)) < 0.001  # TODO validate value
+
+        print(conversions)
+
+        unit_pint = Unit.objects.create(name='pint', base_unit='pint', space=space_1)
+        conversions = uch.get_conversions(ingredient_food_1_floz1)
+        assert len(conversions) == 3
+        assert next(x for x in conversions if x.unit == unit_pint) is not None
+        assert abs(next(x for x in conversions if x.unit == unit_pint).amount - Decimal(6.004749627524276)) < 0.001  # TODO validate value
+
+        print(conversions)
+
+        print('\n----------- TEST BASE CUSTOM CONVERSION - TO CUSTOM CONVERSION ---------------')
+        UnitConversion.objects.create(
+            base_amount=1000,
+            base_unit=unit_gram,
+            converted_amount=1337,
+            converted_unit=unit_fantasy,
+            space=space_1,
+            created_by=auth.get_user(u1_s1),
+        )
+        conversions = uch.get_conversions(ingredient_food_1_gram)
+
+        assert len(conversions) == 3
+        assert next(x for x in conversions if x.unit == unit_fantasy) is not None
+        assert abs(next(x for x in conversions if x.unit == unit_fantasy).amount - Decimal('133.700')) < 0.001  # TODO validate value
+
+        print(conversions)
+
+        print('\n----------- TEST CUSTOM CONVERSION - NO PCS ---------------')
+        ingredient_food_1_pcs = Ingredient.objects.create(
+            food=food_1,
+            unit=unit_pcs,
+            amount=5,
+            space=space_1,
+        )
+
+        ingredient_food_2_pcs = Ingredient.objects.create(
+            food=food_2,
+            unit=unit_pcs,
+            amount=5,
+            space=space_1,
+        )
+
+        assert len(uch.get_conversions(ingredient_food_1_pcs)) == 1
+        assert len(uch.get_conversions(ingredient_food_2_pcs)) == 1
+        print(uch.get_conversions(ingredient_food_1_pcs))
+        print(uch.get_conversions(ingredient_food_2_pcs))
+
+        print('\n----------- TEST CUSTOM CONVERSION - PCS TO MULTIPLE BASE ---------------')
+        uc1 = UnitConversion.objects.create(
+            base_amount=1,
+            base_unit=unit_pcs,
+            converted_amount=200,
+            converted_unit=unit_gram,
+            food=food_1,
+            space=space_1,
+            created_by=auth.get_user(u1_s1),
+        )
+
+        conversions = uch.get_conversions(ingredient_food_1_pcs)
+        assert len(conversions) == 3
+        assert abs(next(x for x in conversions if x.unit == unit_gram).amount - Decimal(1000)) < 0.0001
+        assert abs(next(x for x in conversions if x.unit == unit_kg).amount - Decimal(1)) < 0.0001
+        print(conversions)
+
+        assert len(uch.get_conversions(ingredient_food_2_pcs)) == 1
+        print(uch.get_conversions(ingredient_food_2_pcs))
+
+        print('\n----------- TEST CUSTOM CONVERSION - CONVERT MULTI STEP ---------------')
+
+        # TODO add test for multi step conversion ... do I even do or want to support this ?
+
+        print('\n----------- TEST CUSTOM CONVERSION - REVERSE CONVERSION ---------------')
+        uc2 = UnitConversion.objects.create(
+            base_amount=200,
+            base_unit=unit_gram,
+            converted_amount=1,
+            converted_unit=unit_pcs,
+            food=food_2,
+            space=space_1,
+            created_by=auth.get_user(u1_s1),
+        )
+
+        conversions = uch.get_conversions(ingredient_food_1_pcs)
+        assert len(conversions) == 3
+        assert abs(next(x for x in conversions if x.unit == unit_gram).amount - Decimal(1000)) < 0.0001
+        assert abs(next(x for x in conversions if x.unit == unit_kg).amount - Decimal(1)) < 0.0001
+        print(conversions)
+
+        conversions = uch.get_conversions(ingredient_food_2_pcs)
+        assert len(conversions) == 3
+        assert abs(next(x for x in conversions if x.unit == unit_gram).amount - Decimal(1000)) < 0.0001
+        assert abs(next(x for x in conversions if x.unit == unit_kg).amount - Decimal(1)) < 0.0001
+        print(conversions)
+
+        print('\n----------- TEST SPACE SEPARATION ---------------')
+        uc2.space = space_2
+        uc2.save()
+
+        conversions = uch.get_conversions(ingredient_food_2_pcs)
+        assert len(conversions) == 1
+        print(conversions)
+
+        conversions = uch_space_2.get_conversions(ingredient_food_1_gram)
+        assert len(conversions) == 1
+        assert not any(x for x in conversions if x.unit == unit_kg)
+        print(conversions)
+
+        unit_kg_space_2 = Unit.objects.create(name='kg', base_unit='kg', space=space_2)
+        conversions = uch_space_2.get_conversions(ingredient_food_1_gram)
+        assert len(conversions) == 2
+        assert not any(x for x in conversions if x.unit == unit_kg)
+        assert next(x for x in conversions if x.unit == unit_kg_space_2) is not None
+        assert abs(next(x for x in conversions if x.unit == unit_kg_space_2).amount - Decimal(0.1)) < 0.0001
+        print(conversions)

cookbook/urls.py

@@ -7,14 +7,14 @@ from rest_framework.schemas import get_schema_view
 
 from cookbook.helper import dal
 from recipes.settings import DEBUG, PLUGINS
-from recipes.version import VERSION_NUMBER
+from cookbook.version_info import TANDOOR_VERSION
 
 from .models import (Automation, Comment, CustomFilter, Food, InviteLink, Keyword, MealPlan, Recipe,
                      RecipeBook, RecipeBookEntry, RecipeImport, ShoppingList, Step, Storage,
                      Supermarket, SupermarketCategory, Sync, SyncLog, Unit, UserFile,
-                     get_model_name, UserSpace, Space)
+                     get_model_name, UserSpace, Space, PropertyType, UnitConversion)
 from .views import api, data, delete, edit, import_export, lists, new, telegram, views
-from .views.api import CustomAuthToken
+from .views.api import CustomAuthToken, ImportOpenData
 
 # extend DRF default router class to allow including additional routers
 class DefaultRouter(routers.DefaultRouter):
@@ -36,10 +36,14 @@ router.register(r'ingredient', api.IngredientViewSet)
 router.register(r'invite-link', api.InviteLinkViewSet)
 router.register(r'keyword', api.KeywordViewSet)
 router.register(r'meal-plan', api.MealPlanViewSet)
+router.register(r'auto-plan', api.AutoPlanViewSet, basename='auto-plan')
 router.register(r'meal-type', api.MealTypeViewSet)
 router.register(r'recipe', api.RecipeViewSet)
 router.register(r'recipe-book', api.RecipeBookViewSet)
 router.register(r'recipe-book-entry', api.RecipeBookEntryViewSet)
+router.register(r'unit-conversion', api.UnitConversionViewSet)
+router.register(r'food-property-type', api.PropertyTypeViewSet)
+router.register(r'food-property', api.PropertyViewSet)
 router.register(r'shopping-list', api.ShoppingListViewSet)
 router.register(r'shopping-list-entry', api.ShoppingListEntryViewSet)
 router.register(r'shopping-list-recipe', api.ShoppingListRecipeViewSet)
@@ -145,12 +149,13 @@ urlpatterns = [
     path('docs/search/', views.search_info, name='docs_search'),
     path('docs/api/', views.api_info, name='docs_api'),
 
-    path('openapi/', get_schema_view(title="Django Recipes", version=VERSION_NUMBER, public=True,
+    path('openapi/', get_schema_view(title="Django Recipes", version=TANDOOR_VERSION, public=True,
                                      permission_classes=(permissions.AllowAny,)), name='openapi-schema'),
 
     path('api/', include((router.urls, 'api'))),
     path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),
     path('api-token-auth/', CustomAuthToken.as_view()),
+    path('api-import-open-data/', ImportOpenData.as_view(), name='api_import_open_data'),
 
     path('offline/', views.offline, name='view_offline'),
 
@@ -201,7 +206,7 @@ for m in generic_models:
             )
         )
 
-vue_models = [Food, Keyword, Unit, Supermarket, SupermarketCategory, Automation, UserFile, Step, CustomFilter]
+vue_models = [Food, Keyword, Unit, Supermarket, SupermarketCategory, Automation, UserFile, Step, CustomFilter, UnitConversion, PropertyType]
 for m in vue_models:
     py_name = get_model_name(m)
     url_name = py_name.replace('_', '-')

cookbook/version_info.py

@@ -0,0 +1,3 @@
+TANDOOR_VERSION = ""
+TANDOOR_REF = ""
+VERSION_INFO = []

cookbook/views/api.py

@@ -1,7 +1,9 @@
+import datetime
 import io
 import json
 import mimetypes
 import pathlib
+import random
 import re
 import threading
 import traceback
@@ -19,11 +21,13 @@ from annoying.functions import get_object_or_None
 from django.contrib import messages
 from django.contrib.auth.models import Group, User
 from django.contrib.postgres.search import TrigramSimilarity
+from django.core.cache import caches
 from django.core.exceptions import FieldError, ValidationError
 from django.core.files import File
 from django.db.models import Case, Count, Exists, OuterRef, ProtectedError, Q, Subquery, Value, When, Avg, Max
 from django.db.models.fields.related import ForeignObjectRel
 from django.db.models.functions import Coalesce, Lower
+from django.db.models.signals import post_save
 from django.http import FileResponse, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
@@ -44,6 +48,7 @@ from rest_framework.parsers import MultiPartParser
 from rest_framework.renderers import JSONRenderer, TemplateHTMLRenderer
 from rest_framework.response import Response
 from rest_framework.throttling import AnonRateThrottle
+from rest_framework.views import APIView
 from rest_framework.viewsets import ViewSetMixin
 from treebeard.exceptions import InvalidMoveToDescendant, InvalidPosition, PathOverflow
 
@@ -52,10 +57,13 @@ from cookbook.helper import recipe_url_import as helper
 from cookbook.helper.HelperFunctions import str2bool
 from cookbook.helper.image_processing import handle_image
 from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.helper.open_data_importer import OpenDataImporter
 from cookbook.helper.permission_helper import (CustomIsAdmin, CustomIsOwner,
                                                CustomIsOwnerReadOnly, CustomIsShared,
                                                CustomIsSpaceOwner, CustomIsUser, group_required,
-                                               is_space_owner, switch_user_active_space, above_space_limit, CustomRecipePermission, CustomUserPermission, CustomTokenHasReadWriteScope, CustomTokenHasScope, has_group_permission)
+                                               is_space_owner, switch_user_active_space, above_space_limit,
+                                               CustomRecipePermission, CustomUserPermission,
+                                               CustomTokenHasReadWriteScope, CustomTokenHasScope, has_group_permission, IsReadOnlyDRF)
 from cookbook.helper.recipe_search import RecipeFacet, RecipeSearch
 from cookbook.helper.recipe_url_import import get_from_youtube_scraper, get_images_from_soup, clean_dict
 from cookbook.helper.scrapers.scrapers import text_scraper
@@ -65,7 +73,7 @@ from cookbook.models import (Automation, BookmarkletImport, CookLog, CustomFilte
                              MealType, Recipe, RecipeBook, RecipeBookEntry, ShareLink, ShoppingList,
                              ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
                              Supermarket, SupermarketCategory, SupermarketCategoryRelation, Sync,
-                             SyncLog, Unit, UserFile, UserPreference, UserSpace, ViewLog)
+                             SyncLog, Unit, UserFile, UserPreference, UserSpace, ViewLog, UnitConversion, PropertyType, Property)
 from cookbook.provider.dropbox import Dropbox
 from cookbook.provider.local import Local
 from cookbook.provider.nextcloud import Nextcloud
@@ -88,7 +96,9 @@ from cookbook.serializer import (AutomationSerializer, BookmarkletImportListSeri
                                  SupermarketCategorySerializer, SupermarketSerializer,
                                  SyncLogSerializer, SyncSerializer, UnitSerializer,
                                  UserFileSerializer, UserSerializer, UserPreferenceSerializer,
-                                 UserSpaceSerializer, ViewLogSerializer, AccessTokenSerializer, FoodSimpleSerializer, RecipeExportSerializer)
+                                 UserSpaceSerializer, ViewLogSerializer, AccessTokenSerializer, FoodSimpleSerializer,
+                                 RecipeExportSerializer, UnitConversionSerializer, PropertyTypeSerializer,
+                                 PropertySerializer, AutoMealPlanSerializer)
 from cookbook.views.import_export import get_integration
 from recipes import settings
 
@@ -166,14 +176,17 @@ class FuzzyFilterMixin(ViewSetMixin, ExtendedRecipeMixin):
     def get_queryset(self):
         self.queryset = self.queryset.filter(space=self.request.space).order_by(Lower('name').asc())
         query = self.request.query_params.get('query', None)
-        fuzzy = self.request.user.searchpreference.lookup or any([self.model.__name__.lower() in x for x in
-                                                                  self.request.user.searchpreference.trigram.values_list(
-                                                                      'field', flat=True)])
+        if self.request.user.is_authenticated:
+            fuzzy = self.request.user.searchpreference.lookup or any([self.model.__name__.lower() in x for x in
+                                                                      self.request.user.searchpreference.trigram.values_list(
+                                                                          'field', flat=True)])
+        else:
+            fuzzy = True
 
         if query is not None and query not in ["''", '']:
-            if fuzzy and (settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']):
-                if any([self.model.__name__.lower() in x for x in
-                        self.request.user.searchpreference.unaccent.values_list('field', flat=True)]):
+            if fuzzy and (settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
+                                                                      'django.db.backends.postgresql']):
+                if self.request.user.is_authenticated and any([self.model.__name__.lower() in x for x in self.request.user.searchpreference.unaccent.values_list('field', flat=True)]):
                     self.queryset = self.queryset.annotate(trigram=TrigramSimilarity('name__unaccent', query))
                 else:
                     self.queryset = self.queryset.annotate(trigram=TrigramSimilarity('name', query))
@@ -181,14 +194,13 @@ class FuzzyFilterMixin(ViewSetMixin, ExtendedRecipeMixin):
             else:
                 # TODO have this check unaccent search settings or other search preferences?
                 filter = Q(name__icontains=query)
-                if any([self.model.__name__.lower() in x for x in
-                        self.request.user.searchpreference.unaccent.values_list('field', flat=True)]):
-                    filter |= Q(name__unaccent__icontains=query)
+                if self.request.user.is_authenticated:
+                    if any([self.model.__name__.lower() in x for x in self.request.user.searchpreference.unaccent.values_list('field', flat=True)]):
+                        filter |= Q(name__unaccent__icontains=query)
 
                 self.queryset = (
-                    self.queryset
-                    .annotate(starts=Case(When(name__istartswith=query, then=(Value(100))),
-                                          default=Value(0)))  # put exact matches at the top of the result set
+                    self.queryset.annotate(starts=Case(When(name__istartswith=query, then=(Value(100))),
+                                                       default=Value(0)))  # put exact matches at the top of the result set
                     .filter(filter).order_by('-starts', Lower('name').asc())
                 )
 
@@ -243,6 +255,9 @@ class MergeMixin(ViewSetMixin):
                 isTree = False
 
             try:
+                if isinstance(source, Food):
+                    source.properties.remove()
+
                 for link in [field for field in source._meta.get_fields() if issubclass(type(field), ForeignObjectRel)]:
                     linkManager = getattr(source, link.get_accessor_name())
                     related = linkManager.all()
@@ -272,6 +287,7 @@ class MergeMixin(ViewSetMixin):
                 source.delete()
                 return Response(content, status=status.HTTP_200_OK)
             except Exception:
+                traceback.print_exc()
                 content = {'error': True,
                            'msg': _(f'An error occurred attempting to merge {source.name} with {target.name}')}
                 return Response(content, status=status.HTTP_400_BAD_REQUEST)
@@ -390,11 +406,11 @@ class GroupViewSet(viewsets.ModelViewSet):
 class SpaceViewSet(viewsets.ModelViewSet):
     queryset = Space.objects
     serializer_class = SpaceSerializer
-    permission_classes = [CustomIsOwner & CustomIsAdmin & CustomTokenHasReadWriteScope]
+    permission_classes = [IsReadOnlyDRF & CustomIsUser | CustomIsOwner & CustomIsAdmin & CustomTokenHasReadWriteScope]
     http_method_names = ['get', 'patch']
 
     def get_queryset(self):
-        return self.queryset.filter(id=self.request.space.id, created_by=self.request.user)
+        return self.queryset.filter(id=self.request.space.id)
 
 
 class UserSpaceViewSet(viewsets.ModelViewSet):
@@ -402,6 +418,7 @@ class UserSpaceViewSet(viewsets.ModelViewSet):
     serializer_class = UserSpaceSerializer
     permission_classes = [(CustomIsSpaceOwner | CustomIsOwnerReadOnly) & CustomTokenHasReadWriteScope]
     http_method_names = ['get', 'patch', 'delete']
+    pagination_class = DefaultPagination
 
     def destroy(self, request, *args, **kwargs):
         if request.space.created_by == UserSpace.objects.get(pk=kwargs['pk']).user:
@@ -409,6 +426,10 @@ class UserSpaceViewSet(viewsets.ModelViewSet):
         return super().destroy(request, *args, **kwargs)
 
     def get_queryset(self):
+        internal_note = self.request.query_params.get('internal_note', None)
+        if internal_note is not None:
+            self.queryset = self.queryset.filter(internal_note=internal_note)
+
         if is_space_owner(self.request.user, self.request.space):
             return self.queryset.filter(space=self.request.space)
         else:
@@ -522,8 +543,20 @@ class FoodViewSet(viewsets.ModelViewSet, TreeMixin):
     pagination_class = DefaultPagination
 
     def get_queryset(self):
-        self.request._shared_users = [x.id for x in list(self.request.user.get_shopping_share())] + [
-            self.request.user.id]
+        shared_users = []
+        if c := caches['default'].get(
+                f'shopping_shared_users_{self.request.space.id}_{self.request.user.id}', None):
+            shared_users = c
+        else:
+            try:
+                shared_users = [x.id for x in list(self.request.user.get_shopping_share())] + [
+                    self.request.user.id]
+                caches['default'].set(
+                    f'shopping_shared_users_{self.request.space.id}_{self.request.user.id}',
+                    shared_users, timeout=5 * 60)
+                # TODO ugly hack that improves API performance significantly, should be done properly
+            except AttributeError:  # Anonymous users (using share links) don't have shared users
+                pass
 
         self.queryset = super().get_queryset()
         shopping_status = ShoppingListEntry.objects.filter(space=self.request.space, food=OuterRef('id'),
@@ -637,6 +670,66 @@ class MealPlanViewSet(viewsets.ModelViewSet):
         return queryset
 
 
+class AutoPlanViewSet(viewsets.ViewSet):
+    def create(self, request):
+        serializer = AutoMealPlanSerializer(data=request.data)
+
+        if serializer.is_valid():
+            keywords = serializer.validated_data['keywords']
+            start_date = serializer.validated_data['start_date']
+            end_date = serializer.validated_data['end_date']
+            servings = serializer.validated_data['servings']
+            shared = serializer.get_initial().get('shared', None)
+            shared_pks = list()
+            if shared is not None:
+                for i in range(len(shared)):
+                    shared_pks.append(shared[i]['id'])
+
+            days = min((end_date - start_date).days + 1, 14)
+
+            recipes = Recipe.objects.values('id', 'name')
+            meal_plans = list()
+
+            for keyword in keywords:
+                recipes = recipes.filter(keywords__name=keyword['name'])
+
+            if len(recipes) == 0:
+                return Response(serializer.data)
+            recipes = list(recipes.order_by('?')[:days])
+
+            for i in range(0, days):
+                day = start_date + datetime.timedelta(i)
+                recipe = recipes[i % len(recipes)]
+                args = {'recipe_id': recipe['id'], 'servings': servings,
+                        'created_by': request.user,
+                        'meal_type_id': serializer.validated_data['meal_type_id'],
+                        'note': '', 'date': day, 'space': request.space}
+
+                m = MealPlan(**args)
+                meal_plans.append(m)
+
+            MealPlan.objects.bulk_create(meal_plans)
+
+            for m in meal_plans:
+                m.shared.set(shared_pks)
+
+                if request.data.get('addshopping', False):
+                    SLR = RecipeShoppingEditor(user=request.user, space=request.space)
+                    SLR.create(mealplan=m, servings=servings)
+
+                else:
+                    post_save.send(
+                        sender=m.__class__,
+                        instance=m,
+                        created=True,
+                        update_fields=None,
+                    )
+
+            return Response(serializer.data)
+
+        return Response(serializer.errors, 400)
+
+
 class MealTypeViewSet(viewsets.ModelViewSet):
     """
     returns list of meal types created by the
@@ -792,7 +885,32 @@ class RecipeViewSet(viewsets.ModelViewSet):
 
         if self.detail:  # if detail request and not list, private condition is verified by permission class
             if not share:  # filter for space only if not shared
-                self.queryset = self.queryset.filter(space=self.request.space)
+                self.queryset = self.queryset.filter(space=self.request.space).prefetch_related(
+                    'keywords',
+                    'shared',
+                    'properties',
+                    'properties__property_type',
+                    'steps',
+                    'steps__ingredients',
+                    'steps__ingredients__step_set',
+                    'steps__ingredients__step_set__recipe_set',
+                    'steps__ingredients__food',
+                    'steps__ingredients__food__properties',
+                    'steps__ingredients__food__properties__property_type',
+                    'steps__ingredients__food__inherit_fields',
+                    'steps__ingredients__food__supermarket_category',
+                    'steps__ingredients__food__onhand_users',
+                    'steps__ingredients__food__substitute',
+                    'steps__ingredients__food__child_inherit_fields',
+
+                    'steps__ingredients__unit',
+                    'steps__ingredients__unit__unit_conversion_base_relation',
+                    'steps__ingredients__unit__unit_conversion_base_relation__base_unit',
+                    'steps__ingredients__unit__unit_conversion_converted_relation',
+                    'steps__ingredients__unit__unit_conversion_converted_relation__converted_unit',
+                    'cooklog_set',
+                ).select_related('nutrition')
+
             return super().get_queryset()
 
         self.queryset = self.queryset.filter(space=self.request.space).filter(
@@ -802,7 +920,7 @@ class RecipeViewSet(viewsets.ModelViewSet):
         params = {x: self.request.GET.get(x) if len({**self.request.GET}[x]) == 1 else self.request.GET.getlist(x) for x
                   in list(self.request.GET)}
         search = RecipeSearch(self.request, **params)
-        self.queryset = search.get_queryset(self.queryset).prefetch_related('cooklog_set')
+        self.queryset = search.get_queryset(self.queryset).prefetch_related('keywords', 'cooklog_set')
         return self.queryset
 
     def list(self, request, *args, **kwargs):
@@ -843,7 +961,7 @@ class RecipeViewSet(viewsets.ModelViewSet):
                 try:
                     url = serializer.validated_data['image_url']
                     if validators.url(url, public=True):
-                        response = requests.get(url)
+                        response = requests.get(url, headers={"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:86.0) Gecko/20100101 Firefox/86.0"})
                         image = File(io.BytesIO(response.content))
                         filetype = mimetypes.guess_extension(response.headers['content-type']) or filetype
                 except UnidentifiedImageError as e:
@@ -921,6 +1039,41 @@ class RecipeViewSet(viewsets.ModelViewSet):
         return Response(self.serializer_class(qs, many=True).data)
 
 
+class UnitConversionViewSet(viewsets.ModelViewSet):
+    queryset = UnitConversion.objects
+    serializer_class = UnitConversionSerializer
+    permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
+    query_params = [
+        QueryParam(name='food_id', description='ID of food to filter for', qtype='int'),
+    ]
+    schema = QueryParamAutoSchema()
+
+    def get_queryset(self):
+        food_id = self.request.query_params.get('food_id', None)
+        if food_id is not None:
+            self.queryset = self.queryset.filter(food_id=food_id)
+
+        return self.queryset.filter(space=self.request.space)
+
+
+class PropertyTypeViewSet(viewsets.ModelViewSet):
+    queryset = PropertyType.objects
+    serializer_class = PropertyTypeSerializer
+    permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
+
+    def get_queryset(self):
+        return self.queryset.filter(space=self.request.space)
+
+
+class PropertyViewSet(viewsets.ModelViewSet):
+    queryset = Property.objects
+    serializer_class = PropertySerializer
+    permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
+
+    def get_queryset(self):
+        return self.queryset.filter(space=self.request.space)
+
+
 class ShoppingListRecipeViewSet(viewsets.ModelViewSet):
     queryset = ShoppingListRecipe.objects
     serializer_class = ShoppingListRecipeSerializer
@@ -963,6 +1116,21 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
             Q(created_by=self.request.user)
             | Q(shoppinglist__shared=self.request.user)
             | Q(created_by__in=list(self.request.user.get_shopping_share()))
+        ).prefetch_related(
+            'created_by',
+            'food',
+            'food__properties',
+            'food__properties__property_type',
+            'food__inherit_fields',
+            'food__supermarket_category',
+            'food__onhand_users',
+            'food__substitute',
+            'food__child_inherit_fields',
+
+            'unit',
+            'list_recipe',
+            'list_recipe__mealplan',
+            'list_recipe__mealplan__recipe',
         ).distinct().all()
 
         if pk := self.request.query_params.getlist('id', []):
@@ -1081,6 +1249,11 @@ class InviteLinkViewSet(viewsets.ModelViewSet, StandardFilterMixin):
     permission_classes = [CustomIsSpaceOwner & CustomIsAdmin & CustomTokenHasReadWriteScope]
 
     def get_queryset(self):
+
+        internal_note = self.request.query_params.get('internal_note', None)
+        if internal_note is not None:
+            self.queryset = self.queryset.filter(internal_note=internal_note)
+
         if is_space_owner(self.request.user, self.request.space):
             self.queryset = self.queryset.filter(space=self.request.space).all()
             return super().get_queryset()
@@ -1122,10 +1295,13 @@ class CustomAuthToken(ObtainAuthToken):
                                            context={'request': request})
         serializer.is_valid(raise_exception=True)
         user = serializer.validated_data['user']
-        if token := AccessToken.objects.filter(user=user, expires__gt=timezone.now(), scope__contains='read').filter(scope__contains='write').first():
+        if token := AccessToken.objects.filter(user=user, expires__gt=timezone.now(), scope__contains='read').filter(
+                scope__contains='write').first():
             access_token = token
         else:
-            access_token = AccessToken.objects.create(user=user, token=f'tda_{str(uuid.uuid4()).replace("-", "_")}', expires=(timezone.now() + timezone.timedelta(days=365 * 5)), scope='read write app')
+            access_token = AccessToken.objects.create(user=user, token=f'tda_{str(uuid.uuid4()).replace("-", "_")}',
+                                                      expires=(timezone.now() + timezone.timedelta(days=365 * 5)),
+                                                      scope='read write app')
         return Response({
             'id': access_token.id,
             'token': access_token.token,
@@ -1153,7 +1329,8 @@ def recipe_from_source(request):
     serializer = RecipeFromSourceSerializer(data=request.data)
     if serializer.is_valid():
 
-        if (b_pk := serializer.validated_data.get('bookmarklet', None)) and (bookmarklet := BookmarkletImport.objects.filter(pk=b_pk).first()):
+        if (b_pk := serializer.validated_data.get('bookmarklet', None)) and (
+                bookmarklet := BookmarkletImport.objects.filter(pk=b_pk).first()):
             serializer.validated_data['url'] = bookmarklet.url
             serializer.validated_data['data'] = bookmarklet.html
             bookmarklet.delete()
@@ -1175,14 +1352,23 @@ def recipe_from_source(request):
                         # 'recipe_html': '',
                         'recipe_images': [],
                     }, status=status.HTTP_200_OK)
-            if re.match('^(.)*/view/recipe/[0-9]+/[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$', url):
-                recipe_json = requests.get(url.replace('/view/recipe/', '/api/recipe/').replace(re.split('/view/recipe/[0-9]+', url)[1], '') + '?share=' + re.split('/view/recipe/[0-9]+', url)[1].replace('/', '')).json()
+            if re.match(
+                    '^(.)*/view/recipe/[0-9]+/[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$',
+                    url):
+                recipe_json = requests.get(
+                    url.replace('/view/recipe/', '/api/recipe/').replace(re.split('/view/recipe/[0-9]+', url)[1],
+                                                                         '') + '?share=' +
+                    re.split('/view/recipe/[0-9]+', url)[1].replace('/', '')).json()
                 recipe_json = clean_dict(recipe_json, 'id')
                 serialized_recipe = RecipeExportSerializer(data=recipe_json, context={'request': request})
                 if serialized_recipe.is_valid():
                     recipe = serialized_recipe.save()
-                    recipe.image = File(handle_image(request, File(io.BytesIO(requests.get(recipe_json['image']).content), name='image'), filetype=pathlib.Path(recipe_json['image']).suffix),
-                                        name=f'{uuid.uuid4()}_{recipe.pk}{pathlib.Path(recipe_json["image"]).suffix}')
+                    if validators.url(recipe_json['image'], public=True):
+                        recipe.image = File(handle_image(request,
+                                                         File(io.BytesIO(requests.get(recipe_json['image']).content),
+                                                              name='image'),
+                                                         filetype=pathlib.Path(recipe_json['image']).suffix),
+                                            name=f'{uuid.uuid4()}_{recipe.pk}{pathlib.Path(recipe_json["image"]).suffix}')
                     recipe.save()
                     return Response({
                         'link': request.build_absolute_uri(reverse('view_recipe', args={recipe.pk}))
@@ -1211,8 +1397,12 @@ def recipe_from_source(request):
                     }, status=status.HTTP_400_BAD_REQUEST)
         else:
             try:
-                json.loads(data)
-                data = "<script type='application/ld+json'>" + data + "</script>"
+                data_json = json.loads(data)
+                if '@context' not in data_json:
+                    data_json['@context'] = 'https://schema.org'
+                if '@type' not in data_json:
+                    data_json['@type'] = 'Recipe'
+                data = "<script type='application/ld+json'>" + json.dumps(data_json) + "</script>"
             except JSONDecodeError:
                 pass
             scrape = text_scraper(text=data, url=url)
@@ -1323,11 +1513,44 @@ def import_files(request):
 
             return Response({'import_id': il.pk}, status=status.HTTP_200_OK)
         except NotImplementedError:
-            return Response({'error': True, 'msg': _('Importing is not implemented for this provider')}, status=status.HTTP_400_BAD_REQUEST)
+            return Response({'error': True, 'msg': _('Importing is not implemented for this provider')},
+                            status=status.HTTP_400_BAD_REQUEST)
     else:
         return Response({'error': True, 'msg': form.errors}, status=status.HTTP_400_BAD_REQUEST)
 
 
+class ImportOpenData(APIView):
+    permission_classes = [CustomIsAdmin & CustomTokenHasReadWriteScope]
+
+    def get(self, request, format=None):
+        response = requests.get('https://raw.githubusercontent.com/TandoorRecipes/open-tandoor-data/main/build/meta.json')
+        metadata = json.loads(response.content)
+        return Response(metadata)
+
+    def post(self, request, *args, **kwargs):
+        # TODO validate data
+        print(request.data)
+        selected_version = request.data['selected_version']
+        selected_datatypes = request.data['selected_datatypes']
+        update_existing = str2bool(request.data['update_existing'])
+        use_metric = str2bool(request.data['use_metric'])
+
+        response = requests.get(f'https://raw.githubusercontent.com/TandoorRecipes/open-tandoor-data/main/build/{selected_version}.json')  # TODO catch 404, timeout, ...
+        data = json.loads(response.content)
+
+        response_obj = {}
+
+        data_importer = OpenDataImporter(request, data, update_existing=update_existing, use_metric=use_metric)
+        response_obj['unit'] = len(data_importer.import_units())
+        response_obj['category'] = len(data_importer.import_category())
+        response_obj['property'] = len(data_importer.import_property())
+        response_obj['store'] = len(data_importer.import_supermarket())
+        response_obj['food'] = len(data_importer.import_food())
+        response_obj['conversion'] = len(data_importer.import_conversion())
+
+        return Response(response_obj)
+
+
 def get_recipe_provider(recipe):
     if recipe.storage.method == Storage.DROPBOX:
         return Dropbox

cookbook/views/lists.py

@@ -228,3 +228,33 @@ def step(request):
             }
         }
     )
+
+
+@group_required('user')
+def unit_conversion(request):
+    # model-name is the models.js name of the model, probably ALL-CAPS
+    return render(
+        request,
+        'generic/model_template.html',
+        {
+            "title": _("Unit Conversions"),
+            "config": {
+                'model': "UNIT_CONVERSION",  # *REQUIRED* name of the model in models.js
+            }
+        }
+    )
+
+
+@group_required('user')
+def property_type(request):
+    # model-name is the models.js name of the model, probably ALL-CAPS
+    return render(
+        request,
+        'generic/model_template.html',
+        {
+            "title": _("Property Types"),
+            "config": {
+                'model': "PROPERTY_TYPE",  # *REQUIRED* name of the model in models.js
+            }
+        }
+    )

cookbook/views/new.py

@@ -37,7 +37,7 @@ class RecipeCreate(GroupRequiredMixin, CreateView):
         obj.space = self.request.space
         obj.internal = True
         obj.save()
-        obj.steps.add(Step.objects.create(space=self.request.space, show_as_header=False))
+        obj.steps.add(Step.objects.create(space=self.request.space, show_as_header=False, show_ingredients_table=self.request.user.userpreference.show_step_ingredients))
         return HttpResponseRedirect(reverse('edit_recipe', kwargs={'pk': obj.pk}))
 
     def get_success_url(self):

cookbook/views/views.py

@@ -1,14 +1,11 @@
 import os
 import re
-import uuid
 from datetime import datetime
 from uuid import UUID
 
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth import update_session_auth_hash
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib.auth.models import Group
 from django.contrib.auth.password_validation import validate_password
 from django.core.exceptions import ValidationError
@@ -18,16 +15,15 @@ from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.translation import gettext as _
 from django_scopes import scopes_disabled
-from oauth2_provider.models import AccessToken
 
-from cookbook.forms import (CommentForm, Recipe, SearchPreferenceForm, ShoppingPreferenceForm,
-                            SpaceCreateForm, SpaceJoinForm, User,
-                            UserCreateForm, UserNameForm, UserPreference, UserPreferenceForm)
+from cookbook.forms import (CommentForm, Recipe, SearchPreferenceForm, SpaceCreateForm, SpaceJoinForm, User,
+                            UserCreateForm, UserPreference)
 from cookbook.helper.permission_helper import group_required, has_group_permission, share_link_valid, switch_user_active_space
 from cookbook.models import (Comment, CookLog, InviteLink, SearchFields, SearchPreference, ShareLink,
                              Space, ViewLog, UserSpace)
 from cookbook.tables import (CookLogTable, ViewLogTable)
-from recipes.version import BUILD_REF, VERSION_NUMBER
+from cookbook.version_info import VERSION_INFO
+from recipes.settings import PLUGINS
 
 
 def index(request):
@@ -325,8 +321,8 @@ def system(request):
         'gunicorn_media': settings.GUNICORN_MEDIA,
         'debug': settings.DEBUG,
         'postgres': postgres,
-        'version': VERSION_NUMBER,
-        'ref': BUILD_REF,
+        'version_info': VERSION_INFO,
+        'plugins': PLUGINS,
         'secret_key': secret_key
     })
 
@@ -375,7 +371,7 @@ def invite_link(request, token):
                     link.used_by = request.user
                     link.save()
 
-                user_space = UserSpace.objects.create(user=request.user, space=link.space, active=False)
+                user_space = UserSpace.objects.create(user=request.user, space=link.space, internal_note=link.internal_note, invite_link=link, active=False)
 
                 if request.user.userspace_set.count() == 1:
                     user_space.active = True