🎨 Black format all

tiangolo · tiangolo · commit f80ccf3da31e · 2018-10-28T11:06:02.000+04:00
diff --git a/{{cookiecutter.project_slug}}/backend/app/app/api/api_v1/endpoints/role.py b/{{cookiecutter.project_slug}}/backend/app/app/api/api_v1/endpoints/role.py
@@ -13,7 +13,14 @@
 from app.core import config
 from app.db.flask_session import db_session
 from app.core.celery_app import celery_app
-from app.db.utils import (check_if_user_is_active, check_if_user_is_superuser, get_role_by_name, create_role, get_roles, get_user_roles)
+from app.db.utils import (
+    check_if_user_is_active,
+    check_if_user_is_superuser,
+    get_role_by_name,
+    create_role,
+    get_roles,
+    get_user_roles,
+)
 
 # Import Schemas
 from app.schemas.role import RoleSchema
diff --git a/{{cookiecutter.project_slug}}/backend/app/app/api/api_v1/endpoints/user.py b/{{cookiecutter.project_slug}}/backend/app/app/api/api_v1/endpoints/user.py
@@ -13,7 +13,16 @@
 from app.core.security import pwd_context
 from app.db.flask_session import db_session
 from app.core.celery_app import celery_app
-from app.db.utils import check_if_user_is_active, check_if_user_is_superuser, get_users, get_user_by_username, create_user, get_user_by_id, get_role_by_id, assign_role_to_user
+from app.db.utils import (
+    check_if_user_is_active,
+    check_if_user_is_superuser,
+    get_users,
+    get_user_by_username,
+    create_user,
+    get_user_by_id,
+    get_role_by_id,
+    assign_role_to_user,
+)
 
 from app.main import app
 
@@ -26,11 +35,7 @@
 
 
 @docs.register
-@doc(
-    description="Retrieve the users",
-    security=security_params,
-    tags=["users"],
-)
+@doc(description="Retrieve the users", security=security_params, tags=["users"])
 @app.route(f"{config.API_V1_STR}/users/", methods=["GET"])
 @marshal_with(UserSchema(many=True))
 @jwt_required
@@ -61,9 +66,7 @@ def route_users_get():
 )
 @marshal_with(UserSchema())
 @jwt_required
-def route_users_post(
-    email=None, password=None, first_name=None, last_name=None,
-):
+def route_users_post(email=None, password=None, first_name=None, last_name=None):
     current_user = get_current_user()
 
     if not current_user:
@@ -79,9 +82,10 @@ def route_users_post(
         return abort(
             400, f"The user with this email already exists in the system: {email}"
         )
-    user = create_user(db_session, email, password, first_name, last_name )
+    user = create_user(db_session, email, password, first_name, last_name)
     return user
 
+
 @docs.register
 @doc(description="Create new user without the need to be logged in", tags=["users"])
 @app.route(f"{config.API_V1_STR}/users/open", methods=["POST"])
@@ -94,12 +98,10 @@ def route_users_post(
     }
 )
 @marshal_with(UserSchema())
-def route_users_post_open(
-    email=None, password=None, first_name=None, last_name=None,
-):
+def route_users_post_open(email=None, password=None, first_name=None, last_name=None):
     if not config.USERS_OPEN_REGISTRATION:
         abort(403, "Open user resgistration is forbidden on this server")
-    
+
     user = get_user_by_username(email, db_session)
 
     if user:
@@ -149,11 +151,13 @@ def route_users_id_get(user_id):
 
 
 @docs.register
-@doc(description="Assign a role to a user by ID", security=security_params, tags=["users"])
+@doc(
+    description="Assign a role to a user by ID",
+    security=security_params,
+    tags=["users"],
+)
 @app.route(f"{config.API_V1_STR}/users/<int:user_id>/roles/", methods=["POST"])
-@use_kwargs({
-    "role_id": fields.Int(required=True),
-})
+@use_kwargs({"role_id": fields.Int(required=True)})
 @marshal_with(UserSchema())
 @jwt_required
 def route_users_assign_role_post(user_id, role_id):
@@ -169,10 +173,10 @@ def route_users_assign_role_post(user_id, role_id):
     user = get_user_by_id(user_id, db_session)
     if not user:
         return abort(400, f"The user with id: {user_id} does not exists")
-    
+
     role = get_role_by_id(role_id, db_session)
     if not role:
         return abort(400, f"The role does not exist")
-    
+
     updated_user = assign_role_to_user(role, user, db_session)
     return updated_user
diff --git a/{{cookiecutter.project_slug}}/backend/app/app/core/security.py b/{{cookiecutter.project_slug}}/backend/app/app/core/security.py
@@ -2,8 +2,10 @@
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
+
 def verify_password(plain_password, hashed_password):
     return pwd_context.verify(plain_password, hashed_password)
 
+
 def get_password_hash(password):
     return pwd_context.hash(password)
diff --git a/{{cookiecutter.project_slug}}/backend/app/app/db/init_db.py b/{{cookiecutter.project_slug}}/backend/app/app/db/init_db.py
@@ -1,12 +1,19 @@
 from app.core import config
 from app.core.security import pwd_context
 
-from app.db.utils import get_role_by_name, create_role, get_user_by_username, create_user, assign_role_to_user
+from app.db.utils import (
+    get_role_by_name,
+    create_role,
+    get_user_by_username,
+    create_user,
+    assign_role_to_user,
+)
 from app.core.security import get_password_hash
 
 from app.models.user import User
 from app.models.role import Role
 
+
 def init_db(db_session):
     # Tables should be created with Alembic migrations
     # But if you don't want to use migrations, create
@@ -19,5 +26,10 @@ def init_db(db_session):
 
     user = get_user_by_username(config.FIRST_SUPERUSER, db_session)
     if not user:
-        user = create_user(db_session, config.FIRST_SUPERUSER, config.FIRST_SUPERUSER_PASSWORD, is_superuser=True)
+        user = create_user(
+            db_session,
+            config.FIRST_SUPERUSER,
+            config.FIRST_SUPERUSER_PASSWORD,
+            is_superuser=True,
+        )
         assign_role_to_user(role, user, db_session)
diff --git a/{{cookiecutter.project_slug}}/backend/app/app/db/utils.py b/{{cookiecutter.project_slug}}/backend/app/app/db/utils.py
@@ -2,36 +2,45 @@
 from app.models.role import Role
 from app.core.security import get_password_hash
 
+
 def get_user(username, db_session):
     return db_session.query(User).filter(User.id == username).first()
 
+
 def check_if_user_is_active(user):
     return user.is_active
 
+
 def check_if_user_is_superuser(user):
     return user.is_superuser
 
+
 def check_if_username_is_active(username, db_session):
     user = get_user(username, db_session)
     return check_if_user_is_active(user)
 
+
 def get_role_by_name(name, db_session):
     role = db_session.query(Role).filter(Role.name == name).first()
     return role
 
+
 def get_role_by_id(role_id, db_session):
     role = db_session.query(Role).filter(Role.id == role_id).first()
     return role
 
+
 def create_role(name, db_session):
     role = Role(name=name)
     db_session.add(role)
     db_session.commit()
     return role
 
+
 def get_roles(db_session):
     return db_session.query(Role).all()
 
+
 def get_user_roles(user):
     return user.roles
 
@@ -40,21 +49,27 @@ def get_user_by_username(username, db_session) -> User:
     user = db_session.query(User).filter(User.email == username).first()  # type: User
     return user
 
+
 def get_user_by_id(user_id, db_session):
     user = db_session.query(User).filter(User.id == user_id).first()  # type: User
     return user
 
+
 def get_user_hashed_password(user):
     return user.password
 
 
 def get_user_id(user):
     return user.id
 
+
 def get_users(db_session):
     return db_session.query(User).all()
 
-def create_user(db_session, username, password, first_name=None, last_name=None, is_superuser=False):
+
+def create_user(
+    db_session, username, password, first_name=None, last_name=None, is_superuser=False
+):
     user = User(
         email=username,
         password=get_password_hash(password),
@@ -67,6 +82,7 @@ def create_user(db_session, username, password, first_name=None, last_name=None,
     db_session.refresh(user)
     return user
 
+
 def assign_role_to_user(role: Role, user: User, db_session):
     user.roles.append(role)
     db_session.add(user)
diff --git a/{{cookiecutter.project_slug}}/backend/app/app/models/role.py b/{{cookiecutter.project_slug}}/backend/app/app/models/role.py
@@ -16,6 +16,4 @@ class Role(Base):
     created_at = Column(DateTime, default=datetime.utcnow(), index=True)
     name = Column(String, index=True)
     # Relationships
-    users = relationship(
-        "User", secondary=users_roles, back_populates="roles"
-    )
+    users = relationship("User", secondary=users_roles, back_populates="roles")
diff --git a/{{cookiecutter.project_slug}}/backend/app/app/tests/api/api_v1/user/test_user.py b/{{cookiecutter.project_slug}}/backend/app/app/tests/api/api_v1/user/test_user.py
@@ -20,6 +20,7 @@ def test_get_users_superuser_me(superuser_token_headers):
     assert current_user["email"] == config.FIRST_SUPERUSER
     assert current_user["is_superuser"] is True
 
+
 def test_create_user_new_email(superuser_token_headers):
     server_api = get_server_api()
     username = random_lower_string()
