sqladmin 0.19.0__py3-none-any.whl → 0.20.0__py3-none-any.whl

sqladmin/__init__.py

@@ -1,7 +1,7 @@
 from sqladmin.application import Admin, action, expose
 from sqladmin.models import BaseView, ModelView
 
-__version__ = "0.19.0"
+__version__ = "0.20.0"
 
 __all__ = [
     "Admin",

sqladmin/application.py

@@ -442,12 +442,13 @@ class Admin(BaseAdminView):
         pagination = await model_view.list(request)
         pagination.add_pagination_urls(request.url)
 
-        if (
-            pagination.page * pagination.page_size
-            > pagination.count + pagination.page_size
-        ):
-            raise HTTPException(
-                status_code=400, detail="Invalid page or pageSize parameter"
+        request_page = model_view.validate_page_number(
+            request.query_params.get("page"), 1
+        )
+
+        if request_page > pagination.page:
+            return RedirectResponse(
+                request.url.include_query_params(page=pagination.page), status_code=302
             )
 
         context = {"model_view": model_view, "pagination": pagination}
@@ -510,8 +511,7 @@ class Admin(BaseAdminView):
         identity = request.path_params["identity"]
         model_view = self._find_model_view(identity)
 
-        Form = await model_view.scaffold_form()
-        model_view._validate_form_class(model_view._form_create_rules, Form)
+        Form = await model_view.scaffold_form(model_view._form_create_rules)
         form_data = await self._handle_form_data(request)
         form = Form(form_data)
 
@@ -561,8 +561,7 @@ class Admin(BaseAdminView):
         if not model:
             raise HTTPException(status_code=404)
 
-        Form = await model_view.scaffold_form()
-        model_view._validate_form_class(model_view._form_edit_rules, Form)
+        Form = await model_view.scaffold_form(model_view._form_edit_rules)
         context = {
             "obj": model,
             "model_view": model_view,

sqladmin/models.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 import time
 import warnings
 from enum import Enum
@@ -454,7 +455,7 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         ```
     """
 
-    export_types: ClassVar[List[str]] = ["csv"]
+    export_types: ClassVar[List[str]] = ["csv", "json"]
     """A list of available export filetypes.
     Currently only `csv` is supported.
     """
@@ -1015,10 +1016,11 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         By default do nothing.
         """
 
-    async def scaffold_form(self) -> Type[Form]:
+    async def scaffold_form(self, rules: List[str] | None = None) -> Type[Form]:
         if self.form is not None:
             return self.form
-        return await get_model_form(
+
+        form = await get_model_form(
             model=self.model,
             session_maker=self.session_maker,
             only=self._form_prop_names,
@@ -1032,6 +1034,11 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
             form_converter=self.form_converter,
         )
 
+        if rules:
+            self._validate_form_class(rules, form)
+
+        return form
+
     def search_placeholder(self) -> str:
         """Return search placeholder text.
 
@@ -1152,7 +1159,9 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
     ) -> StreamingResponse:
         if export_type == "csv":
             return await self._export_csv(data)
-        raise NotImplementedError("Only export_type='csv' is implemented.")
+        elif export_type == "json":
+            return await self._export_json(data)
+        raise NotImplementedError("Only export_type='csv' or 'json' is implemented.")
 
     async def _export_csv(
         self,
@@ -1179,6 +1188,30 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
             headers={"Content-Disposition": f"attachment;filename={filename}"},
         )
 
+    async def _export_json(
+        self,
+        data: List[Any],
+    ) -> StreamingResponse:
+        async def generate() -> AsyncGenerator[str, None]:
+            yield "["
+            separator = "," if len(data) > 1 else ""
+
+            for row in data:
+                row_dict = {
+                    name: await self.get_prop_value(row, name)
+                    for name in self._export_prop_names
+                }
+                yield json.dumps(row_dict) + separator
+
+            yield "]"
+
+        filename = secure_filename(self.get_export_name(export_type="json"))
+        return StreamingResponse(
+            content=generate(),
+            media_type="application/json",
+            headers={"Content-Disposition": f"attachment;filename={filename}"},
+        )
+
     def _refresh_form_rules_cache(self) -> None:
         if self.form_rules:
             self._form_create_rules = self.form_rules

sqladmin/pagination.py

@@ -46,6 +46,10 @@ class Pagination:
 
         raise RuntimeError("Next page not found.")
 
+    def __post_init__(self) -> None:
+        # Clamp page
+        self.page = min(self.page, max(1, self.count // self.page_size + 1))
+
     def resize(self, page_size: int) -> Pagination:
         self.page = (self.page - 1) * self.page_size // page_size + 1
         self.page_size = page_size

{sqladmin-0.19.0.dist-info → sqladmin-0.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sqladmin
-Version: 0.19.0
+Version: 0.20.0
 Summary: SQLAlchemy admin for FastAPI and Starlette
 Project-URL: Documentation, https://aminalaee.dev/sqladmin
 Project-URL: Issues, https://github.com/aminalaee/sqladmin/issues

{sqladmin-0.19.0.dist-info → sqladmin-0.20.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
-sqladmin/__init__.py,sha256=SqLOSSEKfIFE3-zefHyyqKGrkbxCkfmL2aru-ptmEio,216
+sqladmin/__init__.py,sha256=J9RDjM9xYLz2BbBMrYu0KfRxirw6tKr5hyr1xcoPi2g,216
 sqladmin/_menu.py,sha256=V6uKvIJGKrC0kmXq4M-DAgvPoHvgoGgKAw47OjsswGA,2609
 sqladmin/_queries.py,sha256=KqxMABvepoA0j-8Xizg6ASYS-sZDSdm5iFlU74vilQY,9697
 sqladmin/_types.py,sha256=3Zs0aPb14OS-9leahKxxzFopnIOiNftPZwdUmFDBKog,347
 sqladmin/_validators.py,sha256=w0siGhZQq4MD__lu9Edua9DgMOoKET_kk-alpARFHIM,1604
 sqladmin/ajax.py,sha256=wSP5P9cAIh3GImIc_-E_Mi14aJAcbtiy4_pDPukTs5E,2764
-sqladmin/application.py,sha256=DrG94Y9cTC5klNJ0XWfl5-FK3Wl1X7WKjVuH9QHCP0c,27416
+sqladmin/application.py,sha256=7aMILrxNrDxGAM8WX32XxGQbDjGmy6gp0A-tQ1usqsM,27364
 sqladmin/authentication.py,sha256=QdN3rLZFU25ihaIIi7iisb55-oFi4GtV_k1xGFvnS6w,2482
 sqladmin/exceptions.py,sha256=6-E8m7rbWE3A7hNaSmB6CVqFzkEuwUpmU5AdGbouPCw,154
 sqladmin/fields.py,sha256=1CWoVSMr1WkhBJww0-rakx71gRATeIGA6dKgc26z99M,11660
 sqladmin/formatters.py,sha256=K06la0mm9-Bs5UA9L6KGJC_X_lV3UHdJ3ENI6j9j2Zg,480
 sqladmin/forms.py,sha256=5VhbRWbsG23eDAGz2c03HnED-titNkBdYzDr-TaBSi0,21541
 sqladmin/helpers.py,sha256=VTPOFbWkiC1My6MYYyVUCAdg7UmnViiYE2ZigiXx628,8615
-sqladmin/models.py,sha256=F6C9WZj3V7YO9tS1p1VhozsxTbjl5kygOLZbJ6yN-wE,39610
-sqladmin/pagination.py,sha256=vRXwCeuaUptovvY0wb1MDCIk8WBWwiE9X09SIkzSmcg,2464
+sqladmin/models.py,sha256=7VFwuxz7oixl9jLD8QPLxlCErCUDdPWf3Ob60kOoF20,40630
+sqladmin/pagination.py,sha256=zg_bAvqZd2Rf0wKJ7uiVfNV9vR0hrsilmi9Ak0SOG_U,2600
 sqladmin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqladmin/templating.py,sha256=o-QMikTrOEgrneLonqCWR3SpAthr-9DoMwOmobM9zq0,2252
 sqladmin/widgets.py,sha256=xl9tGhj--KTRPmNhFn3WVbvN_tQfkYSNVBGicsFhrgM,3189
@@ -47,7 +47,7 @@ sqladmin/templates/sqladmin/login.html,sha256=Y_hlcIapfVFPNbSIbCe4Tbj5DLLD46emkS
 sqladmin/templates/sqladmin/modals/delete.html,sha256=jTuv6geT-AhK5HTgRmntrJ8CEi98-kwKrVDrzkOQWhw,1092
 sqladmin/templates/sqladmin/modals/details_action_confirmation.html,sha256=mN8LJ5OqypxNLAg2_GYZgQmGeK4E6t7JL5RmOEYuliM,1020
 sqladmin/templates/sqladmin/modals/list_action_confirmation.html,sha256=U52LLNmpLaMuUZSVtGK15oLXsEu6m2S3l9zj9sjN6uM,1078
-sqladmin-0.19.0.dist-info/METADATA,sha256=x__F5BuE9EUqAuEoyaqOQY28YbI9AFCwgYCTXvveRrg,5270
-sqladmin-0.19.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-sqladmin-0.19.0.dist-info/licenses/LICENSE.md,sha256=4zzpHQMPtND4hzIgJA5qnb4R_wRBWJlYGqNrZolBeP8,1488
-sqladmin-0.19.0.dist-info/RECORD,,
+sqladmin-0.20.0.dist-info/METADATA,sha256=YgbcA1NS7mKPEmMDPlMMOpkU7z3rcYMi-JLqOMe2hPM,5270
+sqladmin-0.20.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+sqladmin-0.20.0.dist-info/licenses/LICENSE.md,sha256=4zzpHQMPtND4hzIgJA5qnb4R_wRBWJlYGqNrZolBeP8,1488
+sqladmin-0.20.0.dist-info/RECORD,,