dynamicforms 0.77.21__tar.gz → 0.77.23__tar.gz

{dynamicforms-0.77.21 → dynamicforms-0.77.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynamicforms
-Version: 0.77.21
+Version: 0.77.23
 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.77.21 → dynamicforms-0.77.23}/dynamicforms/__init__.py

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

{dynamicforms-0.77.21 → dynamicforms-0.77.23}/dynamicforms/filters.py

@@ -1,5 +1,9 @@
+from typing import List
+
 import django_filters.rest_framework as filters
 
+from drf_spectacular.extensions import OpenApiFilterExtension
+
 
 class ListWithFields(list):
     def __init__(self, fields, lst) -> None:
@@ -43,3 +47,29 @@ class FilterBackend(filters.DjangoFilterBackend):
         for name, value in filterset.form.cleaned_data.items():
             if name in ordering_filters:
                 return ordering_filters[name].get_ordering(value)
+
+
+# Extension that implements OpenApiFilterExtension
+class FilterExtension(OpenApiFilterExtension):
+    def get_schema_operation_parameters(self, auto_schema: "AutoSchema", *args, **kwargs) -> List[dict]:
+        from drf_spectacular.contrib.django_filters import DjangoFilterExtension
+
+        # First get the standard parameters from DjangoFilterExtension
+        parameters = DjangoFilterExtension(self.target).get_schema_operation_parameters(auto_schema, *args, **kwargs)
+
+        # Then add any custom parameters specific to your extension
+        custom_params = []
+        # custom_params = [
+        #     {
+        #         'name': 'my_custom_param',
+        #         'required': False,
+        #         'in': 'query',
+        #         'description': 'Custom parameter description',
+        #         'schema': build_parameter_type(str),
+        #     }
+        #     # Add more custom parameters as needed
+        # ]
+
+        return parameters + custom_params
+
+    target_class = FilterBackend

{dynamicforms-0.77.21 → dynamicforms-0.77.23}/dynamicforms/template_render/mixins/serializer.py

@@ -142,15 +142,16 @@ class ViewModeSerializer(ViewModeBase, SerializerFilter, metaclass=SerializerMet
         return BoundSerializerRenderActions()
 
     def component_params(self: "_ViewModeBoundSerializer", output_json: bool = True):
+        from dynamicforms.utils import get_pk_name
+
+        if getattr(self, "Meta", None) and getattr(self.Meta, "model", None):
+            primary_key_name = get_pk_name(self.Meta.model)
+        else:
+            primary_key_name = "id"
+
         params = {
             "uuid": self.uuid,
-            "primary_key_name": (
-                self.Meta.model._meta.pk.name
-                if not self.Meta.model._meta.get_parent_list()
-                else self.Meta.model._meta.get_parent_list()[0]._meta.pk.name
-            )
-            if getattr(self, "Meta", None) and getattr(self.Meta, "model", None)
-            else "id",
+            "primary_key_name": primary_key_name,
             "titles": self.form_titles,
             "columns": [c.as_component_def() for c in self.render_fields.fields],
             "responsive_table_layouts": self.get_responsive_table_layouts_def(),

{dynamicforms-0.77.21 → dynamicforms-0.77.23}/examples/migrations/__init__.py

@@ -2,6 +2,7 @@ import random
 
 import django.utils.timezone
 
+from dynamicforms.utils import get_pk_name
 from setup.settings import TESTING
 
 
@@ -25,7 +26,7 @@ def add_filter(Filter):
                 bool_field=((i - 1) % 10) > 4,
             )
             if TESTING:
-                filter_data[Filter._meta.pk.name] = i
+                filter_data[get_pk_name(Filter)] = i
             Filter.objects.create(**filter_data)
 
 

{dynamicforms-0.77.21 → dynamicforms-0.77.23}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dynamicforms"
-version = "0.77.21"
+version = "0.77.23"
 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"