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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev166
+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.dev166 → 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.dev166
+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.dev166 → 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))