Request refactoring, json_data, form_data, QueryDict str types

Author: davegaeddert

plain-admin/plain/admin/views/models.py

@@ -114,7 +114,7 @@ def search_queryset(self, queryset: models.QuerySet) -> models.QuerySet:
         if search := self.request.query_params.get("search"):
             filters = Q()
             for field in self.search_fields:
-                filters |= Q(**{f"{field}__icontains": search})
+                filters |= Q(**{f"{field}__icontains": search})  # type: ignore[arg-type]
 
             queryset = queryset.filter(filters)
 

plain-admin/plain/admin/views/objects.py

@@ -39,7 +39,7 @@ def get_template_context(self) -> dict[str, Any]:
         self.objects = self.get_objects()
 
         page_size = self.request.query_params.get("page_size", self.page_size)
-        paginator = Paginator(self.objects, page_size)
+        paginator = Paginator(self.objects, int(page_size))
         self._page = paginator.get_page(self.request.query_params.get("page", 1))
 
         context["paginator"] = paginator
@@ -84,10 +84,10 @@ def get(self) -> Response:
 
     def post(self) -> Response:
         # won't be "key" anymore, just list
-        action_name = self.request.data.get("action_name")
+        action_name = self.request.form_data.get("action_name")
         actions = self.get_actions()
         if action_name and action_name in actions:
-            action_ids_param = self.request.data["action_ids"]
+            action_ids_param = self.request.form_data["action_ids"]
             if action_ids_param == "__all__":
                 target_ids = [self.get_object_id(obj) for obj in self.get_objects()]
             else:

plain-api/tests/app/urls.py

@@ -31,7 +31,9 @@ class TestVersionedAPIView(VersionedAPIView):
     }
 
     def post(self):
-        name = self.request.data["name"]
+        data = self.request.json_data
+        assert isinstance(data, dict)
+        name = data["name"]
         return {"message": f"Hello, {name}!"}
 
 

plain-models/plain/models/README.md

@@ -388,7 +388,7 @@ class UserForm(forms.ModelForm):
         fields = ["email", "is_admin"]
 
 # Usage
-form = UserForm(data=request.data)
+form = UserForm(request=request)
 if form.is_valid():
     user = form.save()
 ```

plain-oauth/plain/oauth/providers.py

@@ -137,8 +137,8 @@ def handle_login_request(
         # Store next url in session so we can get it on the callback request
         if redirect_to:
             session[SESSION_NEXT_KEY] = redirect_to
-        elif "next" in request.data:
-            session[SESSION_NEXT_KEY] = request.data["next"]
+        elif "next" in request.form_data:
+            session[SESSION_NEXT_KEY] = request.form_data["next"]
 
         # Sort authorization params for consistency
         sorted_authorization_params = sorted(authorization_params.items())
@@ -151,7 +151,7 @@ def handle_connect_request(
         return self.handle_login_request(request=request, redirect_to=redirect_to)
 
     def handle_disconnect_request(self, *, request: Request) -> Response:
-        provider_user_id = request.data["provider_user_id"]
+        provider_user_id = request.form_data["provider_user_id"]
         connection = OAuthConnection.query.get(
             provider_key=self.provider_key, provider_user_id=provider_user_id
         )
@@ -198,7 +198,7 @@ def get_login_redirect_url(self, *, request: Request) -> str:
         return session.pop(SESSION_NEXT_KEY, "/")
 
     def get_disconnect_redirect_url(self, *, request: Request) -> str:
-        return request.data.get("next", "/")
+        return request.form_data.get("next", "/")
 
     def get_redirect_response(self, redirect_url: str) -> Response:
         """

plain-observer/plain/observer/views.py

@@ -42,7 +42,7 @@ def get_template_context(self) -> dict[str, Any]:
 
     def htmx_put_mode(self) -> Response:
         """Set observer mode via HTMX PUT."""
-        mode = self.request.data.get("mode")
+        mode = self.request.form_data.get("mode")
         observer = Observer.from_request(self.request)
 
         response = Response(status_code=204)
@@ -68,7 +68,7 @@ def htmx_delete_traces(self) -> Response:
 
     def post(self) -> Response:
         """Handle POST requests to set observer mode."""
-        action = self.request.data.get("observe_action")
+        action = self.request.form_data.get("observe_action")
         if action == "summary":
             observer = Observer.from_request(self.request)
             response = Response(status_code=204)

plain-pageviews/plain/pageviews/views.py

@@ -1,16 +1,11 @@
-import json
-
 from plain.views import View
 
 from .models import Pageview
 
 
 class TrackView(View):
     def post(self) -> int:
-        try:
-            data = self.request.data
-        except json.JSONDecodeError:
-            return 400
+        data = self.request.json_data
 
         try:
             pageview = Pageview.create_from_request(

plain/plain/forms/forms.py

@@ -9,6 +9,7 @@
 from typing import TYPE_CHECKING, Any
 
 from plain.exceptions import NON_FIELD_ERRORS
+from plain.utils.datastructures import MultiValueDict
 
 from .exceptions import ValidationError
 from .fields import Field, FileField
@@ -78,12 +79,16 @@ def __init__(
         prefix: str | None = None,
         initial: dict[str, Any] | None = None,
     ):
-        self.data = request.data
-        self.files = request.files
-
+        # Forms can handle both JSON and form data
         self.is_json_request = request.headers.get("Content-Type", "").startswith(
             "application/json"
         )
+        if self.is_json_request:
+            self.data = request.json_data
+            self.files = MultiValueDict()
+        else:
+            self.data = request.form_data
+            self.files = request.files
 
         self.is_bound = bool(self.data or self.files)