Improve typing

Author: frankie567

fastapi_users_db_sqlalchemy/access_token.py

@@ -1,6 +1,6 @@
 import uuid
 from datetime import datetime
-from typing import Any, Dict, Generic, Optional, Type
+from typing import TYPE_CHECKING, Any, Dict, Generic, Optional, Type
 
 from fastapi_users.authentication.strategy.db import AP, AccessTokenDatabase
 from fastapi_users.models import ID
@@ -24,9 +24,12 @@ class SQLAlchemyBaseAccessTokenTable(Generic[ID]):
 
 
 class SQLAlchemyBaseAccessTokenTableUUID(SQLAlchemyBaseAccessTokenTable[uuid.UUID]):
-    @declared_attr
-    def user_id(cls):
-        return Column(GUID, ForeignKey("user.id", ondelete="cascade"), nullable=False)
+    if TYPE_CHECKING:
+        user_id: uuid.UUID  # pragma: no cover
+    else:
+        @declared_attr
+        def user_id(cls):
+            return Column(GUID, ForeignKey("user.id", ondelete="cascade"), nullable=False)
 
 
 class SQLAlchemyAccessTokenDatabase(Generic[AP], AccessTokenDatabase[AP]):

pyproject.toml

@@ -7,7 +7,6 @@ plugins = "sqlalchemy.ext.mypy.plugin"
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 addopts = "--ignore=test_build.py"
-markers = ["db"]
 
 [build-system]
 requires = ["flit_core >=2,<3"]

tests/test_access_token.py

@@ -61,7 +61,6 @@ async def sqlalchemy_access_token_db(
 
 
 @pytest.mark.asyncio
-@pytest.mark.db
 async def test_queries(
     sqlalchemy_access_token_db: SQLAlchemyAccessTokenDatabase[AccessToken],
     user_id: UUID4,
@@ -113,7 +112,6 @@ async def test_queries(
 
 
 @pytest.mark.asyncio
-@pytest.mark.db
 async def test_insert_existing_token(
     sqlalchemy_access_token_db: SQLAlchemyAccessTokenDatabase[AccessToken],
     user_id: UUID4,

tests/test_users.py

@@ -74,7 +74,6 @@ async def sqlalchemy_user_db_oauth() -> AsyncGenerator[SQLAlchemyUserDatabase, N
 
 
 @pytest.mark.asyncio
-@pytest.mark.db
 async def test_queries(sqlalchemy_user_db: SQLAlchemyUserDatabase[User, UUID_ID]):
     user_create = {
         "email": "lancelot@camelot.bt",
@@ -128,7 +127,6 @@ async def test_queries(sqlalchemy_user_db: SQLAlchemyUserDatabase[User, UUID_ID]
 
 
 @pytest.mark.asyncio
-@pytest.mark.db
 async def test_insert_existing_email(
     sqlalchemy_user_db: SQLAlchemyUserDatabase[User, UUID_ID],
 ):
@@ -143,7 +141,6 @@ async def test_insert_existing_email(
 
 
 @pytest.mark.asyncio
-@pytest.mark.db
 async def test_queries_custom_fields(
     sqlalchemy_user_db: SQLAlchemyUserDatabase[User, UUID_ID],
 ):
@@ -162,7 +159,6 @@ async def test_queries_custom_fields(
 
 
 @pytest.mark.asyncio
-@pytest.mark.db
 async def test_queries_oauth(
     sqlalchemy_user_db_oauth: SQLAlchemyUserDatabase[UserOAuth, UUID_ID],
     oauth_account1: Dict[str, Any],