sqladmin 0.18.0__tar.gz → 0.19.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sqladmin
-Version: 0.18.0
+Version: 0.19.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.18.0 → sqladmin-0.19.0}/pyproject.toml

@@ -95,7 +95,7 @@ dependencies = [
 dependencies = [
   "mkdocs-material==9.1.3",
   "mkdocs==1.4.2",
-  "mkdocstrings[python]==0.20.0",
+  "mkdocstrings[python]==0.25.0",
 ]
 
 [tool.hatch.envs.test.scripts]

{sqladmin-0.18.0 → sqladmin-0.19.0}/sqladmin/__init__.py

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

{sqladmin-0.18.0 → sqladmin-0.19.0}/sqladmin/ajax.py

@@ -26,6 +26,7 @@ class QueryAjaxModelLoader:
         self.model_admin = model_admin
         self.fields = options.get("fields", {})
         self.order_by = options.get("order_by")
+        self.limit = options.get("limit", DEFAULT_PAGE_SIZE)
 
         pks = get_primary_keys(self.model)
         self.pk = pks[0] if len(pks) == 1 else None
@@ -60,7 +61,7 @@ class QueryAjaxModelLoader:
 
         return {"id": str(get_object_identifier(model)), "text": str(model)}
 
-    async def get_list(self, term: str, limit: int = DEFAULT_PAGE_SIZE) -> list[Any]:
+    async def get_list(self, term: str) -> list[Any]:
         stmt = select(self.model)
 
         # no type casting to string if a ColumnAssociationProxyInstance is given
@@ -71,9 +72,13 @@ class QueryAjaxModelLoader:
         stmt = stmt.filter(or_(*filters))
 
         if self.order_by:
-            stmt = stmt.order_by(self.order_by)
+            if isinstance(self.order_by, list):
+                for o in self.order_by:
+                    stmt = stmt.order_by(o)
+            else:
+                stmt = stmt.order_by(self.order_by)
 
-        stmt = stmt.limit(limit)
+        stmt = stmt.limit(self.limit)
         result = await self.model_admin._run_query(stmt)
         return result
 

{sqladmin-0.18.0 → sqladmin-0.19.0}/sqladmin/application.py

@@ -68,6 +68,7 @@ class BaseAdmin:
         base_url: str = "/admin",
         title: str = "Admin",
         logo_url: str | None = None,
+        favicon_url: str | None = None,
         templates_dir: str = "templates",
         middlewares: Sequence[Middleware] | None = None,
         authentication_backend: AuthenticationBackend | None = None,
@@ -78,6 +79,7 @@ class BaseAdmin:
         self.templates_dir = templates_dir
         self.title = title
         self.logo_url = logo_url
+        self.favicon_url = favicon_url
 
         if session_maker:
             self.session_maker = session_maker
@@ -340,6 +342,7 @@ class Admin(BaseAdminView):
         base_url: str = "/admin",
         title: str = "Admin",
         logo_url: str | None = None,
+        favicon_url: str | None = None,
         middlewares: Sequence[Middleware] | None = None,
         debug: bool = False,
         templates_dir: str = "templates",
@@ -353,6 +356,7 @@ class Admin(BaseAdminView):
             base_url: Base URL for Admin interface.
             title: Admin title.
             logo_url: URL of logo to be displayed instead of title.
+            favicon_url: URL of favicon to be displayed.
         """
 
         super().__init__(
@@ -362,6 +366,7 @@ class Admin(BaseAdminView):
             base_url=base_url,
             title=title,
             logo_url=logo_url,
+            favicon_url=favicon_url,
             templates_dir=templates_dir,
             middlewares=middlewares,
             authentication_backend=authentication_backend,

{sqladmin-0.18.0 → sqladmin-0.19.0}/sqladmin/forms.py

@@ -18,7 +18,12 @@ from typing import (
 import anyio
 from sqlalchemy import Boolean, select
 from sqlalchemy import inspect as sqlalchemy_inspect
-from sqlalchemy.orm import ColumnProperty, RelationshipProperty, sessionmaker
+from sqlalchemy.orm import (
+    ColumnProperty,
+    RelationshipProperty,
+    sessionmaker,
+)
+from sqlalchemy.sql.elements import Label
 from sqlalchemy.sql.schema import Column
 from wtforms import (
     BooleanField,
@@ -612,9 +617,12 @@ async def get_model_form(
     attributes = []
     names = only or mapper.attrs.keys()
     for name in names:
-        if exclude and name in exclude:
+        attr = mapper.attrs[name]
+        if (exclude and name in exclude) or (
+            isinstance(attr, ColumnProperty) and isinstance(attr.expression, Label)
+        ):
             continue
-        attributes.append((name, mapper.attrs[name]))
+        attributes.append((name, attr))
 
     field_dict = {}
     for name, attr in attributes:

{sqladmin-0.18.0 → sqladmin-0.19.0}/sqladmin/models.py

@@ -176,7 +176,7 @@ class BaseView(BaseModelView):
 
     icon: ClassVar[str] = ""
     """Display icon for ModelAdmin in the sidebar.
-    Currently only supports FontAwesome icons.
+    Currently only supports FontAwesome and Tabler icons.
     """
 
     category: ClassVar[str] = ""

{sqladmin-0.18.0 → sqladmin-0.19.0}/sqladmin/pagination.py

@@ -46,6 +46,11 @@ class Pagination:
 
         raise RuntimeError("Next page not found.")
 
+    def resize(self, page_size: int) -> Pagination:
+        self.page = (self.page - 1) * self.page_size // page_size + 1
+        self.page_size = page_size
+        return self
+
     def add_pagination_urls(self, base_url: URL) -> None:
         # Previous pages
         for p in range(self.page - min(self.max_page_controls, 3), self.page):