Fastapi refactor update

app/dtos/exam.py

@@ -1,57 +1,57 @@
-from pydantic import BaseModel, Field
-from typing import List, Dict, Union, Optional
-from uuid import uuid4, UUID
-
-
-class Option(BaseModel):
-    id: str
-    text: str
-
-
-class MultipleChoiceQuestion(BaseModel):
-    id: str
-    prompt: str
-    variant: str = "text"
-    solution: str
-    options: List[Option]
-
-
-class MultipleChoiceExercise(BaseModel):
-    id: UUID = Field(default_factory=uuid4)
-    type: str = "multipleChoice"
-    prompt: str = "Select the appropriate option."
-    questions: List[MultipleChoiceQuestion]
-    userSolutions: List = Field(default_factory=list)
-
-
-class FillBlanksWord(BaseModel):
-    id: str
-    options: Dict[str, str]
-
-
-class FillBlanksSolution(BaseModel):
-    id: str
-    solution: str
-
-
-class FillBlanksExercise(BaseModel):
-    id: UUID = Field(default_factory=uuid4)
-    type: str = "fillBlanks"
-    variant: str = "mc"
-    prompt: str = "Click a blank to select the appropriate word for it."
-    text: str
-    solutions: List[FillBlanksSolution]
-    words: List[FillBlanksWord]
-    userSolutions: List = Field(default_factory=list)
-
-
-Exercise = Union[MultipleChoiceExercise, FillBlanksExercise]
-
-
-class Part(BaseModel):
-    exercises: List[Exercise]
-    context: Optional[str] = Field(default=None)
-
-
-class Exam(BaseModel):
-    parts: List[Part]
+from pydantic import BaseModel, Field
+from typing import List, Dict, Union, Optional
+from uuid import uuid4, UUID
+
+
+class Option(BaseModel):
+    id: str
+    text: str
+
+
+class MultipleChoiceQuestion(BaseModel):
+    id: str
+    prompt: str
+    variant: str = "text"
+    solution: str
+    options: List[Option]
+
+
+class MultipleChoiceExercise(BaseModel):
+    id: UUID = Field(default_factory=uuid4)
+    type: str = "multipleChoice"
+    prompt: str = "Select the appropriate option."
+    questions: List[MultipleChoiceQuestion]
+    userSolutions: List = Field(default_factory=list)
+
+
+class FillBlanksWord(BaseModel):
+    id: str
+    options: Dict[str, str]
+
+
+class FillBlanksSolution(BaseModel):
+    id: str
+    solution: str
+
+
+class FillBlanksExercise(BaseModel):
+    id: UUID = Field(default_factory=uuid4)
+    type: str = "fillBlanks"
+    variant: str = "mc"
+    prompt: str = "Click a blank to select the appropriate word for it."
+    text: str
+    solutions: List[FillBlanksSolution]
+    words: List[FillBlanksWord]
+    userSolutions: List = Field(default_factory=list)
+
+
+Exercise = Union[MultipleChoiceExercise, FillBlanksExercise]
+
+
+class Part(BaseModel):
+    exercises: List[Exercise]
+    context: Optional[str] = Field(default=None)
+
+
+class Exam(BaseModel):
+    parts: List[Part]

app/dtos/listening.py

@@ -1,14 +1,14 @@
-import random
-import uuid
-from typing import List, Dict
-
-from pydantic import BaseModel
-
-from app.configs.constants import MinTimers, EducationalContent
-
-
-class SaveListeningDTO(BaseModel):
-    parts: List[Dict]
-    minTimer: int = MinTimers.LISTENING_MIN_TIMER_DEFAULT
-    difficulty: str = random.choice(EducationalContent.DIFFICULTIES)
-    id: str = str(uuid.uuid4())
+import random
+import uuid
+from typing import List, Dict
+
+from pydantic import BaseModel
+
+from app.configs.constants import MinTimers, EducationalContent
+
+
+class SaveListeningDTO(BaseModel):
+    parts: List[Dict]
+    minTimer: int = MinTimers.LISTENING_MIN_TIMER_DEFAULT
+    difficulty: str = random.choice(EducationalContent.DIFFICULTIES)
+    id: str = str(uuid.uuid4())

app/dtos/sheet.py

@@ -1,29 +1,29 @@
-from pydantic import BaseModel
-from typing import List, Dict, Union, Any, Optional
-
-
-class Option(BaseModel):
-    id: str
-    text: str
-
-
-class MultipleChoiceQuestion(BaseModel):
-    type: str = "multipleChoice"
-    id: str
-    prompt: str
-    variant: str = "text"
-    options: List[Option]
-
-
-class FillBlanksWord(BaseModel):
-    type: str = "fillBlanks"
-    id: str
-    options: Dict[str, str]
-
-
-Component = Union[MultipleChoiceQuestion, FillBlanksWord, Dict[str, Any]]
-
-
-class Sheet(BaseModel):
-    batch: Optional[int] = None
-    components: List[Component]
+from pydantic import BaseModel
+from typing import List, Dict, Union, Any, Optional
+
+
+class Option(BaseModel):
+    id: str
+    text: str
+
+
+class MultipleChoiceQuestion(BaseModel):
+    type: str = "multipleChoice"
+    id: str
+    prompt: str
+    variant: str = "text"
+    options: List[Option]
+
+
+class FillBlanksWord(BaseModel):
+    type: str = "fillBlanks"
+    id: str
+    options: Dict[str, str]
+
+
+Component = Union[MultipleChoiceQuestion, FillBlanksWord, Dict[str, Any]]
+
+
+class Sheet(BaseModel):
+    batch: Optional[int] = None
+    components: List[Component]

app/dtos/speaking.py

@@ -1,42 +1,42 @@
-import random
-from typing import List, Dict
-
-from pydantic import BaseModel
-
-from app.configs.constants import MinTimers, AvatarEnum
-
-
-class SaveSpeakingDTO(BaseModel):
-    exercises: List[Dict]
-    minTimer: int = MinTimers.SPEAKING_MIN_TIMER_DEFAULT
-
-
-class GradeSpeakingDTO(BaseModel):
-    question: str
-    answer: str
-
-
-class GradeSpeakingAnswersDTO(BaseModel):
-    answers: List[Dict]
-
-
-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 GenerateVideo3DTO(BaseModel):
-    avatar: str = (random.choice(list(AvatarEnum))).value
-    questions: List[str]
-    topic: str
-
+import random
+from typing import List, Dict
+
+from pydantic import BaseModel
+
+from app.configs.constants import MinTimers, AvatarEnum
+
+
+class SaveSpeakingDTO(BaseModel):
+    exercises: List[Dict]
+    minTimer: int = MinTimers.SPEAKING_MIN_TIMER_DEFAULT
+
+
+class GradeSpeakingDTO(BaseModel):
+    question: str
+    answer: str
+
+
+class GradeSpeakingAnswersDTO(BaseModel):
+    answers: List[Dict]
+
+
+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 GenerateVideo3DTO(BaseModel):
+    avatar: str = (random.choice(list(AvatarEnum))).value
+    questions: List[str]
+    topic: str
+

app/dtos/training.py

@@ -1,37 +1,37 @@
-from pydantic import BaseModel
-from typing import List
-
-
-class FetchTipsDTO(BaseModel):
-    context: str
-    question: str
-    answer: str
-    correct_answer: str
-
-
-class QueryDTO(BaseModel):
-    category: str
-    text: str
-
-
-class DetailsDTO(BaseModel):
-    exam_id: str
-    date: int
-    performance_comment: str
-    detailed_summary: str
-
-
-class WeakAreaDTO(BaseModel):
-    area: str
-    comment: str
-
-
-class TrainingContentDTO(BaseModel):
-    details: List[DetailsDTO]
-    weak_areas: List[WeakAreaDTO]
-    queries: List[QueryDTO]
-
-
-class TipsDTO(BaseModel):
-    tip_ids: List[str]
-
+from pydantic import BaseModel
+from typing import List
+
+
+class FetchTipsDTO(BaseModel):
+    context: str
+    question: str
+    answer: str
+    correct_answer: str
+
+
+class QueryDTO(BaseModel):
+    category: str
+    text: str
+
+
+class DetailsDTO(BaseModel):
+    exam_id: str
+    date: int
+    performance_comment: str
+    detailed_summary: str
+
+
+class WeakAreaDTO(BaseModel):
+    area: str
+    comment: str
+
+
+class TrainingContentDTO(BaseModel):
+    details: List[DetailsDTO]
+    weak_areas: List[WeakAreaDTO]
+    queries: List[QueryDTO]
+
+
+class TipsDTO(BaseModel):
+    tip_ids: List[str]
+

app/dtos/user_batch.py

@@ -0,0 +1,30 @@
+import uuid
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+
+class DemographicInfo(BaseModel):
+    phone: str
+    passport_id: Optional[str] = None
+    country: Optional[str] = None
+
+
+class UserDTO(BaseModel):
+    id: uuid.UUID = Field(default_factory=uuid.uuid4)
+    email: str
+    name: str
+    type: str
+    passport_id: str
+    passwordHash: str
+    passwordSalt: str
+    groupName: Optional[str] = None
+    corporate: Optional[str] = None
+    studentID: Optional[str | int] = None
+    expiryDate: Optional[str] = None
+    demographicInformation: Optional[DemographicInfo] = None
+
+
+class BatchUsersDTO(BaseModel):
+    makerID: str
+    users: list[UserDTO]

app/dtos/writing.py

@@ -1,6 +1,6 @@
-from pydantic import BaseModel
-
-
-class WritingGradeTaskDTO(BaseModel):
-    question: str
-    answer: str
+from pydantic import BaseModel
+
+
+class WritingGradeTaskDTO(BaseModel):
+    question: str
+    answer: str