feat: Upgrade sqlmodel to v0.0.14(pydantic v2 and sqlalchemy v2 are supported).

Author: amisadmin

demo/demo-model.py

@@ -1,3 +1,6 @@
+from contextlib import asynccontextmanager
+from typing import Optional
+
 from fastapi import FastAPI
 from sqlmodel import SQLModel
 
@@ -6,17 +9,26 @@
 from fastapi_amis_admin.admin.site import AdminSite
 from fastapi_amis_admin.models.fields import Field
 
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    print("Starting", app)
+    # 创建初始化数据库表
+    await site.db.async_run_sync(SQLModel.metadata.create_all, is_session=False)
+    yield
+
+
 # 创建FastAPI应用
-app = FastAPI()
+app = FastAPI(lifespan=lifespan)
 
 # 创建AdminSite实例
 site = AdminSite(settings=Settings(database_url_async="sqlite+aiosqlite:///amisadmin.db?check_same_thread=False"))
 
 
 # 先创建一个SQLModel模型,详细请参考: https://sqlmodel.tiangolo.com/
 class Category(SQLModel, table=True):
-    id: int = Field(default=None, primary_key=True, nullable=False)
-    name: str = Field(title="CategoryName")
+    id: Optional[int] = Field(default=None, primary_key=True, nullable=False)
+    name: str = Field("", title="CategoryName")
     description: str = Field(default="", title="Description")
 
 
@@ -26,18 +38,13 @@ class CategoryAdmin(admin.ModelAdmin):
     page_schema = "Category"
     # 配置管理模型
     model = Category
+    display_item_action_as_column = True
 
 
 # 挂载后台管理系统
 site.mount_app(app)
 
 
-# 创建初始化数据库表
-@app.on_event("startup")
-async def startup():
-    await site.db.async_run_sync(SQLModel.metadata.create_all, is_session=False)
-
-
 if __name__ == "__main__":
     import uvicorn
 

fastapi_amis_admin/admin/admin.py

@@ -20,13 +20,13 @@
 
 from fastapi import Body, Depends, FastAPI, HTTPException, Request
 from pydantic import BaseModel
-from pydantic.utils import deep_update
 from sqlalchemy import Column, Table, delete, insert
 from sqlalchemy.orm import InstrumentedAttribute, RelationshipProperty
 from sqlalchemy.sql.elements import Label
 from sqlalchemy.util import md5_hex
 from sqlalchemy_database import AsyncDatabase, Database
 from starlette import status
+from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.responses import HTMLResponse, JSONResponse, Response
 from starlette.templating import Jinja2Templates
 from typing_extensions import Annotated, Literal
@@ -78,7 +78,7 @@
     parser_str_set_list,
 )
 from fastapi_amis_admin.utils.functools import cached_property
-from fastapi_amis_admin.utils.pydantic import ModelField, create_model_by_model, model_fields
+from fastapi_amis_admin.utils.pydantic import ModelField, annotation_outer_type, create_model_by_model, deep_update, model_fields
 from fastapi_amis_admin.utils.translation import i18n as _
 
 BaseAdminT = TypeVar("BaseAdminT", bound="BaseAdmin")
@@ -748,7 +748,9 @@ async def get_list_table_api(self, request: Request) -> AmisAPI:
                 api.data[field.name] = f"${field.name}"
             else:
                 modelfield = self.parser.get_modelfield(field)
-                if modelfield and issubclass(modelfield.type_, (datetime.datetime, datetime.date, datetime.time)):
+                if modelfield and issubclass(
+                    annotation_outer_type(modelfield.type_), (datetime.datetime, datetime.date, datetime.time)
+                ):
                     api.data[modelfield.alias] = f"[-]${modelfield.alias}"
         return api
 
@@ -1532,7 +1534,7 @@ def mount_app(
         if enable_exception_handlers:
             register_exception_handlers(self.fastapi)
         if enable_db_middleware:
-            self.db.attach_middleware(fastapi)
+            fastapi.add_middleware(BaseHTTPMiddleware, dispatch=self.db.asgi_dispatch)
         """Add SQLAlchemy Session middleware to the main application, and the session object will be bound to each request.
         Note:
         1. The session will be automatically closed when the request ends, so you don't need to close it manually.

fastapi_amis_admin/admin/extensions/admin.py

@@ -124,11 +124,11 @@ def __init__(self, app: "AdminApp"):
     def get_permission_fields(self, action: str) -> Dict[str, str]:
         """获取权限字段"""
         info = {
-            "list": (self.schema_list, _("List display")+'-', FieldPermEnum.LIST),
-            "filter": (self.schema_filter, _("List filter")+'-', FieldPermEnum.FILTER),
-            "create": (self.schema_create, _("Create")+'-', FieldPermEnum.CREATE),
-            "read": (self.schema_read, _("Read")+'-', FieldPermEnum.READ),
-            "update": (self.schema_update, _("Update")+'-', FieldPermEnum.UPDATE),
+            "list": (self.schema_list, _("List display") + "-", FieldPermEnum.LIST),
+            "filter": (self.schema_filter, _("List filter") + "-", FieldPermEnum.FILTER),
+            "create": (self.schema_create, _("Create") + "-", FieldPermEnum.CREATE),
+            "read": (self.schema_read, _("Read") + "-", FieldPermEnum.READ),
+            "update": (self.schema_update, _("Update") + "-", FieldPermEnum.UPDATE),
         }
         if action not in info:
             return {}

fastapi_amis_admin/admin/parser.py

@@ -4,7 +4,6 @@
 
 from fastapi._compat import Undefined, field_annotation_is_scalar_sequence, field_annotation_is_sequence
 from pydantic import BaseModel, Json
-from pydantic.utils import deep_update, smart_deepcopy
 
 from fastapi_amis_admin import amis
 from fastapi_amis_admin.amis import AmisNode
@@ -22,12 +21,14 @@
     PYDANTIC_V2,
     ModelField,
     annotation_outer_type,
+    deep_update,
     field_allow_none,
     field_json_schema_extra,
     field_outer_type,
     model_config_attr,
     model_fields,
     scalar_sequence_inner_type,
+    smart_deepcopy,
 )
 from fastapi_amis_admin.utils.translation import i18n as _
 

fastapi_amis_admin/amis/components.py

@@ -454,14 +454,14 @@ class App(Page):
     api: API = None  # The page configuration interface, if you want to pull the page configuration remotely,
     # please configure it. Return to the configuration path json>data>pages, please refer to the pages property for
     # the specific format.
-    brandName: str = None  # app name
+    brandName: Template = None  # app name
     logo: str = None  # Support image address, or svg.
     className: str = None  # css class name
-    header: str = None  # header
-    asideBefore: str = None  # The front area on the page menu.
-    asideAfter: str = None  # The front area under the page menu.
-    footer: str = None  # The page.
-    pages: List[PageSchema] = None  # Array<page configuration> specific page configuration.
+    header: Template = None  # header
+    asideBefore: Template = None  # The front area on the page menu.
+    asideAfter: Template = None  # The front area under the page menu.
+    footer: Template = None  # The page.
+    pages: List[Union[PageSchema, dict]] = None  # Array<page configuration> specific page configuration.
     # Usually in an array, the first layer of the array is a group, generally you only need to configure the label set,
     # if you don't want to group, don't configure it directly, the real page should be configured in the second
     # layer, that is, in the children of the first layer.
@@ -2293,7 +2293,7 @@ class ColumnOperation(TableColumn):
     """Action column"""
 
     type: str = "operation"
-    buttons: List[Union[Action, AmisNode]] = None
+    buttons: List[Union[Action, AmisNode, dict]] = None
 
 
 class ColumnImage(Image, TableColumn):

fastapi_amis_admin/crud/schema.py

@@ -50,8 +50,10 @@ def __call__(
         orderBy: str = None,
         orderDir: str = "asc",
     ):
-        self.page = page if page and page > 0 else self.perPageDefault
-        self.perPage = perPage if perPage and perPage > 0 else self.perPageDefault
+        page = int(page or 1)
+        self.page = page if page > 0 else 1
+        perPage = int(perPage or self.perPageDefault)
+        self.perPage = perPage if perPage > 0 else self.perPageDefault
         if self.perPageMax:
             self.perPage = min(self.perPage, self.perPageMax)
         self.show_total = show_total

fastapi_amis_admin/models/__init__.py

@@ -1,6 +1,7 @@
 from .enums import IntegerChoices, TextChoices
 
 try:
+    from ._sqlmodel import SQLModel
     from .fields import Field
 
     # must install sqlmodel to use

fastapi_amis_admin/models/_sqlmodel.py

@@ -0,0 +1,63 @@
+from typing import Any
+
+from sqlalchemy import Column
+from sqlalchemy.ext.hybrid import hybrid_method, hybrid_property
+from sqlalchemy.orm import ColumnProperty, declared_attr
+from sqlalchemy.util import classproperty, memoized_property
+from sqlmodel import main as sqlmodel_main
+from sqlmodel._compat import IS_PYDANTIC_V2, SQLModelConfig, Undefined, get_type_from_field
+from sqlmodel.main import SQLModel as _SQLModel
+from sqlmodel.main import get_column_from_field as _get_column_from_field
+
+from .enums import Choices
+from .sqltypes import ChoiceType
+
+try:
+    from functools import cached_property
+except ImportError:
+    cached_property = memoized_property
+
+SaColumnTypes = (
+    Column,
+    ColumnProperty,
+    hybrid_property,
+    declared_attr,
+)
+__sqlmodel_ignored_types__ = (classproperty, cached_property, memoized_property, hybrid_method, *SaColumnTypes)
+
+
+def get_column_from_field(field: Any) -> Column:  # type: ignore
+    """support for choices enums"""
+    if IS_PYDANTIC_V2:
+        field_info = field
+    else:
+        field_info = field.field_info
+    sa_column = getattr(field_info, "sa_column", Undefined)
+    if isinstance(sa_column, SaColumnTypes):
+        return sa_column
+    if isinstance(field_info.default, SaColumnTypes):
+        return field_info.default
+    type_ = get_type_from_field(field)
+    # Support for choices enums
+    if issubclass(type_, Choices):
+        field_info.sa_type = ChoiceType(type_)
+    return _get_column_from_field(field)
+
+
+class SQLModel(_SQLModel):
+    # support cached_property,hybrid_method,hybrid_property
+    if IS_PYDANTIC_V2:
+        model_config = SQLModelConfig(
+            from_attributes=True,
+            ignored_types=__sqlmodel_ignored_types__,
+        )
+    else:
+
+        class Config:
+            orm_mode = True
+            keep_untouched = __sqlmodel_ignored_types__
+
+
+# patch sqlmodel
+sqlmodel_main.get_column_from_field = get_column_from_field
+sqlmodel_main.SQLModel = SQLModel

fastapi_amis_admin/models/enums.py

@@ -10,7 +10,7 @@ def __new__(metacls, classname, bases, classdict, **kwds):
         labels = []
         for key in classdict._member_names:
             value = classdict[key]
-            if isinstance(value, (list, tuple)) and len(value) > 1 and isinstance(value[-1], (Promise, str)):
+            if isinstance(value, (list, tuple)) and len(value) > 1 and isinstance(value[-1], str):
                 *value, label = value
                 value = tuple(value)
             else:
@@ -75,12 +75,3 @@ class TextChoices(str, Choices):
 
     def _generate_next_value_(name, start, count, last_values):
         return name
-
-
-class Promise:
-    """
-    Base class for the proxy class created in the closure of the lazy function.
-    It's used to recognize promises in code.
-    """
-
-    pass

fastapi_amis_admin/models/fields.py

@@ -1,9 +1,8 @@
-from typing import AbstractSet, Any, Callable, Dict, Mapping, Optional, Sequence, Union
+from typing import AbstractSet, Any, Callable, Dict, Mapping, Optional, Sequence, Type, Union
 
-from pydantic.fields import Undefined, UndefinedType
-from pydantic.typing import NoArgAnyCallable
 from sqlalchemy import Column
-from sqlmodel.main import FieldInfo
+from sqlmodel._compat import Undefined, UndefinedType, post_init_field_info
+from sqlmodel.main import FieldInfo, NoArgAnyCallable
 
 from fastapi_amis_admin.amis import FormItem, TableColumn
 
@@ -23,17 +22,23 @@ def Field(
     lt: Optional[float] = None,
     le: Optional[float] = None,
     multiple_of: Optional[float] = None,
+    max_digits: Optional[int] = None,
+    decimal_places: Optional[int] = None,
     min_items: Optional[int] = None,
     max_items: Optional[int] = None,
+    unique_items: Optional[bool] = None,
     min_length: Optional[int] = None,
     max_length: Optional[int] = None,
     allow_mutation: bool = True,
     regex: Optional[str] = None,
-    primary_key: bool = False,
-    foreign_key: Optional[Any] = None,
-    unique: bool = False,
+    discriminator: Optional[str] = None,
+    repr: bool = True,
+    primary_key: Union[bool, UndefinedType] = Undefined,
+    foreign_key: Any = Undefined,
+    unique: Union[bool, UndefinedType] = Undefined,
     nullable: Union[bool, UndefinedType] = Undefined,
     index: Union[bool, UndefinedType] = Undefined,
+    sa_type: Union[Type[Any], UndefinedType] = Undefined,
     sa_column: Union[Column, UndefinedType] = Undefined,  # type: ignore
     sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined,
     sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined,
@@ -63,22 +68,27 @@ def Field(
         lt=lt,
         le=le,
         multiple_of=multiple_of,
+        max_digits=max_digits,
+        decimal_places=decimal_places,
         min_items=min_items,
         max_items=max_items,
+        unique_items=unique_items,
         min_length=min_length,
         max_length=max_length,
         allow_mutation=allow_mutation,
         regex=regex,
+        discriminator=discriminator,
         repr=repr,
         primary_key=primary_key,
         foreign_key=foreign_key,
         unique=unique,
         nullable=nullable,
         index=index,
+        sa_type=sa_type,
         sa_column=sa_column,
         sa_column_args=sa_column_args,
         sa_column_kwargs=sa_column_kwargs,
         **current_schema_extra,
     )
-    field_info._validate()
+    post_init_field_info(field_info)
     return field_info