migration to 2.0 style, new project outfit

Author: rafsaf

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "python.formatting.provider": "black"
+    "python.formatting.provider": "black",
+    "python.analysis.typeCheckingMode": "basic",
 }

{{cookiecutter.project_name}}/.env

@@ -13,7 +13,7 @@ POSTGRES_USER=postgres
 POSTGRES_PASSWORD="{{ random_ascii_string(50) }}"
 POSTGRES_SERVER=db
 POSTGRES_DB=db
-POSTGRES_PORT=5432
+POSTGRES_PORT=4999
 
 FIRST_SUPERUSER_EMAIL=example@example.com
 FIRST_SUPERUSER_PASSWORD="{{ random_ascii_string(20) }}"

{{cookiecutter.project_name}}/alembic.ini

@@ -5,7 +5,7 @@
 script_location = alembic
 
 # template used to generate migration files
-# file_template = %%(rev)s_%%(slug)s
+file_template = %%(year)d%%(month).2d%%(day).2d%%(hour).2d%%(minute).2d%%(second).2d_%%(rev)s_%%(slug)s
 
 # sys.path path, will be prepended to sys.path if present.
 # defaults to the current working directory.

…}}/alembic/versions/ccdd01c9a0c6_init.py …ions/20211023022523_b6b74331d700_init.py{{cookiecutter.project_name}}/alembic/versions/ccdd01c9a0c6_init.py renamed to {{cookiecutter.project_name}}/alembic/versions/20211023022523_b6b74331d700_init.py {{cookiecutter.project_name}}/alembic/versions/ccdd01c9a0c6_init.py renamed to {{cookiecutter.project_name}}/alembic/versions/20211023022523_b6b74331d700_init.py

@@ -1,16 +1,16 @@
 """init
 
-Revision ID: ccdd01c9a0c6
+Revision ID: b6b74331d700
 Revises: 
-Create Date: 2021-09-24 21:52:47.513823
+Create Date: 2021-10-23 02:25:23.653930
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = 'ccdd01c9a0c6'
+revision = 'b6b74331d700'
 down_revision = None
 branch_labels = None
 depends_on = None

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

@@ -1,7 +1,7 @@
 from fastapi import APIRouter
 
-from app.api.endpoints import login, users
+from app.api.endpoints import auth, users
 
 api_router = APIRouter()
-api_router.include_router(login.router, tags=["login"])
+api_router.include_router(auth.router, prefix="/auth", tags=["auth"])
 api_router.include_router(users.router, prefix="/users", tags=["users"])

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

@@ -1,33 +1,35 @@
-from typing import Generator
+from typing import Generator, Optional
 
 from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
 from jose import jwt
 from pydantic import ValidationError
+from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from app import crud, models, schemas
+from app import schemas
 from app.core import security
 from app.core.config import settings
-from app.db.session import SessionLocal
+from app.models import User
+from app.session import SessionLocal
 
 reusable_oauth2 = OAuth2PasswordBearer(
     tokenUrl=f"{settings.API_STR}/login/access-token"
 )
 
 
-def get_db() -> Generator:
+def get_session() -> Generator:
     try:
-        db: Session = SessionLocal()
-        yield db
+        session: Session = SessionLocal()
+        yield session
     except:
         raise Exception
-    db.close()
+    session.close()
 
 
 def get_current_user(
-    db: Session = Depends(get_db), token: str = Depends(reusable_oauth2)
-) -> models.User:
+    session: Session = Depends(get_session), token: str = Depends(reusable_oauth2)
+) -> User:
 
     try:
         payload = jwt.decode(
@@ -39,13 +41,16 @@ def get_current_user(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Could not validate credentials",
         )
-    user = crud.user.get(db, id=token_data.sub)
+    user: Optional[User] = (
+        session.execute(select(User).where(User.id == token_data.sub)).scalars().first()
+    )
+
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
     return user
 
 
 def get_current_active_user(
-    current_user: models.User = Depends(get_current_user),
-) -> models.User:
+    current_user: User = Depends(get_current_user),
+) -> User:
     return current_user

…roject_name}}/app/api/endpoints/login.py …project_name}}/app/api/endpoints/auth.py{{cookiecutter.project_name}}/app/api/endpoints/login.py renamed to {{cookiecutter.project_name}}/app/api/endpoints/auth.py {{cookiecutter.project_name}}/app/api/endpoints/login.py renamed to {{cookiecutter.project_name}}/app/api/endpoints/auth.py

@@ -1,30 +1,40 @@
-from typing import Any
+from typing import Optional
 
 from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordRequestForm
 from jose import jwt
 from pydantic import ValidationError
+from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from app import crud, models, schemas
+from app import schemas
 from app.api import deps
 from app.core import security
 from app.core.config import settings
+from app.models import User
 
 router = APIRouter()
 
 
-@router.post("/login/access-token", response_model=schemas.Token)
+@router.post("/access-token", response_model=schemas.Token)
 def login_access_token(
-    db: Session = Depends(deps.get_db), form_data: OAuth2PasswordRequestForm = Depends()
-) -> Any:
+    session: Session = Depends(deps.get_session),
+    form_data: OAuth2PasswordRequestForm = Depends(),
+):
     """
-    OAuth2 compatible token login, get an access token for future requests
+    OAuth2 compatible token, get an access token for future requests using username and password
     """
-    user = crud.user.authenticate(
-        db, email=form_data.username, password=form_data.password
+
+    user: Optional[User] = (
+        session.execute(select(User).where(User.email == form_data.username))
+        .scalars()
+        .first()
     )
-    if not user:
+
+    if user is None:
+        raise HTTPException(status_code=400, detail="Incorrect email or password")
+
+    if not security.verify_password(form_data.password, user.hashed_password):
         raise HTTPException(status_code=400, detail="Incorrect email or password")
 
     access_token, expire_at = security.create_access_token(user.id)
@@ -38,16 +48,19 @@ def login_access_token(
     }
 
 
-@router.post("/login/test-token", response_model=schemas.User)
-def test_token(current_user: models.User = Depends(deps.get_current_user)) -> Any:
+@router.post("/test-token", response_model=schemas.User)
+def test_token(current_user: User = Depends(deps.get_current_user)):
     """
     Test access token
     """
     return current_user
 
 
 @router.post("/refresh-token", response_model=schemas.Token)
-async def refresh_token(refresh_token: str, db: Session = Depends(deps.get_db)):
+def refresh_token(refresh_token: str, session: Session = Depends(deps.get_session)):
+    """
+    OAuth2 compatible token, get an access token for future requests using refresh token
+    """
     try:
         payload = jwt.decode(
             refresh_token, settings.SECRET_KEY, algorithms=[security.ALGORITHM]
@@ -63,8 +76,12 @@ async def refresh_token(refresh_token: str, db: Session = Depends(deps.get_db)):
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Could not validate credentials",
         )
-    user = crud.user.get(db, id=token_data.sub)
-    if not user:
+
+    user: Optional[User] = (
+        session.execute(select(User).where(User.id == token_data.sub)).scalars().first()
+    )
+
+    if user is None:
         raise HTTPException(status_code=404, detail="User not found")
     access_token, expire_at = security.create_access_token(user.id)
     refresh_token, refresh_expire_at = security.create_refresh_token(user.id)

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

@@ -1,43 +1,41 @@
 from typing import Any
 
-from fastapi import APIRouter, Body, Depends
-from fastapi.encoders import jsonable_encoder
-from pydantic.networks import EmailStr
+from fastapi import APIRouter, Depends
 from sqlalchemy.orm import Session
 
-from app import crud, models, schemas
+from app import models, schemas
 from app.api import deps
+from app.core.security import get_password_hash
 
 router = APIRouter()
 
 
 @router.put("/me", response_model=schemas.User)
 def update_user_me(
-    *,
-    db: Session = Depends(deps.get_db),
-    password: str = Body(None),
-    full_name: str = Body(None),
-    email: EmailStr = Body(None),
+    user_update: schemas.UserUpdate,
+    session: Session = Depends(deps.get_session),
     current_user: models.User = Depends(deps.get_current_active_user),
 ) -> Any:
     """
-    Update own user.
+    Update me.
     """
-    current_user_data = jsonable_encoder(current_user)
-    user_in = schemas.UserUpdate(**current_user_data)
-    if password is not None:
-        user_in.password = password
-    if full_name is not None:
-        user_in.full_name = full_name
-    if email is not None:
-        user_in.email = email
-    user = crud.user.update(db, db_obj=current_user, obj_in=user_in)
-    return user
+    if user_update.password is not None:
+        current_user.hashed_password = get_password_hash(user_update.password)
+    if user_update.full_name is not None:
+        current_user.full_name = user_update.full_name
+    if user_update.email is not None:
+        current_user.email = user_update.email
+
+    session.add(current_user)
+    session.commit()
+    session.refresh(current_user)
+
+    return current_user
 
 
 @router.get("/me", response_model=schemas.User)
 def read_user_me(
-    db: Session = Depends(deps.get_db),
+    session: Session = Depends(deps.get_session),
     current_user: models.User = Depends(deps.get_current_active_user),
 ) -> Any:
     """

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

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Dict, List, Union
+from typing import Dict, List, Optional, Union
 
 from pydantic import AnyHttpUrl, AnyUrl, BaseSettings, EmailStr, validator
 
@@ -42,12 +42,16 @@ def _assemble_cors_origins(cls, cors_origins):
         return cors_origins
 
     @validator("SQLALCHEMY_DATABASE_URI", pre=True)
-    def _assemble_db_connection(cls, v: str, values: Dict[str, str]) -> str:
+    def _assemble_db_connection(cls, v: str, values: Dict[str, Optional[str]]) -> str:
         if v != "":
             return v
         if values.get("DEBUG"):
             postgres_server = "localhost"
         else:
+            assert (
+                values.get("POSTGRES_SERVER") is not None
+            ), "Variable POSTGRES_SERVER cannot be None"
+
             postgres_server = values.get("POSTGRES_SERVER")
 
         return AnyUrl.build(