perf: Improved compatibility with pydantic v2

Author: amisadmin

fastapi_amis_admin/admin/admin.py

@@ -27,7 +27,7 @@
 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.responses import HTMLResponse, Response
 from starlette.templating import Jinja2Templates
 from typing_extensions import Annotated, Literal
 
@@ -432,7 +432,7 @@ async def page_parser(self, request: Request, page: Page) -> Response:
             if await request.body():
                 data = deep_update(data, (await request.json()).get("_update", {}))
             result = BaseAmisApiOut(data=data)
-            result = JSONResponse(result.dict())
+            result = Response(result.amis_json(), media_type="application/json")
         return result
 
     def register_router(self):

fastapi_amis_admin/admin/site.py

@@ -5,6 +5,8 @@
 from pathlib import Path
 
 import aiofiles
+import pydantic
+import sqlalchemy
 from fastapi import FastAPI, File, UploadFile
 from pydantic import BaseModel
 from starlette.requests import Request
@@ -76,6 +78,8 @@ async def get_page(self, request: Request) -> Page:
                     Property.Item(label="amis-cdn", content=self.site.settings.amis_cdn),
                     Property.Item(label="amis-pkg", content=self.site.settings.amis_pkg),
                     Property.Item(label="amis-theme", content=self.site.settings.amis_theme),
+                    Property.Item(label="sqlalchemy", content=sqlalchemy.__version__),
+                    Property.Item(label="pydantic", content=pydantic.__version__),
                 ],
             ),
         ]

fastapi_amis_admin/amis/components.py

@@ -8,7 +8,7 @@
 try:
     from pydantic import SerializeAsAny
 except ImportError:
-    from typing import Optional as SerializeAsAny
+    from typing import Union as SerializeAsAny
 from .constants import (
     BarcodeEnum,
     DisplayModeEnum,
@@ -356,8 +356,8 @@ class Toast(Action):
         """Toast light"""
 
         class ToastItem(AmisNode):
-            title: SerializeAsAny[Union[str, SchemaNode]] = None  # Toast Item Title
-            body: SerializeAsAny[Union[str, SchemaNode]] = None  # Toast Item Content
+            title: SerializeAsAny[SchemaNode] = None  # Toast Item Title
+            body: SerializeAsAny[SchemaNode] = None  # Toast Item Content
             level: str = None  # default 'info', Display icon, optional 'info', 'success', 'error', 'warning'
             position: str = None  # default 'top-center', display position,
             # 'top-right', 'top-center', 'top-left', 'bottom-center', 'bottom-left', 'bottom-right', 'center'
@@ -1184,8 +1184,8 @@ class CollapseItem(AmisNode):
         disabled: bool = None  # default False
         collapsed: bool = None  # default True
         key: Union[int, str] = None  # default -, logo
-        header: SerializeAsAny[Union[str, SchemaNode]] = None  # default -, title
-        body: SerializeAsAny[Union[str, SchemaNode]] = None  # default -, content
+        header: SerializeAsAny[SchemaNode] = None  # default -, title
+        body: SerializeAsAny[SchemaNode] = None  # default -, content
 
     type: str = "collapse-group"
     activeKey: Union[str, int, List[Union[int, str]]] = None  # Initialize the key to activate the panel
@@ -1371,7 +1371,7 @@ class Limit(BaseAmisModel):
     autoFill: Dict[str, str] = None  # After the upload is successful, the value returned by the upload interface can
     # be filled into a form item by configuring autoFill (not supported under non-form)
     initAutoFill: bool = None  # False  # 表单反显时是否执行 autoFill
-    uploadBtnText: SerializeAsAny[Union[str, SchemaNode]] = None  # 上传按钮文案。支持tpl、schema形式配置。
+    uploadBtnText: SerializeAsAny[SchemaNode] = None  # 上传按钮文案。支持tpl、schema形式配置。
     dropCrop: bool = None  # True  # 图片上传后是否进入裁剪模式
     initCrop: bool = None  # False  # 图片选择器初始化后是否立即进入裁剪模式
 
@@ -1416,7 +1416,7 @@ class Picker(FormItem):
     extractValue: bool = None  # False # extract value
     autoFill: dict = None  # autofill
     modalMode: Literal["dialog", "drawer"] = None  # "dialog" # Set dialog or drawer to configure the popup mode.
-    pickerSchema: SerializeAsAny[Union["CRUD", SchemaNode]] = None  # "{mode: 'list', listItem: {title: '${label}'}}"
+    pickerSchema: SerializeAsAny[Union[SchemaNode, "CRUD"]] = None  # "{mode: 'list', listItem: {title: '${label}'}}"
     # That is to use the rendering of the List type to display the list information. More configuration reference CRUD
     embed: bool = None  # False # whether to use embedded mode
 
@@ -1543,7 +1543,7 @@ class Timeline(AmisNode):
 
     class TimelineItem(AmisNode):
         time: str  # Node Time
-        title: Union[str, SchemaNode] = None  # Node Title
+        title: SchemaNode = None  # Node Title
         detail: str = None  # Node detailed description (collapsed)
         detailCollapsedText: str = None  # default 'Expand'
         detailExpandedText: str = None  # default 'Collapse'
@@ -1563,9 +1563,9 @@ class Steps(AmisNode):
     """Steps Bar"""
 
     class StepItem(AmisNode):
-        title: SerializeAsAny[Union[str, SchemaNode]] = None  # Title
-        subTitle: SerializeAsAny[Union[str, SchemaNode]] = None  # Sub Heading
-        description: SerializeAsAny[Union[str, SchemaNode]] = None  # Detail Description
+        title: SerializeAsAny[SchemaNode] = None  # Title
+        subTitle: SerializeAsAny[SchemaNode] = None  # Sub Heading
+        description: SerializeAsAny[SchemaNode] = None  # Detail Description
         value: str = None  # Step Value
         icon: str = None  # Icon name, support fontawesome v4 or use url (priority is higher than color)
         className: str = None  # Custom CSS class name
@@ -1970,8 +1970,8 @@ class InputKVS(FormItem):
     type: str = "input-kvs"
     addButtonText: str = None  # default 'new field', butto text of the add button
     draggable: bool = None  # Default True, Whether to drag and drop to sort is allowed
-    keyItem: SerializeAsAny[Union[str, SchemaNode]] = None  # key field
-    valueItems: SerializeAsAny[List[Union[str, SchemaNode]]] = None  # items for the key
+    keyItem: SerializeAsAny[SchemaNode] = None  # key field
+    valueItems: SerializeAsAny[List[SchemaNode]] = None  # items for the key
 
 
 class InputTimeRange(FormItem):

tests/test_amis/test_amis.py

@@ -1,14 +1,14 @@
-from fastapi_amis_admin.amis.components import Page, PageSchema
+from fastapi_amis_admin import amis
 
 
 def test_Page():
-    page = Page(title="Title", body="HelloWorld!")
+    page = amis.Page(title="Title", body="HelloWorld!")
     page_json = r'{"type":"page","title":"Title","body":"HelloWorld!"}'
     assert page.amis_json().replace(" ", "") == page_json
     assert page.amis_dict() == {"type": "page", "title": "Title", "body": "HelloWorld!"}
     assert page.amis_html().find(page_json)
 
 
 def test_extra_fields():
-    tmp = PageSchema(schema=Page(), children=[PageSchema()], extra_field="extra field")  # type: ignore
+    tmp = amis.PageSchema(schema=amis.Page(), children=[amis.PageSchema()], extra_field="extra field")  # type: ignore
     assert tmp.amis_dict().get("extra_field") == "extra field"