Merge branch 'master' into pagination-items-attribute

Author: vitalik

ninja/pagination.py

@@ -42,6 +42,7 @@ def paginate_queryset(
         self,
         queryset: QuerySet,
         pagination: Any,
+        request: HttpRequest,
         **params: Any,
     ) -> Any:
         pass  # pragma: no cover
@@ -64,6 +65,7 @@ async def apaginate_queryset(
         self,
         queryset: QuerySet,
         pagination: Any,
+        request: HttpRequest,
         **params: Any,
     ) -> Any:
         pass  # pragma: no cover
@@ -92,6 +94,7 @@ def paginate_queryset(
         self,
         queryset: QuerySet,
         pagination: Input,
+        request: HttpRequest,
         **params: Any,
     ) -> Any:
         offset = pagination.offset
@@ -105,6 +108,7 @@ async def apaginate_queryset(
         self,
         queryset: QuerySet,
         pagination: Input,
+        request: HttpRequest,
         **params: Any,
     ) -> Any:
         offset = pagination.offset
@@ -144,6 +148,7 @@ def paginate_queryset(
         self,
         queryset: QuerySet,
         pagination: Input,
+        request: HttpRequest,
         **params: Any,
     ) -> Any:
         page_size = self._get_page_size(pagination.page_size)
@@ -157,6 +162,7 @@ async def apaginate_queryset(
         self,
         queryset: QuerySet,
         pagination: Input,
+        request: HttpRequest,
         **params: Any,
     ) -> Any:
         page_size = self._get_page_size(pagination.page_size)
@@ -214,13 +220,20 @@ def _inject_pagination(
     **paginator_params: Any,
 ) -> Callable[..., Any]:
     paginator = paginator_class(**paginator_params)
+
+    # Check if Input schema has any fields
+    # If it has no fields, we should make it optional to support Pydantic 2.12+
+    has_input_fields = bool(paginator.Input.model_fields)
+
     if is_async_callable(func):
         if not hasattr(paginator, "apaginate_queryset"):
             raise ConfigError("Pagination class not configured for async requests")
 
         @wraps(func)
         async def view_with_pagination(request: HttpRequest, **kwargs: Any) -> Any:
-            pagination_params = kwargs.pop("ninja_pagination")
+            pagination_params = kwargs.pop("ninja_pagination", None)
+            if pagination_params is None:
+                pagination_params = paginator.Input()
             if paginator.pass_parameter:
                 kwargs[paginator.pass_parameter] = pagination_params
 
@@ -245,7 +258,9 @@ async def evaluate(results: Union[List, QuerySet]) -> AsyncGenerator:
 
         @wraps(func)
         def view_with_pagination(request: HttpRequest, **kwargs: Any) -> Any:
-            pagination_params = kwargs.pop("ninja_pagination")
+            pagination_params = kwargs.pop("ninja_pagination", None)
+            if pagination_params is None:
+                pagination_params = paginator.Input()
             if paginator.pass_parameter:
                 kwargs[paginator.pass_parameter] = pagination_params
 
@@ -261,12 +276,15 @@ def view_with_pagination(request: HttpRequest, **kwargs: Any) -> Any:
                 # ^ forcing queryset evaluation #TODO: check why pydantic did not do it here
             return result
 
-    contribute_operation_args(
-        view_with_pagination,
-        "ninja_pagination",
-        paginator.Input,
-        paginator.InputSource,
-    )
+    # Only contribute args if Input has fields
+    # For empty Input schemas, don't add the parameter at all to support Pydantic 2.12+
+    if has_input_fields:
+        contribute_operation_args(
+            view_with_pagination,
+            "ninja_pagination",
+            paginator.Input,
+            paginator.InputSource,
+        )
 
     if paginator.Output:  # type: ignore
         contribute_operation_callback(

tests/test_pagination.py

@@ -117,6 +117,18 @@ class CustomItemsPageNumberPagination(PageNumberPagination):
     class Output(Schema):
         results: List[int]
         count: int
+class NoPagination(PaginationBase):
+    """
+    Pagination class that returns all records without slicing.
+    Does not define its own Input - uses empty PaginationBase.Input.
+    This reproduces bug from https://github.com/vitalik/django-ninja/issues/1564
+    """
+
+    def paginate_queryset(self, items, pagination: PaginationBase.Input, **params):
+        return {
+            "count": self._items_count(items),
+            "items": items,
+        }
 
 
 @api.get("/items_1", response=List[int])
@@ -192,6 +204,12 @@ def items_12(request):
     return list(range(100))
 
 
+@api.get("/items_no_pagination", response=List[int])
+@paginate(NoPagination)
+def items_no_pagination(request):
+    return ITEMS
+
+
 client = TestClient(api)
 
 
@@ -635,3 +653,30 @@ def test_pagination_works_with_unnamed_classes():
         PydanticSchemaGenerationError
     ):  # It does fail after we passed the logic that we are testing
         make_response_paginated(LimitOffsetPagination, operation)
+
+
+def test_no_pagination_without_query_params():
+    """
+    Test that NoPagination works without any query parameters.
+    Reproduces bug from https://github.com/vitalik/django-ninja/issues/1564
+
+    NoPagination doesn't define any Input fields (uses empty PaginationBase.Input),
+    so it should NOT require any query parameters.
+    """
+    response = client.get("/items_no_pagination")
+    if response.status_code != 200:
+        print(f"Status: {response.status_code}")
+        print(f"Response: {response.json()}")
+    assert response.status_code == 200
+    result = response.json()
+    assert result == {"count": 100, "items": ITEMS}
+
+    # Check OpenAPI schema - should have no required parameters
+    schema = api.get_openapi_schema()["paths"]["/api/items_no_pagination"]["get"]
+    params = schema.get("parameters", [])
+
+    # If there are any parameters, they should all be optional
+    for param in params:
+        assert (
+            param.get("required", False) is False
+        ), f"Parameter {param['name']} should not be required"

tests/test_pagination_async.py

@@ -65,6 +65,29 @@ async def _items_count(self, queryset: QuerySet) -> int:
             return len(queryset)
 
 
+class AsyncNoPagination(AsyncPaginationBase):
+    """
+    Async pagination class that returns all records without slicing.
+    Does not define its own Input - uses empty PaginationBase.Input.
+    This tests the bug fix from https://github.com/vitalik/django-ninja/issues/1564
+    """
+
+    async def apaginate_queryset(
+        self, items, pagination: PaginationBase.Input, **params
+    ):
+        await asyncio.sleep(0)
+        return {
+            "count": await self._aitems_count(items),
+            "items": items,
+        }
+
+    def paginate_queryset(self, items, pagination: PaginationBase.Input, **params):
+        return {
+            "count": self._items_count(items),
+            "items": items,
+        }
+
+
 @pytest.mark.asyncio
 async def test_async_config_error():
     api = NinjaAPI()
@@ -178,3 +201,38 @@ async def cats_paginated_page_number(request):
         "items": [{"title": "cat1"}, {"title": "cat2"}],
         "count": 2,
     }
+
+
+@pytest.mark.asyncio
+async def test_async_no_pagination_without_query_params():
+    """
+    Test that AsyncNoPagination works without any query parameters.
+    Tests the async branch of the bug fix from https://github.com/vitalik/django-ninja/issues/1564
+
+    AsyncNoPagination doesn't define any Input fields (uses empty PaginationBase.Input),
+    so it should NOT require any query parameters.
+    """
+    api = NinjaAPI()
+
+    @api.get("/items_no_pagination_async", response=List[int])
+    @paginate(AsyncNoPagination)
+    async def items_no_pagination_async(request):
+        await asyncio.sleep(0)
+        return ITEMS
+
+    client = TestAsyncClient(api)
+
+    response = await client.get("/items_no_pagination_async")
+    assert response.status_code == 200
+    result = response.json()
+    assert result == {"count": 100, "items": ITEMS}
+
+    # Check OpenAPI schema - should have no required parameters
+    schema = api.get_openapi_schema()["paths"]["/api/items_no_pagination_async"]["get"]
+    params = schema.get("parameters", [])
+
+    # If there are any parameters, they should all be optional
+    for param in params:
+        assert (
+            param.get("required", False) is False
+        ), f"Parameter {param['name']} should not be required"