Skip to content

Commit d730766

Browse files
committed
fix: Fix pydantic v2 json_schema_extra
1 parent abd4a5f commit d730766

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

fastapi_amis_admin/models/_sqlmodel.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def get_column_from_field(field: Any) -> Column: # type: ignore
4545

4646

4747
class SQLModel(_SQLModel):
48+
__table_args__ = {"extend_existing": True}
4849
# support cached_property,hybrid_method,hybrid_property
4950
if IS_PYDANTIC_V2:
5051
model_config = SQLModelConfig(

fastapi_amis_admin/models/fields.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from sqlmodel.main import FieldInfo, NoArgAnyCallable
66

77
from fastapi_amis_admin.amis import FormItem, TableColumn
8+
from fastapi_amis_admin.utils.pydantic import PYDANTIC_V2
89

910

1011
def Field(
@@ -54,6 +55,10 @@ def Field(
5455
current_schema_extra["amis_filter_item"] = amis_filter_item
5556
if amis_table_column:
5657
current_schema_extra["amis_table_column"] = amis_table_column
58+
if PYDANTIC_V2:
59+
current_schema_extra = {
60+
"json_schema_extra": current_schema_extra,
61+
}
5762
field_info = FieldInfo(
5863
default,
5964
default_factory=default_factory,

0 commit comments

Comments
 (0)