sqladmin 0.19.0__tar.gz → 0.20.1__tar.gz

{sqladmin-0.19.0 → sqladmin-0.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sqladmin
-Version: 0.19.0
+Version: 0.20.1
 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 → sqladmin-0.20.1}/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.1"
 
 __all__ = [
     "Admin",

{sqladmin-0.19.0 → sqladmin-0.20.1}/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-0.19.0 → sqladmin-0.20.1}/sqladmin/models.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 import time
 import warnings
 from enum import Enum
@@ -402,16 +403,16 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
     Normally, objects have three save options:
     ``Save`, `Save and continue editing` and `Save and add another`.
 
-    If save_as is True, `Save and add another` will be replaced 
-    by a `Save as new` button 
-    that creates a new object (with a new ID) 
+    If save_as is True, `Save and add another` will be replaced
+    by a `Save as new` button
+    that creates a new object (with a new ID)
     rather than updating the existing object.
 
     By default, `save_as` is set to `False`.
     """
 
     save_as_continue: ClassVar[bool] = True
-    """When `save_as=True`, the default redirect after saving the new object 
+    """When `save_as=True`, the default redirect after saving the new object
     is to the edit view for that object.
     If you set `save_as_continue=False`, the redirect will be to the list view.
 
@@ -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,32 @@ 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 "["
+            len_data = len(data)
+            last_idx = len_data - 1
+            separator = "," if len_data > 1 else ""
+
+            for idx, row in enumerate(data):
+                row_dict = {
+                    name: str(await self.get_prop_value(row, name))
+                    for name in self._export_prop_names
+                }
+                yield json.dumps(row_dict) + (separator if idx < last_idx else "")
+
+            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-0.19.0 → sqladmin-0.20.1}/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