Fixed async-await bugs

back/add_poems_and_filters.py

@@ -37,12 +37,10 @@ async def add_poems_to_db(async_db: AsyncSession):
                       flag = True
                   else:
                       author += str1
-        async with async_db() as session:
-            async with session.begin():
         poem = orm_models.Poems(title=name, text=stixi, author=author)
         # В конце каждой итерации добавляем в базу данных
-                session.add(poem)
-                session.commit()
+        async_db.add(poem)
+        async_db.commit()
 
     # close the file
     f1.close()

back/api.py

@@ -93,7 +93,7 @@ async def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form(
             if f.tell() > 0:
                 f.seek(0)
                 destination = pathlib.Path("./uploads/" + str(hash(f)) + pathlib.Path(src.filename).suffix.lower())
-                async with destination.open('wb') as buffer:
+                with destination.open('wb') as buffer:
                     shutil.copyfileobj(f, buffer)
 
                 # изменяем название директории загруженного файла
@@ -163,7 +163,7 @@ async def create_user(nickname: Annotated[str, Form()], password: Annotated[str,
         new_user = orm_models.User(nickname=nickname, hashed_password=auth_utils.get_password_hash(password),
         name=name, surname=surname, reg_date=datetime.date.today())
         # добавляем в бд
-        await db.add(new_user)
+        db.add(new_user)
         await db.commit()
         await db.refresh(new_user)  # обновляем состояние объекта
         return {"Success": True}
@@ -187,7 +187,7 @@ async def login_for_access_token(
     # задаем временной интервал, в течение которого токен можно использовать
     access_token_expires = auth_utils.timedelta(minutes=auth_utils.ACCESS_TOKEN_EXPIRE_MINUTES)
     # создаем токен
-    access_token = await auth_utils.create_access_token(
+    access_token = auth_utils.create_access_token(
         data={"user_id": user.id}, expires_delta=access_token_expires
     )
     return {"access_token":access_token}
@@ -195,7 +195,7 @@ async def login_for_access_token(
 
 # получаем данные успешно вошедшего пользователя
 @app.get("/api/users/me", response_model=pydantic_schemas.User) #
-async def read_users_me(current_user: Annotated[pydantic_schemas.User, Depends(auth_utils.get_current_active_user)]):
+def read_users_me(current_user: Annotated[pydantic_schemas.User, Depends(auth_utils.get_current_active_user)]):
     return current_user
 
 
@@ -231,7 +231,7 @@ async def poems_to_front(db: Annotated[Session, Depends(auth_utils.get_session)]
     num_of_poems = len(query.scalars().all())
     # если стихов в бд нет
     if num_of_poems < 1:
-        add_poems_and_filters.add_poems_to_db(db) # добавляем поэмы в базу данных
+        await add_poems_and_filters.add_poems_to_db(db) # добавляем поэмы в базу данных
         # после добавления стихов снова определяем кол-во стихов в бд
         query = await db.execute(select(orm_models.Poems))
         num_of_poems = len(query.scalars().all())

back/auth_utils.py

@@ -30,11 +30,11 @@ async def get_session() -> AsyncSession:
         yield session
 
 
-async def verify_password(plain_password, hashed_password):
+def verify_password(plain_password, hashed_password):
     return pwd_context.verify(plain_password, hashed_password)
 
 
-async def get_password_hash(password):
+def get_password_hash(password):
     return pwd_context.hash(password)
 
 
@@ -63,7 +63,7 @@ async def authenticate_user(db: Annotated[AsyncSession, Depends(get_session)], n
     return user
 
 
-async def create_access_token(data: dict, expires_delta: Union[timedelta, None] = None):
+def create_access_token(data: dict, expires_delta: Union[timedelta, None] = None):
     to_encode = data.copy()
     if expires_delta:
         expire = datetime.utcnow() + expires_delta
@@ -95,7 +95,7 @@ async def get_current_user(db: Annotated[AsyncSession, Depends(get_session)], to
         disabled=user.disabled, items=user.announcements, reg_date=user.reg_date, points=user.points)
 
 
-async def get_current_active_user(
+def get_current_active_user(
     current_user: Annotated[pydantic_schemas.User, Depends(get_current_user)]
 ):
     if current_user.disabled:

requirements.txt

@@ -1,5 +1,7 @@
+aiosqlite==0.19.0
 annotated-types==0.5.0
 anyio==3.7.1
+asyncpg==0.28.0
 certifi==2023.7.22
 charset-normalizer==3.2.0
 click==8.1.6