fastadmin 0.2.10__tar.gz → 0.2.12__tar.gz

{fastadmin-0.2.10 → fastadmin-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastadmin
-Version: 0.2.10
+Version: 0.2.12
 Summary: FastAdmin is an easy-to-use Admin Dashboard App for FastAPI/Flask/Django inspired by Django Admin.
 Home-page: https://github.com/vsdudakov/fastadmin
 License: MIT
@@ -27,8 +27,8 @@ Provides-Extra: flask
 Provides-Extra: pony
 Provides-Extra: sqlalchemy
 Provides-Extra: tortoise-orm
-Requires-Dist: asgiref (==3.6.0)
-Requires-Dist: django (==4.*) ; extra == "django"
+Requires-Dist: asgiref (>=3.7.0,<4.0.0)
+Requires-Dist: django (==5.*) ; extra == "django"
 Requires-Dist: fastapi (==0.*) ; extra == "fastapi"
 Requires-Dist: flask (==2.*) ; extra == "flask"
 Requires-Dist: pony (==0.*) ; extra == "pony"

{fastadmin-0.2.10 → fastadmin-0.2.12}/fastadmin/models/decorators.py

@@ -24,7 +24,8 @@ def action(function=None, *, description: str | None = None):
         return decorator(function)
 
 
-def display(function=None):
+# TODO: make the sorter parameter a string to specify how to sort the data
+def display(function=None, *, sorter: bool = False):
     """Conveniently add attributes to a display function:
 
     Example of usage:
@@ -33,10 +34,13 @@ def display(function=None):
         return obj.publish_date is not None
 
     :param function: A function to decorate.
+    :param sorter: Enable sorting or not. **WARNING**: supported only for Django and Tortoise.
+        Function name should be like an ORM ordering param, e.g. `def user__username(self, obj)`.
     """
 
     def decorator(func):
         func.is_display = True
+        func.sorter = sorter
         return func
 
     if function is None:

{fastadmin-0.2.10 → fastadmin-0.2.12}/fastadmin/models/helpers.py

@@ -15,6 +15,21 @@ from fastadmin.models.schemas import (
     ModelSchema,
 )
 
+try:
+    from tortoise.models import Model as TortoiseModel
+except ImportError:
+
+    class TortoiseModel:  # type: ignore [no-redef]
+        pass
+
+
+try:
+    from django.db.models import Model as DjangoModel
+except ImportError:
+
+    class DjangoModel:  # type: ignore [no-redef]
+        pass
+
 
 def register_admin_model_class(admin_model_class: type[ModelAdmin], orm_model_classes: list[Any], **kwargs) -> None:
     """This method is used to register an admin model.
@@ -162,17 +177,24 @@ def generate_models_schema(
                 ),
             )
 
-        for column_index, field_name in enumerate(orm_model_fields_for_serialize):
+        for field_name in orm_model_fields_for_serialize:
             display_field_function = getattr(admin_model_obj, field_name, None)
             if not display_field_function or not hasattr(display_field_function, "is_display"):
                 continue
+            if field_name not in column_fields:
+                continue
+            column_index = column_fields.index(field_name)
+
+            sorter = getattr(display_field_function, "sorter", False)
+            if sorter and not issubclass(orm_model_cls, TortoiseModel | DjangoModel):
+                raise NotImplementedError("Sorter of custom columns is supported only for Tortoise or Django")
 
             fields_schema.append(
                 ModelFieldSchema(
                     name=field_name,
                     list_configuration=ListConfigurationFieldSchema(
                         index=column_index,
-                        sorter=False,
+                        sorter=sorter,
                         is_link=field_name in getattr(admin_model_obj, "list_display_links", ()),
                         empty_value_display=admin_model_obj.empty_value_display,
                         filter_widget_type=None,

{fastadmin-0.2.10 → fastadmin-0.2.12}/fastadmin/models/orms/ponyorm.py

@@ -328,9 +328,12 @@ class PonyORMMixin:
         :params id: an id of object.
         :return: None.
         """
-        # delete(o for o in self.model_cls if getattr(o, self.get_model_pk_name(self.model_cls)) == id)
-        # flush()
-        # commit()
+        obj = next((i for i in self.model_cls.select(**{self.get_model_pk_name(self.model_cls): id})), None)
+        if not obj:
+            return
+        obj.delete()
+        flush()
+        commit()
 
     @sync_to_async
     @db_session
@@ -365,12 +368,12 @@ class PonyORMMixin:
         obj = next((i for i in self.model_cls.select(**{key_id: getattr(obj, key_id)})), None)
         if not obj:
             return
-        obj.participants.clear()
+        getattr(obj, field).clear()
         if ids:
             rel_model_cls = getattr(self.model_cls, field).py_type
             rel_key_id = self.get_model_pk_name(rel_model_cls)
             rel_objs = list(rel_model_cls.select(lambda o: getattr(o, rel_key_id) in ids))
-            obj.participants.add(rel_objs)
+            getattr(obj, field).add(rel_objs)
         flush()
         commit()
 

{fastadmin-0.2.10 → fastadmin-0.2.12}/fastadmin/settings.py

@@ -1,11 +1,6 @@
 import os
 from pathlib import Path
 
-from dotenv import load_dotenv
-
-load_dotenv(os.getenv("ADMIN_ENV_FILE") or ".env")
-
-
 ROOT_DIR = Path(__file__).resolve().parent
 
 

{fastadmin-0.2.10 → fastadmin-0.2.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastadmin"
-version = "0.2.10"
+version = "0.2.12"
 description = "FastAdmin is an easy-to-use Admin Dashboard App for FastAPI/Flask/Django inspired by Django Admin."
 authors = ["Seva D <vsdudakov@gmail.com>"]
 license = "MIT"
@@ -28,10 +28,10 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.10"
 pyjwt = "^2.6.0"
-asgiref = "3.6.0"
+asgiref = "^3.7.0"
 fastapi = { version = "0.*", optional = true }
 flask = { version = "2.*", optional = true }
-django = { version = "4.*", optional = true }
+django = { version = "5.*", optional = true }
 tortoise-orm = { version = "0.*", optional = true }
 sqlalchemy = { version = "2.*", extras = ["asyncio"], optional = true }
 pony = { version = "0.*", optional = true }