Chore:

Blacked and isorted all files

brewman/routers/auth/client.py

@@ -1,15 +1,17 @@
 import uuid
 
-from fastapi import APIRouter, HTTPException, status, Depends, Security
+import brewman.schemas.auth as schemas
+
+from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import desc
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-from ...schemas.auth import UserToken
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionLocal
 from ...models.auth import Client, LoginHistory
-import brewman.schemas.auth as schemas
+from ...schemas.auth import UserToken
+
 
 router = APIRouter()
 
@@ -41,7 +43,8 @@ def update(
     except SQLAlchemyError as e:
         db.rollback()
         raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e),
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=str(e),
         )
     except Exception:
         db.rollback()
@@ -50,7 +53,9 @@ def update(
 
 @router.delete("/{id_}")
 def delete(
-    id_: uuid.UUID, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["clients"]),
+    id_: uuid.UUID,
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["clients"]),
 ):
     try:
         item: Client = db.query(Client).filter(Client.id == id_).first()
@@ -61,7 +66,8 @@ def delete(
     except SQLAlchemyError as e:
         db.rollback()
         raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e),
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=str(e),
         )
     except Exception:
         db.rollback()
@@ -70,7 +76,8 @@ def delete(
 
 @router.get("/list")
 async def show_list(
-    db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["clients"]),
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["clients"]),
 ):
     list_ = db.query(Client).order_by(Client.name).all()
     clients = []
@@ -95,7 +102,9 @@ async def show_list(
 
 @router.get("/{id_}")
 def show_id(
-    id_: uuid.UUID, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["clients"]),
+    id_: uuid.UUID,
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["clients"]),
 ):
     item: Client = db.query(Client).filter(Client.id == id_).first()
     return {

brewman/routers/auth/role.py

@@ -1,15 +1,18 @@
 import uuid
+
 from typing import List, Optional
 
-from fastapi import APIRouter, HTTPException, status, Depends, Security
+import brewman.schemas.auth as schemas
+
+from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-from ...schemas.auth import UserToken
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionLocal
-from ...models.auth import Role, Permission
-import brewman.schemas.auth as schemas
+from ...models.auth import Permission, Role
+from ...schemas.auth import UserToken
+
 
 router = APIRouter()
 
@@ -25,7 +28,9 @@ def get_db():
 
 @router.post("", response_model=schemas.Role)
 def save(
-    data: schemas.RoleIn, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    data: schemas.RoleIn,
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     try:
         item = Role(data.name)
@@ -36,7 +41,8 @@ def save(
     except SQLAlchemyError as e:
         db.rollback()
         raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e),
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=str(e),
         )
     except Exception:
         db.rollback()
@@ -59,7 +65,8 @@ def update(
     except SQLAlchemyError as e:
         db.rollback()
         raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e),
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=str(e),
         )
     except Exception:
         db.rollback()
@@ -78,17 +85,21 @@ def add_permissions(role: Role, permissions: List[schemas.PermissionItem], db):
 
 @router.delete("/{id_}")
 def delete(
-    id_: uuid.UUID, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    id_: uuid.UUID,
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     try:
         item: Role = db.query(Role).filter(Role.id == id_).first()
         if item is None:
             raise HTTPException(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Role not found",
+                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                detail="Role not found",
             )
         else:
             raise HTTPException(
-                status_code=status.HTTP_501_NOT_IMPLEMENTED, detail="Role deletion not implemented",
+                status_code=status.HTTP_501_NOT_IMPLEMENTED,
+                detail="Role deletion not implemented",
             )
     except Exception:
         db.rollback()
@@ -97,14 +108,16 @@ def delete(
 
 @router.get("")
 def show_blank(
-    db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     return role_info(None, db)
 
 
 @router.get("/list", response_model=List[schemas.RoleList])
 async def show_list(
-    db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     return [
         {
@@ -118,7 +131,9 @@ async def show_list(
 
 @router.get("/{id_}", response_model=schemas.Role)
 def show_id(
-    id_: uuid.UUID, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    id_: uuid.UUID,
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     item: Role = db.query(Role).filter(Role.id == id_).first()
     return role_info(item, db)
@@ -138,7 +153,11 @@ def role_info(item: Optional[Role], db):
             "id": item.id,
             "name": item.name,
             "permissions": [
-                {"id": p.id, "name": p.name, "enabled": True if p in item.permissions else False,}
+                {
+                    "id": p.id,
+                    "name": p.name,
+                    "enabled": True if p in item.permissions else False,
+                }
                 for p in db.query(Permission).order_by(Permission.name).all()
             ],
         }

brewman/routers/auth/user.py

@@ -1,15 +1,18 @@
 import uuid
+
 from typing import List, Optional
 
-from fastapi import APIRouter, HTTPException, status, Depends, Security
+import brewman.schemas.auth as schemas
+
+from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-from ...schemas.auth import UserToken
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionLocal
-from brewman.models.auth import User, Role
-import brewman.schemas.auth as schemas
+from ...models.auth import Role, User
+from ...schemas.auth import UserToken
+
 
 router = APIRouter()
 
@@ -25,7 +28,9 @@ def get_db():
 
 @router.post("", response_model=schemas.User)
 def save(
-    data: schemas.UserIn, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    data: schemas.UserIn,
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     try:
         item = User(name=data.name, password=data.password, locked_out=data.locked_out)
@@ -36,7 +41,8 @@ def save(
     except SQLAlchemyError as e:
         db.rollback()
         raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e),
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=str(e),
         )
     except Exception:
         db.rollback()
@@ -45,7 +51,8 @@ def save(
 
 @router.get("/me", response_model=schemas.User)
 def show_me(
-    db: Session = Depends(get_db), user: UserToken = Depends(get_user),
+    db: Session = Depends(get_db),
+    user: UserToken = Depends(get_user),
 ):
     item = db.query(User).filter(User.id == user.id_).first()
     return user_info(item, db, user)
@@ -53,7 +60,9 @@ def show_me(
 
 @router.put("/me", response_model=schemas.User)
 def update_me(
-    data: schemas.UserIn, db: Session = Depends(get_db), user: UserToken = Depends(get_user),
+    data: schemas.UserIn,
+    db: Session = Depends(get_db),
+    user: UserToken = Depends(get_user),
 ):
     try:
         item: User = db.query(User).filter(User.id == user.id_).first()
@@ -68,7 +77,8 @@ def update_me(
     except SQLAlchemyError as e:
         db.rollback()
         raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e),
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=str(e),
         )
     except Exception:
         db.rollback()
@@ -94,7 +104,8 @@ def update(
     except SQLAlchemyError as e:
         db.rollback()
         raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e),
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=str(e),
         )
     except Exception:
         db.rollback()
@@ -113,17 +124,21 @@ def add_roles(user: User, roles: List[schemas.RoleItem], db: Session):
 
 @router.delete("/{id_}")
 def delete(
-    id_: uuid.UUID, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    id_: uuid.UUID,
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     try:
         item: User = db.query(User).filter(User.id == id_).first()
         if item is None:
             raise HTTPException(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="User not found",
+                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                detail="User not found",
             )
         else:
             raise HTTPException(
-                status_code=status.HTTP_501_NOT_IMPLEMENTED, detail="User deletion not implemented",
+                status_code=status.HTTP_501_NOT_IMPLEMENTED,
+                detail="User deletion not implemented",
             )
     except Exception:
         db.rollback()
@@ -132,14 +147,16 @@ def delete(
 
 @router.get("")
 def show_blank(
-    db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     return user_info(None, db, user)
 
 
 @router.get("/list", response_model=List[schemas.UserList])
 async def show_list(
-    db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     return [
         {
@@ -159,7 +176,9 @@ async def show_active(db: Session = Depends(get_db), user: UserToken = Depends(g
 
 @router.get("/{id_}", response_model=schemas.User)
 def show_id(
-    id_: uuid.UUID, db: Session = Depends(get_db), user: UserToken = Security(get_user, scopes=["users"]),
+    id_: uuid.UUID,
+    db: Session = Depends(get_db),
+    user: UserToken = Security(get_user, scopes=["users"]),
 ):
     item = db.query(User).filter(User.id == id_).first()
     return user_info(item, db, user)
@@ -179,7 +198,11 @@ def user_info(item: Optional[User], db: Session, user: UserToken):
             "password": "",
             "lockedOut": item.locked_out,
             "roles": [
-                {"id": r.id, "name": r.name, "enabled": True if r in item.roles else False,}
+                {
+                    "id": r.id,
+                    "name": r.name,
+                    "enabled": True if r in item.roles else False,
+                }
                 for r in db.query(Role).order_by(Role.name).all()
             ]
             if "advanced-delete" in user.permissions