Writing and speaking rework, some changes to module upload

app/api/grade.py

@@ -1,9 +1,8 @@
 from dependency_injector.wiring import inject, Provide
-from fastapi import APIRouter, Depends, Path, Request
+from fastapi import APIRouter, Depends, Path, Request, BackgroundTasks
 
 from app.controllers.abc import IGradeController
 from app.dtos.writing import WritingGradeTaskDTO
-from app.dtos.speaking import GradeSpeakingAnswersDTO, GradeSpeakingDTO
 from app.middlewares import Authorized, IsAuthenticatedViaBearerToken
 
 controller = "grade_controller"
@@ -17,35 +16,51 @@ grade_router = APIRouter()
 @inject
 async def grade_writing_task(
     data: WritingGradeTaskDTO,
+    background_tasks: BackgroundTasks,
     task: int = Path(..., ge=1, le=2),
     grade_controller: IGradeController = Depends(Provide[controller])
 ):
-    return await grade_controller.grade_writing_task(task, data)
+    return await grade_controller.grade_writing_task(task, data, background_tasks)
 
 
-@grade_router.post(
-    '/speaking/2',
-    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
-)
-@inject
-async def grade_speaking_task_2(
-    data: GradeSpeakingDTO,
-    grade_controller: IGradeController = Depends(Provide[controller])
-):
-    return await grade_controller.grade_speaking_task(2, [data.dict()])
-
 
 @grade_router.post(
     '/speaking/{task}',
     dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
 )
 @inject
-async def grade_speaking_task_1_and_3(
-    data: GradeSpeakingAnswersDTO,
+async def grade_speaking_task(
+    request: Request,
+    background_tasks: BackgroundTasks,
     task: int = Path(..., ge=1, le=3),
     grade_controller: IGradeController = Depends(Provide[controller])
 ):
-    return await grade_controller.grade_speaking_task(task, data.answers)
+    form = await request.form()
+    return await grade_controller.grade_speaking_task(task, form, background_tasks)
+
+
+@grade_router.get(
+    '/pending/{sessionId}',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def get_pending_evaluations(
+    session_id: str,
+    grade_controller: IGradeController = Depends(Provide[controller])
+):
+    return await grade_controller.get_evaluations(session_id, "pending")
+
+
+@grade_router.get(
+    '/completed/{sessionId}',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def get_completed_evaluations(
+    session_id: str,
+    grade_controller: IGradeController = Depends(Provide[controller])
+):
+    return await grade_controller.get_evaluations(session_id, "completed")
 
 
 @grade_router.post(

app/api/level.py

@@ -18,7 +18,6 @@ async def generate_exercises(
     dto: LevelExercisesDTO,
     level_controller: ILevelController = Depends(Provide[controller])
 ):
-    print(dto.dict())
     return await level_controller.generate_exercises(dto)
 
 @level_router.get(

app/api/speaking.py

@@ -3,9 +3,8 @@ from typing import Optional
 
 from dependency_injector.wiring import inject, Provide
 from fastapi import APIRouter, Path, Query, Depends
-from pydantic import BaseModel
 
-from app.dtos.video import Task, TaskStatus
+from app.dtos.speaking import Video
 from app.middlewares import Authorized, IsAuthenticatedViaBearerToken
 from app.configs.constants import EducationalContent
 from app.controllers.abc import ISpeakingController
@@ -13,11 +12,6 @@ from app.controllers.abc import ISpeakingController
 controller = "speaking_controller"
 speaking_router = APIRouter()
 
-
-class Video(BaseModel):
-    text: str
-    avatar: str
-
 @speaking_router.post(
     '/media',
     dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]