Merge branch 'main' into process_picture_signal

Author: jmsmkn

.github/workflows/ci.yml

@@ -46,12 +46,13 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
+          - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
         django-version:
-          - "4.2" # LTS
+          - "5.2" # LTS
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -71,11 +72,11 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.12"
+          - "3.10"
         django-version:
           # LTS gets tested on all OS
+          - "4.2"
           - "5.1"
-          - "5.2"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6

README.md

@@ -33,7 +33,11 @@ from pictures.models import PictureField
 
 class Profile(models.Model):
     title = models.CharField(max_length=255)
-    picture = PictureField(upload_to="avatars")
+    picture = PictureField(
+        upload_to="avatars", width_field="picture_width", height_field="picture_height"
+    )
+    picture_width = models.PositiveIntegerField(editable=False)
+    picture_height = models.PositiveIntegerField(editable=False)
 ```
 
 ```html
@@ -157,7 +161,11 @@ class Profile(models.Model):
     picture = PictureField(
         upload_to="avatars",
         aspect_ratios=[None, "1/1", "3/2", "16/9"],
+        width_field="picture_width",
+        height_field="picture_height",
     )
+    picture_width = models.PositiveIntegerField(editable=False)
+    picture_height = models.PositiveIntegerField(editable=False)
 ```
 
 ```html
@@ -235,10 +243,15 @@ class Profile(models.Model):
         validators=[
             MinSizeValidator(400, 300),  # At least 400x300 pixels
             MaxSizeValidator(4096, 4096),  # At most 4096x4096 pixels
-        ]
+        ],
+        width_field="picture_width",
+        height_field="picture_height",
     )
+    picture_width = models.PositiveIntegerField(editable=False)
+    picture_height = models.PositiveIntegerField(editable=False)
+
 
-Use `None` to limit only one dimension: `MaxSizeValidator(2048, None)` limits only width.
+# Use `None` to limit only one dimension: `MaxSizeValidator(2048, None)` limits only width.
 ```
 
 > [!IMPORTANT]

pictures/migrations.py

@@ -56,7 +56,9 @@ def update_pictures(self, from_field: PictureField, to_model: type[models.Model]
             new_field_file.update_all(old_field_file)
 
     def from_picture_field(self, from_model: type[models.Model]):
-        for obj in from_model._default_manager.all().iterator():
+        for obj in from_model._default_manager.exclude(
+            Q(**{self.name: ""}) | Q(**{self.name: None})
+        ).iterator():
             field_file = getattr(obj, self.name)
             field_file.delete_all()
 
@@ -66,9 +68,13 @@ def to_picture_field(
         from_field = from_model._meta.get_field(self.name)
         if hasattr(from_field.attr_class, "delete_variations"):
             # remove obsolete django-stdimage variations
-            for obj in from_model._default_manager.all().iterator():
+            for obj in from_model._default_manager.exclude(
+                Q(**{self.name: ""}) | Q(**{self.name: None})
+            ).iterator():
                 field_file = getattr(obj, self.name)
                 field_file.delete_variations()
-        for obj in to_model._default_manager.all().iterator():
+        for obj in to_model._default_manager.exclude(
+            Q(**{self.name: ""}) | Q(**{self.name: None})
+        ).iterator():
             field_file = getattr(obj, self.name)
             field_file.save_all()

pictures/models.py

@@ -6,6 +6,7 @@
 import math
 from fractions import Fraction
 from pathlib import Path
+from types import NotImplementedType
 
 from django.core import checks
 from django.core.files.base import ContentFile
@@ -105,7 +106,7 @@ def name(self) -> str:
     def path(self) -> Path:
         return Path(self.storage.path(self.name))
 
-    def process(self, image) -> Image:
+    def process(self, image) -> Image.Image:
         image = ImageOps.exif_transpose(image)  # crates a copy
         height = self.height or self.width / Fraction(*image.size)
         size = math.floor(self.width), math.floor(height)
@@ -130,7 +131,7 @@ def delete(self):
 
 
 class PictureFieldFile(ImageFieldFile):
-    def __xor__(self, other) -> tuple[set[Picture], set[Picture]]:
+    def __xor__(self, other) -> tuple[set[Picture], set[Picture]] | NotImplementedType:
         """Return the new and obsolete :class:`Picture` instances."""
         if not isinstance(other, PictureFieldFile):
             return NotImplemented
@@ -202,7 +203,7 @@ def height(self):
         return self._get_image_dimensions()[1]
 
     @property
-    def aspect_ratios(self) -> {Fraction | None: {str: {int: Picture}}}:
+    def aspect_ratios(self) -> dict[Fraction | None, dict[str, dict[int, Picture]]]:
         self._require_file()
         return self.get_picture_files(
             file_name=self.name,
@@ -220,7 +221,7 @@ def get_picture_files(
         img_height: int,
         storage: Storage,
         field: PictureField,
-    ) -> {Fraction | None: {str: {int: Picture}}}:
+    ) -> dict[Fraction | None, dict[str, dict[int, Picture]]]:
         PictureClass = import_string(conf.get_settings().PICTURE_CLASS)
         return {
             ratio: {
@@ -301,7 +302,7 @@ def _check_aspect_ratios(self):
         return errors
 
     def _check_width_height_field(self):
-        if None in self.aspect_ratios and not (self.width_field and self.height_field):
+        if not (self.width_field and self.height_field):
             return [
                 checks.Warning(
                     "width_field and height_field attributes are missing",

pictures/utils.py

@@ -61,7 +61,7 @@ def sizes(
 
 
 def source_set(
-    size: (int, int), *, ratio: str | Fraction | None, max_width: int, cols: int
+    size: tuple[int, int], *, ratio: str | Fraction | None, max_width: int, cols: int
 ) -> set:
     ratio = Fraction(ratio) if ratio else None
     img_width, img_height = size
@@ -82,8 +82,8 @@ def placeholder(width: int, height: int, alt):
     hue = random.randint(0, 360)  # NoQA S311
     img = Image.new("RGB", (width, height), color=f"hsl({hue}, 40%, 80%)")
     draw = ImageDraw.Draw(img)
-    draw.line(((0, 0, width, height)), width=3, fill=f"hsl({hue}, 60%, 20%)")
-    draw.line(((0, height, width, 0)), width=3, fill=f"hsl({hue}, 60%, 20%)")
+    draw.line((0, 0, width, height), width=3, fill=f"hsl({hue}, 60%, 20%)")
+    draw.line((0, height, width, 0), width=3, fill=f"hsl({hue}, 60%, 20%)")
     draw.rectangle(
         (width / 4, height / 4, width * 3 / 4, height * 3 / 4),
         fill=f"hsl({hue}, 40%, 80%)",

pyproject.toml

@@ -23,17 +23,17 @@ classifiers = [
   "Topic :: Software Development",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Framework :: Django",
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.1",
   "Framework :: Django :: 5.2",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = ["django>=4.2.0", "pillow>=11.3.0"]
 
 [project.optional-dependencies]
@@ -44,7 +44,7 @@ test = [
   "redis",
 ]
 dramatiq = [
-  "dramatiq<2",
+  "dramatiq",
   "django-dramatiq",
 ]
 celery = [

tests/test_migrations.py

@@ -171,6 +171,54 @@ class Meta:
 
         assert not luke.picture
 
+    @pytest.mark.django_db
+    def test_update_pictures__with_empty_pictures(
+        self, request, stub_worker, image_upload_file
+    ):
+        """Test that update_pictures skips objects with empty/null pictures."""
+
+        class ToModel(models.Model):
+            name = models.CharField(max_length=100)
+            picture = PictureField(
+                upload_to="testapp/profile/", aspect_ratios=[None, "21/9"], blank=True
+            )
+
+            class Meta:
+                app_label = request.node.name
+                db_table = "testapp_profile"
+
+        # Create profiles with different picture states
+        luke = Profile.objects.create(name="Luke", picture=image_upload_file)
+        leia = Profile.objects.create(name="Leia", picture="")
+        han = Profile.objects.create(name="Han", picture=None)
+        stub_worker.join()
+
+        path = luke.picture.aspect_ratios["16/9"]["AVIF"][100].path
+        assert path.exists()
+
+        migration = migrations.AlterPictureField("profile", "picture", PictureField())
+        from_field = Profile._meta.get_field("picture")
+
+        # This should not fail despite empty/null pictures
+        migration.update_pictures(from_field, ToModel)
+        stub_worker.join()
+
+        # Verify old path was deleted and new one was created for luke
+        assert not path.exists()
+        luke.refresh_from_db()
+        path = (
+            ToModel.objects.get(pk=luke.pk)
+            .picture.aspect_ratios["21/9"]["AVIF"][100]
+            .path
+        )
+        assert path.exists()
+
+        # Verify empty profiles still exist and remain empty
+        leia_profile = Profile.objects.get(pk=leia.pk)
+        assert not leia_profile.picture
+        han_profile = Profile.objects.get(pk=han.pk)
+        assert not han_profile.picture
+
     @pytest.mark.django_db
     def test_from_picture_field(self, stub_worker, image_upload_file):
         luke = Profile.objects.create(name="Luke", picture=image_upload_file)
@@ -182,6 +230,30 @@ def test_from_picture_field(self, stub_worker, image_upload_file):
         stub_worker.join()
         assert not path.exists()
 
+    @pytest.mark.django_db
+    def test_from_picture_field__with_empty_pictures(
+        self, stub_worker, image_upload_file
+    ):
+        """Test that from_picture_field skips objects with empty/null pictures."""
+        # Create profiles with different picture states
+        luke = Profile.objects.create(name="Luke", picture=image_upload_file)
+        Profile.objects.create(name="Leia", picture="")
+        Profile.objects.create(name="Han", picture=None)
+        stub_worker.join()
+
+        path = luke.picture.aspect_ratios["16/9"]["AVIF"][100].path
+        assert path.exists()
+
+        migration = migrations.AlterPictureField("profile", "picture", PictureField())
+        # This should not fail despite empty/null pictures
+        migration.from_picture_field(Profile)
+        stub_worker.join()
+
+        assert not path.exists()
+        # Verify other profiles still exist and weren't affected
+        assert Profile.objects.filter(name="Leia").exists()
+        assert Profile.objects.filter(name="Han").exists()
+
     @pytest.mark.django_db
     def test_to_picture_field(self, request, stub_worker, image_upload_file):
         class FromModel(models.Model):
@@ -234,6 +306,53 @@ class Meta:
         migration = migrations.AlterPictureField("profile", "picture", PictureField())
         migration.to_picture_field(FromModel, Profile)
 
+    @pytest.mark.django_db
+    def test_to_picture_field__with_empty_pictures(
+        self, request, stub_worker, image_upload_file
+    ):
+        """Test that to_picture_field skips objects with empty/null pictures."""
+
+        class FromModel(models.Model):
+            picture = models.ImageField(blank=True)
+
+            class Meta:
+                app_label = request.node.name
+                db_table = "testapp_profile"
+
+        class ToModel(models.Model):
+            name = models.CharField(max_length=100)
+            picture = models.ImageField(upload_to="testapp/profile/", blank=True)
+
+            class Meta:
+                app_label = request.node.name
+                db_table = "testapp_profile"
+
+        # Create profiles with different picture states
+        luke = ToModel.objects.create(name="Luke", picture=image_upload_file)
+        leia = ToModel.objects.create(name="Leia", picture="")
+        han = ToModel.objects.create(name="Han", picture=None)
+        stub_worker.join()
+
+        migration = migrations.AlterPictureField("profile", "picture", PictureField())
+        # This should not fail despite empty/null pictures
+        migration.to_picture_field(FromModel, Profile)
+        stub_worker.join()
+
+        luke.refresh_from_db()
+        # Verify only luke's picture was processed
+        path = (
+            Profile.objects.get(pk=luke.pk)
+            .picture.aspect_ratios["16/9"]["AVIF"][100]
+            .path
+        )
+        assert path.exists()
+
+        # Verify empty profiles still exist
+        leia_profile = Profile.objects.get(pk=leia.pk)
+        assert not leia_profile.picture
+        han_profile = Profile.objects.get(pk=han.pk)
+        assert not han_profile.picture
+
     @pytest.mark.django_db
     def test_to_picture_field__from_stdimage(
         self, request, stub_worker, image_upload_file

tests/test_models.py

@@ -825,9 +825,19 @@ def test_check_aspect_ratios(self):
         assert errors
         assert errors[0].id == "fields.E100"
 
-    def test_check_width_height_field(self):
-        assert not PictureField(aspect_ratios=["3/2"])._check_width_height_field()
-        with override_field_aspect_ratios(Profile.picture.field, [None]):
+    @pytest.mark.parametrize(
+        "aspect_ratios",
+        [
+            ("3/2",),
+            (None,),
+            (
+                "3/2",
+                None,
+            ),
+        ],
+    )
+    def test_check_width_height_field(self, aspect_ratios):
+        with override_field_aspect_ratios(Profile.picture.field, aspect_ratios):
             errors = Profile.picture.field._check_width_height_field()
         assert errors
         assert errors[0].id == "fields.E101"

tests/test_utils.py

@@ -145,14 +145,14 @@ def test_placeholder():
     assert img.height == 1200
 
 
-class TestPicture(Picture):
+class SamplePicture(Picture):
     @property
     def url(self):
         return f"/media/{self.parent_name}"
 
 
 def test_reconstruct(image_upload_file):
-    picture = TestPicture(
+    picture = SamplePicture(
         image_upload_file.name,
         "WEBP",
         "16/9",
@@ -164,7 +164,7 @@ def test_reconstruct(image_upload_file):
     assert isinstance(reconstructed, Storage)
 
     assert utils.reconstruct(
-        "tests.test_utils.TestPicture",
+        "tests.test_utils.SamplePicture",
         [],
         {
             "parent_name": "test.jpg",
@@ -173,7 +173,7 @@ def test_reconstruct(image_upload_file):
             "storage": default_storage,
             "width": 100,
         },
-    ) == TestPicture(
+    ) == SamplePicture(
         "test.jpg",
         "JPEG",
         "16/9",