django-pfx 1.4.dev174__tar.gz → 1.4.dev178__tar.gz

{django_pfx-1.4.dev174 → django_pfx-1.4.dev178}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev174
+Version: 1.4.dev178
 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.4.dev174 → django_pfx-1.4.dev178}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev174
+Version: 1.4.dev178
 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.4.dev174 → django_pfx-1.4.dev178}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-12-18 12:52+0100\n"
+"POT-Creation-Date: 2026-02-11 13:48+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -112,27 +112,27 @@ msgstr "OTP activé"
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr "%(model_name)s avec ce/cette %(field_labels)s éxiste déjà."
 
-#: shortcuts.py:51
+#: shortcuts.py:52
 #, python-brace-format
 msgid "{key} must be an integer number."
 msgstr "{key} doit être un nombre entier."
 
-#: shortcuts.py:67
+#: shortcuts.py:68
 #, python-brace-format
 msgid "{key} must be a number."
 msgstr "{key} doit être un nombre."
 
-#: shortcuts.py:83
+#: shortcuts.py:84
 #, python-brace-format
 msgid "{key} must be a decimal number."
 msgstr "{key} doit être un nombre décimal."
 
-#: shortcuts.py:99
+#: shortcuts.py:100
 #, python-brace-format
 msgid "{key} must be a date."
 msgstr "{key} doit être une date."
 
-#: shortcuts.py:120
+#: shortcuts.py:121
 #, python-brace-format
 msgid "{key} must be “true”, “false”, “1”, “0” or empty."
 msgstr "{key} doit être « true », « false », « 1 », « 0 » ou vide"
@@ -286,23 +286,23 @@ msgstr "Le paramètre object est requis pour move={move}."
 msgid "object {pk} does not exists in this move context."
 msgstr "object {pk} n'existe pas dans ce contexte de déplacement."
 
-#: views/rest_views.py:225 views/rest_views.py:391
+#: views/rest_views.py:225 views/rest_views.py:390
 #, python-brace-format
 msgid "{obj} cannot be deleted because it is referenced by other objects."
 msgstr ""
 "{obj} ne peut pas être supprimé car il est référencé par d’autres objets."
 
-#: views/rest_views.py:355
+#: views/rest_views.py:354
 #, python-brace-format
 msgid "{model} {obj} created."
 msgstr "{model} {obj} créé."
 
-#: views/rest_views.py:356
+#: views/rest_views.py:355
 #, python-brace-format
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1270
+#: views/rest_views.py:1269
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.4.dev174 → django_pfx-1.4.dev178}/pfx/pfxcore/shortcuts.py

@@ -2,6 +2,7 @@
 import logging
 from datetime import date
 from decimal import Decimal as D
+from pathlib import Path
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import gettext_lazy as _
@@ -156,3 +157,13 @@ def permissions(*perms):
 def model_permissions(model, *actions):
     meta = model._meta
     return {f"{meta.app_label}.{a}_{meta.model_name}" for a in actions}
+
+
+def file_extension(filename):
+    suffixes = Path(filename).suffixes
+    if not suffixes:
+        return ''
+    elif suffixes[-1] in ['gz', 'bz2'] and len(suffixes) > 1:
+        return ''.join(suffixes[-2:])
+    else:
+        return suffixes[-1]

{django_pfx-1.4.dev174 → django_pfx-1.4.dev178}/pfx/pfxcore/storage/local_storage.py

@@ -1,10 +1,10 @@
-import hashlib
 import logging
+import uuid
 from pathlib import Path
 
 from django.http import FileResponse
 
-from pfx.pfxcore.shortcuts import settings
+from pfx.pfxcore.shortcuts import file_extension, settings
 
 logger = logging.getLogger(__name__)
 
@@ -24,18 +24,11 @@ class LocalStorage:
         relative_path = Path(*key_list[:-1])
         dirname = Path(settings.STORAGE_LOCAL_ROOT, relative_path)
         dirname.mkdir(parents=True, exist_ok=True)
-        suffixes = Path(filename).suffixes
-        if not suffixes:
-            ext = ''
-        elif suffixes[-1] in ['gz', 'bz2'] and len(suffixes) > 1:
-            ext = ''.join(suffixes[-2:])
-        else:
-            ext = suffixes[-1]
-        hashname = f'{hashlib.sha1(file).hexdigest()}{ext}'
-        final_key = str(Path(relative_path, hashname))
-        with open(Path(dirname, hashname), 'wb') as f:
+        uuidname = f'{uuid.uuid4()}{file_extension(filename)}'
+        final_key = str(Path(relative_path, uuidname))
+        with open(Path(dirname, uuidname), 'wb') as f:
             f.write(file)
-        with open(Path(dirname, hashname), 'rb') as f:
+        with open(Path(dirname, uuidname), 'rb') as f:
             response = FileResponse(
                 f, as_attachment=True, filename=filename)
             return {

{django_pfx-1.4.dev174 → django_pfx-1.4.dev178}/pfx/pfxcore/views/fields.py

@@ -2,6 +2,10 @@ import inspect
 import logging
 import operator
 
+from django.contrib.contenttypes.fields import (
+    GenericForeignKey,
+    GenericRelation,
+)
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models.constants import LOOKUP_SEP
@@ -57,6 +61,8 @@ class FieldType:
         (models.CharField, CharField),
         (models.URLField, CharField),
         (models.UUIDField, CharField),
+        (GenericRelation, ModelObjectList),
+        (GenericForeignKey, ModelObject),
         (models.ForeignObject, ModelObject),
         (models.OneToOneRel, ModelObject),
         (models.ForeignObjectRel, ModelObjectList),
@@ -380,12 +386,16 @@ class ViewModelField(ViewField):
             if self.related_model and related_fields:
                 self.related_fields = process_fields(
                     self.related_model, related_fields)
-        if not self.select_related and (
-                self.field_type == FieldType.ModelObject):
+        # Force a prefetch for GenericForeignKey (not valid in select_related)
+        is_generic_fk = isinstance(model_field, GenericForeignKey)
+        if (not self.select_related and
+                self.field_type == FieldType.ModelObject and
+                not is_generic_fk):
             # Auto add the field in select_related if select_related
             # is not defined and the field is an object.
             self.select_related = [self.name]
         if not self.prefetch_related and (
+                is_generic_fk or
                 self.field_type == FieldType.ModelObjectList):
             # Auto add the field in prefetch_related if prefetch_related
             # is not defined and the field is an object list.

{django_pfx-1.4.dev174 → django_pfx-1.4.dev178}/pfx/pfxcore/views/rest_views.py

@@ -333,7 +333,6 @@ class ModelResponseMixin(ModelMixin):
         obj._rel_data = rel_data or {}
         if errors:
             try:
-                obj._rel_data = rel_data
                 obj.full_clean(**kwargs)
             except ValidationError as e:
                 for k, ms in e.error_dict.items():

{django_pfx-1.4.dev174 → django_pfx-1.4.dev178}/tests/tests/basic_api_test.py

@@ -746,15 +746,12 @@ class BasicAPITest(TestAssertMixin, TestCase):
         self.assertRC(response, 200)
         self.assertJE(response, 'local_file.content-length', '12')
         self.assertJE(response, 'local_file.content-type', 'text/plain')
-        self.assertJE(
-            response, 'local_file.key',
-            f"Book/{book_pk}/bca20547e94049e1ffea27223581c567022a5774.txt")
+        self.assertJEExists(response, 'local_file.key')
         self.assertJE(response, 'local_file.name', 'test.txt')
         self.assertJE(
             response, 'local_file.url', f"/books/{book_pk}/local_file")
-        self.assertTrue(Path(
-            f'/tmp/django-pfx-filestore/Book/{book_pk}/'
-            'bca20547e94049e1ffea27223581c567022a5774.txt').exists())
+        key1 = self.get_val(response, 'local_file.key')
+        self.assertTrue(Path(f'/tmp/django-pfx-filestore/{key1}').exists())
 
         # Replace file
         response = self.client.put(f'/api/books/{book_pk}', dict(
@@ -763,25 +760,18 @@ class BasicAPITest(TestAssertMixin, TestCase):
                 base64='data:text/plain;charset=utf-8;'
                 'base64,TmV3IGNvbnRlbnQ=')))
         self.assertRC(response, 200)
-        self.assertJE(
-            response, 'local_file.key',
-            f"Book/{book_pk}/af9f06b2b3b1546ac44f4a02994d0ef09e074b91.txt")
+        self.assertNJE(response, 'local_file.key', key1)
         self.assertJE(response, 'local_file.name', 'test2.txt')
-        self.assertFalse(Path(
-            f'/tmp/django-pfx-filestore/Book/{book_pk}/'
-            'bca20547e94049e1ffea27223581c567022a5774.txt').exists())
-        self.assertTrue(Path(
-            f'/tmp/django-pfx-filestore/Book/{book_pk}/'
-            'af9f06b2b3b1546ac44f4a02994d0ef09e074b91.txt').exists())
+        self.assertFalse(Path(f'/tmp/django-pfx-filestore/{key1}').exists())
+        key2 = self.get_val(response, 'local_file.key')
+        self.assertTrue(Path(f'/tmp/django-pfx-filestore/{key2}').exists())
 
         # Delete file
         response = self.client.put(f'/api/books/{book_pk}', dict(
             local_file=None))
         self.assertRC(response, 200)
         self.assertJE(response, 'local_file', None)
-        self.assertFalse(Path(
-            f'/tmp/django-pfx-filestore/Book/{book_pk}/'
-            'af9f06b2b3b1546ac44f4a02994d0ef09e074b91.txt').exists())
+        self.assertFalse(Path(f'/tmp/django-pfx-filestore/{key2}').exists())
 
     def test_create_null_values(self):
         response = self.client.post(