Fix image uploads (#1612)

* downgrade boto

* Update base.txt

* reverting a few changes

* add some logging for image uploads

* remove load truncated images

* fix N+1

* log all the things

* pin django

* lower log level

* revert logging

* formatting

* remove commented code

Author: mwvolo

openstax/api.py

@@ -72,7 +72,7 @@ def get_base_queryset(self):
         # Exclude pages that the user doesn't have access to
         restricted_pages = [
             restriction.page
-            for restriction in PageViewRestriction.objects.all().select_related("page")
+            for restriction in PageViewRestriction.objects.select_related("page")
             if not restriction.accept_request(self.request)
         ]
 

openstax/settings/base.py

@@ -324,7 +324,7 @@
     'loggers': {
         # default for all undefined Python modules
         '': {
-            'level': 'ERROR',
+            'level': LOGLEVEL,
             'handlers': ['console'],
         },
         # Our application code
@@ -411,25 +411,24 @@
 WAGTAIL_REDIRECTS_FILE_STORAGE = 'cache'
 WAGTAILFORMS_HELP_TEXT_ALLOW_HTML = True
 
+# Disable the workflow, we don't use them
+WAGTAIL_WORKFLOW_ENABLED = False
+
 WAGTAILSEARCH_BACKENDS = {
     'default': {
         'BACKEND': 'wagtail.search.backends.database',
     }
 }
 
-from PIL import ImageFile
-
-ImageFile.LOAD_TRUNCATED_IMAGES = True
-
 WAGTAILIMAGES_EXTENSIONS = ["gif", "jpg", "jpeg", "png", "webp", "svg"]
 WAGTAILIMAGES_FORMAT_CONVERSIONS = {
     'webp': 'webp',
     'jpeg': 'webp',
     'jpg': 'webp',
     'png': 'webp',
 }
-WAGTAILIMAGES_MAX_UPLOAD_SIZE = 4 * 1024 * 1024  # 4MB
-DATA_UPLOAD_MAX_NUMBER_FIELDS = 10_240
+WAGTAILIMAGES_MAX_UPLOAD_SIZE = 20 * 1024 * 1024  # 20MB
+DATA_UPLOAD_MAX_NUMBER_FIELDS = 10240
 
 WAGTAILADMIN_RICH_TEXT_EDITORS = {
     'default': {

requirements/base.txt

@@ -1,7 +1,7 @@
 boto3
 botocore
 bs4
-Django
+Django==5.0.12
 certifi
 django-admin-rangefilter
 django-crontab
@@ -15,7 +15,7 @@ django-rest-auth
 django-reversion
 django-ses
 django-storages
-django-taggit>=5.0.0
+django-taggit>=6.1.0
 djangorestframework
 html2text # news feed
 mapbox