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/dtos/speaking.py

@@ -11,23 +11,31 @@ class SaveSpeakingDTO(BaseModel):
     minTimer: int = MinTimers.SPEAKING_MIN_TIMER_DEFAULT
 
 
-class SpeakingGradeTask1And2DTO(BaseModel):
+class GradeSpeakingDTO(BaseModel):
     question: str
     answer: str
 
 
-class SpeakingGradeTask3DTO(BaseModel):
-    answers: Dict
+class GradeSpeakingAnswersDTO(BaseModel):
+    answers: List[Dict]
 
 
-class SpeakingGenerateVideoDTO(BaseModel):
+class GenerateVideo1DTO(BaseModel):
+    avatar: str = (random.choice(list(AvatarEnum))).value
+    questions: List[str]
+    first_topic: str
+    second_topic: str
+
+
+class GenerateVideo2DTO(BaseModel):
     avatar: str = (random.choice(list(AvatarEnum))).value
     prompts: List[str] = []
+    suffix: str = ""
     question: str
     topic: str
 
 
-class SpeakingGenerateInteractiveVideoDTO(BaseModel):
+class GenerateVideo3DTO(BaseModel):
     avatar: str = (random.choice(list(AvatarEnum))).value
     questions: List[str]
     topic: str