fix: resolved pre-commit errors

Author: payamt007

README.md

@@ -1,4 +1,4 @@
-# FastAPI + SQLModel + Alembic + Celery + MongoDB + Redis + jwt Auth
+# FastAPI + Async SQLAlchemy + Alembic + Celery + MongoDB + Redis + jwt Auth
 
 This project is an opinionated boilerplate for **FastAPI** micro framework that uses,
 _**Asynchronous SQLAlchemy**_, **_PostgresSQL_**, _**Alembic**_, **_Celery_**, **_MongoDB_**, _**Redis**_, **_Docker_** and **_jwt Authentication_**. You can use this ready to

app/auth/handlers.py

@@ -41,12 +41,12 @@ class TokenData(BaseModel):
 
 
 def verify_password(plain_password, hashed_password):
-    return bcrypt.checkpw(plain_password.encode('utf-8'), hashed_password)
+    return bcrypt.checkpw(plain_password.encode("utf-8"), hashed_password)
 
 
 def get_password_hash(password: str):
     salt = bcrypt.gensalt(rounds=14)
-    return bcrypt.hashpw(password.encode('utf-8'), salt)
+    return bcrypt.hashpw(password.encode("utf-8"), salt)
 
 
 async def get_user(username: str | None):
@@ -77,7 +77,7 @@ def create_access_token(data: dict, expires_delta: timedelta | None = None):
 
 
 async def get_current_user(
-        security_scopes: SecurityScopes, token: Annotated[str, Depends(oauth2_scheme)]
+    security_scopes: SecurityScopes, token: Annotated[str, Depends(oauth2_scheme)]
 ):
     if security_scopes.scopes:
         authenticate_value = f'Bearer scope="{security_scopes.scope_str}"'
@@ -111,7 +111,7 @@ async def get_current_user(
 
 
 async def get_current_active_user(
-        current_user: Annotated[User, Security(get_current_user, scopes=["me"])],
+    current_user: Annotated[User, Security(get_current_user, scopes=["me"])],
 ):
     if current_user.disabled:
         raise HTTPException(status_code=400, detail="Inactive user")
@@ -120,7 +120,7 @@ async def get_current_active_user(
 
 @router.post("/token")
 async def login_for_access_token(
-        form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
+    form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
 ) -> Token:
     user = await authenticate_user(form_data.username, form_data.password)
     if not user:
@@ -139,14 +139,16 @@ async def login_for_access_token(
 
 @router.get("/user", response_model=UserRead)
 async def get_current_active_user_from_token(
-        current_user: Annotated[User, Depends(get_current_active_user)],
+    current_user: Annotated[User, Depends(get_current_active_user)],
 ):
     return current_user
 
 
 @router.post("/user", response_model=UserRead)
-async def register_user(user: UserCreate, session: AsyncSession = Depends(get_db_session),
-                        ):
+async def register_user(
+    user: UserCreate,
+    session: AsyncSession = Depends(get_db_session),
+):
     new_user = User(
         username=user.username,
         full_name=user.full_name,

app/songs/handlers.py

@@ -5,6 +5,7 @@
 from sqlalchemy.orm import selectinload
 
 from ..db import get_db_session
+from ..redis import r
 from .models import City, Song, Tag
 from .schemas import CityCreate, CityRead, SongCreate, SongRead, TagCreate, TagRead
 
@@ -14,9 +15,10 @@
 
 
 @router.get("/songs", response_model=list[SongRead])
-async def get_songs(
-        session: AsyncSession = Depends(get_db_session)):
-    result = await session.scalars(select(Song).options(selectinload(Song.tags), selectinload(Song.city)))
+async def get_songs(session: AsyncSession = Depends(get_db_session)):
+    result = await session.scalars(
+        select(Song).options(selectinload(Song.tags), selectinload(Song.city))
+    )
     songs = result.all()
     return songs
 
@@ -35,7 +37,9 @@ async def add_song(song: SongCreate, session: AsyncSession = Depends(get_db_sess
 
 
 @router.post("/city", response_model=CityRead)
-async def create_city(*, session: AsyncSession = Depends(get_db_session), city: CityCreate):
+async def create_city(
+    *, session: AsyncSession = Depends(get_db_session), city: CityCreate
+):
     # new_city = City(**city.dict())
     new_city = City(name=city.name)
     session.add(new_city)
@@ -46,11 +50,13 @@ async def create_city(*, session: AsyncSession = Depends(get_db_session), city:
 
 @router.post("/connect_city_with_song")
 async def connect_city_with_song(
-        city_title: str, song_title: str, session: AsyncSession = Depends(get_db_session)
+    city_title: str, song_title: str, session: AsyncSession = Depends(get_db_session)
 ):
     city_in_db = await session.scalars(select(City).where(City.name == city_title))
     city = city_in_db.first()
-    song_in_db = await session.scalars(select(Song).where(Song.name.like(f"%{song_title}%")))
+    song_in_db = await session.scalars(
+        select(Song).where(Song.name.like(f"%{song_title}%"))
+    )
     song = song_in_db.first()
     song.city = city
     session.add(song)
@@ -60,7 +66,9 @@ async def connect_city_with_song(
 
 
 @router.post("/tags", response_model=TagRead)
-async def create_tag(*, session: AsyncSession = Depends(get_db_session), tag: TagCreate):
+async def create_tag(
+    *, session: AsyncSession = Depends(get_db_session), tag: TagCreate
+):
     input_tag = TagCreate.model_validate(tag)
     new_tag = Tag(**input_tag.dict())
     session.add(new_tag)
@@ -71,14 +79,17 @@ async def create_tag(*, session: AsyncSession = Depends(get_db_session), tag: Ta
 
 @router.post("/attach-tags")
 async def attach_tag_to_song(
-        tag_title: str, song_name: str, session: AsyncSession = Depends(get_db_session)
+    tag_title: str, song_name: str, session: AsyncSession = Depends(get_db_session)
 ):
     tag_in_db = await session.scalars(
         select(Tag).where(Tag.title.like(f"%{tag_title}%"))
     )
     tag = tag_in_db.first()
     song_in_db = await session.scalars(
-        select(Song).options(selectinload(Song.tags)).where(Song.name.like(f"%{song_name}%")))
+        select(Song)
+        .options(selectinload(Song.tags))
+        .where(Song.name.like(f"%{song_name}%"))
+    )
     song = song_in_db.first()
     song.tags.append(tag)
     session.add(tag)

app/songs/models.py

@@ -22,7 +22,9 @@ class Song(Base):
     city_id: Mapped[int | None] = mapped_column(ForeignKey("cities.id"))
 
     city: Mapped["City"] = relationship("City", back_populates="songs")
-    tags: Mapped[list["Tag"]] = relationship("Tag", back_populates="songs", secondary=SongTag.__table__)
+    tags: Mapped[list["Tag"]] = relationship(
+        "Tag", back_populates="songs", secondary=SongTag.__table__
+    )
 
 
 class Tag(Base):
@@ -32,7 +34,9 @@ class Tag(Base):
     title: Mapped[str] = Column(String)
     description: Mapped[str] = Column(String)
 
-    songs: Mapped[list["Song"]] = relationship(back_populates="tags", secondary=SongTag.__table__)
+    songs: Mapped[list["Song"]] = relationship(
+        back_populates="tags", secondary=SongTag.__table__
+    )
 
 
 class City(Base):

app/tasks/tasks.py

@@ -12,7 +12,9 @@
 
 async def get_songs():
     async with async_session() as session:
-        await session.execute(update(Song).where(Song.id == 1).values(year=Song.year + 1))
+        await session.execute(
+            update(Song).where(Song.id == 1).values(year=Song.year + 1)
+        )
         await session.commit()