move SA stubs to dev, add few typings, a bit better python code style here and there

Author: rafsaf

{{cookiecutter.project_name}}/app/api/deps.py

@@ -42,9 +42,3 @@ async def get_current_user(
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
     return user
-
-
-async def get_current_active_user(
-    current_user: User = Depends(get_current_user),
-) -> User:
-    return current_user

{{cookiecutter.project_name}}/app/api/endpoints/users.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 from fastapi import APIRouter, Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -14,8 +12,8 @@
 async def update_user_me(
     user_update: schemas.UserUpdate,
     session: AsyncSession = Depends(deps.get_session),
-    current_user: models.User = Depends(deps.get_current_active_user),
-) -> Any:
+    current_user: models.User = Depends(deps.get_current_user),
+):
     """
     Update current user.
     """
@@ -35,8 +33,8 @@ async def update_user_me(
 
 @router.get("/me", response_model=schemas.User)
 async def read_user_me(
-    current_user: models.User = Depends(deps.get_current_active_user),
-) -> Any:
+    current_user: models.User = Depends(deps.get_current_user),
+):
     """
     Get current user.
     """

{{cookiecutter.project_name}}/app/core/config.py

@@ -64,7 +64,7 @@ class Settings(BaseSettings):
 
     # VALIDATORS
     @validator("BACKEND_CORS_ORIGINS")
-    def _assemble_cors_origins(cls, cors_origins):
+    def _assemble_cors_origins(cls, cors_origins: Union[str, List[AnyHttpUrl]]):
         if isinstance(cors_origins, str):
             return [item.strip() for item in cors_origins.split(",")]
         return cors_origins

{{cookiecutter.project_name}}/app/session.py

@@ -4,9 +4,9 @@
 from app.core.config import settings
 
 if settings.ENVIRONMENT == "PYTEST":
-    SQLALCHEMY_DATABASE_URI = settings.TEST_SQLALCHEMY_DATABASE_URI
+    sqlalchemy_database_uri = settings.TEST_SQLALCHEMY_DATABASE_URI
 else:
-    SQLALCHEMY_DATABASE_URI = settings.DEFAULT_SQLALCHEMY_DATABASE_URI
+    sqlalchemy_database_uri = settings.DEFAULT_SQLALCHEMY_DATABASE_URI
 
-async_engine = create_async_engine(SQLALCHEMY_DATABASE_URI, pool_pre_ping=True)
+async_engine = create_async_engine(sqlalchemy_database_uri, pool_pre_ping=True)
 async_session = sessionmaker(async_engine, expire_on_commit=False, class_=AsyncSession)

{{cookiecutter.project_name}}/app/tests/utils.py

@@ -2,9 +2,9 @@
 import string
 
 
-def random_lower_string(length=32) -> str:
+def random_lower_string(length: int = 32) -> str:
     return "".join(random.choices(string.ascii_lowercase, k=length))
 
 
-def random_email(length=10) -> str:
+def random_email(length: int = 10) -> str:
     return f"{random_lower_string(length)}@{random_lower_string(length)}.com"

{{cookiecutter.project_name}}/poetry.lock

@@ -16,20 +16,19 @@ passlib = {version = "^1.7.4", extras = ["bcrypt"]}
 pydantic = {version = "^1.8.2", extras = ["email"]}
 alembic = "^1.7.3"
 python-multipart = "^0.0.5"
-sqlalchemy2-stubs = "^0.0.2-alpha.18"
 asyncpg = "^0.24.0"
 
 [tool.poetry.dev-dependencies]
 black = {version = "^21.9b0", python = ">=3.6.2,<4.0.0"}
 autoflake = "^1.4"
 flake8 = "^3.9.2"
 isort = "^5.9.3"
-sqlalchemy-stubs = "^0.4"
 coverage = "^5.5"
 pytest = "^6.2.5"
-mypy = "^0.910"
 pytest-asyncio = "^0.16.0"
 httpx = "^0.20.0"
+sqlalchemy-stubs = "^0.4"
+sqlalchemy2-stubs = "^0.0.2-alpha.19"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

{{cookiecutter.project_name}}/pyproject.toml

@@ -306,9 +306,6 @@ rsa==4.7.2; python_version >= "3.5" and python_version < "4" \
 six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.3.0" \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
-sqlalchemy2-stubs==0.0.2a19; python_version >= "3.6" \
-    --hash=sha256:2117c48ce5acfe33bf9c9bfce2a981632d931949e68fa313aa5c2a3bc980ca7a \
-    --hash=sha256:aac7dca77a2c49e5f0934976421d5e25ae4dc5e27db48c01e055f81caa1e3ead
 sqlalchemy==1.4.26; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") \
     --hash=sha256:c2f2114b0968a280f94deeeaa31cfbac9175e6ac7bd3058b3ce6e054ecd762b3 \
     --hash=sha256:91efbda4e6d311812f23996242bad7665c1392209554f8a31ec6db757456db5c \
@@ -349,7 +346,7 @@ sqlalchemy==1.4.26; (python_version >= "2.7" and python_full_version < "3.0.0")
 starlette==0.14.2; python_version >= "3.6" and python_full_version >= "3.6.1" \
     --hash=sha256:3c8e48e52736b3161e34c9f0e8153b4f32ec5d8995a3ee1d59410d92f75162ed \
     --hash=sha256:7d49f4a27f8742262ef1470608c59ddbc66baf37c148e938c7038e6bc7a998aa
-typing-extensions==3.10.0.2; python_version < "3.8" and python_full_version >= "3.6.1" and python_version >= "3.6" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6") \
+typing-extensions==3.10.0.2; python_version < "3.8" and python_full_version >= "3.6.1" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6") and python_version >= "3.6" \
     --hash=sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7 \
     --hash=sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34 \
     --hash=sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e