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

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

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

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

@@ -19,6 +19,26 @@ def get_storage_class(class_path):
     return getattr(import_module('.'.join(ps[:-1])), ps[-1])()
 
 
+def validate_media_json(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.")
+
+
 class MediaField(models.JSONField):
     def __init__(
             self, *args, max_length=255, get_key=None, storage=None,
@@ -33,9 +53,8 @@ class MediaField(models.JSONField):
         self.allowed_keys = DEFAULT_KEYS.union(extra_keys or set())
         self._db_value = None
 
-        # Inject validator
-        kwargs.setdefault("validators", [])
-        kwargs["validators"].append(self.validate_keys)
+        # Inject default validator if empty
+        kwargs.setdefault("validators", [validate_media_json])
 
         super().__init__(*args, max_length=max_length, **kwargs)
 
@@ -43,25 +62,6 @@ class MediaField(models.JSONField):
     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}