From 49c2ab4278fe66269cd4f274a1f4829f92e67b0e Mon Sep 17 00:00:00 2001 From: Leon Si Date: Sun, 18 Aug 2024 17:39:48 -0700 Subject: [PATCH 1/4] feat: add validation_alias --- sqlmodel/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sqlmodel/main.py b/sqlmodel/main.py index d8fced51fa..3e1f3eddb3 100644 --- a/sqlmodel/main.py +++ b/sqlmodel/main.py @@ -346,6 +346,7 @@ def Field( *, default_factory: Optional[NoArgAnyCallable] = None, alias: Optional[str] = None, + validation_alias = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -388,6 +389,7 @@ def Field( default, default_factory=default_factory, alias=alias, + validation_alias=validation_alias, title=title, description=description, exclude=exclude, From 63be5e9bc65d66a3042a1774f87b0cdc68ca7825 Mon Sep 17 00:00:00 2001 From: Leon Si Date: Sun, 18 Aug 2024 18:50:54 -0700 Subject: [PATCH 2/4] chore: add validation_alias --- sqlmodel/main.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sqlmodel/main.py b/sqlmodel/main.py index 3e1f3eddb3..3b32b0b064 100644 --- a/sqlmodel/main.py +++ b/sqlmodel/main.py @@ -25,7 +25,7 @@ overload, ) -from pydantic import BaseModel, EmailStr +from pydantic import AliasPath, BaseModel, EmailStr from pydantic.fields import FieldInfo as PydanticFieldInfo from sqlalchemy import ( Boolean, @@ -212,6 +212,7 @@ def Field( *, default_factory: Optional[NoArgAnyCallable] = None, alias: Optional[str] = None, + validation_alias: AliasPath = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -257,6 +258,7 @@ def Field( *, default_factory: Optional[NoArgAnyCallable] = None, alias: Optional[str] = None, + validation_alias: AliasPath = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -311,6 +313,7 @@ def Field( *, default_factory: Optional[NoArgAnyCallable] = None, alias: Optional[str] = None, + validation_alias: AliasPath = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -346,7 +349,7 @@ def Field( *, default_factory: Optional[NoArgAnyCallable] = None, alias: Optional[str] = None, - validation_alias = None, + validation_alias: AliasPath = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -389,7 +392,7 @@ def Field( default, default_factory=default_factory, alias=alias, - validation_alias=validation_alias, + validation_alias=validation_alias, title=title, description=description, exclude=exclude, From 4ead4dea7aea48df9846fcd7f01a6e45f9d0738d Mon Sep 17 00:00:00 2001 From: Leon Si Date: Sun, 18 Aug 2024 18:52:27 -0700 Subject: [PATCH 3/4] fix --- sqlmodel/main.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sqlmodel/main.py b/sqlmodel/main.py index 3b32b0b064..daa15816d5 100644 --- a/sqlmodel/main.py +++ b/sqlmodel/main.py @@ -25,7 +25,7 @@ overload, ) -from pydantic import AliasPath, BaseModel, EmailStr +from pydantic import AliasChoices, AliasPath, BaseModel, EmailStr from pydantic.fields import FieldInfo as PydanticFieldInfo from sqlalchemy import ( Boolean, @@ -212,7 +212,7 @@ def Field( *, default_factory: Optional[NoArgAnyCallable] = None, alias: Optional[str] = None, - validation_alias: AliasPath = None, + validation_alias: str | AliasPath | AliasChoices = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -258,7 +258,7 @@ def Field( *, default_factory: Optional[NoArgAnyCallable] = None, alias: Optional[str] = None, - validation_alias: AliasPath = None, + validation_alias: str | AliasPath | AliasChoices = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -313,7 +313,7 @@ def Field( *, default_factory: Optional[NoArgAnyCallable] = None, alias: Optional[str] = None, - validation_alias: AliasPath = None, + validation_alias: str | AliasPath | AliasChoices = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -349,7 +349,7 @@ def Field( *, default_factory: Optional[NoArgAnyCallable] = None, alias: Optional[str] = None, - validation_alias: AliasPath = None, + validation_alias: str | AliasPath | AliasChoices = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ From 44f2de695676af0dc347a24e8365413f041e7954 Mon Sep 17 00:00:00 2001 From: Leon Si Date: Sun, 18 Aug 2024 19:41:29 -0700 Subject: [PATCH 4/4] chore: exclude alias --- sqlmodel/main.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sqlmodel/main.py b/sqlmodel/main.py index daa15816d5..777c3a936b 100644 --- a/sqlmodel/main.py +++ b/sqlmodel/main.py @@ -211,8 +211,6 @@ def Field( default: Any = Undefined, *, default_factory: Optional[NoArgAnyCallable] = None, - alias: Optional[str] = None, - validation_alias: str | AliasPath | AliasChoices = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -257,8 +255,6 @@ def Field( default: Any = Undefined, *, default_factory: Optional[NoArgAnyCallable] = None, - alias: Optional[str] = None, - validation_alias: str | AliasPath | AliasChoices = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -312,8 +308,6 @@ def Field( default: Any = Undefined, *, default_factory: Optional[NoArgAnyCallable] = None, - alias: Optional[str] = None, - validation_alias: str | AliasPath | AliasChoices = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -348,8 +342,6 @@ def Field( default: Any = Undefined, *, default_factory: Optional[NoArgAnyCallable] = None, - alias: Optional[str] = None, - validation_alias: str | AliasPath | AliasChoices = None, title: Optional[str] = None, description: Optional[str] = None, exclude: Union[ @@ -391,8 +383,6 @@ def Field( field_info = FieldInfo( default, default_factory=default_factory, - alias=alias, - validation_alias=validation_alias, title=title, description=description, exclude=exclude,