初步兼容pydantic v2

Author: amisadmin

fastapi_user_auth/admin/actions.py

@@ -9,8 +9,8 @@
 from fastapi_amis_admin.amis.constants import LevelEnum
 from fastapi_amis_admin.crud.schema import BaseApiOut
 from fastapi_amis_admin.models import Field
+from fastapi_amis_admin.utils.pydantic import ModelField
 from pydantic import BaseModel
-from pydantic.fields import ModelField
 from starlette.requests import Request
 from starlette.responses import RedirectResponse
 

fastapi_user_auth/auth/models.py

@@ -1,6 +1,8 @@
+from typing import Optional
+
 from fastapi_amis_admin.amis.components import ColumnImage, InputImage
 from fastapi_amis_admin.crud.parser import LabelField
-from fastapi_amis_admin.models.fields import Field
+from fastapi_amis_admin.models import Field
 from fastapi_amis_admin.utils.translation import i18n as _
 from sqlalchemy import ForeignKey, func, select
 
@@ -19,9 +21,9 @@
 class BaseUser(PkMixin, CUDTimeMixin, UsernameMixin, PasswordMixin, EmailMixin):
     __tablename__ = "auth_user"
     is_active: bool = Field(default=True, title=_("Is Active"))
-    nickname: str = Field(None, title=_("Nickname"), max_length=40)
+    nickname: str = Field("", title=_("Nickname"), max_length=40)
     avatar: str = Field(
-        None,
+        "",
         title=_("Avatar"),
         max_length=255,
         amis_form_item=InputImage(maxLength=1, maxSize=2 * 1024 * 1024),
@@ -63,10 +65,10 @@ class CasbinRule(PkMixin, table=True):
     ptype: str = Field(title="Policy Type")
     v0: str = Field(title="Subject")
     v1: str = Field(title="Object")
-    v2: str = Field(None, title="Action")
-    v3: str = Field(None, title="Group")
-    v4: str = Field(None, title="Effect")
-    v5: str = Field(None)
+    v2: Optional[str] = Field(None, title="Action")
+    v3: Optional[str] = Field(None, title="Group")
+    v4: Optional[str] = Field(None, title="Effect")
+    v5: Optional[str] = Field(None)
 
     def __str__(self) -> str:
         arr = [self.ptype]

fastapi_user_auth/mixins/models.py

@@ -1,27 +1,23 @@
 from datetime import datetime
 from typing import Optional
 
-from fastapi_amis_admin.models.fields import Field
+from fastapi_amis_admin.models import Field, SQLModel
 from fastapi_amis_admin.utils.translation import i18n as _
 from pydantic import EmailStr, SecretStr
 from sqlalchemy import func
-
-try:
-    from sqlmodelx import SQLModel
-except ImportError:
-    from sqlmodel import SQLModel
+from sqlmodel import AutoString
 
 
 class PkMixin(SQLModel):
-    id: int = Field(default=None, title="ID", primary_key=True, nullable=False)
+    id: Optional[int] = Field(default=None, title="ID", primary_key=True, nullable=False)
 
 
 class CreateTimeMixin(SQLModel):
     create_time: datetime = Field(default_factory=datetime.now, title=_("Create Time"))
 
 
 class UpdateTimeMixin(SQLModel):
-    update_time: Optional[datetime] = Field(
+    update_time: datetime = Field(
         default_factory=datetime.now,
         title=_("Update Time"),
         sa_column_kwargs={"onupdate": func.now(), "server_default": func.now()},
@@ -42,17 +38,21 @@ class UsernameMixin(SQLModel):
     username: str = Field(title=_("Username"), max_length=32, unique=True, index=True, nullable=False)
 
 
-class PasswordStr(SecretStr, str):
-    pass
+# class PasswordStr(SecretStr, str):
+#     pass
 
 
 class PasswordMixin(SQLModel):
-    password: PasswordStr = Field(title=_("Password"), max_length=128, nullable=False, amis_form_item="input-password")
+    password: SecretStr = Field(
+        title=_("Password"), sa_type=AutoString, max_length=128, nullable=False, amis_form_item="input-password"
+    )
 
 
 class EmailMixin(SQLModel):
     """If you need to define the email field as unique, you can achieve it by adding the following parameters in the subclass:
     __table_args__ = (UniqueConstraint("email", name="email"),)
     """
 
-    email: EmailStr = Field(None, title=_("Email"), index=True, nullable=True, amis_form_item="input-email")
+    email: Optional[EmailStr] = Field(
+        None, title=_("Email"), sa_type=AutoString, index=True, nullable=True, amis_form_item="input-email"
+    )

pyproject.toml

@@ -37,12 +37,11 @@ classifiers = [
 ]
 dependencies = [
     "pydantic>=1.10.0,<2.0.0",
-    "fastapi-amis-admin>=0.6.5,<0.7.0",
-    "email-validator>=1.3.1,<2.0.0",
+    "fastapi-amis-admin[sqlmodel]>=0.7.0,<0.8.0",
+    "email-validator>=1.3.1,<3.0.0",
     "passlib>=1.7.4",
     "bcrypt>=4.0.0",
     "casbin>=1.29.0",
-    "sqlmodelx>=0.0.5",
 ]
 
 [project.urls]

tests/test_auth/test_auth_user_model.py

@@ -1,19 +1,23 @@
 from datetime import date
+from typing import Optional
 
 import pytest
 from fastapi import Depends
-from fastapi_amis_admin.models.fields import Field
+from fastapi_amis_admin.models import Field
 
-from fastapi_user_auth.auth.models import User
+from fastapi_user_auth.auth.models import BaseUser
 
 
 # 自定义`User`模型,继承`User`
-class MyUser(User, table=True):
+class MyUser(BaseUser, table=True):
     point: float = Field(default=0, title="积分", description="用户积分")
-    phone: str = Field(None, title="手机号", max_length=15)
-    parent_id: int = Field(None, title="上级", foreign_key="auth_user.id")
-    birthday: date = Field(None, title="出生日期")
-    location: str = Field(None, title="位置")
+    phone: str = Field("", title="手机号", max_length=15)
+    parent_id: Optional[int] = Field(None, title="上级", foreign_key="auth_user.id")
+    birthday: Optional[date] = Field(None, title="出生日期")
+    location: str = Field("", title="位置")
+
+
+print(123)
 
 
 @pytest.mark.parametrize("logins", ["admin"], indirect=True)