Updated this to the latest version of develop, got rid of most of the duplication, might be missing some packages in toml, needs testing

app/api/grade.py

@@ -2,7 +2,8 @@ from dependency_injector.wiring import inject, Provide
 from fastapi import APIRouter, Depends, Path, Request
 
 from app.controllers.abc import IGradeController
-from app.dtos import WritingGradeTaskDTO
+from app.dtos.writing import WritingGradeTaskDTO
+from app.dtos.speaking import GradeSpeakingAnswersDTO, GradeSpeakingDTO
 from app.middlewares import Authorized, IsAuthenticatedViaBearerToken
 
 controller = "grade_controller"
@@ -22,18 +23,29 @@ async def grade_writing_task(
     return await grade_controller.grade_writing_task(task, data)
 
 
+@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(
-    request: Request,
+async def grade_speaking_task_1_and_3(
+    data: GradeSpeakingAnswersDTO,
     task: int = Path(..., ge=1, le=3),
     grade_controller: IGradeController = Depends(Provide[controller])
 ):
-    data = await request.json()
-    return await grade_controller.grade_speaking_task(task, data)
+    return await grade_controller.grade_speaking_task(task, data.answers)
 
 
 @grade_router.post(
@@ -47,3 +59,16 @@ async def grading_summary(
 ):
     data = await request.json()
     return await grade_controller.grading_summary(data)
+
+
+@grade_router.post(
+    '/short_answers',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def grade_short_answers(
+    request: Request,
+    grade_controller: IGradeController = Depends(Provide[controller])
+):
+    data = await request.json()
+    return await grade_controller.grade_short_answers(data)

app/api/level.py

@@ -1,5 +1,5 @@
 from dependency_injector.wiring import Provide, inject
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, UploadFile, Request
 
 from app.middlewares import Authorized, IsAuthenticatedViaBearerToken
 from app.controllers.abc import ILevelController
@@ -27,4 +27,29 @@ async def get_level_exam(
 async def get_level_utas(
     level_controller: ILevelController = Depends(Provide[controller])
 ):
-    return await level_controller.get_level_exam()
+    return await level_controller.get_level_utas()
+
+
+@level_router.post(
+    '/upload',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def upload(
+    file: UploadFile,
+    level_controller: ILevelController = Depends(Provide[controller])
+):
+    return await level_controller.upload_level(file)
+
+
+@level_router.post(
+    '/custom',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def custom_level(
+    request: Request,
+    level_controller: ILevelController = Depends(Provide[controller])
+):
+    data = await request.json()
+    return await level_controller.get_custom_level(data)

app/api/listening.py

@@ -6,7 +6,7 @@ from fastapi import APIRouter, Depends, Path
 from app.middlewares import Authorized, IsAuthenticatedViaBearerToken
 from app.controllers.abc import IListeningController
 from app.configs.constants import EducationalContent
-from app.dtos import SaveListeningDTO
+from app.dtos.listening import SaveListeningDTO
 
 
 controller = "listening_controller"

app/api/speaking.py

@@ -6,24 +6,40 @@ from fastapi import APIRouter, Path, Query, Depends, BackgroundTasks
 from app.middlewares import Authorized, IsAuthenticatedViaBearerToken
 from app.configs.constants import EducationalContent
 from app.controllers.abc import ISpeakingController
-from app.dtos import SaveSpeakingDTO, SpeakingGenerateVideoDTO, SpeakingGenerateInteractiveVideoDTO
+from app.dtos.speaking import (
+    SaveSpeakingDTO, GenerateVideo1DTO, GenerateVideo2DTO, GenerateVideo3DTO
+)
 
 controller = "speaking_controller"
 speaking_router = APIRouter()
 
 
+@speaking_router.get(
+    '/1',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def get_speaking_task(
+    first_topic: str = Query(default=random.choice(EducationalContent.MTI_TOPICS)),
+    second_topic: str = Query(default=random.choice(EducationalContent.MTI_TOPICS)),
+    difficulty: str = Query(default=random.choice(EducationalContent.DIFFICULTIES)),
+    speaking_controller: ISpeakingController = Depends(Provide[controller])
+):
+    return await speaking_controller.get_speaking_part(1, first_topic, difficulty, second_topic)
+
+
 @speaking_router.get(
     '/{task}',
     dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
 )
 @inject
 async def get_speaking_task(
-    task: int = Path(..., ge=1, le=3),
+    task: int = Path(..., ge=2, le=3),
     topic: str = Query(default=random.choice(EducationalContent.MTI_TOPICS)),
     difficulty: str = Query(default=random.choice(EducationalContent.DIFFICULTIES)),
     speaking_controller: ISpeakingController = Depends(Provide[controller])
 ):
-    return await speaking_controller.get_speaking_task(task, topic, difficulty)
+    return await speaking_controller.get_speaking_part(task, topic, difficulty)
 
 
 @speaking_router.post(
@@ -40,24 +56,42 @@ async def save_speaking(
 
 
 @speaking_router.post(
-    '/generate_speaking_video',
+    '/generate_video/1',
     dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
 )
 @inject
-async def generate_speaking_video(
-    data: SpeakingGenerateVideoDTO,
+async def generate_video_1(
+    data: GenerateVideo1DTO,
     speaking_controller: ISpeakingController = Depends(Provide[controller])
 ):
-    return await speaking_controller.generate_speaking_video(data)
+    return await speaking_controller.generate_video(
+        1, data.avatar, data.first_topic, data.questions, second_topic=data.second_topic
+    )
 
 
 @speaking_router.post(
-    '/generate_interactive_video',
+    '/generate_video/2',
     dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
 )
 @inject
-async def generate_interactive_video(
-    data: SpeakingGenerateInteractiveVideoDTO,
+async def generate_video_2(
+    data: GenerateVideo2DTO,
     speaking_controller: ISpeakingController = Depends(Provide[controller])
 ):
-    return await speaking_controller.generate_interactive_video(data)
+    return await speaking_controller.generate_video(
+        2, data.avatar, data.topic, [data.question], prompts=data.prompts, suffix=data.suffix
+    )
+
+
+@speaking_router.post(
+    '/generate_video/3',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def generate_video_3(
+    data: GenerateVideo3DTO,
+    speaking_controller: ISpeakingController = Depends(Provide[controller])
+):
+    return await speaking_controller.generate_video(
+        3, data.avatar, data.topic, data.questions
+    )

app/api/training.py

@@ -1,7 +1,7 @@
 from dependency_injector.wiring import Provide, inject
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, Request
 
-from app.dtos import TipsDTO
+from app.dtos.training import FetchTipsDTO
 from app.middlewares import Authorized, IsAuthenticatedViaBearerToken
 from app.controllers.abc import ITrainingController
 
@@ -15,7 +15,20 @@ training_router = APIRouter()
 )
 @inject
 async def get_reading_passage(
-    data: TipsDTO,
+    data: FetchTipsDTO,
     training_controller: ITrainingController = Depends(Provide[controller])
 ):
     return await training_controller.fetch_tips(data)
+
+
+@training_router.post(
+    '/',
+    dependencies=[Depends(Authorized([IsAuthenticatedViaBearerToken]))]
+)
+@inject
+async def training_content(
+    request: Request,
+    training_controller: ITrainingController = Depends(Provide[controller])
+):
+    data = await request.json()
+    return await training_controller.get_training_content(data)