commonground-api-common 2.6.3__py3-none-any.whl → 2.6.4__py3-none-any.whl

{commonground_api_common-2.6.3.dist-info → commonground_api_common-2.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonground-api-common
-Version: 2.6.3
+Version: 2.6.4
 Summary: Commonground API tooling
 Home-page: https://github.com/maykinmedia/commonground-api-common
 Author: Maykin Media, VNG-Realisatie

{commonground_api_common-2.6.3.dist-info → commonground_api_common-2.6.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
-commonground_api_common-2.6.3.data/scripts/generate_schema,sha256=OpKgzlFc_uzA3TVW_vHSYXAD_feLaCdTEnkWjIcxVzA,280
-vng_api_common/__init__.py,sha256=uJ6TLK18jhCrL0aclBja7NzlAGLAyZjVpX-gq3d461k,22
+commonground_api_common-2.6.4.data/scripts/generate_schema,sha256=OpKgzlFc_uzA3TVW_vHSYXAD_feLaCdTEnkWjIcxVzA,280
+vng_api_common/__init__.py,sha256=ODIwI6SfzWmx_FdtwCfr6k5TmpNuA5JdvGyV-9G9YrM,22
 vng_api_common/admin.py,sha256=iFtUPGf-ha0I-bXgq8QIFrP23Kzk_H3FlgAjt0U-ip0,259
 vng_api_common/apps.py,sha256=QQiJXRmjX9Q91oh0P9fvVnHe3NSYd1cEcUUBw0HLBCA,3690
 vng_api_common/checks.py,sha256=tOyfV7MMLGh4anrd_W30LvJCxiyQ4sFs1mGd9mtrEc0,1175
@@ -13,7 +13,8 @@ vng_api_common/doc.py,sha256=a4Wm6Y-Va-tBsLwZFjPX_oA4PppkDR4wpIiw9q7NLd4,1167
 vng_api_common/exception_handling.py,sha256=Z8Si1-GPWaTtsgaFI_zLOvlnLVLM8jqfgFIimX8eo-8,4759
 vng_api_common/exceptions.py,sha256=7Qk5dlETjoQjZeGRKei4PkeLACLoZOMrMiuyi-yn6Kk,615
 vng_api_common/fields.py,sha256=SXY0HB9NiDVmlKdjBDy3b55E4rn-qboiIMBr_eOBuZE,6302
-vng_api_common/filters.py,sha256=oPivwrES1BQgSUg1jD9hJab7dyoO3VbZDVbbRRiW2SQ,5618
+vng_api_common/filters.py,sha256=mfpew4NkUy4AIqXDg5rE1tzUl8Ae9FTmYz9_MKjjLuA,3763
+vng_api_common/filters_backend.py,sha256=bb8D0Z6uT39PW5ASqlExTesALOVAplJgG4hR7ikG2BI,2096
 vng_api_common/filtersets.py,sha256=CpmuOg6jGKFDwVeCusax-CBI7tv-EuOSBLwewdkLu1Y,1256
 vng_api_common/generators.py,sha256=88yQN5-vRFUegfzQcsZtlpbtQyn_zZQwvs20OidPK7M,1239
 vng_api_common/geo.py,sha256=AZbrw0rwGYOmaSUk8JJSkx-4_tVrfT_cgggh9omRwhU,1862
@@ -34,7 +35,7 @@ vng_api_common/utils.py,sha256=EHqVjZhtqnbU7YrqgYIBss28Sd19jtnTLNaMWLfj3Zw,8203
 vng_api_common/validators.py,sha256=ejaFZvFXFaBlqxjA2_07NSHKHlG5pejrfC_GHjwCj6E,12852
 vng_api_common/version.py,sha256=yJV9_yTM7Qnzg0zGNkJQkN9Uai3I_ZUkcyseJRPRk5I,129
 vng_api_common/views.py,sha256=pxpI2dl22I9auTYvRJ-Rx-_NHAKgo1F2QwQJF6WIjrE,7603
-vng_api_common/viewsets.py,sha256=z5pzvSymFiiuCjP_-uuW-3OJKZY_psPAt8fWeWySU0c,2278
+vng_api_common/viewsets.py,sha256=jAXKHFRBhNKzkjugpYnXkE2zKvCWwKwZA6_VoiTWjvw,2286
 vng_api_common/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/api/permissions.py,sha256=okbwiscxlAtbQWTCRDLL2reOxgj0rRDZeDcrtXAYq00,739
 vng_api_common/api/serializers.py,sha256=F1od8SZxgIlGVTSd_x5eTxacL6x8HbNn35O9z1zjio4,213
@@ -106,7 +107,7 @@ vng_api_common/caching/models.py,sha256=RroS9HFiKNXDV59Odh0x8BO8Az8E81v4gwuprF1A
 vng_api_common/caching/registry.py,sha256=mY1r99x7m0DQ1BN9lZF2zMjFj_oDNq7urxDkOH7-8Yg,6205
 vng_api_common/caching/signals.py,sha256=78ej5cVan-JpNHKzZNAfs0m2ON_TXKphe8ZKtP-6FVY,4615
 vng_api_common/conf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vng_api_common/conf/api.py,sha256=lKQWJyRjhQugA6UJuJb7BHZfXd2ZnFsYRLmsehDdaQg,3150
+vng_api_common/conf/api.py,sha256=tNShwZevKpJ6n713pPGPuUpThcPq-057JAd3xSHW5sU,3158
 vng_api_common/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/contrib/setup_configuration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/contrib/setup_configuration/models.py,sha256=1-G0hXeRe-x6GYtsAaQeMGXq0-cwU5LMb8KTQWj-pQk,1201
@@ -183,7 +184,7 @@ vng_api_common/tests/auth.py,sha256=IKDWTEFv4Bign4F70-ibsFcnJqRxEJaXvqaPQJWa1xY,
 vng_api_common/tests/caching.py,sha256=zfIw5cRRvO9cekHZZKfRqZc8cx5IfJUYNmcH6cuIMg4,624
 vng_api_common/tests/schema.py,sha256=WDvifDQQiKqIpQijpeQ7rYkFroJmuPuHe7zNhl1Bigk,2293
 vng_api_common/tests/urls.py,sha256=PFrYzQbBC0TFPMEn3uPhcBG0IQs9JsEPqckicJT1UA4,2159
-commonground_api_common-2.6.3.dist-info/METADATA,sha256=xAiksqZyWhVPcglOXU0hf8Mh6YvvTDOsbuRGrZdHlAY,6969
-commonground_api_common-2.6.3.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-commonground_api_common-2.6.3.dist-info/top_level.txt,sha256=vPismc83zPzWXTmlNCCwfDlFV9iygJYxNJW5iDjKTgw,15
-commonground_api_common-2.6.3.dist-info/RECORD,,
+commonground_api_common-2.6.4.dist-info/METADATA,sha256=3ukeRcXs4xAZnPuryteaoyPCP7SHHYFMa6tIAxgP6HM,6969
+commonground_api_common-2.6.4.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+commonground_api_common-2.6.4.dist-info/top_level.txt,sha256=vPismc83zPzWXTmlNCCwfDlFV9iygJYxNJW5iDjKTgw,15
+commonground_api_common-2.6.4.dist-info/RECORD,,

{commonground_api_common-2.6.3.dist-info → commonground_api_common-2.6.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

vng_api_common/__init__.py

@@ -1 +1 @@
-__version__ = "2.6.3"
+__version__ = "2.6.4"

vng_api_common/conf/api.py

@@ -33,7 +33,7 @@ BASE_REST_FRAMEWORK = {
     # of applications
     "DEFAULT_AUTHENTICATION_CLASSES": (),
     "DEFAULT_VERSIONING_CLASS": "rest_framework.versioning.URLPathVersioning",
-    "DEFAULT_FILTER_BACKENDS": ("vng_api_common.filters.Backend",),
+    "DEFAULT_FILTER_BACKENDS": ("vng_api_common.filters_backend.Backend",),
     #
     # # Filtering
     "ORDERING_PARAM": "ordering",  # 'ordering',

vng_api_common/filters.py

@@ -5,67 +5,18 @@ from django.core.exceptions import ValidationError
 from django.core.validators import URLValidator
 from django.db import models
 from django.forms.widgets import URLInput
-from django.http import QueryDict
 from django.utils.translation import gettext_lazy as _
 
 from django_filters import fields, filters
 from django_filters.constants import EMPTY_VALUES
-from django_filters.rest_framework import DjangoFilterBackend
-from djangorestframework_camel_case.parser import CamelCaseJSONParser
-from djangorestframework_camel_case.render import CamelCaseJSONRenderer
-from djangorestframework_camel_case.util import underscoreize
-from rest_framework.request import Request
-from rest_framework.views import APIView
 
 from .constants import FILTER_URL_DID_NOT_RESOLVE
-from .search import is_search_view
 from .utils import NotAViewSet, get_resource_for_path
 from .validators import validate_rsin
 
 logger = logging.getLogger(__name__)
 
 
-class Backend(DjangoFilterBackend):
-    def _is_camel_case(self, view):
-        return any(
-            issubclass(parser, CamelCaseJSONParser) for parser in view.parser_classes
-        ) or any(
-            issubclass(renderer, CamelCaseJSONRenderer)
-            for renderer in view.renderer_classes
-        )
-
-    def _transform_query_params(self, view, query_params: QueryDict) -> QueryDict:
-        if not self._is_camel_case(view):
-            return query_params
-
-        # data can be a regular dict if it's coming from a serializer
-        if hasattr(query_params, "lists"):
-            data = dict(query_params.lists())
-        else:
-            data = query_params
-
-        transformed = underscoreize(data)
-
-        return QueryDict(urlencode(transformed, doseq=True))
-
-    def get_filterset_kwargs(
-        self, request: Request, queryset: models.QuerySet, view: APIView
-    ):
-        """
-        Get the initialization parameters for the filterset.
-
-        * filter on request.data if request.query_params is empty
-        * do the camelCase transformation of filter parameters
-        """
-        kwargs = super().get_filterset_kwargs(request, queryset, view)
-        filter_parameters = (
-            request.query_params if not is_search_view(view) else request.data
-        )
-        query_params = self._transform_query_params(view, filter_parameters)
-        kwargs["data"] = query_params
-        return kwargs
-
-
 class URLModelChoiceField(fields.ModelChoiceField):
     widget = URLInput
 

vng_api_common/filters_backend.py

@@ -0,0 +1,61 @@
+import logging
+from urllib.parse import urlencode
+
+from django.db import models
+from django.http import QueryDict
+from django.utils.translation import gettext_lazy as _
+
+from django_filters.rest_framework import DjangoFilterBackend
+from djangorestframework_camel_case.parser import CamelCaseJSONParser
+from djangorestframework_camel_case.render import CamelCaseJSONRenderer
+from djangorestframework_camel_case.util import underscoreize
+from rest_framework.request import Request
+from rest_framework.views import APIView
+
+from .filtersets import FilterSet
+from .search import is_search_view
+
+logger = logging.getLogger(__name__)
+
+
+class Backend(DjangoFilterBackend):
+    filterset_base = FilterSet
+
+    def _is_camel_case(self, view):
+        return any(
+            issubclass(parser, CamelCaseJSONParser) for parser in view.parser_classes
+        ) or any(
+            issubclass(renderer, CamelCaseJSONRenderer)
+            for renderer in view.renderer_classes
+        )
+
+    def _transform_query_params(self, view, query_params: QueryDict) -> QueryDict:
+        if not self._is_camel_case(view):
+            return query_params
+
+        # data can be a regular dict if it's coming from a serializer
+        if hasattr(query_params, "lists"):
+            data = dict(query_params.lists())
+        else:
+            data = query_params
+
+        transformed = underscoreize(data)
+
+        return QueryDict(urlencode(transformed, doseq=True))
+
+    def get_filterset_kwargs(
+        self, request: Request, queryset: models.QuerySet, view: APIView
+    ):
+        """
+        Get the initialization parameters for the filterset.
+
+        * filter on request.data if request.query_params is empty
+        * do the camelCase transformation of filter parameters
+        """
+        kwargs = super().get_filterset_kwargs(request, queryset, view)
+        filter_parameters = (
+            request.query_params if not is_search_view(view) else request.data
+        )
+        query_params = self._transform_query_params(view, filter_parameters)
+        kwargs["data"] = query_params
+        return kwargs

vng_api_common/viewsets.py

@@ -6,7 +6,7 @@ from rest_framework.pagination import PageNumberPagination
 from rest_framework.settings import api_settings
 from rest_framework_nested.viewsets import NestedViewSetMixin  # noqa
 
-from .filters import Backend
+from .filters_backend import Backend
 from .utils import underscore_to_camel