Fix #600: revamp Tortoise/Pydantic interaction (#612)

docs/src/db_tortoise.py

@@ -2,6 +2,11 @@ from fastapi import FastAPI
 from fastapi_users import models
 from fastapi_users.db import TortoiseBaseUserModel, TortoiseUserDatabase
 from tortoise.contrib.fastapi import register_tortoise
+from tortoise.contrib.pydantic import PydanticModel
+
+
+class UserModel(TortoiseBaseUserModel):
+    pass
 
 
 class User(models.BaseUser):
@@ -16,17 +21,14 @@ class UserUpdate(User, models.BaseUserUpdate):
     pass
 
 
-class UserDB(User, models.BaseUserDB):
-    pass
+class UserDB(User, models.BaseUserDB, PydanticModel):
+    class Config:
+        orm_mode = True
+        orig_model = UserModel
 
 
 DATABASE_URL = "sqlite://./test.db"
 
-
-class UserModel(TortoiseBaseUserModel):
-    pass
-
-
 user_db = TortoiseUserDatabase(UserDB, UserModel)
 app = FastAPI()
 

docs/src/full_tortoise.py

@@ -3,11 +3,16 @@ from fastapi_users import FastAPIUsers, models
 from fastapi_users.authentication import JWTAuthentication
 from fastapi_users.db import TortoiseBaseUserModel, TortoiseUserDatabase
 from tortoise.contrib.fastapi import register_tortoise
+from tortoise.contrib.pydantic import PydanticModel
 
 DATABASE_URL = "sqlite://./test.db"
 SECRET = "SECRET"
 
 
+class UserModel(TortoiseBaseUserModel):
+    pass
+
+
 class User(models.BaseUser):
     pass
 
@@ -20,12 +25,10 @@ class UserUpdate(User, models.BaseUserUpdate):
     pass
 
 
-class UserDB(User, models.BaseUserDB):
-    pass
-
-
-class UserModel(TortoiseBaseUserModel):
-    pass
+class UserDB(User, models.BaseUserDB, PydanticModel):
+    class Config:
+        orm_mode = True
+        orig_model = UserModel
 
 
 user_db = TortoiseUserDatabase(UserDB, UserModel)
@@ -33,7 +36,7 @@ app = FastAPI()
 register_tortoise(
     app,
     db_url=DATABASE_URL,
-    modules={"models": ["path_to_your_package"]},
+    modules={"models": ["full_tortoise"]},
     generate_schemas=True,
 )
 

docs/src/oauth_full_tortoise.py

@@ -9,6 +9,7 @@ from fastapi_users.db import (
 from httpx_oauth.clients.google import GoogleOAuth2
 from tortoise import fields
 from tortoise.contrib.fastapi import register_tortoise
+from tortoise.contrib.pydantic import PydanticModel
 
 DATABASE_URL = "sqlite://./test.db"
 SECRET = "SECRET"
@@ -17,6 +18,14 @@ SECRET = "SECRET"
 google_oauth_client = GoogleOAuth2("CLIENT_ID", "CLIENT_SECRET")
 
 
+class UserModel(TortoiseBaseUserModel):
+    pass
+
+
+class OAuthAccountModel(TortoiseBaseOAuthAccountModel):
+    user = fields.ForeignKeyField("models.UserModel", related_name="oauth_accounts")
+
+
 class User(models.BaseUser, models.BaseOAuthAccountMixin):
     pass
 
@@ -29,16 +38,10 @@ class UserUpdate(User, models.BaseUserUpdate):
     pass
 
 
-class UserDB(User, models.BaseUserDB):
-    pass
-
-
-class UserModel(TortoiseBaseUserModel):
-    pass
-
-
-class OAuthAccountModel(TortoiseBaseOAuthAccountModel):
-    user = fields.ForeignKeyField("models.UserModel", related_name="oauth_accounts")
+class UserDB(User, models.BaseUserDB, PydanticModel):
+    class Config:
+        orm_mode = True
+        orig_model = UserModel
 
 
 user_db = TortoiseUserDatabase(UserDB, UserModel, OAuthAccountModel)
@@ -46,7 +49,7 @@ app = FastAPI()
 register_tortoise(
     app,
     db_url=DATABASE_URL,
-    modules={"models": ["path_to_your_package"]},
+    modules={"models": ["oauth_full_tortoise"]},
     generate_schemas=True,
 )