Really? I forgot to push that?

images/models.py

@@ -1,11 +1,12 @@
 import uuid
 from io import BytesIO
 
+from botocore.compat import file_type
 from django.db import models
 from django.utils import timezone
 
 from images.utils import get_b2_resource
-from PIL import Image as PILImage, ImageOps
+from PIL import Image as PILImage, ImageOps, ImageEnhance, ImageFilter
 
 
 class Image(models.Model):
@@ -21,6 +22,7 @@ class Image(models.Model):
     model_version = models.IntegerField(default=1)
     height = models.IntegerField(default=0)
     width = models.IntegerField(default=0)
+    version = models.IntegerField(default=2)
 
     @property
     def thumbnail_size(self):
@@ -33,56 +35,81 @@ class Image(models.Model):
     def backblaze_filepath(self):
         return f"{self.id.hex[:2]}/{self.id.hex[2:4]}/{self.id.hex}"
 
-    def create_variant_tasks(self, width, height, original_file_type):
-        ImageVariantTask(
-            image=self,
-            height=height,
-            width=width,
-            original_file_type=original_file_type,
+    def create_variant_tasks(self, variant):
+        ImageVariant(
+            image=variant.image,
+            height=variant.height,
+            width=variant.width,
+            is_full_size=variant.is_full_size,
             file_type="avif",
+            gaussian_blur=variant.gaussian_blur,
+            brightness=variant.brightness,
+            available=False,
         ).save()
 
-        ImageVariantTask(
-            image=self,
-            height=height,
-            width=width,
-            original_file_type=original_file_type,
+        ImageVariant(
+            image=variant.image,
+            height=variant.height,
+            width=variant.width,
+            is_full_size=variant.is_full_size,
             file_type="webp",
+            gaussian_blur=variant.gaussian_blur,
+            brightness=variant.brightness,
+            available=False,
         ).save()
 
-        ImageVariantTask(
-            image=self,
-            height=height,
-            width=width,
-            original_file_type=original_file_type,
+        ImageVariant(
+            image=variant.image,
+            height=variant.height,
+            width=variant.width,
+            is_full_size=variant.is_full_size,
             file_type="jpegli",
+            gaussian_blur=variant.gaussian_blur,
+            brightness=variant.brightness,
+            available=False,
         ).save()
 
-    def create_variant(self, width, height):
+    def create_variant(self, width, height, gaussian_blur, brightness):
         bucket = get_b2_resource()
 
         original_image = BytesIO()
         original_variant = self.imagevariant_set.filter(
-            is_full_size=True, file_type__in=["jpg", "png"]
+            is_full_size=True,
+            file_type__in=["jpg", "png"],
+            gaussian_blur=0,
+            brightness=1,
         ).first()
+
         bucket.download_fileobj(
-            f"{self.backblaze_filepath}/{original_variant.width}-{original_variant.height}/image.{original_variant.file_type}",
+            original_variant.backblaze_filepath,
             original_image,
         )
         original_image.seek(0)
 
         resized_image = BytesIO()
 
-        file_extension = "jpg"
+        image_variant = ImageVariant(
+            image=self,
+            height=height,
+            width=width,
+            is_full_size=False,
+            file_type="jpg",
+            gaussian_blur=gaussian_blur,
+            brightness=brightness,
+            available=True,
+        )
 
         with PILImage.open(original_image) as im:
             ImageOps.exif_transpose(im, in_place=True)
+            im = im.filter(ImageFilter.GaussianBlur(gaussian_blur))
+            enhancer = ImageEnhance.Brightness(im)
+            im = enhancer.enhance(brightness)
             im.thumbnail((width, height))
 
             if im.has_transparency_data:
                 try:
                     im.save(resized_image, "PNG")
-                    file_extension = "png"
+                    image_variant.file_extension = "png"
                 except OSError:
                     im.convert("RGB").save(resized_image, "JPEG")
             else:
@@ -93,32 +120,40 @@ class Image(models.Model):
 
         resized_image.seek(0)
 
-        bucket.upload_fileobj(
-            resized_image,
-            f"{self.backblaze_filepath}/{width}-{height}/image.{file_extension}",
-        )
-
-        image_variant = ImageVariant(
-            image=self,
-            height=height,
-            width=width,
-            is_full_size=False,
-            file_type=file_extension,
-        )
+        bucket.upload_fileobj(resized_image, image_variant.backblaze_filepath)
 
         image_variant.save()
 
-        self.create_variant_tasks(width, height, file_extension)
+        self.create_variant_tasks(image_variant)
 
         return image_variant
 
 
 class ImageVariant(models.Model):
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     image = models.ForeignKey(Image, on_delete=models.CASCADE)
     height = models.IntegerField()
     width = models.IntegerField()
+    gaussian_blur = models.FloatField(default=0)
+    brightness = models.FloatField(default=1)
     is_full_size = models.BooleanField(default=False)
     file_type = models.CharField(max_length=10)
+    available = models.BooleanField(default=False)
+
+    @property
+    def backblaze_filepath(self):
+        return f"{self.id.hex[:2]}/{self.id.hex[2:4]}/{self.id.hex}.{self.file_type}"
+
+    @property
+    def parent_variant_for_optimized_versions(self):
+        return ImageVariant.objects.filter(
+            image_id=self.image_id,
+            height=self.height,
+            width=self.width,
+            gaussian_blur=self.gaussian_blur,
+            brightness=self.brightness,
+            file_type__in=["jpg", "png"],
+        ).first()
 
 
 class ImageVariantTask(models.Model):
@@ -127,6 +162,8 @@ class ImageVariantTask(models.Model):
     image = models.ForeignKey(Image, on_delete=models.CASCADE)
     height = models.IntegerField()
     width = models.IntegerField()
+    gaussian_blur = models.FloatField(default=0)
+    brightness = models.FloatField(default=1)
     original_file_type = models.CharField(max_length=10)
     file_type = models.CharField(max_length=10)