django-pfx 1.4.dev4__tar.gz → 1.4.dev8__tar.gz

{django-pfx-1.4.dev4 → django-pfx-1.4.dev8}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.4.dev4
+Version: 1.4.dev8
 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.dev4 → django-pfx-1.4.dev8}/pfx/pfxcore/default_settings.py

@@ -12,4 +12,12 @@ PFX_OPENAPI_TEMPLATE = {}
 PFX_PROFILING_SQL = ""
 PFX_PROFILING_CPROFILE = ""
 
+STORAGE_S3_AWS_REGION = None
+STORAGE_S3_AWS_ACCESS_KEY = None
+STORAGE_S3_AWS_SECRET_KEY = None
+STORAGE_S3_AWS_ENDPOINT_URL = None
+STORAGE_S3_AWS_S3_BUCKET = None
+STORAGE_S3_AWS_PUT_URL_EXPIRE = None
+STORAGE_S3_AWS_GET_URL_EXPIRE = None
+
 PFX_TEST_MODE = False

{django-pfx-1.4.dev4 → django-pfx-1.4.dev8}/pfx/pfxcore/storage/s3_storage.py

@@ -1,11 +1,11 @@
 import logging
 from io import IOBase
 
-from django.conf import settings
-
 import boto3
 from botocore.exceptions import ClientError
 
+from pfx.pfxcore.shortcuts import settings
+
 logger = logging.getLogger(__name__)
 
 
@@ -19,7 +19,8 @@ class S3Storage:
         return boto3.client(
             's3', region_name=settings.STORAGE_S3_AWS_REGION,
             aws_access_key_id=settings.STORAGE_S3_AWS_ACCESS_KEY,
-            aws_secret_access_key=settings.STORAGE_S3_AWS_SECRET_KEY)
+            aws_secret_access_key=settings.STORAGE_S3_AWS_SECRET_KEY,
+            endpoint_url=settings.STORAGE_S3_AWS_ENDPOINT_URL)
 
     def to_python(self, value):
         if 'key' not in value:

{django-pfx-1.4.dev4 → django-pfx-1.4.dev8}/pfx/pfxcore/views/rest_views.py

@@ -12,6 +12,7 @@ from django.core.exceptions import (
 )
 from django.db import IntegrityError, transaction
 from django.db.models import ForeignKey, Model, Q
+from django.db.models.fields import AutoFieldMixin
 from django.shortcuts import redirect
 from django.urls import path
 from django.utils.translation import gettext_lazy as _
@@ -422,7 +423,8 @@ class BodyMixin:
         except JSONDecodeError as e:
             raise JsonErrorAPIError(e)
 
-    def body_to_model(self, model: Model, validate=True, **kwargs):
+    def body_to_model(
+            self, model: Model, validate=True, fields=None, **kwargs):
         """Return a new model instance built with request body.
 
         :param model: The model to instantiate
@@ -430,7 +432,12 @@ class BodyMixin:
         :param \\**kwargs: The optional arguments for `full_clean`
         :rtype: :class:`django.db.models.Model`
         """
-        obj = model(**self.deserialize_body())
+        if fields is None:
+            fields = [
+                f.name for f in model._meta.get_fields()
+                if not isinstance(f, AutoFieldMixin)]
+        obj = model(**{
+            k: v for k, v in self.deserialize_body().items() if k in fields})
         if validate:
             try:
                 obj.full_clean(**kwargs)

{django-pfx-1.4.dev4 → django-pfx-1.4.dev8}/tests/tests/test_body_mixin.py

@@ -32,6 +32,22 @@ class TestBodyMixin(TestAssertMixin, TestCase):
         self.assertIsInstance(custom, CustomModel)
         self.assertEqual(custom.value, 7)
 
+    def test_body_to_model_ignore_auto_fields(self):
+        view = CustomView(id=99999, value=7)
+        custom = view.body_to_model(CustomModel)
+
+        self.assertIsInstance(custom, CustomModel)
+        self.assertNotEqual(custom.pk, 99999)
+        self.assertEqual(custom.value, 7)
+
+    def test_body_to_model_ignore_unknown_fields(self):
+        view = CustomView(id=99999, value=7)
+        custom = view.body_to_model(CustomModel)
+
+        self.assertIsInstance(custom, CustomModel)
+        self.assertNotEqual(custom.pk, 99999)
+        self.assertEqual(custom.value, 7)
+
     def test_body_to_model_validation(self):
         view = CustomView()
         with self.assertRaises(ModelValidationAPIError) as cm: