dynamicforms 0.76.17__tar.gz → 0.76.18__tar.gz

{dynamicforms-0.76.17 → dynamicforms-0.76.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dynamicforms
-Version: 0.76.17
+Version: 0.76.18
 Summary: DynamicForms performs all the visualisation & data entry of your DRF Serializers & ViewSets and adds some candy of its own
 Project-URL: Homepage, https://github.com/velis74/DynamicForms
 Project-URL: Repository, https://github.com/velis74/DynamicForms

{dynamicforms-0.76.17 → dynamicforms-0.76.18}/dynamicforms/__init__.py

@@ -1,5 +1,5 @@
 __title__ = "DynamicForms"
-__version__ = '0.76.17'
+__version__ = '0.76.18'
 __author__ = "Jure Erznožnik"
 __email__ = "jure.erznoznik@gmail.com"
 __license__ = "BSD 3-Clause"

{dynamicforms-0.76.17 → dynamicforms-0.76.18}/dynamicforms/pagination.py

@@ -140,39 +140,39 @@ class CursorPagination(drf_p.CursorPagination):
         return self.page
 
 
-def _get_position_from_instance(self, instance, ordering):
-    def process_field(idx):
-        field_name = ordering[idx].lstrip("-")
-        attr = None
-        if isinstance(instance, dict):
-            attr = instance[field_name]
+    def _get_position_from_instance(self, instance, ordering):
+        def process_field(idx):
+            field_name = ordering[idx].lstrip("-")
+            attr = None
+            if isinstance(instance, dict):
+                attr = instance[field_name]
+            else:
+                field_name_list = field_name.split("__")
+                for fn in field_name_list:
+                    attr = getattr(instance if attr is None else attr, fn)
+            return field_name, self.field_to_representation(attr)
+
+        return json.dumps({k: v for k, v in map(lambda idx: process_field(idx), range(len(ordering)))})
+
+
+    def field_to_representation(self, value):
+        """
+        Converts field value to something that will be later understood by QuerySet.filter()
+        Question: why does DRF not do this? is str(value) always enough?
+        """
+        if isinstance(value, datetime.timedelta):
+            return str(value.total_seconds())
+        elif value is None:
+            return self.NONE_VALUE
+        return str(value)
+
+
+    def field_to_python(self, queryset, order_attr, value):
+        if order_attr in queryset.query.annotations:
+            field = queryset.query.annotations.get(order_attr).field
         else:
-            field_name_list = field_name.split("__")
-            for fn in field_name_list:
-                attr = getattr(instance if attr is None else attr, fn)
-        return field_name, self.field_to_representation(attr)
-
-    return json.dumps({k: v for k, v in map(lambda idx: process_field(idx), range(len(ordering)))})
-
-
-def field_to_representation(self, value):
-    """
-    Converts field value to something that will be later understood by QuerySet.filter()
-    Question: why does DRF not do this? is str(value) always enough?
-    """
-    if isinstance(value, datetime.timedelta):
-        return str(value.total_seconds())
-    elif value is None:
-        return self.NONE_VALUE
-    return str(value)
-
-
-def field_to_python(self, queryset, order_attr, value):
-    if order_attr in queryset.query.annotations:
-        field = queryset.query.annotations.get(order_attr).field
-    else:
-        # noinspection PyProtectedMember
-        field = queryset.model._meta.get_field(order_attr)
-    if isinstance(field, DurationField):
-        return datetime.timedelta(seconds=float(value))
-    return value
+            # noinspection PyProtectedMember
+            field = queryset.model._meta.get_field(order_attr)
+        if isinstance(field, DurationField):
+            return datetime.timedelta(seconds=float(value))
+        return value

{dynamicforms-0.76.17 → dynamicforms-0.76.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dynamicforms"
-version = "0.76.17"
+version = "0.76.18"
 description = "DynamicForms performs all the visualisation & data entry of your DRF Serializers & ViewSets and adds some candy of its own"
 readme = "README.md"
 requires-python = ">=3.8"