feat(django): support django 5.1

Author: jbarreau

src/_example/django/django_demo/django_demo/settings.py

@@ -89,6 +89,7 @@
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
+    # "django.contrib.auth.middleware.LoginRequiredMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]

src/datasource_django/forestadmin/datasource_django/utils/type_converter.py

@@ -1,5 +1,6 @@
 from typing import Dict, Set, Tuple
 
+import django
 from django.db import models
 from forestadmin.datasource_django.exception import DjangoDatasourceException
 from forestadmin.datasource_toolkit.interfaces.fields import ColumnAlias, Operator, PrimitiveType
@@ -25,11 +26,12 @@ class ConverterException(DjangoDatasourceException):
 if postgres_fields is not None:
     POSTGRES_TYPE: Dict[type, PrimitiveType] = {
         # specific postgres fields
-        postgres_fields.CIText: PrimitiveType.STRING,
-        postgres_fields.CIEmailField: PrimitiveType.STRING,
         postgres_fields.HStoreField: PrimitiveType.JSON,
         # postgres_fields.RangeField and subclassed ones not handles
     }
+    if django.VERSION[0] < 5 or (django.VERSION[0] == 5 and django.VERSION[1] < 1):
+        POSTGRES_TYPE[postgres_fields.CIText] = PrimitiveType.STRING
+        POSTGRES_TYPE[postgres_fields.CIEmailField] = PrimitiveType.STRING
 else:
     POSTGRES_TYPE: Dict[type, PrimitiveType] = {}
 

src/datasource_django/pyproject.toml

@@ -17,7 +17,7 @@ include = "forestadmin"
 [tool.poetry.dependencies]
 python = ">=3.8,<3.13"
 typing-extensions = "~=4.2"
-django = ">=3.2,<6.0"
+django = ">=3.2,<5.2"
 forestadmin-datasource-toolkit = "1.16.1"
 forestadmin-agent-toolkit = "1.16.1"
 

src/django_agent/forestadmin/django_agent/utils/views_decorator.py

@@ -0,0 +1,6 @@
+try:
+    from django.contrib.auth.decorators import login_not_required as no_django_login_required  # type: ignore
+except ImportError:
+
+    def no_django_login_required(fn):
+        return fn

src/django_agent/forestadmin/django_agent/views/actions.py

@@ -2,15 +2,18 @@
 from django.http import HttpRequest
 from forestadmin.django_agent.apps import DjangoAgentApp
 from forestadmin.django_agent.utils.converter import convert_request, convert_response
+from forestadmin.django_agent.utils.views_decorator import no_django_login_required  # type: ignore
 
 
+@no_django_login_required
 @async_to_sync
 async def hook(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["actions"]
     response = await resource.dispatch(convert_request(request, kwargs), "hook")
     return convert_response(response)
 
 
+@no_django_login_required
 @async_to_sync
 async def execute(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["actions"]

src/django_agent/forestadmin/django_agent/views/authentication.py

@@ -2,8 +2,10 @@
 from django.http import HttpRequest
 from forestadmin.django_agent.apps import DjangoAgentApp
 from forestadmin.django_agent.utils.converter import convert_request, convert_response
+from forestadmin.django_agent.utils.views_decorator import no_django_login_required  # type: ignore
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def authentication(request: HttpRequest):
     resource = (await DjangoAgentApp.get_agent().get_resources())["authentication"]
@@ -15,6 +17,7 @@ async def authentication(request: HttpRequest):
 authentication.csrf_exempt = True
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def callback(request: HttpRequest):
     resource = (await DjangoAgentApp.get_agent().get_resources())["authentication"]

src/django_agent/forestadmin/django_agent/views/charts.py

@@ -2,15 +2,18 @@
 from django.http import HttpRequest
 from forestadmin.django_agent.apps import DjangoAgentApp
 from forestadmin.django_agent.utils.converter import convert_request, convert_response
+from forestadmin.django_agent.utils.views_decorator import no_django_login_required  # type: ignore
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def chart_collection(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["collection_charts"]
     response = await resource.dispatch(convert_request(request, kwargs), "add")
     return convert_response(response)
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def chart_datasource(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["datasource_charts"]

src/django_agent/forestadmin/django_agent/views/crud.py

@@ -4,8 +4,10 @@
 from forestadmin.django_agent.apps import DjangoAgentApp
 from forestadmin.django_agent.utils.converter import convert_request, convert_response
 from forestadmin.django_agent.utils.dispatcher import get_dispatcher_method
+from forestadmin.django_agent.utils.views_decorator import no_django_login_required  # type: ignore
 
 
+@no_django_login_required
 @async_to_sync
 async def detail(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["crud"]
@@ -14,20 +16,23 @@ async def detail(request: HttpRequest, **kwargs):
     return convert_response(response)
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def count(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["crud"]
     response = await resource.dispatch(convert_request(request, kwargs), "count")
     return convert_response(response)
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def csv(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["crud"]
     response = await resource.dispatch(convert_request(request, kwargs), "csv")
     return convert_response(response)
 
 
+@no_django_login_required
 @async_to_sync
 async def list_(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["crud"]

src/django_agent/forestadmin/django_agent/views/crud_related.py

@@ -4,22 +4,26 @@
 from forestadmin.django_agent.apps import DjangoAgentApp
 from forestadmin.django_agent.utils.converter import convert_request, convert_response
 from forestadmin.django_agent.utils.dispatcher import get_dispatcher_method
+from forestadmin.django_agent.utils.views_decorator import no_django_login_required  # type: ignore
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def count(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["crud_related"]
     response = await resource.dispatch(convert_request(request, kwargs), "count")
     return convert_response(response)
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def csv(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["crud_related"]
     response = await resource.dispatch(convert_request(request, kwargs), "csv")
     return convert_response(response)
 
 
+@no_django_login_required
 @async_to_sync
 async def list_(request: HttpRequest, **kwargs):
     resource = (await DjangoAgentApp.get_agent().get_resources())["crud_related"]

src/django_agent/forestadmin/django_agent/views/index.py

@@ -1,13 +1,16 @@
 from django.db import transaction
 from django.http import HttpRequest, HttpResponse
 from forestadmin.django_agent.apps import DjangoAgentApp
+from forestadmin.django_agent.utils.views_decorator import no_django_login_required  # type: ignore
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def index(request: HttpRequest):
     return HttpResponse(status=200)
 
 
+@no_django_login_required
 @transaction.non_atomic_requests
 async def scope_cache_invalidation(request: HttpRequest):
     DjangoAgentApp.get_agent()._permission_service.invalidate_cache("forest.scopes")