fastadmin 0.2.20__py3-none-any.whl → 0.2.22__py3-none-any.whl

{fastadmin-0.2.20.dist-info → fastadmin-0.2.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fastadmin
-Version: 0.2.20
+Version: 0.2.22
 Summary: FastAdmin is an easy-to-use Admin Dashboard App for FastAPI/Flask/Django inspired by Django Admin.
 License: MIT
 Keywords: fastapi,admin
@@ -475,13 +475,14 @@ Register ORM models
 
 
 ```python
+import typing as tp
 from uuid import UUID
 
 import bcrypt
 from tortoise import fields
 from tortoise.models import Model
 
-from fastadmin import TortoiseModelAdmin, register
+from fastadmin import TortoiseModelAdmin, WidgetType, register
 
 
 class User(Model):
@@ -489,6 +490,7 @@ class User(Model):
     hash_password = fields.CharField(max_length=255)
     is_superuser = fields.BooleanField(default=False)
     is_active = fields.BooleanField(default=False)
+    avatar_url = fields.TextField(null=True)
 
     def __str__(self):
         return self.username
@@ -501,15 +503,39 @@ class UserAdmin(TortoiseModelAdmin):
     list_display_links = ("id", "username")
     list_filter = ("id", "username", "is_superuser", "is_active")
     search_fields = ("username",)
-
-    async def authenticate(self, username: str, password: str) -> UUID | int | None:
-        user = await User.filter(username=username, is_superuser=True).first()
+    formfield_overrides = {  # noqa: RUF012
+        "username": (WidgetType.SlugInput, {"required": True}),
+        "password": (WidgetType.PasswordInput, {"passwordModalForm": True}),
+        "avatar_url": (
+            WidgetType.Upload,
+            {
+                "required": False,
+                # Disable crop image for upload field
+                # "disableCropImage": True,
+            },
+        ),
+    }
+
+    async def authenticate(self, username: str, password: str) -> int | None:
+        user = await self.model_cls.filter(phone=username, is_superuser=True).first()
         if not user:
             return None
         if not bcrypt.checkpw(password.encode(), user.hash_password.encode()):
             return None
         return user.id
 
+    async def change_password(self, id: UUID | int, password: str) -> None:
+        user = await self.model_cls.filter(id=id).first()
+        if not user:
+            return
+        user.hash_password = bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
+        await user.save(update_fields=("hash_password",))
+
+    async def orm_save_upload_field(self, obj: tp.Any, field: str, base64: str) -> None:
+        # convert base64 to bytes, upload to s3/filestorage, get url and save or save base64 as is to db (don't recomment it)
+        setattr(obj, field, base64)
+        await obj.save(update_fields=(field,))
+
 ```
 
 
@@ -583,8 +609,11 @@ class UserAdmin(DjangoModelAdmin):
 
 
 ```python
+import typing as tp
+import uuid
+
 import bcrypt
-from sqlalchemy import Boolean, Integer, String, select
+from sqlalchemy import Boolean, Integer, String, Text, select, update
 from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
@@ -609,6 +638,7 @@ class User(Base):
     hash_password: Mapped[str] = mapped_column(String(length=255), nullable=False)
     is_superuser: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
     is_active: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
+    avatar_url: Mapped[str | None] = mapped_column(Text, nullable=True)
 
     def __str__(self):
         return self.username
@@ -622,17 +652,33 @@ class UserAdmin(SqlAlchemyModelAdmin):
     list_filter = ("id", "username", "is_superuser", "is_active")
     search_fields = ("username",)
 
-    async def authenticate(self, username, password):
+    async def authenticate(self, username: str, password: str) -> uuid.UUID | int | None:
         sessionmaker = self.get_sessionmaker()
         async with sessionmaker() as session:
-            query = select(User).filter_by(username=username, password=password, is_superuser=True)
+            query = select(self.model_cls).filter_by(username=username, password=password, is_superuser=True)
             result = await session.scalars(query)
-            user = result.first()
-            if not user:
+            obj = result.first()
+            if not obj:
                 return None
-            if not bcrypt.checkpw(password.encode(), user.hash_password.encode()):
+            if not bcrypt.checkpw(password.encode(), obj.hash_password.encode()):
                 return None
-            return user.id
+            return obj.id
+
+    async def change_password(self, id: uuid.UUID | int, password: str) -> None:
+        sessionmaker = self.get_sessionmaker()
+        async with sessionmaker() as session:
+            hash_password = bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
+            query = update(self.model_cls).where(User.id.in_([id])).values(hash_password=hash_password)
+            await session.execute(query)
+            await session.commit()
+
+    async def orm_save_upload_field(self, obj: tp.Any, field: str, base64: str) -> None:
+        sessionmaker = self.get_sessionmaker()
+        async with sessionmaker() as session:
+            # convert base64 to bytes, upload to s3/filestorage, get url and save or save base64 as is to db (don't recomment it)
+            query = update(self.model_cls).where(User.id.in_([obj.id])).values(**{field: base64})
+            await session.execute(query)
+            await session.commit()
 
 ```
 
@@ -655,8 +701,11 @@ class UserAdmin(SqlAlchemyModelAdmin):
 
 
 ```python
+import typing as tp
+import uuid
+
 import bcrypt
-from pony.orm import Database, PrimaryKey, Required, db_session
+from pony.orm import Database, LongStr, Optional, PrimaryKey, Required, commit, db_session
 
 from fastadmin import PonyORMModelAdmin, register
 
@@ -671,6 +720,7 @@ class User(db.Entity):  # type: ignore [name-defined]
     hash_password = Required(str)
     is_superuser = Required(bool, default=False)
     is_active = Required(bool, default=False)
+    avatar_url = Optional(LongStr, nullable=True)
 
     def __str__(self):
         return self.username
@@ -685,13 +735,31 @@ class UserAdmin(PonyORMModelAdmin):
     search_fields = ("username",)
 
     @db_session
-    def authenticate(self, username, password):
-        user = next((f for f in self.model_cls.select(username=username, password=password, is_superuser=True)), None)
-        if not user:
+    def authenticate(self, username: str, password: str) -> uuid.UUID | int | None:
+        obj = next((f for f in User.select(username=username, password=password, is_superuser=True)), None)  # fmt: skip
+        if not obj:
             return None
-        if not bcrypt.checkpw(password.encode(), user.hash_password.encode()):
+        if not bcrypt.checkpw(password.encode(), obj.hash_password.encode()):
             return None
-        return user.id
+        return obj.id
+
+    @db_session
+    def change_password(self, id: uuid.UUID | int, password: str) -> None:
+        obj = next((f for f in self.model_cls.select(id=id)), None)
+        if not obj:
+            return
+        hash_password = bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
+        obj.hash_password = hash_password
+        commit()
+
+    @db_session
+    def orm_save_upload_field(self, obj: tp.Any, field: str, base64: str) -> None:
+        obj = next((f for f in self.model_cls.select(id=obj.id)), None)
+        if not obj:
+            return
+        # convert base64 to bytes, upload to s3/filestorage, get url and save or save base64 as is to db (don't recomment it)
+        setattr(obj, field, base64)
+        commit()
 
 ```
 

{fastadmin-0.2.20.dist-info → fastadmin-0.2.22.dist-info}/RECORD

@@ -19,7 +19,7 @@ fastadmin/api/helpers.py,sha256=Tj0xMW-RHhQtnT-tOgEerIFcks3dCxGFj4etHMkKPwo,2322
 fastadmin/api/schemas.py,sha256=5eYJDGrSrvy0YdB8vak0zPv-a51a36CYJ_RVA2vgTKU,1348
 fastadmin/api/service.py,sha256=TGVb4HS80IC0QpdN-qbDqaqbaI-H769EHCE-HHEd2Lo,18174
 fastadmin/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastadmin/models/base.py,sha256=KkQq8r2Tni5IfxLlHHH4DmDIeMylTV4wTxvedb6qxe8,27697
+fastadmin/models/base.py,sha256=u8qw07QVpKdph3vqAB4mtKhYmtps0UOZWMVEAi7Kks0,27885
 fastadmin/models/decorators.py,sha256=KtfUBoiDJGbUGVgw4LZS7YdgqlEzHvA1mhXynnJ3-jg,2877
 fastadmin/models/helpers.py,sha256=CBQhkwgzhtdPkkMLiHhuQUBrmG539ceDI1EiqdTdhn0,14761
 fastadmin/models/orms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,9 +40,9 @@ fastadmin/static/images/header-logo.svg,sha256=FfFOShL7p4EvggDS106VDcMzI_Oe7zAG7
 fastadmin/static/images/sign-in-logo.svg,sha256=sD6YXIwT0kOvZTCGxyoUMiIoszXV77OBxFLvlZOYEeE,1359
 fastadmin/static/index.html,sha256=J6YYi1W7Y-YHlAfdTjy4KOd_yMZy-UWMJZAFDe78eAI,613
 fastadmin/static/index.min.css,sha256=wLq82YRWuzAgSDLc92AzsDhWUuP94F4y7AlayA3fd5U,72109
-fastadmin/static/index.min.js,sha256=C8lz6Mdx9XZwlq7q9dcbNe0hvbsPexDL81FtSjtrKxc,3270358
+fastadmin/static/index.min.js,sha256=E6B5aPBPVYvLhJ5yIEtU_wvDaEdXiKQZEr6Cm84XiZ4,3270501
 fastadmin/templates/index.html,sha256=WHIAqNmtJ_fHMgYrMHkUwsYxt4Xo6yMrieDODKDCN9Q,719
-fastadmin-0.2.20.dist-info/LICENSE,sha256=-5Cmq6xd5DlFq8rhBcqGMi8Mlh_h-YVjKOYjnYk5dyM,1063
-fastadmin-0.2.20.dist-info/METADATA,sha256=mkZC4z3vWBNhI7Yrh_wkTo3xMS54vOJj5M_BSOwCorM,11813
-fastadmin-0.2.20.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-fastadmin-0.2.20.dist-info/RECORD,,
+fastadmin-0.2.22.dist-info/LICENSE,sha256=-5Cmq6xd5DlFq8rhBcqGMi8Mlh_h-YVjKOYjnYk5dyM,1063
+fastadmin-0.2.22.dist-info/METADATA,sha256=46Riio3lGEl3XoXgGJ8jxmnOJR-LxJfe-DSEFQDSVGI,14898
+fastadmin-0.2.22.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+fastadmin-0.2.22.dist-info/RECORD,,