Fix examples

Author: vsdudakov

examples/fastapi_ponyorm/example.py

@@ -3,35 +3,39 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from models import BaseEvent, Event, Tournament, User, db
-from pony.orm import db_session
+from pony.orm import commit, db_session
 
-from fastadmin import PonyORMInlineModelAdmin, PonyORMModelAdmin, action, display
+from fastadmin import PonyORMInlineModelAdmin, PonyORMModelAdmin, WidgetType, action, display
 from fastadmin import fastapi_app as admin_app
 from fastadmin import register
 
 
 @register(User)
 class UserModelAdmin(PonyORMModelAdmin):
-    exclude = ("password",)
     list_display = ("id", "username", "is_superuser")
     list_display_links = ("id", "username")
     list_filter = ("id", "username", "is_superuser")
     search_fields = ("username",)
-
-    async def authenticate(self, username, password):
-        with db_session:
-            obj = next((f for f in User.select(username=username, password=password, is_superuser=True)), None)  # fmt: skip
-            if not obj:
-                return None
-            return obj.id
-
-    async def change_password(self, user_id, password):
-        user = await self.model_cls.filter(id=user_id).first()
-        if not user:
+    formfield_overrides = {  # noqa: RUF012
+        "username": (WidgetType.SlugInput, {"required": True}),
+        "password": (WidgetType.PasswordInput, {"passwordModalForm": True}),
+    }
+
+    @db_session
+    def authenticate(self, username, password):
+        obj = next((f for f in User.select(username=username, password=password, is_superuser=True)), None)  # fmt: skip
+        if not obj:
+            return None
+        return obj.id
+
+    @db_session
+    def change_password(self, user_id, password):
+        obj = next((f for f in self.model_cls.select(id=user_id)), None)
+        if not obj:
             return
         # direct saving password is only for tests - use hash
-        user.password = password
-        await user.save()
+        obj.password = password
+        commit()
 
 
 class EventInlineModelAdmin(PonyORMInlineModelAdmin):
@@ -61,20 +65,32 @@ class EventModelAdmin(PonyORMModelAdmin):
         "started",
     )
 
-    @action(description="Make user active")
-    async def make_is_active(self, ids):
-        await self.model_cls.filter(id__in=ids).update(is_active=True)
+    @action(description="Make event active")
+    @db_session
+    def make_is_active(self, ids):
+        # update(o.set(is_active=True) for o in self.model_cls if o.id in ids)
+        objs = self.model_cls.select(lambda o: o.id in ids)
+        for obj in objs:
+            obj.is_active = True
+        commit()
 
     @action
-    async def make_is_not_active(self, ids):
-        await self.model_cls.filter(id__in=ids).update(is_active=False)
+    @db_session
+    def make_is_not_active(self, ids):
+        # update(o.set(is_active=False) for o in self.model_cls if o.id in ids)
+        objs = self.model_cls.select(lambda o: o.id in ids)
+        for obj in objs:
+            obj.is_active = False
+        commit()
 
     @display
-    async def started(self, obj):
+    @db_session
+    def started(self, obj):
         return bool(obj.start_time)
 
     @display()
-    async def name_with_price(self, obj):
+    @db_session
+    def name_with_price(self, obj):
         return f"{obj.name} - {obj.price}"
 
 

examples/fastapi_ponyorm/models.py

@@ -20,10 +20,6 @@ class BaseModel:
     def before_update(self):
         self.updated_at = datetime.now(tz=UTC)
 
-    @classmethod
-    def get_model_name(cls):
-        return f"ponyorm.{cls.__name__}"
-
 
 class User(db.Entity, BaseModel):
     _table_ = "user"

examples/fastapi_sqlalchemy/example.py

@@ -3,7 +3,7 @@
 from models import Base, BaseEvent, Event, Tournament, User, sqlalchemy_engine, sqlalchemy_sessionmaker
 from sqlalchemy import select, update
 
-from fastadmin import SqlAlchemyInlineModelAdmin, SqlAlchemyModelAdmin, action, display
+from fastadmin import SqlAlchemyInlineModelAdmin, SqlAlchemyModelAdmin, WidgetType, action, display
 from fastadmin import fastapi_app as admin_app
 from fastadmin import register
 
@@ -15,6 +15,10 @@ class UserModelAdmin(SqlAlchemyModelAdmin):
     list_display_links = ("id", "username")
     list_filter = ("id", "username", "is_superuser")
     search_fields = ("username",)
+    formfield_overrides = {  # noqa: RUF012
+        "username": (WidgetType.SlugInput, {"required": True}),
+        "password": (WidgetType.PasswordInput, {"passwordModalForm": True}),
+    }
 
     async def authenticate(self, username, password):
         sessionmaker = self.get_sessionmaker()

examples/fastapi_sqlalchemy/models.py

@@ -31,10 +31,6 @@ class BaseModel(Base):
         DateTime, nullable=False, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow
     )
 
-    @classmethod
-    def get_model_name(cls):
-        return f"sqlalchemy.{cls.__name__}"
-
 
 user_m2m_event = Table(
     "event_participants",

examples/fastapi_tortoiseorm/example.py

@@ -3,7 +3,7 @@
 from models import BaseEvent, Event, Tournament, User
 from tortoise import Tortoise
 
-from fastadmin import TortoiseInlineModelAdmin, TortoiseModelAdmin, action, display
+from fastadmin import TortoiseInlineModelAdmin, TortoiseModelAdmin, WidgetType, action, display
 from fastadmin import fastapi_app as admin_app
 from fastadmin import register
 
@@ -15,6 +15,10 @@ class UserModelAdmin(TortoiseModelAdmin):
     list_display_links = ("id", "username")
     list_filter = ("id", "username", "is_superuser")
     search_fields = ("username",)
+    formfield_overrides = {  # noqa: RUF012
+        "username": (WidgetType.SlugInput, {"required": True}),
+        "password": (WidgetType.PasswordInput, {"passwordModalForm": True}),
+    }
 
     async def authenticate(self, username, password):
         obj = await self.model_cls.filter(username=username, password=password, is_superuser=True).first()
@@ -51,7 +55,7 @@ class EventModelAdmin(TortoiseModelAdmin):
     actions = ("make_is_active", "make_is_not_active")
     list_display = ("id", "name_with_price", "rating", "event_type", "is_active", "started")
 
-    @action(description="Make user active")
+    @action(description="Make event active")
     async def make_is_active(self, ids):
         await self.model_cls.filter(id__in=ids).update(is_active=True)
 

examples/fastapi_tortoiseorm/models.py

@@ -14,10 +14,6 @@ class BaseModel(Model):
     created_at = fields.DatetimeField(auto_now_add=True)
     updated_at = fields.DatetimeField(auto_now=True)
 
-    @classmethod
-    def get_model_name(cls):
-        return f"tortoiseorm.{cls.__name__}"
-
     class Meta:
         abstract = True
 

fastadmin/models/orms/ponyorm.py

@@ -328,6 +328,7 @@ def orm_delete_obj(self, id: UUID | int) -> None:
         :params id: an id of object.
         :return: None.
         """
+        # TODO: fix me
         # delete(o for o in self.model_cls if getattr(o, self.get_model_pk_name(self.model_cls)) == id)
         # flush()
         # commit()
@@ -365,12 +366,14 @@ def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) -> None:
         obj = next((i for i in self.model_cls.select(**{key_id: getattr(obj, key_id)})), None)
         if not obj:
             return
-        obj.participants.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)
+        # TODO: fix me
+        # 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))
+        #     getattr(obj, field).clear()
+        #     for rel_obj in rel_objs:
+        #         getattr(obj, field).add(rel_obj)
         flush()
         commit()