Iris: Merge chattype-specific pipelines into a single chat pipeline

iris/src/iris/domain/__init__.py

@@ -1,14 +1,5 @@
-from iris.domain.chat.course_chat.course_chat_pipeline_execution_dto import (
-    CourseChatPipelineExecutionDTO,
-)
-from iris.domain.chat.exercise_chat.exercise_chat_pipeline_execution_dto import (
-    ExerciseChatPipelineExecutionDTO,
-)
 from iris.domain.feature_dto import FeatureDTO
 
-from .chat.chat_pipeline_execution_base_data_dto import (
-    ChatPipelineExecutionBaseDataDTO,
-)
 from .chat.chat_pipeline_execution_dto import ChatPipelineExecutionDTO
 from .competency_extraction_pipeline_execution_dto import (
     CompetencyExtractionPipelineExecutionDTO,
@@ -22,10 +13,7 @@
 from .pipeline_execution_settings_dto import PipelineExecutionSettingsDTO
 
 __all__ = [
-    "CourseChatPipelineExecutionDTO",
-    "ExerciseChatPipelineExecutionDTO",
     "FeatureDTO",
-    "ChatPipelineExecutionBaseDataDTO",
     "ChatPipelineExecutionDTO",
     "CompetencyExtractionPipelineExecutionDTO",
     "image_message_content_dto",

iris/src/iris/domain/chat/chat_pipeline_execution_dto.py

@@ -3,11 +3,38 @@
 from pydantic import Field
 
 from iris.common.pyris_message import PyrisMessage
+from iris.domain.data.course_dto import CourseDTO
+from iris.domain.data.lecture_dto import PyrisLectureDTO
+from iris.domain.data.metrics.student_metrics_dto import StudentMetricsDTO
+from iris.domain.data.programming_exercise_dto import ProgrammingExerciseDTO
+from iris.domain.data.programming_submission_dto import ProgrammingSubmissionDTO
+from iris.domain.data.text_exercise_dto import TextExerciseDTO
 from iris.domain.data.user_dto import UserDTO
 from iris.domain.pipeline_execution_dto import PipelineExecutionDTO
+from iris.pipeline.chat.iris_chat_mode import IrisChatMode
 
 
 class ChatPipelineExecutionDTO(PipelineExecutionDTO):
+    """
+    Data Transfer Object for chat pipeline execution
+    """
+
+    chat_mode: IrisChatMode = Field(alias="chatMode")
+    user: UserDTO
+    course: CourseDTO
+
     session_title: Optional[str] = Field(alias="sessionTitle", default=None)
     chat_history: List[PyrisMessage] = Field(alias="chatHistory", default=[])
-    user: Optional[UserDTO]
+    metrics: Optional[StudentMetricsDTO] = None
+    custom_instructions: Optional[str] = Field(alias="customInstructions", default="")
+
+    programming_exercise: Optional[ProgrammingExerciseDTO] = Field(
+        alias="programmingExercise", default=None
+    )
+    text_exercise: Optional[TextExerciseDTO] = Field(alias="textExercise", default=None)
+    lecture: Optional[PyrisLectureDTO] = None
+    lecture_unit_id: Optional[int] = Field(alias="lectureUnitId", default=None)
+    programming_exercise_submission: Optional[ProgrammingSubmissionDTO] = Field(
+        alias="programmingExerciseSubmission", default=None
+    )
+    text_exercise_submission: str = Field(alias="textExerciseSubmission", default="")

iris/src/iris/domain/data/course_dto.py

@@ -1,9 +1,42 @@
-from typing import Optional
+from datetime import datetime
+from typing import List, Optional
 
 from pydantic import BaseModel, Field
 
+from iris.domain.data.competency_dto import CompetencyDTO
+from iris.domain.data.exam_dto import ExamDTO
+from iris.domain.data.exercise_with_submissions_dto import (
+    ExerciseWithSubmissionsDTO,
+)
+from iris.domain.data.programming_exercise_dto import ProgrammingLanguage
+
 
 class CourseDTO(BaseModel):
+    """
+    Data Transfer Object representing a course and its configuration.
+    """
+
     id: int
-    name: Optional[str]
-    description: Optional[str] = Field(None)
+    name: Optional[str] = None
+    description: Optional[str] = None
+    start_time: Optional[datetime] = Field(alias="startTime", default=None)
+    end_time: Optional[datetime] = Field(alias="endTime", default=None)
+    default_programming_language: Optional[ProgrammingLanguage] = Field(
+        alias="defaultProgrammingLanguage", default=None
+    )
+    max_complaints: Optional[int] = Field(alias="maxComplaints", default=None)
+    max_team_complaints: Optional[int] = Field(alias="maxTeamComplaints", default=None)
+    max_complaint_time_days: Optional[int] = Field(
+        alias="maxComplaintTimeDays", default=None
+    )
+    max_request_more_feedback_time_days: Optional[int] = Field(
+        alias="maxRequestMoreFeedbackTimeDays", default=None
+    )
+    max_points: Optional[int] = Field(alias="maxPoints", default=None)
+    presentation_score: Optional[int] = Field(alias="presentationScore", default=None)
+    exercises: List[ExerciseWithSubmissionsDTO] = Field(alias="exercises", default=[])
+    exams: List[ExamDTO] = Field(alias="exams", default=[])
+    competencies: List[CompetencyDTO] = Field(alias="competencies", default=[])
+    student_analytics_dashboard_enabled: bool = Field(
+        alias="studentAnalyticsDashboardEnabled", default=False
+    )

iris/src/iris/domain/data/programming_exercise_dto.py

@@ -26,16 +26,16 @@ class ProgrammingExerciseDTO(BaseModel):
     """
 
     id: int
-    name: str
+    title: str = ""
+    problem_statement: Optional[str] = Field(alias="problemStatement", default=None)
+    start_date: Optional[datetime] = Field(alias="startDate", default=None)
+    end_date: Optional[datetime] = Field(alias="endDate", default=None)
     programming_language: Optional[str] = Field(
         alias="programmingLanguage", default=None
     )
     template_repository: Dict[str, str] = Field(alias="templateRepository", default={})
     solution_repository: Dict[str, str] = Field(alias="solutionRepository", default={})
     test_repository: Dict[str, str] = Field(alias="testRepository", default={})
-    problem_statement: str = Field(alias="problemStatement", default=None)
-    start_date: Optional[datetime] = Field(alias="startDate", default=None)
-    end_date: Optional[datetime] = Field(alias="endDate", default=None)
     max_points: Optional[float] = Field(alias="maxPoints", default=None)
     recent_changes: Optional[str] = Field(
         alias="recentChanges",

iris/src/iris/domain/data/text_exercise_dto.py

@@ -3,14 +3,11 @@
 
 from pydantic import BaseModel, Field
 
-from iris.domain.data.course_dto import CourseDTO
-
 
 class TextExerciseDTO(BaseModel):
     id: int
-    title: str
-    course: CourseDTO
+    title: str = ""
     problem_statement: Optional[str] = Field(alias="problemStatement", default=None)
-    example_solution: Optional[str] = Field(alias="exampleSolution", default=None)
     start_date: Optional[datetime] = Field(alias="startDate", default=None)
     end_date: Optional[datetime] = Field(alias="endDate", default=None)
+    example_solution: Optional[str] = Field(alias="exampleSolution", default=None)

iris/src/iris/domain/chat/course_chat/course_chat_status_update_dto.py → iris/src/iris/domain/status/chat_status_update_dto.py

@@ -1,14 +1,14 @@
 from typing import List, Optional
 
-from memiris import MemoryDTO
+from memiris.api.memory_dto import MemoryDTO
 from pydantic import Field
 
 from iris.domain.status.status_update_dto import StatusUpdateDTO
 
 
-class CourseChatStatusUpdateDTO(StatusUpdateDTO):
+class ChatStatusUpdateDTO(StatusUpdateDTO):
     result: Optional[str] = None
-    suggestions: List[str] = []
     session_title: Optional[str] = Field(alias="sessionTitle", default=None)
+    suggestions: Optional[List[str]] = Field(default_factory=list)
     accessed_memories: List[MemoryDTO] = Field(alias="accessedMemories", default=[])
     created_memories: List[MemoryDTO] = Field(alias="createdMemories", default=[])