refactor: improve initialization code (#4)

Signed-off-by: Will Killian <william.killian@outlook.com>

Author: willkill07

example.json

@@ -408,7 +408,6 @@
     "faculty_lab",
     "same_room",
     "same_lab",
-    "pack_rooms",
-    "pack_labs"
+    "pack_rooms"
   ]
 }

pyproject.toml

@@ -11,6 +11,7 @@ license-files = ["LICENSE*"]
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
+    "bidict~=0.23.1",
     "click~=8.2.1",
     "fastapi~=0.116.1",
     "requests~=2.32.5",

src/scheduler/main.py

@@ -54,7 +54,7 @@ def main(
     if limit is not None:
         full_config.limit = limit
     limit = full_config.limit
-    if optimizer_flags is not None:
+    if optimizer_flags:
         full_config.optimizer_flags = optimizer_flags
 
     logger.info(f"Using limit={limit}")

src/scheduler/models/course.py

@@ -1,50 +1,48 @@
+from dataclasses import dataclass
+
 import z3
 from pydantic import BaseModel, ConfigDict, Field, computed_field
 
 from .time_slot import TimeInstance, TimeSlot
 
 
-class Course(BaseModel):
+@dataclass
+class Course:
     """
     A course with a course_id, section, credits, conflicts, potential labs, potential rooms, and potential faculty.
     """
 
-    model_config = ConfigDict(extra="forbid", strict=True, arbitrary_types_allowed=True)
-    """
-    Configuration for the model which forbids extra fields and is strict (@private)
-    """
-
-    course_id: str = Field(description="The unique identifier for the course")
+    course_id: str
     """
     The unique identifier for the course
     """
 
-    credits: int = Field(description="The number of credits for the course")
+    credits: int
     """
     The number of credits for the course
     """
 
-    section: int = Field(description="The section number for the course")
+    section: int
     """
     The section number for the course
     """
 
-    labs: list[str] = Field(default_factory=list, description="The list of potential labs for the course")
+    labs: list[str]
     """
     The list of potential labs for the course
     """
 
-    rooms: list[str] = Field(default_factory=list, description="The list of potential rooms for the course")
+    rooms: list[str]
     """
     The list of potential rooms for the course
     """
 
-    conflicts: list[str] = Field(default_factory=list, description="The list of course conflicts for the course")
+    conflicts: list[str]
     """
     The list of course conflicts for the course
     """
 
-    faculties: list[str] = Field(default_factory=list, description="The list of potential faculty for the course")
+    faculties: list[str]
     """
     The list of potential faculty for the course
     """
@@ -81,7 +79,7 @@ class CourseInstance(BaseModel):
     A course instance with a course, time, faculty, room, and lab.
     """
 
-    model_config = ConfigDict(extra="forbid", strict=True)
+    model_config = ConfigDict(extra="forbid", strict=True, arbitrary_types_allowed=True)
     """
     Configuration for the model which forbids extra fields and is strict (@private)
     """

src/scheduler/models/time_slot.py

@@ -1,3 +1,5 @@
+from typing import Self
+
 from pydantic import BaseModel, ConfigDict, Field, model_serializer
 
 from .day import Day
@@ -35,16 +37,16 @@ def value(self) -> int:
     def __abs__(self) -> "Duration":
         return Duration(duration=abs(self.value))
 
-    def __lt__(self, other: "Duration") -> bool:
+    def __lt__(self, other: Self) -> bool:
         return self.value < other.value
 
-    def __le__(self, other: "Duration") -> bool:
+    def __le__(self, other: Self) -> bool:
         return self.value <= other.value
 
-    def __gt__(self, other: "Duration") -> bool:
+    def __gt__(self, other: Self) -> bool:
         return self.value > other.value
 
-    def __ge__(self, other: "Duration") -> bool:
+    def __ge__(self, other: Self) -> bool:
         return self.value >= other.value
 
     def __eq__(self, other: object) -> bool:
@@ -117,22 +119,22 @@ def value(self) -> int:
     def __add__(self, dur: Duration) -> "TimePoint":
         return TimePoint(timepoint=(self.value + dur.value))
 
-    def __sub__(self, other: "TimePoint") -> Duration:
+    def __sub__(self, other: Self) -> Duration:
         return Duration(duration=(self.value - other.value))
 
     def __abs__(self) -> Duration:
         return Duration(duration=abs(self.value))
 
-    def __lt__(self, other: "TimePoint") -> bool:
+    def __lt__(self, other: Self) -> bool:
         return self.value < other.value
 
-    def __le__(self, other: "TimePoint") -> bool:
+    def __le__(self, other: Self) -> bool:
         return self.value <= other.value
 
-    def __gt__(self, other: "TimePoint") -> bool:
+    def __gt__(self, other: Self) -> bool:
         return self.value > other.value
 
-    def __ge__(self, other: "TimePoint") -> bool:
+    def __ge__(self, other: Self) -> bool:
         return self.value >= other.value
 
     def __eq__(self, other: object) -> bool:
@@ -198,11 +200,6 @@ class TimeSlot(BaseModel):
     Configuration for the model which allows extra fields and is not strict (@private)
     """
 
-    id: int = Field(description="The unique identifier for the time slot")
-    """
-    The unique identifier for the time slot
-    """
-
     times: list[TimeInstance] = Field(description="The list of time instances in the time slot")
     """
     The list of time instances in the time slot
@@ -219,7 +216,10 @@ class TimeSlot(BaseModel):
     """
 
     def __hash__(self) -> int:
-        return hash(self.id)
+        """
+        Hash the time slot by its string representation
+        """
+        return hash(str(self))
 
     def lab_time(self) -> TimeInstance | None:
         """