otf-api 0.13.0__py3-none-any.whl → 0.13.2__py3-none-any.whl

otf_api/__init__.py

@@ -36,7 +36,7 @@ def _setup_logging() -> None:
 
 _setup_logging()
 
-__version__ = "0.13.0"
+__version__ = "0.13.2"
 
 
 __all__ = ["Otf", "OtfUser", "models"]

otf_api/api/bookings/booking_api.py

@@ -80,7 +80,7 @@ class BookingApi:
             ends_before=end_date, starts_after=start_date, include_canceled=include_canceled, expand=expand
         )
 
-        results = [models.BookingV2.create(**b, api=self) for b in bookings_resp]
+        results = [models.BookingV2.create(**b, api=self.otf) for b in bookings_resp]
 
         if not remove_duplicates:
             return results
@@ -188,7 +188,7 @@ class BookingApi:
         for c in classes_resp:
             c["studio"] = studio_dict[c["studio"]["id"]]  # the one (?) place where ID actually means UUID
             c["is_home_studio"] = c["studio"].studio_uuid == self.otf.home_studio_uuid
-            classes.append(models.OtfClass(**c))
+            classes.append(models.OtfClass.create(**c, api=self.otf))
 
         # additional data filtering and enrichment
 
@@ -228,7 +228,7 @@ class BookingApi:
             raise ValueError("booking_uuid is required")
 
         data = self.client.get_booking(booking_uuid)
-        return models.Booking.create(**data, api=self)
+        return models.Booking.create(**data, api=self.otf)
 
     def get_booking_from_class(self, otf_class: str | models.OtfClass) -> models.Booking:
         """Get a specific booking by class_uuid or OtfClass object.
@@ -337,7 +337,7 @@ class BookingApi:
 
         resp = self.client.post_class_new(body)
 
-        new_booking = models.BookingV2.create(**resp, api=self)
+        new_booking = models.BookingV2.create(**resp, api=self.otf)
 
         return new_booking
 
@@ -443,7 +443,7 @@ class BookingApi:
             b["class"]["studio"] = studios[b["class"]["studio"]["studioUUId"]]
             b["is_home_studio"] = b["class"]["studio"].studio_uuid == self.otf.home_studio_uuid
 
-        bookings = [models.Booking.create(**b, api=self) for b in resp]
+        bookings = [models.Booking.create(**b, api=self.otf) for b in resp]
         bookings = sorted(bookings, key=lambda x: x.otf_class.starts_at)
 
         if exclude_cancelled:

otf_api/api/members/member_api.py

@@ -134,7 +134,7 @@ class MemberApi:
 
         res = self.client.put_member_name(first_name, last_name)
 
-        return models.MemberDetail.create(**res, api=self)
+        return models.MemberDetail.create(**res, api=self.otf)
 
     def get_member_detail(self) -> models.MemberDetail:
         """Get the member details.
@@ -148,7 +148,7 @@ class MemberApi:
         home_studio_uuid = data["homeStudio"]["studioUUId"]
         data["home_studio"] = self.otf.studios.get_studio_detail(home_studio_uuid)
 
-        return models.MemberDetail.create(**data, api=self)
+        return models.MemberDetail.create(**data, api=self.otf)
 
     def get_member_membership(self) -> models.MemberMembership:
         """Get the member's membership details.

otf_api/api/studios/studio_api.py

@@ -56,7 +56,7 @@ class StudioApi:
 
         new_faves = resp.get("studios", [])
 
-        return [models.StudioDetail.create(**studio, api=self) for studio in new_faves]
+        return [models.StudioDetail.create(**studio, api=self.otf) for studio in new_faves]
 
     def remove_favorite_studio(self, studio_uuids: list[str] | str) -> None:
         """Remove a studio from the member's favorite studios.
@@ -116,7 +116,7 @@ class StudioApi:
         except exc.ResourceNotFoundError:
             return models.StudioDetail.create_empty_model(studio_uuid)
 
-        return models.StudioDetail.create(**res, api=self)
+        return models.StudioDetail.create(**res, api=self.otf)
 
     def get_studios_by_geo(
         self, latitude: float | None = None, longitude: float | None = None
@@ -141,7 +141,7 @@ class StudioApi:
         longitude = longitude or self.otf.home_studio.location.longitude
 
         results = self.client.get_studios_by_geo(latitude, longitude, distance)
-        return [models.StudioDetail.create(**studio, api=self) for studio in results]
+        return [models.StudioDetail.create(**studio, api=self.otf) for studio in results]
 
     def _get_all_studios(self) -> list[models.StudioDetail]:
         """Gets all studios. Marked as private to avoid random users calling it.
@@ -153,7 +153,7 @@ class StudioApi:
         """
         # long/lat being None will cause the endpoint to return all studios
         results = self.client.get_studios_by_geo(None, None)
-        return [models.StudioDetail.create(**studio, api=self) for studio in results]
+        return [models.StudioDetail.create(**studio, api=self.otf) for studio in results]
 
     def _get_studio_detail_threaded(self, studio_uuids: list[str]) -> dict[str, models.StudioDetail]:
         """Get detailed information about multiple studios in a threaded manner.
@@ -169,5 +169,6 @@ class StudioApi:
         """
         studio_dicts = self.client.get_studio_detail_threaded(studio_uuids)
         return {
-            studio_uuid: models.StudioDetail.create(**studio, api=self) for studio_uuid, studio in studio_dicts.items()
+            studio_uuid: models.StudioDetail.create(**studio, api=self.otf)
+            for studio_uuid, studio in studio_dicts.items()
         }

otf_api/api/workouts/workout_api.py

@@ -237,7 +237,7 @@ class WorkoutApi:
 
         perf_summary = self.client.get_performance_summary(booking.workout.performance_summary_id)
         telemetry = self.get_telemetry(booking.workout.performance_summary_id)
-        workout = models.Workout.create(**perf_summary, v2_booking=booking, telemetry=telemetry, api=self)
+        workout = models.Workout.create(**perf_summary, v2_booking=booking, telemetry=telemetry, api=self.otf)
 
         return workout
 
@@ -275,7 +275,7 @@ class WorkoutApi:
                 v2_booking=bookings_dict[perf_id],
                 telemetry=telemetry_dict.get(perf_id),
                 class_uuid=perf_summary_to_class_uuid_map.get(perf_id),
-                api=self,
+                api=self.otf,
             )
             workouts.append(workout)
 

otf_api/models/mixins.py

@@ -22,9 +22,8 @@ class ApiMixin:
         self._api = api
 
     @classmethod
-    def create(cls, **kwargs) -> typing.Self:
+    def create(cls, api: "Otf", **kwargs) -> typing.Self:
         """Creates a new instance of the model with the given keyword arguments."""
-        api = kwargs.pop("api", None)
         instance = cls(**kwargs)
         if api is not None:
             instance.set_api(api)

{otf_api-0.13.0.dist-info → otf_api-0.13.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: otf-api
-Version: 0.13.0
+Version: 0.13.2
 Summary: Python OrangeTheory Fitness API Client
 Author-email: Jessica Smith <j.smith.git1@gmail.com>
 License-Expression: MIT

{otf_api-0.13.0.dist-info → otf_api-0.13.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-otf_api/__init__.py,sha256=mpjME4x_GP5hUzbQ99qMPuZ4pzbQNrYXLAXqnGNsXcw,1150
+otf_api/__init__.py,sha256=B8xq2bcHRV-z-pluFbo3Ow-FBAYO4jG5hq6wll9FhqE,1150
 otf_api/cache.py,sha256=m4xUBhaS0MkcZypon1jjfhJzZPRQBE5Fto4_RMReXZ0,4311
 otf_api/exceptions.py,sha256=b6ZdH1dtYyUfXSupdVGGni6d66qqhzD0SGzyuty89gM,2174
 otf_api/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,16 +8,16 @@ otf_api/api/api.py,sha256=yda8RObOMd_lBWbqlAAUZ3dTwGhdEYsfGQJDiphp6Eo,2633
 otf_api/api/client.py,sha256=o533H-nYweRcosBEYmm3U-7ivkpGDF7jElM9iIhK7E8,8157
 otf_api/api/utils.py,sha256=mNDUrz6d8b8KqTaUr5fGGGejy6bq9HHLs9LS8ibbfW4,9926
 otf_api/api/bookings/__init__.py,sha256=ocHSZXV4nnkZhjpjBX76iKHCQ21_ZL5hV4YKgUR0Wwg,62
-otf_api/api/bookings/booking_api.py,sha256=s4GWT1MYUY0-EjXucj_8rcNfRP6o-sFGfVsmY3RJMdM,22087
+otf_api/api/bookings/booking_api.py,sha256=VdEX5WF3TIV5V_1n2DclBPqxhXQysNqyxJxeR6c05UM,22124
 otf_api/api/bookings/booking_client.py,sha256=qYaEomexGWP2N_WdWePMN7BR8aIKEpO71g5J0KaVfAc,4244
 otf_api/api/members/__init__.py,sha256=6mkeMiATRsNQTYQ37P7k6SWf9RZ9T5QY9-_r1sS1-vY,59
-otf_api/api/members/member_api.py,sha256=bpSnUWrLbrqkIcwhzaPonkWTa9-gLPdadzE4ec_meT0,7224
+otf_api/api/members/member_api.py,sha256=5FAPbRN_Dv3mLC1AmxcErqF1d1ypL5zVEn1u7gDbTZA,7232
 otf_api/api/members/member_client.py,sha256=d6v6vexmtiedw1-lXLMobbN8tTmRT-zHq7VzdJb5wDE,4528
 otf_api/api/studios/__init__.py,sha256=vPir509hQOJL7uJ4yBCOHgooXVnXs6N5RlWs1tN54Uk,59
-otf_api/api/studios/studio_api.py,sha256=qggdaTGeYtrE1q5oV8ozCqAC5Xv6DtwVG5dHzSB1q74,6781
+otf_api/api/studios/studio_api.py,sha256=sn1jBebe4u-wE1VkHp2W96beUOFwHdiGzVSmnGNPZjg,6813
 otf_api/api/studios/studio_client.py,sha256=KWc4CF-2387WDUFYpMtIUm3KyPj1JdelCn7RH9L1FBI,4707
 otf_api/api/workouts/__init__.py,sha256=GPb2cEsAxoaiJIP8Finrk9x9vUeL9NXA9iz2eya9HYk,62
-otf_api/api/workouts/workout_api.py,sha256=h65nEt2-2mYV33tiVkv2N6L7NoEJ_naViw-IrMnEn8E,13207
+otf_api/api/workouts/workout_api.py,sha256=prlqDFF4VXuzC7SRPpmD_yeZuMAp-dnfaSa52I4SM9o,13215
 otf_api/api/workouts/workout_client.py,sha256=MvEWbhPXywpQMSdsBSGCYBIR65TJjdqgb7T0Bc8H8D0,6762
 otf_api/auth/__init__.py,sha256=uTvFTNQVvfogTN_-4D3bRSundAf2enUJ5ji6PwO0xm8,104
 otf_api/auth/auth.py,sha256=67-RXDla3rVm5vmlyPEOqPOF5kecJiEznVmq0gSz3M0,16448
@@ -25,7 +25,7 @@ otf_api/auth/user.py,sha256=OChRG0EhZ63vEtT_Sg3NmXWmOD1vZcILuHhRXlwaG0I,2156
 otf_api/auth/utils.py,sha256=YBxqg2h59u4V1ij5kgqJDyKh0gtgOlXrSZdpAKSdelY,3954
 otf_api/models/__init__.py,sha256=P0IjxRUPIfzUI-e3VDMpipJeWr6BlypWAED2ovnZw-w,1545
 otf_api/models/base.py,sha256=KJlIxl_sRj6f-g5vKYPw4yV6fGDk-fwZ93EO0JGPYMw,202
-otf_api/models/mixins.py,sha256=mY9ufoi3QJM5H7KMU9q7grgYuZp85xLs8ie2aLikvi8,4164
+otf_api/models/mixins.py,sha256=R2FvaxieTcJn7BRn_rPuuV84ZyuV0VS4dhIKw7am6R8,4138
 otf_api/models/bookings/__init__.py,sha256=-EtaVW9qF5dmWvSlkq693vkxc3bX6d7dWOgcnNNfpV4,642
 otf_api/models/bookings/bookings.py,sha256=YlocSxdOEECxcCsVkEYAXHFE3EmMTUBxXgSFFxskaLk,5681
 otf_api/models/bookings/bookings_v2.py,sha256=Jd9zh4E3AEWUyxLTISq2j2I_firKCfV5IQzNdkc7iK4,7965
@@ -52,8 +52,8 @@ otf_api/models/workouts/out_of_studio_workout_history.py,sha256=-BKp-MnIp_5-U2KW
 otf_api/models/workouts/performance_summary.py,sha256=R1p-g1L4XWWEiBYaGtX5JFvoS3Z6bzQrsPIfTQHDqyM,3464
 otf_api/models/workouts/telemetry.py,sha256=rKsmLbsOVUxUXH439zxxIEWYGTohKNemqrtMamAl5cA,3465
 otf_api/models/workouts/workout.py,sha256=_KIR9fLI4LgUlS02Q5SNauHd4aOqJI9H4uaFKf-xJOU,4580
-otf_api-0.13.0.dist-info/licenses/LICENSE,sha256=UaPT9ynYigC3nX8n22_rC37n-qmTRKLFaHrtUwF9ktE,1071
-otf_api-0.13.0.dist-info/METADATA,sha256=-x6Y4z5eG5ECRWfbS_jmbFr3oo6eNrKdrNMeDkMniuM,2162
-otf_api-0.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-otf_api-0.13.0.dist-info/top_level.txt,sha256=KAhYg1X2YG0LkTuVRhUV1I_AReNZUVNdEan7cp0pEE4,8
-otf_api-0.13.0.dist-info/RECORD,,
+otf_api-0.13.2.dist-info/licenses/LICENSE,sha256=UaPT9ynYigC3nX8n22_rC37n-qmTRKLFaHrtUwF9ktE,1071
+otf_api-0.13.2.dist-info/METADATA,sha256=ABfr_86oOf234G_WSqA06txQG2igkLdAx7KaNhabQFs,2162
+otf_api-0.13.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+otf_api-0.13.2.dist-info/top_level.txt,sha256=KAhYg1X2YG0LkTuVRhUV1I_AReNZUVNdEan7cp0pEE4,8
+otf_api-0.13.2.dist-info/RECORD,,