otf-api 0.6.1__tar.gz → 0.6.3__tar.gz

{otf_api-0.6.1 → otf_api-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otf-api
-Version: 0.6.1
+Version: 0.6.3
 Summary: Python OrangeTheory Fitness API Client
 License: MIT
 Author: Jessica Smith

{otf_api-0.6.1 → otf_api-0.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "otf-api"
-version = "0.6.1"
+version = "0.6.3"
 description = "Python OrangeTheory Fitness API Client"
 authors = ["Jessica Smith <j.smith.git1@gmail.com>"]
 license = "MIT"

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/__init__.py

@@ -6,7 +6,7 @@ from loguru import logger
 from .api import Otf
 from .auth import OtfUser
 
-__version__ = "0.6.1"
+__version__ = "0.6.3"
 
 
 __all__ = ["Otf", "OtfUser"]

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/__init__.py

@@ -11,7 +11,6 @@ from .responses import (
     DoW,
     EquipmentType,
     FavoriteStudioList,
-    HistoryClassStatus,
     LatestAgreement,
     MemberDetail,
     MemberMembership,
@@ -45,7 +44,6 @@ __all__ = [
     "DoW",
     "EquipmentType",
     "FavoriteStudioList",
-    "HistoryClassStatus",
     "LatestAgreement",
     "MemberDetail",
     "MemberMembership",

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/__init__.py

@@ -5,7 +5,7 @@ from .cancel_booking import CancelBooking
 from .challenge_tracker_content import ChallengeTrackerContent
 from .challenge_tracker_detail import ChallengeTrackerDetailList
 from .classes import ClassType, DoW, OtfClassList
-from .enums import ChallengeType, EquipmentType, HistoryClassStatus
+from .enums import ChallengeType, EquipmentType
 from .favorite_studios import FavoriteStudioList
 from .latest_agreement import LatestAgreement
 from .lifetime_stats import StatsResponse, StatsTime
@@ -35,7 +35,6 @@ __all__ = [
     "DoW",
     "EquipmentType",
     "FavoriteStudioList",
-    "HistoryClassStatus",
     "LatestAgreement",
     "MemberDetail",
     "MemberMembership",

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/body_composition_list.py

@@ -5,6 +5,8 @@ from enum import Enum
 import pint
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
+from otf_api.models.base import OtfItemBase, OtfListBase
+
 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]
@@ -98,7 +100,7 @@ def get_body_fat_percent_dividers_female(age: int) -> list[float]:
             return [0.0, 0.0, 0.0, 0.0]
 
 
-class LeanBodyMass(BaseModel):
+class LeanBodyMass(OtfItemBase):
     model_config: ConfigDict = ConfigDict(extra="ignore")
     left_arm: float = Field(..., alias="lbmOfLeftArm")
     left_leg: float = Field(..., alias="lbmOfLeftLeg")
@@ -107,7 +109,7 @@ class LeanBodyMass(BaseModel):
     trunk: float = Field(..., alias="lbmOfTrunk")
 
 
-class LeanBodyMassPercent(BaseModel):
+class LeanBodyMassPercent(OtfItemBase):
     model_config: ConfigDict = ConfigDict(extra="ignore")
     left_arm: float = Field(..., alias="lbmPercentOfLeftArm")
     left_leg: float = Field(..., alias="lbmPercentOfLeftLeg")
@@ -116,7 +118,7 @@ class LeanBodyMassPercent(BaseModel):
     trunk: float = Field(..., alias="lbmPercentOfTrunk")
 
 
-class BodyFatMass(BaseModel):
+class BodyFatMass(OtfItemBase):
     model_config: ConfigDict = ConfigDict(extra="ignore")
     control: float = Field(..., alias="bfmControl")
     left_arm: float = Field(..., alias="bfmOfLeftArm")
@@ -126,7 +128,7 @@ class BodyFatMass(BaseModel):
     trunk: float = Field(..., alias="bfmOfTrunk")
 
 
-class BodyFatMassPercent(BaseModel):
+class BodyFatMassPercent(OtfItemBase):
     model_config: ConfigDict = ConfigDict(extra="ignore")
     left_arm: float = Field(..., alias="bfmPercentOfLeftArm")
     left_leg: float = Field(..., alias="bfmPercentOfLeftLeg")
@@ -135,7 +137,7 @@ class BodyFatMassPercent(BaseModel):
     trunk: float = Field(..., alias="bfmPercentOfTrunk")
 
 
-class TotalBodyWeight(BaseModel):
+class TotalBodyWeight(OtfItemBase):
     model_config: ConfigDict = ConfigDict(extra="ignore")
     right_arm: float = Field(..., alias="tbwOfRightArm")
     left_arm: float = Field(..., alias="tbwOfLeftArm")
@@ -144,7 +146,7 @@ class TotalBodyWeight(BaseModel):
     left_leg: float = Field(..., alias="tbwOfLeftLeg")
 
 
-class IntraCellularWater(BaseModel):
+class IntraCellularWater(OtfItemBase):
     model_config: ConfigDict = ConfigDict(extra="ignore")
     right_arm: float = Field(..., alias="icwOfRightArm")
     left_arm: float = Field(..., alias="icwOfLeftArm")
@@ -153,7 +155,7 @@ class IntraCellularWater(BaseModel):
     left_leg: float = Field(..., alias="icwOfLeftLeg")
 
 
-class ExtraCellularWater(BaseModel):
+class ExtraCellularWater(OtfItemBase):
     model_config: ConfigDict = ConfigDict(extra="ignore")
     right_arm: float = Field(..., alias="ecwOfRightArm")
     left_arm: float = Field(..., alias="ecwOfLeftArm")
@@ -162,7 +164,7 @@ class ExtraCellularWater(BaseModel):
     left_leg: float = Field(..., alias="ecwOfLeftLeg")
 
 
-class ExtraCellularWaterOverTotalBodyWater(BaseModel):
+class ExtraCellularWaterOverTotalBodyWater(OtfItemBase):
     model_config: ConfigDict = ConfigDict(extra="ignore")
     right_arm: float = Field(..., alias="ecwOverTBWOfRightArm")
     left_arm: float = Field(..., alias="ecwOverTBWOfLeftArm")
@@ -171,7 +173,7 @@ class ExtraCellularWaterOverTotalBodyWater(BaseModel):
     left_leg: float = Field(..., alias="ecwOverTBWOfLeftLeg")
 
 
-class BodyCompositionData(BaseModel):
+class BodyCompositionData(OtfItemBase):
     member_uuid: str = Field(..., alias="memberUUId")
     member_id: str = Field(..., alias="memberId")
     scan_result_uuid: str = Field(..., alias="scanResultUUId")
@@ -300,5 +302,5 @@ class BodyCompositionData(BaseModel):
         )
 
 
-class BodyCompositionList(BaseModel):
+class BodyCompositionList(OtfListBase):
     data: list[BodyCompositionData]

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/book_class.py

@@ -1,19 +1,21 @@
 from datetime import datetime
 from typing import Any
 
-from pydantic import BaseModel, Field
+from pydantic import Field
 
+from otf_api.models.base import OtfItemBase
 
-class MemberProfile(BaseModel):
+
+class MemberProfile(OtfItemBase):
     is_latest_agreement_signed: bool = Field(..., alias="isLatestAgreementSigned")
 
 
-class StudioProfiles(BaseModel):
+class StudioProfiles(OtfItemBase):
     studio_id: int = Field(..., alias="studioId")
     is_franchise_agreement_enabled: int = Field(..., alias="isFranchiseAgreementEnabled")
 
 
-class HomeStudio(BaseModel):
+class HomeStudio(OtfItemBase):
     studio_uuid: str = Field(..., alias="studioUUId")
     studio_name: str = Field(..., alias="studioName")
     description: str
@@ -28,7 +30,7 @@ class HomeStudio(BaseModel):
     studio_profiles: StudioProfiles = Field(..., alias="studioProfiles")
 
 
-class MemberService(BaseModel):
+class MemberService(OtfItemBase):
     member_service_id: int = Field(..., alias="memberServiceId")
     member_service_uuid: str = Field(..., alias="memberServiceUUId")
     service_name: str = Field(..., alias="serviceName")
@@ -49,13 +51,13 @@ class MemberService(BaseModel):
     is_deleted: bool = Field(..., alias="isDeleted")
 
 
-class ServiceItem(BaseModel):
+class ServiceItem(OtfItemBase):
     service_id: int = Field(..., alias="serviceId")
     name: str
     member_service: MemberService = Field(..., alias="MemberService")
 
 
-class Member(BaseModel):
+class Member(OtfItemBase):
     member_id: int = Field(..., alias="memberId")
     member_uuid: str = Field(..., alias="memberUUId")
     cognito_id: str = Field(..., alias="cognitoId")
@@ -68,16 +70,16 @@ class Member(BaseModel):
     first_name: str = Field(..., alias="firstName")
     last_name: str = Field(..., alias="lastName")
     email: str
-    profile_picture_url: None = Field(..., alias="profilePictureUrl")
+    profile_picture_url: str | None = Field(..., alias="profilePictureUrl")
     alternate_emails: None = Field(..., alias="alternateEmails")
-    address_line1: None = Field(..., alias="addressLine1")
-    address_line2: None = Field(..., alias="addressLine2")
-    city: None
-    state: None
-    postal_code: None = Field(..., alias="postalCode")
+    address_line1: str | None = Field(..., alias="addressLine1")
+    address_line2: str | None = Field(..., alias="addressLine2")
+    city: str | None
+    state: str | None
+    postal_code: str | None = Field(..., alias="postalCode")
     phone_number: str = Field(..., alias="phoneNumber")
     home_phone: str = Field(..., alias="homePhone")
-    work_phone: None = Field(..., alias="workPhone")
+    work_phone: str | None = Field(..., alias="workPhone")
     phone_type: None = Field(..., alias="phoneType")
     birth_day: str = Field(..., alias="birthDay")
     cc_last4: str = Field(..., alias="ccLast4")
@@ -107,7 +109,7 @@ class Member(BaseModel):
     notes: str
 
 
-class Studio(BaseModel):
+class Studio(OtfItemBase):
     studio_uuid: str = Field(..., alias="studioUUId")
     studio_name: str = Field(..., alias="studioName")
     description: str
@@ -121,12 +123,12 @@ class Studio(BaseModel):
     cr_waitlist_flag_last_updated: datetime = Field(..., alias="crWaitlistFlagLastUpdated")
 
 
-class Location(BaseModel):
+class Location(OtfItemBase):
     location_id: int = Field(..., alias="locationId")
     location_uuid: str = Field(..., alias="locationUUId")
 
 
-class Coach(BaseModel):
+class Coach(OtfItemBase):
     coach_uuid: str = Field(..., alias="coachUUId")
     first_name: str = Field(..., alias="firstName")
     last_name: str = Field(..., alias="lastName")
@@ -134,7 +136,7 @@ class Coach(BaseModel):
     name: str
 
 
-class Class(BaseModel):
+class Class(OtfItemBase):
     class_id: int = Field(..., alias="classId")
     class_uuid: str = Field(..., alias="classUUId")
     mbo_studio_id: int = Field(..., alias="mboStudioId")
@@ -175,16 +177,16 @@ class Class(BaseModel):
     attributes: dict[str, Any]
 
 
-class Class1(BaseModel):
+class Class1(OtfItemBase):
     mbo_studio_id: int = Field(..., alias="mboStudioId")
     studio_uuid: str = Field(..., alias="studioUUId")
 
 
-class CustomData(BaseModel):
+class CustomData(OtfItemBase):
     otf_class: Class1 = Field(..., alias="class")
 
 
-class SavedBooking(BaseModel):
+class SavedBooking(OtfItemBase):
     class_booking_id: int = Field(..., alias="classBookingId")
     class_booking_uuid: str = Field(..., alias="classBookingUUId")
     studio_id: int = Field(..., alias="studioId")
@@ -193,13 +195,13 @@ class SavedBooking(BaseModel):
     member_id: int = Field(..., alias="memberId")
     mbo_member_id: str = Field(..., alias="mboMemberId")
     mbo_class_id: int = Field(..., alias="mboClassId")
-    mbo_visit_id: None = Field(..., alias="mboVisitId")
-    mbo_waitlist_entry_id: None = Field(..., alias="mboWaitlistEntryId")
-    mbo_sync_message: None = Field(..., alias="mboSyncMessage")
+    mbo_visit_id: int | None = Field(..., alias="mboVisitId")
+    mbo_waitlist_entry_id: int | None = Field(..., alias="mboWaitlistEntryId")
+    mbo_sync_message: str | None = Field(..., alias="mboSyncMessage")
     status: str
     booked_date: datetime = Field(..., alias="bookedDate")
-    checked_in_date: None = Field(..., alias="checkedInDate")
-    cancelled_date: None = Field(..., alias="cancelledDate")
+    checked_in_date: datetime | None = Field(..., alias="checkedInDate")
+    cancelled_date: datetime | None = Field(..., alias="cancelledDate")
     created_by: str | None = Field(None, alias="createdBy")
     created_date: datetime | None = Field(None, alias="createdDate")
     updated_by: str | None = Field(None, alias="updatedBy")
@@ -211,19 +213,19 @@ class SavedBooking(BaseModel):
     attributes: dict[str, Any]
 
 
-class FieldModel(BaseModel):
+class FieldModel(OtfItemBase):
     xsi_nil: str = Field(..., alias="xsiNil")
 
 
-class FacilitySquareFeet(BaseModel):
+class FacilitySquareFeet(OtfItemBase):
     field_: FieldModel
 
 
-class TreatmentRooms(BaseModel):
+class TreatmentRooms(OtfItemBase):
     field_: FieldModel
 
 
-class Location1(BaseModel):
+class Location1(OtfItemBase):
     site_id: str | Any = Field(..., alias="siteId")
     business_description: str | Any = Field(..., alias="businessDescription")
     additional_image_ur_ls: str | Any = Field(..., alias="additionalImageUrLs")
@@ -247,38 +249,38 @@ class Location1(BaseModel):
     longitude: str
 
 
-class MaxCapacity(BaseModel):
+class MaxCapacity(OtfItemBase):
     field_: FieldModel | Any
 
 
-class WebCapacity(BaseModel):
+class WebCapacity(OtfItemBase):
     field_: FieldModel | Any
 
 
-class TotalBookedWaitlist(BaseModel):
+class TotalBookedWaitlist(OtfItemBase):
     field_: FieldModel | Any
 
 
-class WebBooked(BaseModel):
+class WebBooked(OtfItemBase):
     field_: FieldModel | Any
 
 
-class SemesterId(BaseModel):
+class SemesterId(OtfItemBase):
     field_: FieldModel | Any
 
 
-class Program(BaseModel):
+class Program(OtfItemBase):
     id: str
     name: str
     schedule_type: str = Field(..., alias="scheduleType")
     cancel_offset: str = Field(..., alias="cancelOffset")
 
 
-class DefaultTimeLength(BaseModel):
+class DefaultTimeLength(OtfItemBase):
     field_: FieldModel
 
 
-class SessionType(BaseModel):
+class SessionType(OtfItemBase):
     default_time_length: DefaultTimeLength = Field(..., alias="defaultTimeLength")
     program_id: str = Field(..., alias="programId")
     num_deducted: str = Field(..., alias="numDeducted")
@@ -289,7 +291,7 @@ class SessionType(BaseModel):
     available_for_add_on: str = Field(..., alias="availableForAddOn")
 
 
-class ClassDescription(BaseModel):
+class ClassDescription(OtfItemBase):
     id: str
     name: str
     description: str
@@ -300,7 +302,7 @@ class ClassDescription(BaseModel):
     session_type: SessionType = Field(..., alias="sessionType")
 
 
-class Staff(BaseModel):
+class Staff(OtfItemBase):
     email: str
     mobile_phone: str = Field(..., alias="mobilePhone")
     state: str
@@ -318,25 +320,25 @@ class Staff(BaseModel):
     is_male: str = Field(..., alias="isMale")
 
 
-class AgreementDate(BaseModel):
+class AgreementDate(OtfItemBase):
     field_: FieldModel
 
 
-class ReleasedBy(BaseModel):
+class ReleasedBy(OtfItemBase):
     field_: FieldModel
 
 
-class Liability(BaseModel):
+class Liability(OtfItemBase):
     is_released: str = Field(..., alias="isReleased")
     agreement_date: AgreementDate = Field(..., alias="agreementDate")
     released_by: ReleasedBy = Field(..., alias="releasedBy")
 
 
-class FirstAppointmentDate(BaseModel):
+class FirstAppointmentDate(OtfItemBase):
     field_: FieldModel
 
 
-class Client(BaseModel):
+class Client(OtfItemBase):
     notes: str
     mobile_provider: str = Field(..., alias="mobileProvider")
     appointment_gender_preference: str = Field(..., alias="appointmentGenderPreference")
@@ -369,12 +371,12 @@ class Client(BaseModel):
     member_uuid: str = Field(..., alias="memberUUId")
 
 
-class MboClass(BaseModel):
+class MboClass(OtfItemBase):
     class_schedule_id: str = Field(..., alias="classScheduleId")
     location: Location1
     max_capacity: MaxCapacity = Field(..., alias="maxCapacity")
     web_capacity: WebCapacity = Field(..., alias="webCapacity")
-    total_booked: None = Field(..., alias="totalBooked")
+    total_booked: int | None = Field(..., alias="totalBooked")
     total_booked_waitlist: TotalBookedWaitlist = Field(..., alias="totalBookedWaitlist")
     web_booked: WebBooked = Field(..., alias="webBooked")
     semester_id: SemesterId = Field(..., alias="semesterId")
@@ -394,12 +396,12 @@ class MboClass(BaseModel):
     client: Client
 
 
-class MboResponseItem(BaseModel):
+class MboResponseItem(OtfItemBase):
     class_booking_uuid: str | Any = Field(..., alias="classBookingUUId")
     action: str | Any
     otf_class: MboClass | Any = Field(..., alias="class")
 
 
-class BookClass(BaseModel):
+class BookClass(OtfItemBase):
     saved_bookings: list[SavedBooking] = Field(..., alias="savedBookings")
     mbo_response: list[MboResponseItem] = Field(..., alias="mboResponse")

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/bookings.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from enum import Enum
 from typing import ClassVar
 
-from inflection import humanize
 from pydantic import Field
 
 from otf_api.models.base import OtfItemBase, OtfListBase
@@ -17,10 +16,6 @@ class StudioStatus(str, Enum):
     TEMP_CLOSED = "Temporarily Closed"
     PERM_CLOSED = "Permanently Closed"
 
-    @classmethod
-    def all_statuses(cls) -> list[str]:
-        return list(cls.__members__.values())
-
 
 class BookingStatus(str, Enum):
     CheckedIn = "Checked In"
@@ -34,46 +29,6 @@ class BookingStatus(str, Enum):
     CheckinRequested = "Checkin Requested"
     CheckinCancelled = "Checkin Cancelled"
 
-    @classmethod
-    def get_from_key_insensitive(cls, key: str) -> "BookingStatus":
-        lcase_to_actual = {item.lower(): item for item in cls._member_map_}
-        val = cls.__members__.get(lcase_to_actual[key.lower()])
-        if not val:
-            raise ValueError(f"Invalid BookingStatus: {key}")
-        return val
-
-    @classmethod
-    def get_case_insensitive(cls, value: str) -> str:
-        lcase_to_actual = {item.value.lower(): item.value for item in cls}
-        return lcase_to_actual[value.lower()]
-
-    @classmethod
-    def all_statuses(cls) -> list[str]:
-        return list(cls.__members__.values())
-
-
-class BookingStatusCli(str, Enum):
-    """Flipped enum so that the CLI does not have values with spaces"""
-
-    CheckedIn = "CheckedIn"
-    CancelCheckinPending = "CancelCheckinPending"
-    CancelCheckinRequested = "CancelCheckinRequested"
-    Cancelled = "Cancelled"
-    LateCancelled = "LateCancelled"
-    Booked = "Booked"
-    Waitlisted = "Waitlisted"
-    CheckinPending = "CheckinPending"
-    CheckinRequested = "CheckinRequested"
-    CheckinCancelled = "CheckinCancelled"
-
-    @classmethod
-    def to_standard_case_insensitive(cls, key: str) -> BookingStatus:
-        lcase_to_actual = {item.lower(): item for item in cls._member_map_}
-        val = cls.__members__.get(lcase_to_actual[key.lower()])
-        if not val:
-            raise ValueError(f"Invalid BookingStatus: {key}")
-        return BookingStatus(val)
-
     @classmethod
     def get_case_insensitive(cls, value: str) -> str:
         lcase_to_actual = {item.value.lower(): item.value for item in cls}
@@ -162,23 +117,6 @@ class OtfClass(OtfItemBase, OtfClassTimeMixin):
     location: Location
     virtual_class: bool | None = Field(None, alias="virtualClass")
 
-    @classmethod
-    def attr_to_column_header(cls, attr: str) -> str:
-        attr_map = {k: humanize(k) for k in cls.model_fields}
-        overrides = {
-            "day_of_week": "Class DoW",
-            "date": "Class Date",
-            "time": "Class Time",
-            "duration": "Class Duration",
-            "name": "Class Name",
-            "is_home_studio": "Home Studio",
-            "is_booked": "Booked",
-        }
-
-        attr_map.update(overrides)
-
-        return attr_map.get(attr, attr)
-
 
 class Member(OtfItemBase):
     member_uuid: str = Field(alias="memberUUId")
@@ -216,10 +154,6 @@ class Booking(OtfItemBase):
     otf_class: OtfClass = Field(alias="class")
     is_home_studio: bool | None = Field(None, description="Custom helper field to determine if at home studio")
 
-    @property
-    def id_val(self) -> str:
-        return self.class_booking_id
-
 
 class BookingList(OtfListBase):
     collection_field: ClassVar[str] = "bookings"

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/cancel_booking.py

@@ -1,9 +1,11 @@
 from datetime import datetime
 
-from pydantic import BaseModel, Field
+from pydantic import Field
 
+from otf_api.models.base import OtfItemBase
 
-class Studio(BaseModel):
+
+class Studio(OtfItemBase):
     studio_uuid: str = Field(..., alias="studioUUId")
     studio_name: str = Field(..., alias="studioName")
     description: str
@@ -17,7 +19,7 @@ class Studio(BaseModel):
     cr_waitlist_flag_last_updated: datetime = Field(..., alias="crWaitlistFlagLastUpdated")
 
 
-class Coach(BaseModel):
+class Coach(OtfItemBase):
     coach_uuid: str = Field(..., alias="coachUUId")
     name: str
     first_name: str = Field(..., alias="firstName")
@@ -25,7 +27,7 @@ class Coach(BaseModel):
     mbo_coach_id: int = Field(..., alias="mboCoachId")
 
 
-class Class(BaseModel):
+class Class(OtfItemBase):
     class_uuid: str = Field(..., alias="classUUId")
     name: str
     description: str
@@ -40,7 +42,7 @@ class Class(BaseModel):
     coach: Coach
 
 
-class HomeStudio(BaseModel):
+class HomeStudio(OtfItemBase):
     studio_uuid: str = Field(..., alias="studioUUId")
     studio_name: str = Field(..., alias="studioName")
     description: str
@@ -54,7 +56,7 @@ class HomeStudio(BaseModel):
     cr_waitlist_flag_last_updated: datetime = Field(..., alias="crWaitlistFlagLastUpdated")
 
 
-class Member(BaseModel):
+class Member(OtfItemBase):
     member_id: int = Field(..., alias="memberId")
     member_uuid: str = Field(..., alias="memberUUId")
     email: str
@@ -67,7 +69,7 @@ class Member(BaseModel):
     home_studio: HomeStudio = Field(..., alias="homeStudio")
 
 
-class CancelBooking(BaseModel):
+class CancelBooking(OtfItemBase):
     class_booking_id: int = Field(..., alias="classBookingId")
     class_booking_uuid: str = Field(..., alias="classBookingUUId")
     studio_id: int = Field(..., alias="studioId")
@@ -77,11 +79,11 @@ class CancelBooking(BaseModel):
     mbo_member_id: str = Field(..., alias="mboMemberId")
     mbo_class_id: int = Field(..., alias="mboClassId")
     mbo_visit_id: int = Field(..., alias="mboVisitId")
-    mbo_waitlist_entry_id: None = Field(..., alias="mboWaitlistEntryId")
+    mbo_waitlist_entry_id: int | None = Field(..., alias="mboWaitlistEntryId")
     mbo_sync_message: str = Field(..., alias="mboSyncMessage")
     status: str
     booked_date: datetime = Field(..., alias="bookedDate")
-    checked_in_date: None = Field(..., alias="checkedInDate")
+    checked_in_date: datetime | None = Field(..., alias="checkedInDate")
     cancelled_date: datetime = Field(..., alias="cancelledDate")
     created_by: str = Field(..., alias="createdBy")
     created_date: datetime = Field(..., alias="createdDate")

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/challenge_tracker_detail.py

@@ -1,9 +1,9 @@
 from datetime import datetime
-from typing import Any
+from typing import Any, ClassVar
 
 from pydantic import Field
 
-from otf_api.models.base import OtfItemBase
+from otf_api.models.base import OtfItemBase, OtfListBase
 
 
 class MetricEntry(OtfItemBase):
@@ -22,15 +22,15 @@ class BenchmarkHistory(OtfItemBase):
     date_created: datetime = Field(..., alias="DateCreated")
     date_updated: datetime = Field(..., alias="DateUpdated")
     class_time: datetime = Field(..., alias="ClassTime")
-    challenge_sub_category_id: None = Field(..., alias="ChallengeSubCategoryId")
+    challenge_sub_category_id: int | None = Field(..., alias="ChallengeSubCategoryId")
     class_id: int = Field(..., alias="ClassId")
     substitute_id: int | None = Field(..., alias="SubstituteId")
     weight_lbs: int = Field(..., alias="WeightLBS")
     class_name: str = Field(..., alias="ClassName")
     coach_name: str = Field(..., alias="CoachName")
     coach_image_url: str = Field(..., alias="CoachImageUrl")
-    workout_type_id: None = Field(..., alias="WorkoutTypeId")
-    workout_id: None = Field(..., alias="WorkoutId")
+    workout_type_id: int | None = Field(..., alias="WorkoutTypeId")
+    workout_id: int | None = Field(..., alias="WorkoutId")
     linked_challenges: list[Any] = Field(
         ..., alias="LinkedChallenges"
     )  # not sure what this will be, never seen it before
@@ -50,7 +50,7 @@ class ChallengeHistory(OtfItemBase):
 
 class ChallengeTrackerDetail(OtfItemBase):
     challenge_category_id: int = Field(..., alias="ChallengeCategoryId")
-    challenge_sub_category_id: None = Field(..., alias="ChallengeSubCategoryId")
+    challenge_sub_category_id: int | None = Field(..., alias="ChallengeSubCategoryId")
     equipment_id: int = Field(..., alias="EquipmentId")
     equipment_name: str = Field(..., alias="EquipmentName")
     metric_entry: MetricEntry = Field(..., alias="MetricEntry")
@@ -64,5 +64,6 @@ class ChallengeTrackerDetail(OtfItemBase):
     challenge_histories: list[ChallengeHistory] = Field(..., alias="ChallengeHistories")
 
 
-class ChallengeTrackerDetailList(OtfItemBase):
+class ChallengeTrackerDetailList(OtfListBase):
+    collection_field: ClassVar[str] = "details"
     details: list[ChallengeTrackerDetail]

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/classes.py

@@ -18,8 +18,8 @@ class DoW(str, Enum):
     sunday = "sunday"
 
     @classmethod
-    def get_case_insensitive(cls, value: str) -> str:
-        lcase_to_actual = {item.value.lower(): item.value for item in cls}
+    def get_case_insensitive(cls, value: str) -> "DoW":
+        lcase_to_actual = {item.value.lower(): item for item in cls}
         return lcase_to_actual[value.lower()]
 
 
@@ -34,38 +34,12 @@ class ClassType(str, Enum):
     VIP_CLASS = "VIP Class"
     OTHER = "Other"
 
-    @classmethod
-    def all_statuses(cls) -> list[str]:
-        return list(cls.__members__.values())
-
-    @classmethod
-    def get_from_key_insensitive(cls, key: str) -> "ClassType":
-        lcase_to_actual = {item.lower(): item for item in cls._member_map_}
-        val = cls.__members__.get(lcase_to_actual[key.lower()])
-        if not val:
-            raise ValueError(f"Invalid ClassType: {key}")
-        return val
-
     @classmethod
     def get_case_insensitive(cls, value: str) -> str:
         lcase_to_actual = {item.value.lower(): item.value for item in cls}
         return lcase_to_actual[value.lower()]
 
 
-class ClassTypeCli(str, Enum):
-    """Flipped enum so that the CLI does not have values with spaces"""
-
-    ORANGE_60_MIN_2G = "Orange_60_Min_2G"
-    TREAD_50 = "Tread_50"
-    STRENGTH_50 = "Strength_50"
-    ORANGE_3G = "Orange_3G"
-    ORANGE_60_TORNADO = "Orange_60_Tornado"
-    ORANGE_TORNADO = "Orange_Tornado"
-    ORANGE_90_MIN_3G = "Orange_90_Min_3G"
-    VIP_CLASS = "VIP_Class"
-    OTHER = "Other"
-
-
 class Address(OtfItemBase):
     line1: str
     city: str
@@ -163,10 +137,6 @@ class OtfClass(OtfItemBase, OtfClassTimeMixin):
     def has_availability(self) -> bool:
         return not self.full
 
-    @property
-    def id_val(self) -> str:
-        return self.ot_class_uuid
-
     @property
     def day_of_week_enum(self) -> DoW:
         dow = self.starts_at_local.strftime("%A")

otf_api-0.6.3/src/otf_api/models/responses/enums.py

@@ -0,0 +1,23 @@
+from enum import Enum
+
+
+class EquipmentType(int, Enum):
+    Treadmill = 2
+    Strider = 3
+    Rower = 4
+    Bike = 5
+    WeightFloor = 6
+    PowerWalker = 7
+
+
+class ChallengeType(int, Enum):
+    Other = 0
+    DriTri = 2
+    MarathonMonth = 5
+    HellWeek = 52
+    Mayhem = 58
+    TwelveDaysOfFitness = 63
+    Transformation = 64
+    RemixInSix = 65
+    Push = 66
+    BackAtIt = 84

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/favorite_studios.py

@@ -1,8 +1,9 @@
 from datetime import datetime
+from typing import ClassVar
 
 from pydantic import Field
 
-from otf_api.models.base import OtfItemBase
+from otf_api.models.base import OtfItemBase, OtfListBase
 
 
 class Location(OtfItemBase):
@@ -94,7 +95,8 @@ class FavoriteStudio(OtfItemBase):
     studio_location: StudioLocation = Field(..., alias="studioLocation")
 
 
-class FavoriteStudioList(OtfItemBase):
+class FavoriteStudioList(OtfListBase):
+    collection_field: ClassVar[str] = "studios"
     studios: list[FavoriteStudio]
 
     @property

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/lifetime_stats.py

@@ -1,6 +1,8 @@
 from enum import Enum
 
-from pydantic import BaseModel, Field
+from pydantic import Field
+
+from otf_api.models.base import OtfItemBase
 
 
 class StatsTime(str, Enum):
@@ -19,20 +21,20 @@ class StatsType(str, Enum):
     All = "allStats"
 
 
-class OutStudioMixin(BaseModel):
+class OutStudioMixin(OtfItemBase):
     walking_distance: float = Field(..., alias="walkingDistance")
     running_distance: float = Field(..., alias="runningDistance")
     cycling_distance: float = Field(..., alias="cyclingDistance")
 
 
-class InStudioMixin(BaseModel):
+class InStudioMixin(OtfItemBase):
     treadmill_distance: float = Field(..., alias="treadmillDistance")
     treadmill_elevation_gained: float = Field(..., alias="treadmillElevationGained")
     rower_distance: float = Field(..., alias="rowerDistance")
     rower_watt: float = Field(..., alias="rowerWatt")
 
 
-class BaseStatsData(BaseModel):
+class BaseStatsData(OtfItemBase):
     calories: float
     splat_point: float = Field(..., alias="splatPoint")
     total_black_zone: float = Field(..., alias="totalBlackZone")
@@ -56,7 +58,7 @@ class AllStatsData(OutStudioMixin, InStudioMixin, BaseStatsData):
     pass
 
 
-class OutStudioTimeStats(BaseModel):
+class OutStudioTimeStats(OtfItemBase):
     last_year: OutStudioStatsData = Field(..., alias="lastYear")
     this_year: OutStudioStatsData = Field(..., alias="thisYear")
     last_month: OutStudioStatsData = Field(..., alias="lastMonth")
@@ -66,7 +68,7 @@ class OutStudioTimeStats(BaseModel):
     all_time: OutStudioStatsData = Field(..., alias="allTime")
 
 
-class InStudioTimeStats(BaseModel):
+class InStudioTimeStats(OtfItemBase):
     last_year: InStudioStatsData = Field(..., alias="lastYear")
     this_year: InStudioStatsData = Field(..., alias="thisYear")
     last_month: InStudioStatsData = Field(..., alias="lastMonth")
@@ -76,7 +78,7 @@ class InStudioTimeStats(BaseModel):
     all_time: InStudioStatsData = Field(..., alias="allTime")
 
 
-class AllStatsTimeStats(BaseModel):
+class AllStatsTimeStats(OtfItemBase):
     last_year: AllStatsData = Field(..., alias="lastYear")
     this_year: AllStatsData = Field(..., alias="thisYear")
     last_month: AllStatsData = Field(..., alias="lastMonth")
@@ -86,7 +88,7 @@ class AllStatsTimeStats(BaseModel):
     all_time: AllStatsData = Field(..., alias="allTime")
 
 
-class StatsResponse(BaseModel):
+class StatsResponse(OtfItemBase):
     all_stats: AllStatsTimeStats = Field(..., alias="allStats")
     in_studio: InStudioTimeStats = Field(..., alias="inStudio")
     out_studio: OutStudioTimeStats = Field(..., alias="outStudio")

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/member_detail.py

@@ -93,16 +93,16 @@ class MemberDetail(OtfItemBase):
     first_name: str = Field(..., alias="firstName")
     last_name: str = Field(..., alias="lastName")
     email: str
-    profile_picture_url: None = Field(..., alias="profilePictureUrl")
+    profile_picture_url: str | None = Field(..., alias="profilePictureUrl")
     alternate_emails: None = Field(..., alias="alternateEmails")
-    address_line1: None = Field(..., alias="addressLine1")
-    address_line2: None = Field(..., alias="addressLine2")
-    city: None
-    state: None
-    postal_code: None = Field(..., alias="postalCode")
+    address_line1: str | None = Field(..., alias="addressLine1")
+    address_line2: str | None = Field(..., alias="addressLine2")
+    city: str | None
+    state: str | None
+    postal_code: str | None = Field(..., alias="postalCode")
     phone_number: str = Field(..., alias="phoneNumber")
     home_phone: str | None = Field(..., alias="homePhone")
-    work_phone: None = Field(..., alias="workPhone")
+    work_phone: str | None = Field(..., alias="workPhone")
     phone_type: None = Field(..., alias="phoneType")
     birth_day: date | str = Field(..., alias="birthDay")
     cc_last4: str = Field(..., alias="ccLast4")

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/member_purchases.py

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from pydantic import Field
 
-from otf_api.models.base import OtfItemBase
+from otf_api.models.base import OtfItemBase, OtfListBase
 
 
 class Location(OtfItemBase):
@@ -44,7 +44,7 @@ class StudioLocation(OtfItemBase):
     bill_to_country_id: int = Field(..., alias="billToCountryId")
     bill_to_country: str = Field(..., alias="billToCountry")
     ship_to_address: str = Field(..., alias="shipToAddress")
-    ship_to_address2: None = Field(..., alias="shipToAddress2")
+    ship_to_address2: str | None = Field(..., alias="shipToAddress2")
     ship_to_city: str = Field(..., alias="shipToCity")
     ship_to_state: str = Field(..., alias="shipToState")
     ship_to_postal_code: str = Field(..., alias="shipToPostalCode")
@@ -52,7 +52,7 @@ class StudioLocation(OtfItemBase):
     ship_to_country_id: int = Field(..., alias="shipToCountryId")
     ship_to_country: str = Field(..., alias="shipToCountry")
     physical_address: str = Field(..., alias="physicalAddress")
-    physical_address2: None = Field(..., alias="physicalAddress2")
+    physical_address2: str | None = Field(..., alias="physicalAddress2")
     physical_city: str = Field(..., alias="physicalCity")
     physical_state: str = Field(..., alias="physicalState")
     physical_postal_code: str = Field(..., alias="physicalPostalCode")
@@ -120,7 +120,7 @@ class MemberPurchase(OtfItemBase):
     status: str
     member_service_id: int | None = Field(..., alias="memberServiceId")
     member_membership_id: int | None = Field(..., alias="memberMembershipId")
-    member_fee_id: None = Field(..., alias="memberFeeId")
+    member_fee_id: int | None = Field(..., alias="memberFeeId")
     pos_contract_id: int | None = Field(..., alias="posContractId")
     pos_product_id: int = Field(..., alias="posProductId")
     pos_description_id: int | None = Field(..., alias="posDescriptionId")
@@ -131,5 +131,5 @@ class MemberPurchase(OtfItemBase):
     studio: Studio
 
 
-class MemberPurchaseList(OtfItemBase):
+class MemberPurchaseList(OtfListBase):
     data: list[MemberPurchase]

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/out_of_studio_workout_history.py

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from pydantic import Field
 
-from otf_api.models.base import OtfItemBase
+from otf_api.models.base import OtfItemBase, OtfListBase
 
 
 class WorkoutType(OtfItemBase):
@@ -37,5 +37,5 @@ class OutOfStudioWorkoutHistory(OtfItemBase):
     max_heartrate: int = Field(..., alias="maxHeartrate")
 
 
-class OutOfStudioWorkoutHistoryList(OtfItemBase):
+class OutOfStudioWorkoutHistoryList(OtfListBase):
     data: list[OutOfStudioWorkoutHistory]

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/performance_summary_detail.py

@@ -1,7 +1,9 @@
-from pydantic import BaseModel, Field
+from pydantic import Field
 
+from otf_api.models.base import OtfItemBase
 
-class ZoneTimeMinutes(BaseModel):
+
+class ZoneTimeMinutes(OtfItemBase):
     gray: int
     blue: int
     green: int
@@ -9,7 +11,7 @@ class ZoneTimeMinutes(BaseModel):
     red: int
 
 
-class HeartRate(BaseModel):
+class HeartRate(OtfItemBase):
     max_hr: int
     peak_hr: int
     peak_hr_percent: int
@@ -17,19 +19,19 @@ class HeartRate(BaseModel):
     avg_hr_percent: int
 
 
-class PerformanceMetricFloat(BaseModel):
+class PerformanceMetricFloat(OtfItemBase):
     display_value: float
     display_unit: str
     metric_value: float
 
 
-class PerformanceMetricString(BaseModel):
+class PerformanceMetricString(OtfItemBase):
     display_value: str
     display_unit: str
     metric_value: str
 
 
-class BaseEquipment(BaseModel):
+class BaseEquipment(OtfItemBase):
     avg_pace: PerformanceMetricString
     avg_speed: PerformanceMetricFloat
     max_pace: PerformanceMetricString
@@ -50,12 +52,12 @@ class Rower(BaseEquipment):
     max_cadence: PerformanceMetricFloat
 
 
-class EquipmentData(BaseModel):
+class EquipmentData(OtfItemBase):
     treadmill: Treadmill
     rower: Rower
 
 
-class Details(BaseModel):
+class Details(OtfItemBase):
     calories_burned: int
     splat_points: int
     step_count: int
@@ -65,12 +67,12 @@ class Details(BaseModel):
     equipment_data: EquipmentData
 
 
-class Class(BaseModel):
+class Class(OtfItemBase):
     starts_at_local: str
     name: str
 
 
-class PerformanceSummaryDetail(BaseModel):
+class PerformanceSummaryDetail(OtfItemBase):
     id: str
     details: Details
     ratable: bool

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/performance_summary_list.py

@@ -1,6 +1,8 @@
+from typing import ClassVar
+
 from pydantic import Field
 
-from otf_api.models.base import OtfItemBase
+from otf_api.models.base import OtfItemBase, OtfListBase
 
 
 class ZoneTimeMinutes(OtfItemBase):
@@ -64,5 +66,6 @@ class PerformanceSummaryEntry(OtfItemBase):
     ratings: Ratings | None = None
 
 
-class PerformanceSummaryList(OtfItemBase):
+class PerformanceSummaryList(OtfListBase):
+    collection_field: ClassVar[str] = "summaries"
     summaries: list[PerformanceSummaryEntry]

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/studio_detail.py

@@ -1,8 +1,9 @@
 from datetime import datetime
+from typing import ClassVar
 
 from pydantic import Field
 
-from otf_api.models.base import OtfItemBase
+from otf_api.models.base import OtfItemBase, OtfListBase
 
 
 class Country(OtfItemBase):
@@ -34,8 +35,8 @@ class Language(OtfItemBase):
 
 class StudioLocationLocalized(OtfItemBase):
     language: Language
-    studio_name: None = Field(..., alias="studioName")
-    studio_address: None = Field(..., alias="studioAddress")
+    studio_name: str | None = Field(..., alias="studioName")
+    studio_address: str | None = Field(..., alias="studioAddress")
 
 
 class StudioProfiles(OtfItemBase):
@@ -107,5 +108,6 @@ class Pagination(OtfItemBase):
     total_pages: int = Field(..., alias="totalPages")
 
 
-class StudioDetailList(OtfItemBase):
+class StudioDetailList(OtfListBase):
+    collection_field: ClassVar[str] = "studios"
     studios: list[StudioDetail]

{otf_api-0.6.1 → otf_api-0.6.3}/src/otf_api/models/responses/studio_services.py

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from pydantic import Field
 
-from otf_api.models.base import OtfItemBase
+from otf_api.models.base import OtfItemBase, OtfListBase
 
 
 class Currency(OtfItemBase):
@@ -53,5 +53,5 @@ class StudioService(OtfItemBase):
     studio: Studio
 
 
-class StudioServiceList(OtfItemBase):
+class StudioServiceList(OtfListBase):
     data: list[StudioService]

otf_api-0.6.1/src/otf_api/models/responses/enums.py

@@ -1,52 +0,0 @@
-from enum import Enum
-
-
-class EquipmentType(int, Enum):
-    Treadmill = 2
-    Strider = 3
-    Rower = 4
-    Bike = 5
-    WeightFloor = 6
-    PowerWalker = 7
-
-
-class ChallengeType(int, Enum):
-    Other = 0
-    DriTri = 2
-    MarathonMonth = 5
-    HellWeek = 52
-    Mayhem = 58
-    TwelveDaysOfFitness = 63
-    Transformation = 64
-    RemixInSix = 65
-    Push = 66
-    BackAtIt = 84
-
-
-class HistoryBookingStatus(str, Enum):
-    Attended = "Attended"
-    Cancelled = "Cancelled"
-    LateCancelled = "Late Cancelled"
-
-    @classmethod
-    def all_statuses(cls) -> list[str]:
-        return list(cls.__members__.values())
-
-
-class HistoryClassStatus(str, Enum):
-    CheckedIn = "Checked In"
-    CancelCheckinPending = "Cancel Checkin Pending"
-    CancelCheckinRequested = "Cancel Checkin Requested"
-    LateCancelled = "Late Cancelled"
-    Booked = "Booked"
-    Waitlisted = "Waitlisted"
-    CheckinPending = "Checkin Pending"
-    CheckinRequested = "Checkin Requested"
-    CheckinCancelled = "Checkin Cancelled"
-    Pending = "Pending"
-    Confirmed = "Confirmed"
-    Requested = "Requested"
-
-    @classmethod
-    def all_statuses(cls) -> list[str]:
-        return list(cls.__members__.values())