django-pfx 1.4.dev164__tar.gz → 1.4.dev168__tar.gz

{django_pfx-1.4.dev164 → django_pfx-1.4.dev168}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev164
+Version: 1.4.dev168
 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.dev164 → django_pfx-1.4.dev168}/pfx/pfxcore/fields/media_field.py

@@ -2,6 +2,7 @@ import logging
 from importlib import import_module
 from urllib.request import urlopen
 
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models.signals import post_delete, post_init
 from django.dispatch import receiver
@@ -10,6 +11,8 @@ from pfx.pfxcore.shortcuts import settings
 
 logger = logging.getLogger(__name__)
 
+DEFAULT_KEYS = {"key", "name", "content-type", "content-length"}
+
 
 def get_storage_class(class_path):
     ps = class_path.split('.')
@@ -19,7 +22,7 @@ def get_storage_class(class_path):
 class MediaField(models.JSONField):
     def __init__(
             self, *args, max_length=255, get_key=None, storage=None,
-            auto_delete=False, **kwargs):
+            auto_delete=False, extra_keys=None, **kwargs):
         self.get_key = get_key or self.get_default_key
         if not storage and not settings.STORAGE_DEFAULT:
             raise Exception(
@@ -27,14 +30,47 @@ class MediaField(models.JSONField):
                 "class on the field or define STORAGE_DEFAULT settings.")
         self.storage = storage or get_storage_class(settings.STORAGE_DEFAULT)
         self.auto_delete = auto_delete
+        self.allowed_keys = DEFAULT_KEYS.union(extra_keys or set())
         self._db_value = None
-        super().__init__(
-            *args, max_length=max_length, **kwargs)
+
+        # Inject validator
+        kwargs.setdefault("validators", [])
+        kwargs["validators"].append(self.validate_keys)
+
+        super().__init__(*args, max_length=max_length, **kwargs)
 
     @staticmethod
     def get_default_key(obj, filename):
         return f"{type(obj).__name__}/{obj.pk}/{filename}"
 
+    def validate_keys(self, value):
+        if isinstance(value, dict):
+            missing_keys = []
+            if value.get('key'):
+                # Empty dict or empty key is allowed to save
+                # and object without file to have a pk to determine the key.
+                # When the key is set, other required keys must be present.
+                if not value.get('name'):
+                    missing_keys.append('name')
+                if not value.get('content-type'):
+                    missing_keys.append('content-type')
+                if not value.get('content-length'):
+                    missing_keys.append('content-length')
+            if missing_keys:
+                raise ValidationError(
+                    f"Missing required keys: {', '.join(missing_keys)}")
+        else:
+            raise ValidationError("Value must be a dictionary.")
+
+    def clean_value(self, value):
+        if isinstance(value, dict):
+            return {k: v for k, v in value.items() if k in self.allowed_keys}
+        return value
+
+    def get_prep_value(self, value):
+        value = self.clean_value(value)
+        return super().get_prep_value(value)
+
     def media_pre_save(self, obj):
         def save_file(obj, file, name):
             setattr(obj, self.name, self.upload(obj, file, name))

{django_pfx-1.4.dev164 → django_pfx-1.4.dev168}/pfx/pfxcore/fields/rich_text_field.py

@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
+from django.db.models.signals import pre_save
 from django.utils.safestring import mark_safe
 
 import nh3
@@ -28,19 +29,22 @@ class RichTextField(models.TextField):
                     "for this field.")
             self.nh3_kwargs = settings.NH3_CONFIGS[nh3_config]
 
-    def pre_save(self, model_instance, add):
-        data = getattr(model_instance, self.attname)
-        if data is None:
-            return data
-        clean_value = (
-            nh3.clean(data, **self.nh3_kwargs)
-            if self.nh3_kwargs and data else data or "")
-        setattr(model_instance, self.attname, mark_safe(clean_value))
-        return clean_value
-
     def from_db_value(self, value, expression, connection):
         if value is None:
             return value
         # Values are sanitized before saving, so any value returned from the DB
         # is safe to render unescaped.
         return mark_safe(value)
+
+    def contribute_to_class(self, cls, name, private_only=False):
+        super().contribute_to_class(cls, name, private_only=private_only)
+
+        if self.nh3_kwargs:
+            # connect a pre_save signal for this field
+            def sanitize(sender, instance, **kwargs):
+                value = getattr(instance, name)
+                if value:
+                    clean_value = nh3.clean(value, **self.nh3_kwargs)
+                    setattr(instance, name, mark_safe(clean_value))
+
+            pre_save.connect(sanitize, sender=cls, weak=False)

{django_pfx-1.4.dev164 → django_pfx-1.4.dev168}/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-10-22 16:49+0200\n"
+"POT-Creation-Date: 2025-11-18 16:38+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -302,7 +302,7 @@ msgstr "{model} {obj} créé."
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1261
+#: views/rest_views.py:1262
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.4.dev164 → django_pfx-1.4.dev168}/pfx/pfxcore/views/fields.py

@@ -113,6 +113,7 @@ class ViewField:
             readonly=False, readonly_create=False, readonly_update=False,
             choices=None, json_repr=None, media_field_api=None,
             related_model=None, related_model_api=None, related_fields=None,
+            related_filter=None,
             select_related=None, prefetch_related=None):
         self.name = name
         self.alias = alias or name
@@ -131,6 +132,7 @@ class ViewField:
         if self.related_model and related_fields:
             self.related_fields = process_fields(
                 self.related_model, related_fields)
+        self.related_filter = related_filter
         self.select_related = select_related or []
         self.prefetch_related = prefetch_related or []
         self.model_field = None
@@ -188,7 +190,10 @@ class ViewField:
         if self.field_type == FieldType.ModelObject:
             return self._related_json_repr(value)
         if self.field_type == FieldType.ModelObjectList:
-            return [self._related_json_repr(o) for o in value.all()]
+            qs = (
+                value.filter(self.related_filter) if self.related_filter
+                else value.all())
+            return [self._related_json_repr(o) for o in qs]
 
         if self.json_repr:
             return self.json_repr(value)
@@ -454,8 +459,8 @@ class VF:
             readonly=False, readonly_create=False, readonly_update=False,
             choices=None, select_related=None, prefetch_related=None,
             json_repr=None, related_model=None, related_model_api=None,
-            field=None, related_fields=None, media_field_api=None,
-            db_type=None, order=None):
+            field=None, related_fields=None, related_filter=None,
+            media_field_api=None, db_type=None, order=None):
         self.kwargs = dict(
             name=name, verbose_name=verbose_name, field_type=field_type,
             alias=alias,
@@ -464,7 +469,8 @@ class VF:
             select_related=select_related, prefetch_related=prefetch_related,
             json_repr=json_repr, related_model=related_model,
             related_model_api=related_model_api, field=field,
-            related_fields=related_fields, media_field_api=media_field_api,
+            related_fields=related_fields, related_filter=related_filter,
+            media_field_api=media_field_api,
             db_type=db_type, order=order)
 
     def to_field(self, model):

{django_pfx-1.4.dev164 → django_pfx-1.4.dev168}/pfx/pfxcore/views/rest_views.py

@@ -282,7 +282,7 @@ class ModelResponseMixin(ModelMixin):
         return vals
 
     def get_navigation_meta(self, obj):
-        raise APIError("navigation data are only available on list view.")
+        return {}
 
     def response(self, o, **meta):
         """Build a :class:`JsonResponse` from an object instance.
@@ -391,6 +391,7 @@ class ModelResponseMixin(ModelMixin):
                             save_field = getattr(o, '_save_related', False)
                             if save_field:
                                 setattr(o, save_field, obj)
+                                funcs += self.pre_save(o, created=created)
                                 o.save()
                     getattr(obj, k).set(v)
             self.post_save(obj, created=created, funcs=funcs)