perf: Test the list type PropertyField.

Author: amisadmin

fastapi_amis_admin/crud/_sqlmodel.py

@@ -305,8 +305,7 @@ def _create_schema_filter(self) -> Type[SchemaFilterT]:
     def _create_schema_read(self) -> Type[SchemaReadT]:
         if self.schema_read:
             return self.schema_read
-        if not self.read_fields:
-            return super()._create_schema_read()
+        self.read_fields = self.read_fields or self.schema_model.__fields__.values()
         self.read_fields = self.parser.filter_insfield(self.read_fields, save_class=(ModelField,))
         modelfields = [self.parser.get_modelfield(ins, deepcopy=True) for ins in self.read_fields]
         return schema_create_by_modelfield(f"{self.schema_name_prefix}Read", modelfields, orm_mode=True)
@@ -343,7 +342,7 @@ def _create_schema_create(self) -> Type[SchemaCreateT]:
 
     def read_item(self, obj: ModelT) -> SchemaReadT:
         """read database data and parse to schema_read"""
-        parse = self.schema_read.from_orm if self.schema_read.Config.orm_mode else self.schema_read.parse_obj
+        parse = self.schema_read.from_orm if getattr(self.schema_read.Config, "orm_mode", False) else self.schema_read.parse_obj
         return parse(obj)
 
     def update_item(self, obj: ModelT, values: Dict[str, Any]) -> None:
@@ -352,6 +351,8 @@ def update_item(self, obj: ModelT, values: Dict[str, Any]) -> None:
             if isinstance(v, dict) and hasattr(obj, k):
                 # Relational attributes, nested;such as: setattr(article.content, "body", "new body")
                 self.update_item(getattr(obj, k), v)
+            elif isinstance(v, list):  # todo
+                pass
             else:
                 setattr(obj, k, v)
 

tests/test_crud/conftest.py

@@ -7,7 +7,7 @@
 from sqlmodel import SQLModel
 
 from tests.conftest import async_db as db
-from tests.models import Article, ArticleContent, Category, User
+from tests.models import Article, ArticleContent, ArticleTagLink, Category, Tag, User
 
 pytestmark = pytest.mark.asyncio
 
@@ -72,3 +72,15 @@ async def fake_articles(async_session, fake_users, fake_categorys, fake_article_
     async_session.add_all(data)
     await async_session.commit()
     return data
+
+
+@pytest.fixture
+async def fake_article_tags(async_session, fake_articles) -> List[Tag]:
+    # add tags
+    data = [Tag(id=i, name=f"Tag_{i}") for i in range(1, 6)]
+    async_session.add_all(data)
+    await async_session.commit()
+    # add article_tag_link
+    async_session.add_all([ArticleTagLink(article_id=i, tag_id=i) for i in range(1, 6)])
+    await async_session.commit()
+    return data

tests/test_crud/test_SQLModelCrud_fields.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from fastapi import FastAPI
 from httpx import AsyncClient
 from sqlmodel.sql.expression import Select
@@ -7,7 +9,7 @@
 from fastapi_amis_admin.crud.parser import LabelField, PropertyField
 from fastapi_amis_admin.models import Field
 from tests.conftest import async_db as db
-from tests.models import Article, ArticleContent, Category, User
+from tests.models import Article, ArticleContent, Category, Tag, User
 
 
 async def test_pk_name(app: FastAPI, async_client: AsyncClient, fake_users):
@@ -273,7 +275,7 @@ class ArticleCrud(SQLModelCrud):
     assert items["description"] == "Description_1"
 
 
-async def test_read_fields_relationship(app: FastAPI, async_client: AsyncClient, fake_articles):
+async def test_read_fields_relationship(app: FastAPI, async_client: AsyncClient, fake_articles, fake_article_tags):
     class ArticleCrud(SQLModelCrud):
         router_prefix = "/article"
         read_fields = [
@@ -282,6 +284,7 @@ class ArticleCrud(SQLModelCrud):
             PropertyField(name="category", type_=Category),  # Relationship attribute
             # Article.category,  # Relationship todo support
             PropertyField(name="content_text", type_=str),  # property attribute
+            PropertyField(name="tags", type_=List[Tag]),  # property attribute
         ]
 
     ins = ArticleCrud(Article, db.engine).register_crud()
@@ -293,15 +296,15 @@ class ArticleCrud(SQLModelCrud):
     assert "title" in ins.schema_read.__fields__
     assert "description" in ins.schema_read.__fields__
     assert "category" in ins.schema_read.__fields__
+    assert "tags" in ins.schema_read.__fields__
     # test api
     res = await async_client.get("/article/item/1")
     items = res.json()["data"]
-    print(items)
     assert "id" not in items
     assert "category" in items
     assert items["category"]["name"] == "Category_1"
     assert "content_text" in items
-    # assert items["user"]["username"] == "User_1"
+    assert items["tags"][0]["name"] == "Tag_1"
 
 
 async def test_update_fields_relationship(app: FastAPI, async_client: AsyncClient, fake_articles, async_session):

tests/test_crud/test_SQLModelCrud_schemas.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import List, Optional
 
 from fastapi import FastAPI
 from httpx import AsyncClient
@@ -7,7 +7,7 @@
 
 from fastapi_amis_admin.crud import SQLModelCrud
 from tests.conftest import async_db as db
-from tests.models import Article, ArticleContent, Category, User
+from tests.models import Article, ArticleContent, Category, Tag, User
 
 
 async def test_schema_update(app: FastAPI, async_client: AsyncClient, fake_users):
@@ -152,14 +152,15 @@ class UserCrud(SQLModelCrud):
     assert items
 
 
-async def test_schema_read_relationship(app: FastAPI, async_client: AsyncClient, fake_articles):
+async def test_schema_read_relationship(app: FastAPI, async_client: AsyncClient, fake_articles, fake_article_tags):
     class ArticleRead(SQLModel):  # must be SQLModel, not BaseModel
         id: int
         title: str
         description: str
         category: Optional[Category] = None  # Relationship
         content: Optional[ArticleContent] = None  # Relationship
         user: Optional[User] = None  # Relationship
+        tags: List[Tag] = []  # Relationship
 
     class ArticleCrud(SQLModelCrud):
         router_prefix = "/article"
@@ -176,6 +177,7 @@ class ArticleCrud(SQLModelCrud):
     assert schemas["ArticleRead"]["properties"]["category"]["$ref"] == "#/components/schemas/Category"
     assert "content" in schemas["ArticleRead"]["properties"]
     assert "user" in schemas["ArticleRead"]["properties"]
+    assert "tags" in schemas["ArticleRead"]["properties"]
 
     # test api
     res = await async_client.get("/article/item/1")
@@ -187,6 +189,7 @@ class ArticleCrud(SQLModelCrud):
     assert items["category"]["id"] == 1
     assert items["content"]["id"] == 1
     assert items["user"]["id"] == 1
+    assert items["tags"][0]["id"] == 1
 
 
 async def test_schema_update_relationship(app: FastAPI, async_client: AsyncClient, fake_articles, async_session):