otf-api 0.8.2__py3-none-any.whl → 0.9.1__py3-none-any.whl

otf_api/models/__init__.py

@@ -1,59 +1,48 @@
-from .body_composition_list import BodyCompositionList
-from .book_class import BookClass
-from .bookings import Booking, BookingList
-from .cancel_booking import CancelBooking
-from .challenge_tracker_content import ChallengeTrackerContent
-from .challenge_tracker_detail import ChallengeTrackerDetailList
-from .classes import OtfClass, OtfClassList
-from .enums import BookingStatus, ChallengeType, ClassType, DoW, EquipmentType, StatsTime, StudioStatus
-from .favorite_studios import FavoriteStudioList
-from .latest_agreement import LatestAgreement
-from .lifetime_stats import StatsResponse
+from .body_composition_list import BodyCompositionData
+from .bookings import Booking
+from .challenge_tracker_content import ChallengeTracker
+from .challenge_tracker_detail import FitnessBenchmark
+from .classes import OtfClass
+from .enums import BookingStatus, ChallengeCategory, ClassType, DoW, EquipmentType, StatsTime, StudioStatus
+from .lifetime_stats import StatsResponse, TimeStats
 from .member_detail import MemberDetail
 from .member_membership import MemberMembership
-from .member_purchases import MemberPurchaseList
-from .out_of_studio_workout_history import OutOfStudioWorkoutHistoryList
+from .member_purchases import MemberPurchase
+from .notifications import EmailNotificationSettings, SmsNotificationSettings
+from .out_of_studio_workout_history import OutOfStudioWorkoutHistory
 from .performance_summary_detail import PerformanceSummaryDetail
-from .performance_summary_list import PerformanceSummaryList
-from .studio_detail import Pagination, StudioDetail, StudioDetailList
-from .studio_services import StudioServiceList
-from .telemetry import Telemetry
-from .telemetry_hr_history import TelemetryHrHistory
-from .telemetry_max_hr import TelemetryMaxHr
-from .total_classes import TotalClasses
+from .performance_summary_list import PerformanceSummaryEntry
+from .studio_detail import StudioDetail
+from .studio_services import StudioService
+from .telemetry import Telemetry, TelemetryHistoryItem
 
 __all__ = [
-    "BodyCompositionList",
-    "BookClass",
+    "BodyCompositionData",
     "Booking",
-    "BookingList",
     "BookingStatus",
-    "CancelBooking",
-    "ChallengeTrackerContent",
-    "ChallengeTrackerDetailList",
-    "ChallengeType",
+    "ChallengeCategory",
+    "ChallengeParticipation",
+    "ChallengeTracker",
     "ClassType",
     "DoW",
+    "EmailNotificationSettings",
     "EquipmentType",
-    "FavoriteStudioList",
+    "FitnessBenchmark",
     "LatestAgreement",
     "MemberDetail",
     "MemberMembership",
-    "MemberPurchaseList",
-    "OtfClassList",
+    "MemberPurchase",
     "OtfClass",
-    "OutOfStudioWorkoutHistoryList",
-    "Pagination",
+    "OutOfStudioWorkoutHistory",
     "PerformanceSummaryDetail",
-    "PerformanceSummaryList",
+    "PerformanceSummaryEntry",
+    "SmsNotificationSettings",
     "StatsResponse",
     "StatsTime",
     "StudioDetail",
-    "StudioDetailList",
-    "StudioServiceList",
+    "StudioService",
     "StudioStatus",
     "Telemetry",
-    "TelemetryHrHistory",
-    "TelemetryMaxHr",
-    "TotalClasses",
+    "TelemetryHistoryItem",
+    "TimeStats",
 ]

otf_api/models/body_composition_list.py

@@ -1,27 +1,28 @@
-import inspect
 from datetime import datetime
-from enum import Enum
+from enum import StrEnum
+from typing import Literal
 
 import pint
-from pydantic import BaseModel, Field, field_validator
+from pydantic import Field, field_validator
 
 from otf_api.models.base import OtfItemBase
 
 ureg = pint.UnitRegistry()
 
+
 DEFAULT_WEIGHT_DIVIDERS = [55.0, 70.0, 85.0, 100.0, 115.0, 130.0, 145.0, 160.0, 175.0, 190.0, 205.0]
 DEFAULT_SKELETAL_MUSCLE_MASS_DIVIDERS = [70.0, 80.0, 90.0, 100.0, 110.0, 120.0, 130.0, 140.0, 150.0, 160.0, 170.0]
 DEFAULT_BODY_FAT_MASS_DIVIDERS = [40.0, 60.0, 80.0, 100.0, 160.0, 220.0, 280.0, 340.0, 400.0, 460.0, 520.0]
 
 
-class AverageType(str, Enum):
+class AverageType(StrEnum):
     BELOW_AVERAGE = "BELOW_AVERAGE"
     AVERAGE = "AVERAGE"
     ABOVE_AVERAGE = "ABOVE_AVERAGE"
     MINIMUM = "MINIMUM"  # unused
 
 
-class BodyFatPercentIndicator(str, Enum):
+class BodyFatPercentIndicator(StrEnum):
     NO_INDICATOR = "NO_INDICATOR"
     MINIMUM_BODY_FAT = "MINIMUM_BODY_FAT"  # unused
     LOW_BODY_FAT = "LOW_BODY_FAT"  # unused
@@ -31,11 +32,6 @@ class BodyFatPercentIndicator(str, Enum):
     OBESE_BODY_FAT = "OBESE_BODY_FAT"  # unused
 
 
-class Gender(str, Enum):
-    MALE = "M"
-    FEMALE = "F"
-
-
 def get_percent_body_fat_descriptor(
     percent_body_fat: float, body_fat_percent_dividers: list[float]
 ) -> BodyFatPercentIndicator:
@@ -61,8 +57,8 @@ def get_relative_descriptor(in_body_value: float, in_body_dividers: list[float])
     return AverageType.ABOVE_AVERAGE
 
 
-def get_body_fat_percent_dividers(age: int, gender: Gender) -> list[float]:
-    if gender == Gender.MALE:
+def get_body_fat_percent_dividers(age: int, gender: Literal["M", "F"]) -> list[float]:
+    if gender == "M":
         return get_body_fat_percent_dividers_male(age)
 
     return get_body_fat_percent_dividers_female(age)
@@ -166,13 +162,15 @@ class ExtraCellularWaterOverTotalBodyWater(OtfItemBase):
 
 
 class BodyCompositionData(OtfItemBase):
+    # NOTE: weight is hardcoded to be pounds here, regardless of the unit shown in the member details
+
     member_uuid: str = Field(..., alias="memberUUId")
-    member_id: str = Field(..., alias="memberId")
+    member_id: str | int = Field(..., alias="memberId")
     scan_result_uuid: str = Field(..., alias="scanResultUUId")
-    inbody_id: str = Field(..., alias="id", exclude=True, description="InBody ID, same as email address")
+    inbody_id: str = Field(..., alias="id", exclude=True, repr=False, description="InBody ID, same as email address")
     email: str
     height: str = Field(..., description="Height in cm")
-    gender: Gender
+    gender: Literal["M", "F"]
     age: int
     scan_datetime: datetime = Field(..., alias="testDatetime")
     provided_weight: float = Field(
@@ -193,44 +191,47 @@ class BodyCompositionData(OtfItemBase):
     in_body_type: str = Field(..., alias="inBodyType")
 
     # excluded because they are only useful for end result of calculations
-    body_fat_mass_dividers: list[float] = Field(..., alias="bfmGraphScale", exclude=True)
-    body_fat_mass_plot_point: float = Field(..., alias="pfatnew", exclude=True)
-    skeletal_muscle_mass_dividers: list[float] = Field(..., alias="smmGraphScale", exclude=True)
-    skeletal_muscle_mass_plot_point: float = Field(..., alias="psmm", exclude=True)
-    weight_dividers: list[float] = Field(..., alias="wtGraphScale", exclude=True)
-    weight_plot_point: float = Field(..., alias="pwt", exclude=True)
+    body_fat_mass_dividers: list[float] = Field(..., alias="bfmGraphScale", exclude=True, repr=False)
+    body_fat_mass_plot_point: float = Field(..., alias="pfatnew", exclude=True, repr=False)
+    skeletal_muscle_mass_dividers: list[float] = Field(..., alias="smmGraphScale", exclude=True, repr=False)
+    skeletal_muscle_mass_plot_point: float = Field(..., alias="psmm", exclude=True, repr=False)
+    weight_dividers: list[float] = Field(..., alias="wtGraphScale", exclude=True, repr=False)
+    weight_plot_point: float = Field(..., alias="pwt", exclude=True, repr=False)
 
     # excluded due to 0 values
-    body_fat_mass_details: BodyFatMass = Field(..., exclude=True)
-    body_fat_mass_percent_details: BodyFatMassPercent = Field(..., exclude=True)
-    total_body_weight_details: TotalBodyWeight = Field(..., exclude=True)
-    intra_cellular_water_details: IntraCellularWater = Field(..., exclude=True)
-    extra_cellular_water_details: ExtraCellularWater = Field(..., exclude=True)
-    extra_cellular_water_over_total_body_water_details: ExtraCellularWaterOverTotalBodyWater = Field(..., exclude=True)
-    visceral_fat_level: float = Field(..., alias="vfl", exclude=True)
-    visceral_fat_area: float = Field(..., alias="vfa", exclude=True)
-    body_comp_measurement: float = Field(..., alias="bcm", exclude=True)
-    total_body_weight_over_lean_body_mass: float = Field(..., alias="tbwOverLBM", exclude=True)
-    intracellular_water: float = Field(..., alias="icw", exclude=True)
-    extracellular_water: float = Field(..., alias="ecw", exclude=True)
-    lean_body_mass_control: float = Field(..., alias="lbmControl", exclude=True)
+    body_fat_mass_details: BodyFatMass = Field(..., exclude=True, repr=False)
+    body_fat_mass_percent_details: BodyFatMassPercent = Field(..., exclude=True, repr=False)
+    total_body_weight_details: TotalBodyWeight = Field(..., exclude=True, repr=False)
+    intra_cellular_water_details: IntraCellularWater = Field(..., exclude=True, repr=False)
+    extra_cellular_water_details: ExtraCellularWater = Field(..., exclude=True, repr=False)
+    extra_cellular_water_over_total_body_water_details: ExtraCellularWaterOverTotalBodyWater = Field(
+        ..., exclude=True, repr=False
+    )
+    visceral_fat_level: float = Field(..., alias="vfl", exclude=True, repr=False)
+    visceral_fat_area: float = Field(..., alias="vfa", exclude=True, repr=False)
+    body_comp_measurement: float = Field(..., alias="bcm", exclude=True, repr=False)
+    total_body_weight_over_lean_body_mass: float = Field(..., alias="tbwOverLBM", exclude=True, repr=False)
+    intracellular_water: float = Field(..., alias="icw", exclude=True, repr=False)
+    extracellular_water: float = Field(..., alias="ecw", exclude=True, repr=False)
+    lean_body_mass_control: float = Field(..., alias="lbmControl", exclude=True, repr=False)
 
     def __init__(self, **data):
-        # populate child models
-        child_model_dict = {
-            k: v.annotation
-            for k, v in self.model_fields.items()
-            if inspect.isclass(v.annotation) and issubclass(v.annotation, BaseModel)
+        # Convert the nested dictionaries to the appropriate classes
+        attr_to_class_map = {
+            "lean_body_mass_details": LeanBodyMass,
+            "lean_body_mass_percent_details": LeanBodyMassPercent,
+            "body_fat_mass_details": BodyFatMass,
+            "body_fat_mass_percent_details": BodyFatMassPercent,
+            "total_body_weight_details": TotalBodyWeight,
+            "intra_cellular_water_details": IntraCellularWater,
+            "extra_cellular_water_details": ExtraCellularWater,
+            "extra_cellular_water_over_total_body_water_details": ExtraCellularWaterOverTotalBodyWater,
         }
-        for k, v in child_model_dict.items():
-            data[k] = v(**data)
 
-        super().__init__(**data)
+        for attr, cls in attr_to_class_map.items():
+            data[attr] = cls(**data)
 
-    @field_validator("member_id", mode="before")
-    @classmethod
-    def int_to_str(cls, v: int):
-        return str(v)
+        super().__init__(**data)
 
     @field_validator("skeletal_muscle_mass_dividers", "weight_dividers", "body_fat_mass_dividers", mode="before")
     @classmethod
@@ -289,7 +290,3 @@ class BodyCompositionData(OtfItemBase):
         return get_percent_body_fat_descriptor(
             self.percent_body_fat, get_body_fat_percent_dividers(self.age, self.gender)
         )
-
-
-class BodyCompositionList(OtfItemBase):
-    data: list[BodyCompositionData]

otf_api/models/bookings.py

@@ -1,119 +1,95 @@
-from collections.abc import Hashable
 from datetime import datetime
-from typing import Any
 
 from pydantic import Field
 
 from otf_api.models.base import OtfItemBase
-from otf_api.models.enums import BookingStatus, StudioStatus
-from otf_api.models.mixins import OtfClassTimeMixin
-
-
-class Location(OtfItemBase):
-    address_one: str | None = Field(None, alias="address1")
-    address_two: str | None = Field(alias="address2")
-    city: str | None = None
-    country: str | None = None
-    distance: float | None = None
-    location_name: str | None = Field(None, alias="locationName")
-    latitude: float | None = Field(None, alias="latitude")
-    longitude: float | None = Field(None, alias="longitude")
-    phone_number: str | None = Field(None, alias="phone")
-    postal_code: str | None = Field(None, alias="postalCode")
-    state: str | None = None
+from otf_api.models.enums import BookingStatus
+from otf_api.models.studio_detail import StudioDetail
 
 
 class Coach(OtfItemBase):
     coach_uuid: str = Field(alias="coachUUId")
-    name: str
     first_name: str | None = Field(None, alias="firstName")
     last_name: str | None = Field(None, alias="lastName")
-    image_url: str | None = Field(None, alias="imageUrl", exclude=True)
-    profile_picture_url: str | None = Field(None, alias="profilePictureUrl", exclude=True)
-
-
-class StudioLocation(OtfItemBase):
-    latitude: float | None = Field(None, alias="latitude")
-    longitude: float | None = Field(None, alias="longitude")
-    phone_number: str | None = Field(None, alias="phoneNumber")
-    physical_city: str | None = Field(None, alias="physicalCity")
-    physical_address: str | None = Field(None, alias="physicalAddress")
-    physical_address2: str | None = Field(None, alias="physicalAddress2")
-    physical_state: str | None = Field(None, alias="physicalState")
-    physical_postal_code: str | None = Field(None, alias="physicalPostalCode")
-    physical_region: str | None = Field(None, alias="physicalRegion", exclude=True)
-    physical_country_id: int | None = Field(None, alias="physicalCountryId", exclude=True)
-    physical_country: str | None = Field(None, alias="physicalCountry")
-    country: dict[Hashable, Any] | None = Field(None, alias="country", exclude=True)
-
-
-class Studio(OtfItemBase):
-    studio_uuid: str = Field(alias="studioUUId")
-    studio_name: str = Field(alias="studioName")
-    studio_id: int = Field(alias="studioId")
-    description: str | None = None
-    contact_email: str | None = Field(None, alias="contactEmail", exclude=True)
-    status: StudioStatus | None = None
-    logo_url: str | None = Field(None, alias="logoUrl", exclude=True)
-    time_zone: str = Field(alias="timeZone")
-    mbo_studio_id: int | None = Field(None, alias="mboStudioId", exclude=True)
-    allows_cr_waitlist: bool | None = Field(None, alias="allowsCRWaitlist")
-    cr_waitlist_flag_last_updated: datetime | None = Field(None, alias="crWaitlistFlagLastUpdated", exclude=True)
-    studio_location: StudioLocation | None = Field(None, alias="studioLocation", exclude=True)
-
-
-class OtfClass(OtfItemBase, OtfClassTimeMixin):
+
+    # unused fields
+    name: str = Field(exclude=True, repr=False)
+
+    @property
+    def full_name(self) -> str:
+        return f"{self.first_name} {self.last_name}"
+
+
+class OtfClass(OtfItemBase):
     class_uuid: str = Field(alias="classUUId")
     name: str
-    description: str | None = Field(None, exclude=True)
-    starts_at_local: datetime = Field(alias="startDateTime")
-    ends_at_local: datetime = Field(alias="endDateTime")
+    starts_at: datetime = Field(alias="startDateTime", description="Start time in local timezone")
+    ends_at: datetime = Field(alias="endDateTime", description="End time in local timezone")
     is_available: bool = Field(alias="isAvailable")
     is_cancelled: bool = Field(alias="isCancelled")
-    program_name: str | None = Field(None, alias="programName")
-    coach_id: int | None = Field(None, alias="coachId")
-    studio: Studio
+    studio: StudioDetail
     coach: Coach
-    location: Location | None = None
-    virtual_class: bool | None = Field(None, alias="virtualClass")
 
-
-class Member(OtfItemBase):
-    member_uuid: str = Field(alias="memberUUId")
-    first_name: str = Field(alias="firstName")
-    last_name: str = Field(alias="lastName")
-    email: str | None = None
-    phone_number: str | None = Field(None, alias="phoneNumber")
-    gender: str | None = None
-    cc_last_4: str | None = Field(None, alias="ccLast4", exclude=True)
+    # unused fields
+    coach_id: int | None = Field(None, alias="coachId", exclude=True, repr=False, description="Not used by API")
+    description: str | None = Field(None, exclude=True, repr=False)
+    program_name: str | None = Field(None, alias="programName", exclude=True, repr=False)
+    virtual_class: bool | None = Field(None, alias="virtualClass", exclude=True, repr=False)
 
 
 class Booking(OtfItemBase):
-    class_booking_id: int = Field(alias="classBookingId")
-    class_booking_uuid: str = Field(alias="classBookingUUId", description="ID used to cancel the booking")
-    studio_id: int = Field(alias="studioId")
-    class_id: int = Field(alias="classId")
+    booking_uuid: str = Field(alias="classBookingUUId", description="ID used to cancel the booking")
     is_intro: bool = Field(alias="isIntro")
-    member_id: int = Field(alias="memberId")
-    mbo_member_id: str | None = Field(None, alias="mboMemberId", exclude=True)
-    mbo_class_id: int | None = Field(None, alias="mboClassId", exclude=True)
-    mbo_visit_id: int | None = Field(None, alias="mboVisitId", exclude=True)
-    mbo_waitlist_entry_id: int | None = Field(None, alias="mboWaitlistEntryId", exclude=True)
-    mbo_sync_message: str | None = Field(None, alias="mboSyncMessage", exclude=True)
     status: BookingStatus
     booked_date: datetime | None = Field(None, alias="bookedDate")
     checked_in_date: datetime | None = Field(None, alias="checkedInDate")
     cancelled_date: datetime | None = Field(None, alias="cancelledDate")
-    created_by: str = Field(alias="createdBy", exclude=True)
     created_date: datetime = Field(alias="createdDate")
-    updated_by: str = Field(alias="updatedBy", exclude=True)
     updated_date: datetime = Field(alias="updatedDate")
     is_deleted: bool = Field(alias="isDeleted")
-    member: Member | None = Field(None, exclude=True)
     waitlist_position: int | None = Field(None, alias="waitlistPosition")
     otf_class: OtfClass = Field(alias="class")
     is_home_studio: bool | None = Field(None, description="Custom helper field to determine if at home studio")
 
-
-class BookingList(OtfItemBase):
-    bookings: list[Booking]
+    # unused fields
+    class_booking_id: int = Field(alias="classBookingId", exclude=True, repr=False, description="Not used by API")
+    class_id: int = Field(alias="classId", exclude=True, repr=False, description="Not used by API")
+    created_by: str = Field(alias="createdBy", exclude=True, repr=False)
+    mbo_class_id: int | None = Field(None, alias="mboClassId", exclude=True, repr=False, description="MindBody attr")
+    mbo_member_id: str | None = Field(None, alias="mboMemberId", exclude=True, repr=False, description="MindBody attr")
+    mbo_sync_message: str | None = Field(
+        None, alias="mboSyncMessage", exclude=True, repr=False, description="MindBody attr"
+    )
+    mbo_visit_id: int | None = Field(None, alias="mboVisitId", exclude=True, repr=False, description="MindBody attr")
+    mbo_waitlist_entry_id: int | None = Field(None, alias="mboWaitlistEntryId", exclude=True, repr=False)
+    member_id: int = Field(alias="memberId", exclude=True, repr=False, description="Not used by API")
+    studio_id: int = Field(alias="studioId", exclude=True, repr=False, description="Not used by API")
+    updated_by: str = Field(alias="updatedBy", exclude=True, repr=False)
+
+    @property
+    def studio_uuid(self) -> str:
+        """Shortcut to get the studio UUID"""
+        return self.otf_class.studio.studio_uuid
+
+    @property
+    def class_uuid(self) -> str:
+        """Shortcut to get the class UUID"""
+        return self.otf_class.class_uuid
+
+    @property
+    def starts_at(self) -> datetime:
+        """Shortcut to get the class start time"""
+        return self.otf_class.starts_at
+
+    @property
+    def ends_at(self) -> datetime:
+        """Shortcut to get the class end time"""
+        return self.otf_class.ends_at
+
+    def __str__(self) -> str:
+        starts_at_str = self.otf_class.starts_at.strftime("%a %b %d, %I:%M %p")
+        class_name = self.otf_class.name
+        coach_name = self.otf_class.coach.name
+        booked_str = self.status.value
+
+        return f"Booking: {starts_at_str} {class_name} - {coach_name} ({booked_str})"

otf_api/models/challenge_tracker_content.py

@@ -1,38 +1,59 @@
+"""
+These models represent the data returned by the challenge tracker endpoint.
+
+I believe these are used by the app to populate the list of challenges, programs,
+and benchmarks that a member can compete in.
+
+The actual data for *your* participation in these challenges is returned by a different
+endpoint.
+"""
+
 from pydantic import Field
 
 from otf_api.models.base import OtfItemBase
+from otf_api.models.enums import ChallengeCategory, EquipmentType
 
 
 class Year(OtfItemBase):
-    year: str = Field(..., alias="Year")
-    is_participated: bool = Field(..., alias="IsParticipated")
-    in_progress: bool = Field(..., alias="InProgress")
+    year: int | None = Field(None, alias="Year")
+    is_participated: bool | None = Field(None, alias="IsParticipated")
+    in_progress: bool | None = Field(None, alias="InProgress")
 
 
 class Program(OtfItemBase):
-    challenge_category_id: int = Field(..., alias="ChallengeCategoryId")
-    challenge_sub_category_id: int = Field(..., alias="ChallengeSubCategoryId")
-    challenge_name: str = Field(..., alias="ChallengeName")
-    years: list[Year] = Field(..., alias="Years")
-    logo_url: str = Field(..., alias="LogoUrl")
+    """A program represents multi-day/week challenges that members can participate in."""
+
+    # NOTE: These ones do seem to match the ChallengeType enums in the OTF app.
+    # Leaving them as int for now though in case older data or other user's
+    # data doesn't match up.
+    challenge_category_id: int | None = Field(None, alias="ChallengeCategoryId")
+    challenge_sub_category_id: int | None = Field(None, alias="ChallengeSubCategoryId")
+    challenge_name: str | None = Field(None, alias="ChallengeName")
+    years: list[Year] = Field(default_factory=list, alias="Years")
 
 
 class Challenge(OtfItemBase):
-    challenge_category_id: int = Field(..., alias="ChallengeCategoryId")
-    challenge_sub_category_id: int = Field(..., alias="ChallengeSubCategoryId")
-    challenge_name: str = Field(..., alias="ChallengeName")
-    years: list[Year] = Field(..., alias="Years")
-    logo_url: str = Field(..., alias="LogoUrl")
+    """A challenge represents a single day or event that members can participate in."""
+
+    # NOTE: The challenge category/subcategory ids here do not seem to be at
+    # all related to the ChallengeType enums or the few SubCategory enums I've
+    # been able to puzzle out. I haven't been able to link them to any code
+    # in the OTF app. Due to that, they are being excluded from the model for now.
+    challenge_category_id: ChallengeCategory | None = Field(None, alias="ChallengeCategoryId")
+    challenge_sub_category_id: int | None = Field(None, alias="ChallengeSubCategoryId")
+    challenge_name: str | None = Field(None, alias="ChallengeName")
+    years: list[Year] = Field(default_factory=list, alias="Years")
 
 
 class Benchmark(OtfItemBase):
-    equipment_id: int = Field(..., alias="EquipmentId")
-    equipment_name: str = Field(..., alias="EquipmentName")
-    years: list[Year] = Field(..., alias="Years")
-    logo_url: str = Field(..., alias="LogoUrl")
+    """A benchmark represents a specific workout that members can participate in."""
+
+    equipment_id: EquipmentType | None = Field(None, alias="EquipmentId")
+    equipment_name: str | None = Field(None, alias="EquipmentName")
+    years: list[Year] = Field(default_factory=list, alias="Years")
 
 
-class ChallengeTrackerContent(OtfItemBase):
-    programs: list[Program] = Field(..., alias="Programs")
-    challenges: list[Challenge] = Field(..., alias="Challenges")
-    benchmarks: list[Benchmark] = Field(..., alias="Benchmarks")
+class ChallengeTracker(OtfItemBase):
+    programs: list[Program] = Field(default_factory=list, alias="Programs")
+    challenges: list[Challenge] = Field(default_factory=list, alias="Challenges")
+    benchmarks: list[Benchmark] = Field(default_factory=list, alias="Benchmarks")