django-pfx 1.7.6.dev33__tar.gz → 1.7.6.dev35__tar.gz

{django_pfx-1.7.6.dev33 → django_pfx-1.7.6.dev35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.6.dev33
+Version: 1.7.6.dev35
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.7.6.dev33 → django_pfx-1.7.6.dev35}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.6.dev33
+Version: 1.7.6.dev35
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

django_pfx-1.7.6.dev35/django_pfx.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.7.5",
+  "distance": 35,
+  "node": "gb6a06c83048f8ebb878d880aa41c71f04adb2127",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-19"
+}

{django_pfx-1.7.6.dev33 → django_pfx-1.7.6.dev35}/pfx/pfxcore/fields/media_field.py

@@ -7,7 +7,7 @@ from urllib.parse import unquote_to_bytes
 
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models.signals import post_delete, post_init
+from django.db.models.signals import post_delete, post_init, post_save
 from django.dispatch import receiver
 
 from pfx.pfxcore.shortcuts import settings
@@ -80,7 +80,6 @@ class MediaField(models.JSONField):
         self.auto_delete = auto_delete
         self.allowed_keys = DEFAULT_KEYS.union(extra_keys or set())
         self.convert_heic = convert_heic
-        self._db_value = None
 
         # Inject default validator if empty
         kwargs.setdefault("validators", [validate_media_json])
@@ -113,8 +112,9 @@ class MediaField(models.JSONField):
         else:
             b64 = None
 
-        if self._db_value and (b64 or not value):
-            after_save.append(lambda: self.delete(self._db_value))
+        db_value = obj._media_db_values.get(self.name)
+        if db_value and (b64 or not value):
+            after_save.append(lambda: self.delete(db_value))
             setattr(obj, self.name, None)
         if b64:
             try:
@@ -160,11 +160,17 @@ class MediaField(models.JSONField):
         return self.storage.delete(value)
 
 
+# Kept on the instance: the field is shared by every instance of the model.
 @receiver(post_init)
-def post_init_media(sender, instance, **kwargs):
+@receiver(post_save)
+def store_media_db_values(sender, instance, update_fields=None, **kwargs):
     for field in sender._meta.fields:
-        if isinstance(field, MediaField):
-            field._db_value = field.value_from_object(instance)
+        if isinstance(field, MediaField) and (
+                update_fields is None or field.name in update_fields):
+            if not hasattr(instance, '_media_db_values'):
+                instance._media_db_values = {}
+            instance._media_db_values[field.name] = (
+                field.value_from_object(instance))
 
 
 @receiver(post_delete)

{django_pfx-1.7.6.dev33 → django_pfx-1.7.6.dev35}/tests/tests/basic_api_test.py

@@ -847,6 +847,64 @@ class BasicAPITest(TestAssertMixin, TestCase):
         self.assertJE(response, 'local_file', None)
         self.assertFalse(Path(f'/tmp/django-pfx-filestore/{key2}').exists())
 
+    def _create_book_with_file(self, name):
+        response = self.client.post('/api/books', dict(
+            name=name,
+            author=self.author1.pk,
+            pub_date='2000-01-01',
+            local_file=dict(
+                name='test.txt',
+                base64='data:text/plain;charset=utf-8;'
+                'base64,VGVzdCBjb250ZW50')))
+        self.assertRC(response, 200)
+        return (
+            self.get_val(response, 'pk'),
+            self.get_val(response, 'local_file.key'))
+
+    def _replace_file(self, book):
+        book.local_file = dict(
+            name='new.txt',
+            base64='data:text/plain;charset=utf-8;base64,TmV3IGNvbnRlbnQ=')
+        funcs = Book._meta.get_field('local_file').media_pre_save(book)
+        book.save()
+        for func in funcs:
+            func()
+        return book.local_file['key']
+
+    def test_replace_file_after_loading_another_object(self):
+        """Replacing a file deletes the old file of that object only.
+
+        The original value used to live on the field, shared by every
+        instance of the model: loading a second book overwrote it, and
+        replacing the first book's file deleted the second book's file
+        while leaving the first one's old file orphaned.
+        """
+        pk1, key1 = self._create_book_with_file("Book 1")
+        pk2, key2 = self._create_book_with_file("Book 2")
+
+        book1 = Book.objects.get(pk=pk1)
+        Book.objects.get(pk=pk2)
+        self._replace_file(book1)
+
+        self.assertFalse(Path(f'/tmp/django-pfx-filestore/{key1}').exists())
+        self.assertTrue(Path(f'/tmp/django-pfx-filestore/{key2}').exists())
+
+    def test_replace_file_twice_on_same_instance(self):
+        """The original value follows each save, so a second replacement
+        on the same instance deletes the file of the first one rather
+        than the long-gone file it was loaded with."""
+        pk, key = self._create_book_with_file("Book")
+
+        book = Book.objects.get(pk=pk)
+        new_key = self._replace_file(book)
+        self.assertTrue(
+            Path(f'/tmp/django-pfx-filestore/{new_key}').exists())
+        self._replace_file(book)
+
+        self.assertFalse(Path(f'/tmp/django-pfx-filestore/{key}').exists())
+        self.assertFalse(
+            Path(f'/tmp/django-pfx-filestore/{new_key}').exists())
+
     def test_create_file_rejects_non_data_uri(self):
         """A media upload only accepts a ``data:`` URI.
 
@@ -1332,19 +1390,20 @@ class BasicAPITest(TestAssertMixin, TestCase):
         STORAGE_S3_AWS_PUT_URL_EXPIRE=300)
     @patch("boto3.client", MagicMock(return_value=MockBoto3Client()))
     def test_media_field(self):
+        key = f"Book/{self.author1_book1.pk}/cover.png"
         response = self.client.get(
             f'/api/books/{self.author1_book1.pk}/cover/upload-url/'
             'cover.png?content-type=image/png')
         self.assertRC(response, 200)
-        self.assertJE(response, 'file.key', "Book/1/cover.png")
+        self.assertJE(response, 'file.key', key)
         self.assertJE(response, 'file.name', "cover.png")
         self.assertJE(
-            response, 'url', "http://dragonfly.fake/Book/1/cover.png")
+            response, 'url', f"http://dragonfly.fake/{key}")
 
         response = self.client.put(f'/api/books/{self.author1_book1.pk}', dict(
             cover=response.json_content['file']))
         self.assertRC(response, 200)
-        self.assertJE(response, 'cover.key', "Book/1/cover.png")
+        self.assertJE(response, 'cover.key', key)
         self.assertJE(response, 'cover.name', "cover.png")
         self.assertJE(response, 'cover.content-length', 1000)
         self.assertJE(response, 'cover.content-type', "image/png")
@@ -1353,18 +1412,18 @@ class BasicAPITest(TestAssertMixin, TestCase):
             f'/api/books/{self.author1_book1.pk}/cover')
         self.assertRC(response, 200)
         self.assertJE(
-            response, 'url', "http://dragonfly.fake/Book/1/cover.png")
+            response, 'url', f"http://dragonfly.fake/{key}")
 
         response = self.client.get(
             f'/api/books/{self.author1_book1.pk}/cover?redirect=false')
         self.assertRC(response, 200)
         self.assertJE(
-            response, 'url', "http://dragonfly.fake/Book/1/cover.png")
+            response, 'url', f"http://dragonfly.fake/{key}")
 
         response = self.client.get(
             f'/api/books/{self.author1_book1.pk}/cover?redirect=true')
         self.assertRedirects(
-            response, "http://dragonfly.fake/Book/1/cover.png",
+            response, f"http://dragonfly.fake/{key}",
             fetch_redirect_response=False)
 
         with patch.object(
@@ -1374,7 +1433,7 @@ class BasicAPITest(TestAssertMixin, TestCase):
                 f'/api/books/{self.author1_book1.pk}')
             mock_delete.assert_called_with(
                 Bucket='dragonfly.fake',
-                Key=f'Book/{self.author1_book1.pk}/cover.png')
+                Key=key)
 
     def test_annotate_meta_service(self):
         response = self.client.get('/api/authors-annotate/meta')

django_pfx-1.7.6.dev33/django_pfx.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.7.5",
-  "distance": 33,
-  "node": "gcc4ff94bcc60ebba66f3ffe5034d8ffcdd15cdde",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-14"
-}