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/controllers/abc/grade.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Dict
+from typing import Dict, List
 
 
 class IGradeController(ABC):
@@ -9,18 +9,14 @@ class IGradeController(ABC):
         pass
 
     @abstractmethod
-    async def grade_speaking_task(self, task: int, data: Dict):
+    async def grade_speaking_task(self, task: int, answers: List[Dict]) -> Dict:
+        pass
+
+    @abstractmethod
+    async def grade_short_answers(self, data: Dict):
         pass
 
     @abstractmethod
     async def grading_summary(self, data: Dict):
         pass
 
-    @abstractmethod
-    async def _grade_speaking_task_1_2(self, task: int, question: str, answer_firebase_path: str):
-        pass
-
-    @abstractmethod
-    async def _grade_speaking_task3(self, answers: Dict):
-        pass
-

app/controllers/abc/level.py

@@ -1,5 +1,8 @@
 from abc import ABC, abstractmethod
 
+from fastapi import UploadFile
+from typing import Dict
+
 
 class ILevelController(ABC):
 
@@ -10,3 +13,11 @@ class ILevelController(ABC):
     @abstractmethod
     async def get_level_utas(self):
         pass
+
+    @abstractmethod
+    async def upload_level(self, file: UploadFile):
+        pass
+
+    @abstractmethod
+    async def get_custom_level(self, data: Dict):
+        pass

app/controllers/abc/speaking.py

@@ -1,11 +1,13 @@
 from abc import ABC, abstractmethod
+from typing import Optional
+
 from fastapi import BackgroundTasks
 
 
 class ISpeakingController(ABC):
 
     @abstractmethod
-    async def get_speaking_task(self, task: int, topic: str, difficulty: str):
+    async def get_speaking_part(self, task: int, topic: str, difficulty: str, second_topic: Optional[str] = None):
         pass
 
     @abstractmethod
@@ -13,9 +15,11 @@ class ISpeakingController(ABC):
         pass
 
     @abstractmethod
-    async def generate_speaking_video(self, data):
-        pass
-
-    @abstractmethod
-    async def generate_interactive_video(self, data):
+    async def generate_video(
+            self, part: int, avatar: str, topic: str, questions: list[str],
+            *,
+            second_topic: Optional[str] = None,
+            prompts: Optional[list[str]] = None,
+            suffix: Optional[str] = None,
+    ):
         pass

app/controllers/abc/training.py

@@ -6,3 +6,7 @@ class ITrainingController(ABC):
     @abstractmethod
     async def fetch_tips(self, data):
         pass
+
+    @abstractmethod
+    async def get_training_content(self, data):
+        pass