Brushed up the backend, added writing task 1 academic prompt gen and grading ENCOA-274

ielts_be/dtos/evaluation.py

@@ -0,0 +1,18 @@
+from enum import Enum
+from typing import Dict, Optional
+from pydantic import BaseModel
+
+
+class EvaluationType(str, Enum):
+    WRITING = "writing"
+    SPEAKING_INTERACTIVE = "speaking_interactive"
+    SPEAKING = "speaking"
+
+class EvaluationRecord(BaseModel):
+    id: str
+    session_id: str
+    exercise_id: str
+    type: EvaluationType
+    task: int
+    status: str = "pending"
+    result: Optional[Dict] = None

ielts_be/dtos/exams/level.py

@@ -0,0 +1,60 @@
+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 Text(BaseModel):
+    content: str
+    title: str
+
+class Part(BaseModel):
+    exercises: List[Exercise]
+    text: Optional[Text] = Field(default=None)
+
+
+class Exam(BaseModel):
+    parts: List[Part]

ielts_be/dtos/exams/listening.py

@@ -0,0 +1,89 @@
+from enum import Enum
+from pydantic import BaseModel, Field
+from typing import List, Union, Optional, Literal
+from uuid import uuid4, UUID
+
+
+class ExerciseBase(BaseModel):
+    id: UUID = Field(default_factory=uuid4)
+    type: str
+    prompt: str
+
+
+class TrueFalseSolution(str, Enum):
+    TRUE = "true"
+    FALSE = "false"
+    NOT_GIVEN = "not_given"
+
+class TrueFalseQuestions(BaseModel):
+    prompt: str
+    solution: TrueFalseSolution
+    id: str
+
+
+class TrueFalseExercise(ExerciseBase):
+    type: Literal["trueFalse"]
+    questions: List[TrueFalseQuestions]
+
+
+class MCOption(BaseModel):
+    id: str
+    text: str
+
+
+class MCQuestion(BaseModel):
+    id: str
+    prompt: str
+    options: List[MCOption]
+    solution: str
+    variant: str = "text"
+
+
+class MultipleChoiceExercise(ExerciseBase):
+    type: Literal["multipleChoice"]
+    questions: List[MCQuestion]
+
+
+class WriteBlankQuestion(BaseModel):
+    id: str
+    prompt: str
+    solution: List[str]
+
+class WriteBlanksVariant(str, Enum):
+    QUESTIONS = "questions"
+    FILL = "fill"
+    FORM = "form"
+
+class WriteBlanksQuestionExercise(ExerciseBase):
+    type: Literal["writeBlanks"]
+    maxWords: int
+    questions: List[WriteBlankQuestion]
+    variant: WriteBlanksVariant
+
+class WriteBlankSolution(BaseModel):
+    id: str
+    solution: List[str]
+
+class WriteBlanksExercise(ExerciseBase):
+    type: Literal["writeBlanks"]
+    maxWords: int
+    solutions: List[WriteBlankSolution]
+    text: str
+    variant: Optional[WriteBlanksVariant]
+
+
+ListeningExercise = Union[
+    TrueFalseExercise,
+    MultipleChoiceExercise,
+    WriteBlanksExercise
+]
+
+
+class ListeningSection(BaseModel):
+    exercises: List[ListeningExercise]
+
+
+class ListeningExam(BaseModel):
+    module: str = "listening"
+    minTimer: Optional[int]
+    parts: List[ListeningSection]

ielts_be/dtos/exams/reading.py

@@ -0,0 +1,107 @@
+from enum import Enum
+
+from pydantic import BaseModel, Field
+from typing import List, Union, Optional
+from uuid import uuid4, UUID
+
+
+class WriteBlanksSolution(BaseModel):
+    id: str
+    solution: List[str]
+
+class WriteBlanksExercise(BaseModel):
+    id: UUID = Field(default_factory=uuid4)
+    type: str = "writeBlanks"
+    maxWords: int
+    solutions: List[WriteBlanksSolution]
+    text: str
+    prompt: str
+
+
+class MatchSentencesOption(BaseModel):
+    id: str
+    sentence: str
+
+class MatchSentencesSentence(MatchSentencesOption):
+    solution: str
+
+class MatchSentencesVariant(str, Enum):
+    HEADING = "heading"
+    IDEAMATCH = "ideaMatch"
+
+class MCOption(BaseModel):
+    id: str
+    text: str
+
+class MCQuestion(BaseModel):
+    id: str
+    prompt: str
+    options: List[MCOption]
+    solution: str
+    variant: Optional[str] = None
+
+class MultipleChoice(BaseModel):
+    questions: List[MCQuestion]
+    type: str
+    prompt: str
+
+
+class MatchSentencesExercise(BaseModel):
+    options: List[MatchSentencesOption]
+    sentences: List[MatchSentencesSentence]
+    type: str = "matchSentences"
+    variant: MatchSentencesVariant
+    prompt: str
+
+class TrueFalseSolution(str, Enum):
+    TRUE = "true"
+    FALSE = "false"
+    NOT_GIVEN = "not_given"
+
+class TrueFalseQuestions(BaseModel):
+    prompt: str
+    solution: TrueFalseSolution
+    id: str
+
+class TrueFalseExercise(BaseModel):
+    id: UUID = Field(default_factory=uuid4)
+    questions: List[TrueFalseQuestions]
+    type: str = "trueFalse"
+    prompt: str = "Do the following statements agree with the information given in the Reading Passage?"
+
+
+
+class FillBlanksSolution(BaseModel):
+    id: str
+    solution: str
+
+class FillBlanksWord(BaseModel):
+    letter: str
+    word: str
+
+class FillBlanksExercise(BaseModel):
+    id: UUID = Field(default_factory=uuid4)
+    solutions: List[FillBlanksSolution]
+    text: str
+    type: str = "fillBlanks"
+    words: List[FillBlanksWord]
+    allowRepetition: bool = False
+    prompt: str
+
+Exercise = Union[FillBlanksExercise, TrueFalseExercise, MatchSentencesExercise, WriteBlanksExercise, MultipleChoice]
+
+
+class Context(BaseModel):
+    title: str
+    content: str
+
+class Part(BaseModel):
+    exercises: List[Exercise]
+    text: Context
+
+class Exam(BaseModel):
+    id: UUID = Field(default_factory=uuid4)
+    module: str = "reading"
+    minTimer: int
+    isDiagnostic: bool = False
+    parts: List[Part]

ielts_be/dtos/level.py

@@ -0,0 +1,18 @@
+from typing import List, Optional
+
+from pydantic import BaseModel
+
+from ielts_be.configs.constants import LevelExerciseType
+
+
+class LevelExercises(BaseModel):
+    type: LevelExerciseType
+    quantity: int
+    text_size: Optional[int] = None
+    sa_qty: Optional[int] = None
+    mc_qty: Optional[int] = None
+    topic: Optional[str] = None
+
+class LevelExercisesDTO(BaseModel):
+    exercises: List[LevelExercises]
+    difficulty: Optional[str] = None

ielts_be/dtos/listening.py

@@ -0,0 +1,34 @@
+import random
+import uuid
+from typing import List, Dict, Optional
+
+from pydantic import BaseModel, Field
+
+from ielts_be.configs.constants import MinTimers, EducationalContent, ListeningExerciseType
+
+
+class SaveListeningDTO(BaseModel):
+    parts: List[Dict]
+    minTimer: int = MinTimers.LISTENING_MIN_TIMER_DEFAULT
+    difficulty: str = random.choice(EducationalContent.DIFFICULTIES)
+    id: str = str(uuid.uuid4())
+
+
+class ListeningExercises(BaseModel):
+    type: ListeningExerciseType
+    quantity: int
+
+class GenerateListeningExercises(BaseModel):
+    text: str
+    exercises: List[ListeningExercises]
+    difficulty: Optional[str]
+
+class ConversationPayload(BaseModel):
+    name: str
+    gender: str
+    text: str
+    voice: str
+
+class Dialog(BaseModel):
+    conversation: Optional[List[ConversationPayload]] = Field(default_factory=list)
+    monologue: Optional[str] = None

ielts_be/dtos/reading.py

@@ -0,0 +1,17 @@
+import random
+from typing import List, Optional
+
+from pydantic import BaseModel, Field
+
+from ielts_be.configs.constants import ReadingExerciseType, EducationalContent
+
+class ReadingExercise(BaseModel):
+    type: ReadingExerciseType
+    quantity: int
+    num_random_words: Optional[int] = Field(1)
+    max_words: Optional[int] = Field(3)
+
+class ReadingDTO(BaseModel):
+    text: str = Field(...)
+    exercises: List[ReadingExercise] = Field(...)
+    difficulty: str = Field(random.choice(EducationalContent.DIFFICULTIES))

ielts_be/dtos/sheet.py

@@ -0,0 +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]

ielts_be/dtos/speaking.py

@@ -0,0 +1,11 @@
+from fastapi import UploadFile
+from pydantic import BaseModel
+
+
+class Video(BaseModel):
+    text: str
+    avatar: str
+
+class GradeSpeakingItem(BaseModel):
+    question: str
+    answer: UploadFile

ielts_be/dtos/training.py

@@ -0,0 +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]
+

ielts_be/dtos/user_batch.py

@@ -0,0 +1,35 @@
+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 Entity(BaseModel):
+  id: str
+  role: str
+
+
+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] = None
+  expiryDate: Optional[str] = None
+  demographicInformation: Optional[DemographicInfo] = None
+  entities: list[dict] = Field(default_factory=list)
+
+
+class BatchUsersDTO(BaseModel):
+  makerID: str
+  users: list[UserDTO]

ielts_be/dtos/video.py

@@ -0,0 +1,14 @@
+from enum import Enum
+from typing import Optional
+
+from pydantic import BaseModel
+
+class TaskStatus(Enum):
+    STARTED = "STARTED"
+    IN_PROGRESS = "IN_PROGRESS"
+    COMPLETED = "COMPLETED"
+    ERROR = "ERROR"
+
+class Task(BaseModel):
+    status: TaskStatus
+    result: Optional[str] = None

ielts_be/dtos/writing.py

@@ -0,0 +1,13 @@
+from typing import Optional
+
+from pydantic import BaseModel
+
+
+class WritingGradeTaskDTO(BaseModel):
+    userId: str
+    sessionId: str
+    exerciseId: str
+    question: str
+    answer: str
+    type: str
+    attachment: Optional[str]