Skip to content

Commit

Permalink
Add new pipeline DTOs (#58)
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelOwenDyer authored Feb 19, 2024
1 parent 5fc091b commit db3c066
Show file tree
Hide file tree
Showing 7 changed files with 135 additions and 3 deletions.
4 changes: 4 additions & 0 deletions app/domain/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
from domain.message import IrisMessage, IrisMessageRole
from domain.course import Course
from domain.exercise import ProgrammingExercise
from domain.submission import ProgrammingSubmission
from domain.codehint import CodeHint
28 changes: 28 additions & 0 deletions app/domain/codehint.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
from pydantic import BaseModel


class ProgrammingExerciseSolutionEntry(BaseModel):
file_path: str
previous_line: int
line: int
previous_code: str
code: str

def __str__(self):
return (
f'ProgrammingExerciseSolutionEntry(file_path="{self.file_path}", previous_line={self.previous_line}, '
f'line={self.line}, previous_code="{self.previous_code}", code="{self.code}")'
)


class CodeHint(BaseModel):
title: str
description: str
content: str
solution_entries: [ProgrammingExerciseSolutionEntry]

def __str__(self):
return (
f'CodeHint(title="{self.title}", description="{self.description}", content="{self.content}", '
f"solution_entries={self.solution_entries})"
)
9 changes: 9 additions & 0 deletions app/domain/course.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from pydantic import BaseModel


class Course(BaseModel):
title: str
description: str

def __str__(self):
return f'Course(title="{self.title}", description="{self.description}")'
60 changes: 60 additions & 0 deletions app/domain/dtos.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
from pydantic import BaseModel

from domain import (
Course,
ProgrammingExercise,
IrisMessage,
ProgrammingSubmission,
CodeHint,
)


class ProgrammingExerciseTutorChatDTO(BaseModel):
course: Course
exercise: ProgrammingExercise
submission: ProgrammingSubmission
chat_history: [IrisMessage]

def __str__(self):
return (
f"ProgrammingExerciseTutorChatDTO(course={self.course}, exercise={self.exercise}, "
f"submission={self.submission}, chat_history={self.chat_history})"
)


class CodeEditorChatDTO(BaseModel):
problem_statement: str
solution_repository: dict[str, str]
template_repository: dict[str, str]
test_repository: dict[str, str]
chat_history: [IrisMessage]

def __str__(self):
return (
f'CodeEditorChatDTO(problem_statement="{self.problem_statement}", '
f"solution_repository={self.solution_repository}, template_repository={self.template_repository}, "
f"test_repository={self.test_repository}, chat_history={self.chat_history})"
)


class CodeEditorAdaptDTO(BaseModel):
problem_statement: str
solution_repository: dict[str, str]
template_repository: dict[str, str]
test_repository: dict[str, str]
instructions: str

def __str__(self):
return (
f'CodeEditorAdaptDTO(problem_statement="{self.problem_statement}", '
f"solution_repository={self.solution_repository}, template_repository={self.template_repository}, "
f'test_repository={self.test_repository}, instructions="{self.instructions}")'
)


class HestiaDTO(BaseModel):
code_hint: CodeHint
exercise: ProgrammingExercise

def __str__(self):
return f"HestiaDTO(code_hint={self.code_hint}, exercise={self.exercise})"
9 changes: 9 additions & 0 deletions app/domain/exercise.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from pydantic import BaseModel


class ProgrammingExercise(BaseModel):
title: str
problem_statement: str

def __str__(self):
return f'ProgrammingExercise(title="{self.title}", problem_statement="{self.problem_statement}")'
7 changes: 4 additions & 3 deletions app/domain/message.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
from enum import Enum

from pydantic import BaseModel


class IrisMessageRole(Enum):
USER = "user"
ASSISTANT = "assistant"
SYSTEM = "system"


class IrisMessage:
class IrisMessage(BaseModel):
role: IrisMessageRole
text: str

def __init__(self, role: IrisMessageRole, text: str):
self.role = role
self.text = text
super().__init__(role=role, text=text)

def __str__(self):
return f"IrisMessage(role={self.role.value}, text='{self.text}')"
21 changes: 21 additions & 0 deletions app/domain/submission.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
from pydantic import BaseModel


class BuildLogEntry(BaseModel):
time: str
message: str

def __str__(self):
return f'BuildLogEntry(time="{self.time}", message="{self.message}")'


class ProgrammingSubmission(BaseModel):
commit_hash: str
build_failed: bool
build_log_entries: [BuildLogEntry]

def __str__(self):
return (
f'ProgrammingSubmission(commit_hash="{self.commit_hash}", build_failed={self.build_failed}, '
f"build_log_entries={self.build_log_entries})"
)

0 comments on commit db3c066

Please sign in to comment.