python/fastapi-users
1
0
Fork 0
mirror of https://github.com/fastapi-users/fastapi-users.git synced 2026-03-13 07:49:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Create a dedicated test environment and fix coverage/typing issues to support Pydantic V2

Browse Source
This commit is contained in:
François Voron
2023-07-12 10:54:51 +02:00
parent e17bb609ae
commit a7b77cac73
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fastapi_users/schemas.py
View File

@@ -9,21 +9,21 @@ PYDANTIC_V2 = PYDANTIC_VERSION.startswith("2.")
SCHEMA = TypeVar("SCHEMA", bound=BaseModel)
if PYDANTIC_V2:
if PYDANTIC_V2: # pragma: no cover
def model_dump(model: BaseModel, *args, **kwargs) -> Dict[str, Any]:
return model.model_dump(*args, **kwargs)
return model.model_dump(*args, **kwargs) # type: ignore
def model_validate(schema: Type[SCHEMA], obj: Any, *args, **kwargs) -> SCHEMA:
return schema.model_validate(obj, *args, **kwargs)
return schema.model_validate(obj, *args, **kwargs) # type: ignore
else:
else: # pragma: no cover # type: ignore
def model_dump(model: BaseModel, *args, **kwargs) -> Dict[str, Any]:
return model.dict(*args, **kwargs)
return model.dict(*args, **kwargs) # type: ignore
def model_validate(schema: Type[SCHEMA], obj: Any, *args, **kwargs) -> SCHEMA:
return schema.from_orm(obj)
return schema.from_orm(obj) # type: ignore
class CreateUpdateDictModel(BaseModel):
@@ -53,9 +53,9 @@ class BaseUser(CreateUpdateDictModel, Generic[models.ID]):
is_superuser: bool = False
is_verified: bool = False
if PYDANTIC_V2:
model_config = ConfigDict(from_attributes=True)
else:
if PYDANTIC_V2: # pragma: no cover
model_config = ConfigDict(from_attributes=True) # type: ignore
else: # pragma: no cover
class Config:
orm_mode = True
@@ -93,9 +93,9 @@ class BaseOAuthAccount(BaseModel, Generic[models.ID]):
account_id: str
account_email: str
if PYDANTIC_V2:
model_config = ConfigDict(from_attributes=True)
else:
if PYDANTIC_V2: # pragma: no cover
model_config = ConfigDict(from_attributes=True) # type: ignore
else: # pragma: no cover
class Config:
orm_mode = True