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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonground-api-common
-Version: 2.6.4
+Version: 2.6.6
 Summary: Commonground API tooling
 Home-page: https://github.com/maykinmedia/commonground-api-common
 Author: Maykin Media, VNG-Realisatie
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: django>=4.2.0
 Requires-Dist: django-filter<=25.1,>=23.1
@@ -33,7 +34,6 @@ Requires-Dist: zgw-consumers>=0.35.1
 Requires-Dist: oyaml
 Requires-Dist: PyJWT>=2.1.1
 Requires-Dist: requests
-Requires-Dist: requests-mock
 Requires-Dist: coreapi
 Requires-Dist: ape-pie
 Provides-Extra: markdown-docs
@@ -45,24 +45,23 @@ Provides-Extra: drf-extra-fields
 Requires-Dist: drf-extra-fields>=3.7.0; extra == "drf-extra-fields"
 Provides-Extra: tests
 Requires-Dist: psycopg2; extra == "tests"
-Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest==8.3.5; extra == "tests"
 Requires-Dist: pytest-django; extra == "tests"
 Requires-Dist: pytest-dotenv; extra == "tests"
 Requires-Dist: pytest-factoryboy; extra == "tests"
 Requires-Dist: tox; extra == "tests"
-Requires-Dist: isort; extra == "tests"
-Requires-Dist: black; extra == "tests"
+Requires-Dist: ruff; extra == "tests"
 Requires-Dist: requests-mock; extra == "tests"
 Requires-Dist: freezegun; extra == "tests"
 Requires-Dist: zgw-consumers-oas; extra == "tests"
 Requires-Dist: djangorestframework-gis; extra == "tests"
 Requires-Dist: drf-extra-fields; extra == "tests"
+Provides-Extra: oas
+Requires-Dist: requests-mock; extra == "oas"
 Provides-Extra: testutils
 Requires-Dist: zgw-consumers-oas; extra == "testutils"
 Provides-Extra: setup-configuration
 Requires-Dist: django-setup-configuration>=0.7.0; extra == "setup-configuration"
-Provides-Extra: pep8
-Requires-Dist: flake8; extra == "pep8"
 Provides-Extra: coverage
 Requires-Dist: pytest-cov; extra == "coverage"
 Provides-Extra: docs
@@ -76,7 +75,12 @@ Requires-Dist: bump2version; extra == "release"
 Commonground-API-common - Tooling voor RESTful APIs
 ===================================================
 
-|build-status| |code-quality| |coverage| |docs| |black|
+
+:Version: 2.6.6
+:Source: https://github.com/maykinmedia/commonground-api-common
+:PythonVersion: 3.12
+
+|build-status| |code-quality| |coverage| |docs| |ruff|
 
 |python-versions| |django-versions| |pypi-version|
 
@@ -105,7 +109,7 @@ Features
     * Niet-negatieve waarde validator
     * Alfanumerieke waarde (zonder diacritics)
     * URL-validator (test dat URL bestaat) met pluggable link-checker
-    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*.
+    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*. (Via de TIME_LEEWAY setting kan speling worden toegevoegd)
     * ``UniekeIdentificatieValidator`` (in combinatie met organisatie)
     * ``InformatieObjectUniqueValidator`` om te valideren dat M2M entries
       slechts eenmalig voorkomen
@@ -158,7 +162,8 @@ Features
 .. |pypi-version| image:: https://img.shields.io/pypi/v/commonground-api-common.svg
     :target: https://pypi.org/project/commonground-api-common/
 
-.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
+.. |ruff| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
 
 .. _documentatie: https://commonground-api-common.readthedocs.io/en/latest/?badge=latest

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

@@ -1,40 +1,40 @@
-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
+commonground_api_common-2.6.6.data/scripts/generate_schema,sha256=OpKgzlFc_uzA3TVW_vHSYXAD_feLaCdTEnkWjIcxVzA,280
+vng_api_common/__init__.py,sha256=MJHGx-Qo0nycI7WHSavnK8Mok6HS_De_qLfGWXih6Og,22
+vng_api_common/admin.py,sha256=WiD6afzO9sJh_Nz7TKsxCiGm49vS0qQH1PxyXnGpEt8,204
 vng_api_common/apps.py,sha256=QQiJXRmjX9Q91oh0P9fvVnHe3NSYd1cEcUUBw0HLBCA,3690
 vng_api_common/checks.py,sha256=tOyfV7MMLGh4anrd_W30LvJCxiyQ4sFs1mGd9mtrEc0,1175
 vng_api_common/choices.py,sha256=dboFRoM34GpRUpxB9WexexccopcQSogu1QIyY4B9ACY,541
-vng_api_common/client.py,sha256=HNLc86RwczAudPBDgH_zQncE19OUaLyhSnacQRxJO0c,1972
+vng_api_common/client.py,sha256=2qLi5BvSiPZ2J93X7_-WFx7F9qBv-y3FhSt5e31QBVo,1971
 vng_api_common/compat.py,sha256=n4jDFSPzXnh-D_VXjftKMCJYj_q_t6eJrUTWLayl8jQ,768
-vng_api_common/constants.py,sha256=yYtnYId9alRuhGBoqaO8lkXYi_ATi2FW-wEDGRpiRuQ,10948
+vng_api_common/constants.py,sha256=_diFyf14vYCdRX8Ewb9IgaK4t8od6zuG_W48TxWL-Lo,11121
 vng_api_common/decorators.py,sha256=_p-mAyi5Na_-ll00ErcQ3mRoZNCsJzYDAliXn50Bmes,278
-vng_api_common/descriptors.py,sha256=RFOqnDn5PEX0-qXb_r4_9wdEvuck5wNxT4tcrP95KaE,3136
+vng_api_common/descriptors.py,sha256=QJX9GINLnxpFDViyfX1SfSq3mowkN9Oq2tvj34qqkE4,3129
 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=mfpew4NkUy4AIqXDg5rE1tzUl8Ae9FTmYz9_MKjjLuA,3763
-vng_api_common/filters_backend.py,sha256=bb8D0Z6uT39PW5ASqlExTesALOVAplJgG4hR7ikG2BI,2096
+vng_api_common/filters.py,sha256=E0Di4HsvaQUFfORn4uzxiVTCcJKeGMfnGSS9BNaX9Mg,3746
+vng_api_common/filters_backend.py,sha256=VUJB6Ya8gwM4DVCffAy0Z3czGMRK6ZEQ8Kq7Rpdhjws,2041
 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
 vng_api_common/middleware.py,sha256=2DRw0hPpvUMqwoH1Ze8S7tDB16lmj4Bnd6vN5ijkGM8,875
-vng_api_common/mocks.py,sha256=0sELLs-uy2ndu29m5P6FN_p1ehNhYv7IoRayYPs379Y,6200
+vng_api_common/mocks.py,sha256=9vL4t-CLIFFgL6MxeyaQy1UP91lrObYI-s3-0h2q3YU,6209
 vng_api_common/models.py,sha256=3WgpCWQpkCOrMCtqp7EbnP681II43Sg_cch8ZOm4EcU,1707
 vng_api_common/oas.py,sha256=ATqqNM7zkDMoK3E-cxNh_c65n6YCrP96KxCFYfkEVK0,2523
 vng_api_common/pagination.py,sha256=U2zojaSHgEIzCEMBzx9r3KLpAujMCdM0ndH3AT6ik1U,734
 vng_api_common/permissions.py,sha256=ayDxk9Wt8j0yO57FhZ8XaRkPET4lAqd8SSw3m4o3EGs,7562
 vng_api_common/polymorphism.py,sha256=N-x39pG2unD4N0ZbxFvuhE8ibPaJ0eKeqfvAJW3NnEU,6623
-vng_api_common/routers.py,sha256=hEnhBulkgMM-7W_lYaykKTgTBj3-avl7DGsR9P7BbTU,1897
+vng_api_common/routers.py,sha256=UVx7g7UCw7kSQswSVN8fwOGNO0y9vWeHTXHPuMT0h7c,1897
 vng_api_common/schema.py,sha256=axs2Q8IXwpHNd5WscQg5xOErL6bWhP8WFItTt4xCFO4,16305
 vng_api_common/scopes.py,sha256=PGs6CkXorAAdWXGFY1bSy-jmsPn122Njen9aFFOpFIQ,2351
 vng_api_common/search.py,sha256=yehS6boCOk1JXLCqAMU-B62hWtbTBSf_WKIVGPgp0Mg,1045
-vng_api_common/serializers.py,sha256=D0DEw-iw4se1MLAlDw25G6q4g1BTEL3VXcuvMTj6qlk,13462
+vng_api_common/serializers.py,sha256=ohdUC11RGMxZQcN2ekLappgT4SbYz12o4GZ7maVS3RY,13464
 vng_api_common/urls.py,sha256=9IWHYLlEIIHNaZ_Zq02qNQ2HJpETb7o-89r7yBM_tQs,270
 vng_api_common/utils.py,sha256=EHqVjZhtqnbU7YrqgYIBss28Sd19jtnTLNaMWLfj3Zw,8203
-vng_api_common/validators.py,sha256=ejaFZvFXFaBlqxjA2_07NSHKHlG5pejrfC_GHjwCj6E,12852
+vng_api_common/validators.py,sha256=tZkjHPXfcG1FxGXCSNnyFkMQPzFHhlxfyOfNdEOb5js,12978
 vng_api_common/version.py,sha256=yJV9_yTM7Qnzg0zGNkJQkN9Uai3I_ZUkcyseJRPRk5I,129
-vng_api_common/views.py,sha256=pxpI2dl22I9auTYvRJ-Rx-_NHAKgo1F2QwQJF6WIjrE,7603
+vng_api_common/views.py,sha256=ARqNuPlrZ0ctzkHTNs7NMyzrji2LvRmrmzrSNmtS-v0,7603
 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
@@ -45,7 +45,7 @@ vng_api_common/audittrails/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 vng_api_common/audittrails/admin.py,sha256=mrRK9KhvFlRWcmsq-DM9cJdwtpBUciMa4DvtEIYfirQ,301
 vng_api_common/audittrails/apps.py,sha256=eM4RMMgqXq_Hm1Il-dUlO0rtXJVP0DgAFQBW25epzdw,111
 vng_api_common/audittrails/audits.py,sha256=44_vry_9XPZoyKUJeMhhf4xr0OsCndgzGGxRqa65_d0,337
-vng_api_common/audittrails/models.py,sha256=O1GhyJlZaDYPTwKcZE45J2Fl1q02BGtYciu-QdjzBsQ,3596
+vng_api_common/audittrails/models.py,sha256=ja3SUY8cdcAMfjp2h4J7QiWikqa1gaCrtHPg_Z7-UIw,3581
 vng_api_common/audittrails/utils.py,sha256=fhDQ-iaSGE8mWkcE9LXySI_pYfn7Xpao-n1m699h_hk,1316
 vng_api_common/audittrails/viewsets.py,sha256=K0AMPHYU6w_Z1cAww_itzfHjeqzZhIAi1m3cUHcXp30,8105
 vng_api_common/audittrails/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -76,10 +76,10 @@ vng_api_common/audittrails/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 vng_api_common/audittrails/migrations/_operations.py,sha256=UOMv0zAK8CIQ73cSu6wwQG_hkW46Isdy7JCnljn8GII,3280
 vng_api_common/authorizations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vng_api_common/authorizations/admin.py,sha256=Tk0yYKbb005E0XZaYYWbucMf_K5M8Hhz62wSBDi8rhM,813
-vng_api_common/authorizations/middleware.py,sha256=KJ3znCXPRMOVqSur62SmBjvC6RcKxtcWq1rzaHdYR98,8416
-vng_api_common/authorizations/models.py,sha256=slIYxSktxCxSg03Nfb2mhsQse17b93KWE-rdPdMv8Ik,5199
+vng_api_common/authorizations/middleware.py,sha256=cR7reyRIZmCtH2qONopva8PZKCkwBl3DU-VWJqnL-Z0,8418
+vng_api_common/authorizations/models.py,sha256=-PwbFceloUz6pbfFp2DB3YfioC2xq63YDm-EVc3U3HE,5160
 vng_api_common/authorizations/serializers.py,sha256=3HeKWEqhI3UWwI8SttC4rEID-Epbk7SWsC-bEjolbaw,5151
-vng_api_common/authorizations/utils.py,sha256=GmwTy5GhYk3e1VU4LpdfYdr8VD-R8p00hUY11QBbOhc,555
+vng_api_common/authorizations/utils.py,sha256=GSeHVXia-GHGCN_E4u671r4pGssvcyp9osKFf8Fc8v4,590
 vng_api_common/authorizations/validators.py,sha256=u7fKm0QgGy8fiAeYmIEB9Gy-yIE9C-tC2ZpnNQBXPso,2816
 vng_api_common/authorizations/migrations/0001_initial.py,sha256=ooAZtQeDtWgDxXzAP-KnSyyFYLRPM-PMrK5RgOnTPjQ,4360
 vng_api_common/authorizations/migrations/0002_authorizationsconfig.py,sha256=m4taH6ClHI-YHYGGOKaq_qYXGx9lq1InXOGLQKg9MSw,1364
@@ -104,10 +104,10 @@ vng_api_common/caching/decorators.py,sha256=lU5dnBjD9aHjoYaV32FlYxY7VFZPdMZe26fV
 vng_api_common/caching/etags.py,sha256=3zY0DTdwt19QHsxFLK1wqQ3K98JfO6Uxr6tFuixichg,7337
 vng_api_common/caching/introspection.py,sha256=JKeEuTiyWp1oN1Fg27j5-2btROz9NcLxxfzSZuVVJ9w,575
 vng_api_common/caching/models.py,sha256=RroS9HFiKNXDV59Odh0x8BO8Az8E81v4gwuprF1A1qg,988
-vng_api_common/caching/registry.py,sha256=mY1r99x7m0DQ1BN9lZF2zMjFj_oDNq7urxDkOH7-8Yg,6205
+vng_api_common/caching/registry.py,sha256=oXE4kMnVpdp7qvb_goVkCTY5qeY8kB3EDKVX65fPtYc,6207
 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=tNShwZevKpJ6n713pPGPuUpThcPq-057JAd3xSHW5sU,3158
+vng_api_common/conf/api.py,sha256=F1Aj8jOdN-T0ZYqUtuu-jUjST5XcyYcRFqZc057M0Bc,3160
 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
@@ -184,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.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.6.dist-info/METADATA,sha256=cWsFJ1YO-TZLhYWVXu6r7Dp-9Qbt9RXbb8lfB97JAvM,7195
+commonground_api_common-2.6.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+commonground_api_common-2.6.6.dist-info/top_level.txt,sha256=vPismc83zPzWXTmlNCCwfDlFV9iygJYxNJW5iDjKTgw,15
+commonground_api_common-2.6.6.dist-info/RECORD,,

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

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

vng_api_common/__init__.py

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

vng_api_common/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-from django.utils.translation import gettext_lazy as _
 
 from .models import JWTSecret
 

vng_api_common/audittrails/models.py

@@ -20,8 +20,7 @@ class AuditTrail(models.Model):
         max_length=255,
         blank=True,
         help_text=_(
-            'Een globaal "request" ID om een verzoek door het '
-            "netwerk heen te traceren."
+            'Een globaal "request" ID om een verzoek door het netwerk heen te traceren.'
         ),
     )
     bron = models.CharField(

vng_api_common/authorizations/middleware.py

@@ -108,7 +108,7 @@ class JWTAuth:
                     self.encoded,
                     algorithms=["HS256"],
                     options={"verify_signature": False},
-                    leeway=settings.JWT_LEEWAY,
+                    leeway=settings.TIME_LEEWAY,
                 )
             except jwt.DecodeError:
                 logger.info("Invalid JWT encountered")
@@ -146,7 +146,7 @@ class JWTAuth:
                     self.encoded,
                     key,
                     algorithms=["HS256"],
-                    leeway=settings.JWT_LEEWAY,
+                    leeway=settings.TIME_LEEWAY,
                 )
             except jwt.InvalidSignatureError:
                 logger.exception("Invalid signature - possible payload tampering?")

vng_api_common/authorizations/models.py

@@ -11,7 +11,6 @@ from zgw_consumers.constants import APITypes, AuthTypes
 from vng_api_common.client import Client, get_client
 
 from ..constants import ComponentTypes, VertrouwelijkheidsAanduiding
-from ..decorators import field_default
 from ..fields import VertrouwelijkheidsAanduidingField
 from ..models import APIMixin
 

vng_api_common/authorizations/utils.py

@@ -1,18 +1,27 @@
-def generate_jwt(client_id, secret, user_id, user_representation):
-    from zgw_consumers.client import ZGWAuth
+import time
 
-    class FakeService:
-        def __init__(self, **kwargs):
-            for key, value in kwargs.items():
-                setattr(self, key, value)
+import jwt
 
-    auth = ZGWAuth(
-        service=FakeService(  # type: ignore
-            client_id=client_id,
-            secret=secret,
-            user_id=user_id,
-            user_representation=user_representation,
-            jwt_valid_for=5 * 60,
-        )
-    )
-    return f"Bearer {auth._token}"
+
+def generate_jwt(
+    client_id: str,
+    secret: str,
+    user_id: str,
+    user_representation: str,
+    jwt_valid_for: int | None = None,
+) -> str:
+    iat = int(time.time())
+    payload = {
+        # standard claims
+        "iss": client_id,
+        "iat": iat,
+        # custom claims
+        "client_id": client_id,
+        "user_id": user_id,
+        "user_representation": user_representation,
+    }
+    if jwt_valid_for:
+        payload["exp"] = iat + jwt_valid_for
+
+    token = jwt.encode(payload, secret, algorithm="HS256")
+    return f"Bearer {token}"

vng_api_common/caching/registry.py

@@ -64,9 +64,9 @@ class Dependency:
         instance: models.Model,
         is_delete: bool = False,
     ) -> Iterable[models.Model]:
-        assert isinstance(
-            instance, self.source_model
-        ), "Instance is not of expected model class"
+        assert isinstance(instance, self.source_model), (
+            "Instance is not of expected model class"
+        )
 
         reverse_relation_field = self.field.remote_field
 

vng_api_common/client.py

@@ -40,7 +40,6 @@ class Client(APIClient):
     def request(
         self, method: str | bytes, url: str | bytes, *args, **kwargs
     ) -> Response:
-
         headers = kwargs.pop("headers", {})
         headers.setdefault("Accept", "application/json")
         headers.setdefault("Content-Type", "application/json")

vng_api_common/conf/api.py

@@ -8,7 +8,7 @@ __all__ = [
     "GEMMA_URL_INFORMATIEMODEL_VERSIE",
     "GEMMA_URL_INFORMATIEMODEL",
     "GEMMA_URL_TEMPLATE",
-    "JWT_LEEWAY",
+    "TIME_LEEWAY",
     "JWT_SPECTACULAR_SETTINGS",
     "LINK_FETCHER",
     "NOTIFICATIONS_DISABLED",
@@ -95,6 +95,6 @@ vng_repo = "VNG-Realisatie/vng-api-common"
 vng_branch = "ref-responses"
 COMMON_SPEC = f"https://raw.githubusercontent.com/{vng_repo}/feature/{vng_branch}/vng_api_common/schemas/common.yaml"
 
-JWT_LEEWAY = 0  # default in PyJWT
+TIME_LEEWAY = 0  # default in PyJWT
 
 COMMONGROUND_API_COMMON_GET_DOMAIN = "vng_api_common.utils.get_site_domain"

vng_api_common/constants.py

@@ -88,28 +88,40 @@ class RolTypes(models.TextChoices):
 
 
 class Archiefnominatie(models.TextChoices):
-    blijvend_bewaren = "blijvend_bewaren", _(
-        "Het zaakdossier moet bewaard blijven en op de Archiefactiedatum "
-        "overgedragen worden naar een archiefbewaarplaats."
+    blijvend_bewaren = (
+        "blijvend_bewaren",
+        _(
+            "Het zaakdossier moet bewaard blijven en op de Archiefactiedatum "
+            "overgedragen worden naar een archiefbewaarplaats."
+        ),
     )
-    vernietigen = "vernietigen", _(
-        "Het zaakdossier moet op of na de Archiefactiedatum vernietigd worden."
+    vernietigen = (
+        "vernietigen",
+        _("Het zaakdossier moet op of na de Archiefactiedatum vernietigd worden."),
     )
 
 
 class Archiefstatus(models.TextChoices):
-    nog_te_archiveren = "nog_te_archiveren", _(
-        "De zaak cq. het zaakdossier is nog niet als geheel gearchiveerd."
+    nog_te_archiveren = (
+        "nog_te_archiveren",
+        _("De zaak cq. het zaakdossier is nog niet als geheel gearchiveerd."),
     )
-    gearchiveerd = "gearchiveerd", _(
-        "De zaak cq. het zaakdossier is als geheel niet-wijzigbaar bewaarbaar gemaakt."
+    gearchiveerd = (
+        "gearchiveerd",
+        _(
+            "De zaak cq. het zaakdossier is als geheel niet-wijzigbaar bewaarbaar gemaakt."
+        ),
     )
-    gearchiveerd_procestermijn_onbekend = "gearchiveerd_procestermijn_onbekend", _(
-        "De zaak cq. het zaakdossier is als geheel niet-wijzigbaar bewaarbaar gemaakt "
-        "maar de vernietigingsdatum kan nog niet bepaald worden."
+    gearchiveerd_procestermijn_onbekend = (
+        "gearchiveerd_procestermijn_onbekend",
+        _(
+            "De zaak cq. het zaakdossier is als geheel niet-wijzigbaar bewaarbaar gemaakt "
+            "maar de vernietigingsdatum kan nog niet bepaald worden."
+        ),
     )
-    overgedragen = "overgedragen", _(
-        "De zaak cq. het zaakdossier is overgebracht naar een archiefbewaarplaats."
+    overgedragen = (
+        "overgedragen",
+        _("De zaak cq. het zaakdossier is overgebracht naar een archiefbewaarplaats."),
     )
 
 
@@ -190,17 +202,20 @@ class ZaakobjectTypes(models.TextChoices):
     buurt = "buurt", _("Buurt")
     enkelvoudig_document = "enkelvoudig_document", _("Enkelvoudig document")
     gemeente = "gemeente", _("Gemeente")
-    gemeentelijke_openbare_ruimte = "gemeentelijke_openbare_ruimte", _(
-        "Gemeentelijke openbare ruimte"
+    gemeentelijke_openbare_ruimte = (
+        "gemeentelijke_openbare_ruimte",
+        _("Gemeentelijke openbare ruimte"),
     )
     huishouden = "huishouden", _("Huishouden")
     inrichtingselement = "inrichtingselement", _("Inrichtingselement")
-    kadastrale_onroerende_zaak = "kadastrale_onroerende_zaak", _(
-        "Kadastrale onroerende zaak"
+    kadastrale_onroerende_zaak = (
+        "kadastrale_onroerende_zaak",
+        _("Kadastrale onroerende zaak"),
     )
     kunstwerkdeel = "kunstwerkdeel", _("Kunstwerkdeel")
-    maatschappelijke_activiteit = "maatschappelijke_activiteit", _(
-        "Maatschappelijke activiteit"
+    maatschappelijke_activiteit = (
+        "maatschappelijke_activiteit",
+        _("Maatschappelijke activiteit"),
     )
     medewerker = "medewerker", _("Medewerker")
     natuurlijk_persoon = "natuurlijk_persoon", _("Natuurlijk persoon")

vng_api_common/descriptors.py

@@ -30,9 +30,9 @@ class GegevensGroepType:
         self.none_for_empty = none_for_empty
 
         all_fields_known = set(self.optional).issubset(set(mapping.keys()))
-        assert (
-            all_fields_known
-        ), "The fields in 'optional' must be a subset of the mapping keys"
+        assert all_fields_known, (
+            "The fields in 'optional' must be a subset of the mapping keys"
+        )
 
         # check if it's optional or not
         self.required = (
@@ -45,7 +45,7 @@ class GegevensGroepType:
         fields = ", ".join(
             [
                 field if field not in self.optional else f"{field} (optional)"
-                for field in self.mapping.keys()
+                for field in self.mapping
             ]
         )
         return "<GegevensGroepType: fields=%r required=%r>" % (fields, self.required)

vng_api_common/filters.py

@@ -1,5 +1,5 @@
 import logging
-from urllib.parse import urlencode, urlparse
+from urllib.parse import urlparse
 
 from django.core.exceptions import ValidationError
 from django.core.validators import URLValidator
@@ -73,7 +73,7 @@ class URLModelChoiceFilter(filters.ModelChoiceFilter):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.instance_path = kwargs.get("instance_path", None)
+        self.instance_path = kwargs.get("instance_path")
         self.queryset = kwargs.get("queryset")
 
     @property

vng_api_common/filters_backend.py

@@ -3,7 +3,6 @@ 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

vng_api_common/mocks.py

@@ -3,7 +3,7 @@ from urllib.parse import urlparse
 
 UUID_PATTERN = re.compile(
     r"[0-9a-f]{8}\-[0-9a-f]{4}\-4[0-9a-f]{3}\-[89ab][0-9a-f]{3}\-[0-9a-f]{12}",
-    flags=re.I,
+    flags=re.IGNORECASE,
 )
 
 

vng_api_common/routers.py

@@ -55,7 +55,7 @@ class DefaultRouter(NestedRegisteringMixin, routers.DefaultRouter):
     APIRootView = APIRootView
 
 
-class nested:
+class Nested:
     def __init__(self, prefix, viewset, nested=None, **kwargs):
         self.prefix = prefix
         self.viewset = viewset
@@ -63,4 +63,4 @@ class nested:
         self.kwargs = kwargs
 
     def __repr__(self):
-        return "nested(prefix={!r}, viewset={!r}".format(self.prefix, self.viewset)
+        return "Nested(prefix={!r}, viewset={!r}".format(self.prefix, self.viewset)

vng_api_common/serializers.py

@@ -104,12 +104,12 @@ class GegevensGroepSerializerMetaclass(serializers.SerializerMetaclass):
     def __new__(cls, name, bases, attrs):
         Meta = attrs.get("Meta")
         if Meta:
-            assert hasattr(
-                Meta, "model"
-            ), "The 'model' class must be defined on the Meta."
-            assert hasattr(
-                Meta, "gegevensgroep"
-            ), "The 'gegevensgroep' name must be defined on the Meta."
+            assert hasattr(Meta, "model"), (
+                "The 'model' class must be defined on the Meta."
+            )
+            assert hasattr(Meta, "gegevensgroep"), (
+                "The 'gegevensgroep' name must be defined on the Meta."
+            )
 
             gegevensgroep = getattr(Meta.model, Meta.gegevensgroep)
             Meta.fields = []
@@ -391,6 +391,6 @@ class CachedNestedHyperlinkedRelatedField(CacheMixin, NestedHyperlinkedRelatedFi
             return None
 
         # Replace the placeholder from the cached base URI with the actual identifier
-        for k, v in self.parent_lookup_kwargs.items():
+        for v in self.parent_lookup_kwargs.values():
             url = url.replace(v, str(get_nested_fk_attribute(obj, v)))
         return url

vng_api_common/validators.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import re
+from datetime import timedelta
 from typing import Callable
 
 from django.conf import settings
@@ -234,7 +235,7 @@ class ResourceValidator(URLValidator):
         # at this point, we know the URL actually exists
         try:
             obj = response.json()
-        except json.JSONDecodeError as exc:
+        except json.JSONDecodeError:
             logger.info(
                 "URL %s doesn't seem to point to a JSON endpoint", url, exc_info=1
             )
@@ -277,6 +278,8 @@ class UntilNowValidator:
     Validate a datetime to not be in the future.
 
     This means that `now` is included.
+
+    Some leeway can be added with the TIME_LEEWAY setting.
     """
 
     message = _("Ensure this value is not in the future.")
@@ -284,7 +287,7 @@ class UntilNowValidator:
 
     @property
     def limit_value(self):
-        return timezone.now()
+        return timezone.now() + timedelta(seconds=settings.TIME_LEEWAY)
 
     def __call__(self, value):
         if value > self.limit_value:

vng_api_common/views.py

@@ -117,7 +117,7 @@ def _test_sites_config(request: HttpRequest) -> list:
         return []
     return [
         (_("Site domain"), domain, request.get_host() == domain),
-        (_("HTTPS"), settings.IS_HTTPS, settings.IS_HTTPS == request.is_secure()),
+        (_("HTTPS"), settings.IS_HTTPS, request.is_secure() == settings.IS_HTTPS),
     ]