perf: Upgrade fastapi-amis-admin to v0.6.0

Author: amisadmin

.gitignore

@@ -139,3 +139,4 @@ cython_debug/
 *.db
 /.idea/
 /note/
+/.pdm-python

.pre-commit-config.yaml

@@ -1,17 +1,17 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 23.1.0
     hooks:
       - id: black
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.2
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-bugbear
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort

README.md

@@ -312,7 +312,7 @@ class MyGroupAdmin(admin.ModelAdmin):
     page_schema = PageSchema(label='用户组管理', icon='fa fa-group')
     model = MyGroup
     link_model_fields = [Group.roles]
-    readonly_fields = ['key']
+    update_exclude = {"key"}
 
 # Customize the user authentication application, inherit and override the default user authentication application
 class MyUserAuthApp(UserAuthApp):

README.zh.md

@@ -311,7 +311,7 @@ class MyGroupAdmin(admin.ModelAdmin):
     page_schema = PageSchema(label='用户组管理', icon='fa fa-group')
     model = MyGroup
     link_model_fields = [Group.roles]
-    readonly_fields = ['key']
+    update_exclude = {"key"}
 
 # 自定义用户认证应用,继承重写默认的用户认证应用
 class MyUserAuthApp(UserAuthApp):

fastapi_user_auth/admin.py

@@ -263,17 +263,17 @@ class RoleAdmin(ModelAdmin):
     page_schema = PageSchema(label=_("Role"), icon="fa fa-group")
     model = Role
     link_model_fields = [Role.permissions]
-    readonly_fields = ["key"]
+    update_exclude = {"key"}
 
 
 class GroupAdmin(ModelAdmin):
     page_schema = PageSchema(label=_("Group"), icon="fa fa-group")
     model = Group
     link_model_fields = [Group.roles]
-    readonly_fields = ["key"]
+    update_exclude = {"key"}
 
 
 class PermissionAdmin(ModelAdmin):
     page_schema = PageSchema(label=_("Permission"), icon="fa fa-lock")
     model = Permission
-    readonly_fields = ["key"]
+    update_exclude = {"key"}

fastapi_user_auth/app.py

@@ -2,7 +2,7 @@
 
 from fastapi_amis_admin.admin import AdminApp, ModelAdmin, PageSchemaAdmin
 from fastapi_amis_admin.amis.components import PageSchema
-from fastapi_amis_admin.crud.utils import schema_create_by_schema
+from fastapi_amis_admin.utils.pydantic import create_model_by_model
 from fastapi_amis_admin.utils.translation import i18n as _
 from starlette.requests import Request
 
@@ -33,16 +33,16 @@ def __init__(self, app: "AdminApp"):
         self.auth = self.auth or self.site.auth
         AuthRouter.__init__(self)
         self.UserAdmin.model = self.UserAdmin.model or self.auth.user_model
-        self.UserLoginFormAdmin.schema = self.UserLoginFormAdmin.schema or schema_create_by_schema(
+        self.UserLoginFormAdmin.schema = self.UserLoginFormAdmin.schema or create_model_by_model(
             self.auth.user_model, "UserLoginIn", include={"username", "password"}
         )
         self.UserLoginFormAdmin.schema_submit_out = self.UserLoginFormAdmin.schema_submit_out or self.schema_user_login_out
-        self.UserRegFormAdmin.schema = self.UserRegFormAdmin.schema or schema_create_by_schema(
+        self.UserRegFormAdmin.schema = self.UserRegFormAdmin.schema or create_model_by_model(
             self.auth.user_model, "UserRegIn", include={"username", "password", "email"}
         )
         self.UserRegFormAdmin.schema_submit_out = self.UserRegFormAdmin.schema_submit_out or self.schema_user_login_out
         self.UserInfoFormAdmin.user_model = self.auth.user_model
-        self.UserInfoFormAdmin.schema = self.UserInfoFormAdmin.schema or schema_create_by_schema(
+        self.UserInfoFormAdmin.schema = self.UserInfoFormAdmin.schema or create_model_by_model(
             self.auth.user_model,
             "UserInfoForm",
             include={"nickname", "password", "avatar", "email"},

fastapi_user_auth/auth/auth.py

@@ -20,8 +20,8 @@
 from fastapi.security.utils import get_authorization_scheme_param
 from fastapi_amis_admin.crud.base import RouterMixin
 from fastapi_amis_admin.crud.schema import BaseApiOut
-from fastapi_amis_admin.crud.utils import schema_create_by_schema
 from fastapi_amis_admin.utils.functools import cached_property
+from fastapi_amis_admin.utils.pydantic import create_model_by_model
 from fastapi_amis_admin.utils.translation import i18n as _
 from passlib.context import CryptContext
 from pydantic import BaseModel, SecretStr
@@ -238,7 +238,7 @@ def __init__(self, auth: Auth = None):
         assert self.auth, "auth is None"
         RouterMixin.__init__(self)
         self.router.dependencies.insert(0, Depends(self.auth.backend.authenticate))
-        self.schema_user_info = self.schema_user_info or schema_create_by_schema(
+        self.schema_user_info = self.schema_user_info or create_model_by_model(
             self.auth.user_model, "UserInfo", exclude={"password"}
         )