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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otf-api
-Version: 0.6.0
+Version: 0.6.1
 Summary: Python OrangeTheory Fitness API Client
 License: MIT
 Author: Jessica Smith
@@ -18,7 +18,7 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: aiohttp (==3.8.*)
+Requires-Dist: aiohttp (==3.10.*)
 Requires-Dist: humanize (>=4.9.0,<5.0.0)
 Requires-Dist: inflection (==0.5.*)
 Requires-Dist: loguru (==0.7.2)
@@ -26,7 +26,6 @@ Requires-Dist: pendulum (>=3.0.0,<4.0.0)
 Requires-Dist: pint (==0.24.*)
 Requires-Dist: pycognito (==2024.5.1)
 Requires-Dist: pydantic (==2.7.3)
-Requires-Dist: python-box (>=7.2.0,<8.0.0)
 Project-URL: Documentation, https://otf-api.readthedocs.io/en/stable/
 Description-Content-Type: text/markdown
 

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "otf-api"
-version = "0.6.0"
+version = "0.6.1"
 description = "Python OrangeTheory Fitness API Client"
 authors = ["Jessica Smith <j.smith.git1@gmail.com>"]
 license = "MIT"
@@ -22,7 +22,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.10"
-aiohttp = "3.8.*"
+aiohttp = "3.10.*"
 humanize = "^4.9.0"
 inflection = "0.5.*"
 loguru = "0.7.2"
@@ -30,7 +30,6 @@ pendulum = "^3.0.0"
 pint = "0.24.*"
 pycognito = "2024.5.1"
 pydantic = "2.7.3"
-python-box = "^7.2.0"
 
 [tool.poetry.group.dev.dependencies]
 aioresponses = "0.7.6"
@@ -46,7 +45,7 @@ pytest-cov = "5.0.0"
 pytest-loguru = "0.4.0"
 ruff = "0.4.9"
 tox = "4.15.1"
-twine = "5.1.0"
+twine = "5.1.1"
 
 
 [tool.poetry.group.docs.dependencies]
@@ -63,9 +62,10 @@ mkdocs-material-extensions = "1.3.1"
 mkdocs-section-index = "0.3.9"
 mkdocstrings = "0.25.1"
 mkdocstrings-python = "1.10.3"
-pkginfo = "^1.11.1"
+pkginfo = "<1.11"
 setuptools = "^70.0.0"
 virtualenv = "^20.26.2"
+griffe = "<1.0.0"
 
 
 [build-system]

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

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

otf_api-0.6.1/src/otf_api/models/base.py

@@ -0,0 +1,22 @@
+from typing import ClassVar
+
+from pydantic import BaseModel, ConfigDict
+
+
+class OtfItemBase(BaseModel):
+    model_config: ClassVar[ConfigDict] = ConfigDict(arbitrary_types_allowed=True, extra="allow")
+
+
+class OtfListBase(BaseModel):
+    model_config: ClassVar[ConfigDict] = ConfigDict(arbitrary_types_allowed=True, extra="allow")
+    collection_field: ClassVar[str] = "data"
+
+    @property
+    def collection(self) -> list[OtfItemBase]:
+        return getattr(self, self.collection_field)
+
+    def to_json(self, **kwargs) -> str:
+        kwargs.setdefault("indent", 4)
+        kwargs.setdefault("exclude_none", True)
+
+        return self.model_dump_json(**kwargs)

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

@@ -101,7 +101,7 @@ class MemberDetail(OtfItemBase):
     state: None
     postal_code: None = Field(..., alias="postalCode")
     phone_number: str = Field(..., alias="phoneNumber")
-    home_phone: str = Field(..., alias="homePhone")
+    home_phone: str | None = Field(..., alias="homePhone")
     work_phone: None = Field(..., alias="workPhone")
     phone_type: None = Field(..., alias="phoneType")
     birth_day: date | str = Field(..., alias="birthDay")

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

@@ -34,6 +34,7 @@ class Class(OtfItemBase):
     ot_base_class_uuid: str | None = None
     starts_at_local: str
     name: str | None = None
+    type: str | None = None
     coach: Coach
     studio: Studio
 

{otf_api-0.6.0 → otf_api-0.6.1}/src/otf_api/models/responses/telemetry.py

@@ -25,6 +25,14 @@ class TreadData(OtfItemBase):
     agg_tread_distance: int = Field(..., alias="aggTreadDistance")
 
 
+class RowData(OtfItemBase):
+    row_speed: float = Field(..., alias="rowSpeed")
+    row_pps: float = Field(..., alias="rowPps")
+    row_Spm: float = Field(..., alias="rowSpm")
+    agg_row_distance: int = Field(..., alias="aggRowDistance")
+    row_pace: int = Field(..., alias="rowPace")
+
+
 class TelemetryItem(OtfItemBase):
     relative_timestamp: int = Field(..., alias="relativeTimestamp")
     hr: int
@@ -36,6 +44,7 @@ class TelemetryItem(OtfItemBase):
         description="The timestamp of the telemetry item, calculated from the class start time and relative timestamp.",
     )
     tread_data: TreadData | None = Field(None, alias="treadData")
+    row_data: RowData | None = Field(None, alias="rowData")
 
 
 class Telemetry(OtfItemBase):

otf_api-0.6.0/src/otf_api/models/base.py

@@ -1,149 +0,0 @@
-import inspect
-import typing
-from typing import ClassVar, TypeVar
-
-from box import Box
-from pydantic import BaseModel, ConfigDict
-
-if typing.TYPE_CHECKING:
-    from pydantic.main import IncEx
-
-T = TypeVar("T", bound="OtfItemBase")
-
-
-class BetterDumperMixin:
-    """A better dumper for Pydantic models that includes properties in the dumped data. Must be mixed
-    into a Pydantic model, as it overrides the `model_dump` method.
-
-    Includes support for nested models, and has an option to not include properties when dumping.
-    """
-
-    def get_properties(self) -> list[str]:
-        """Get the properties of the model."""
-        cls = type(self)
-
-        properties: list[str] = []
-        methods = inspect.getmembers(self, lambda f: not (inspect.isroutine(f)))
-        for prop_name, _ in methods:
-            if hasattr(cls, prop_name) and isinstance(getattr(cls, prop_name), property):
-                properties.append(prop_name)
-
-        return properties
-
-    @typing.overload
-    def model_dump(
-        self,
-        *,
-        mode: typing.Literal["json", "python"] | str = "python",
-        include: "IncEx" = None,
-        exclude: "IncEx" = None,
-        by_alias: bool = False,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        round_trip: bool = False,
-        warnings: bool = True,
-        include_properties: bool = True,
-    ) -> Box[str, typing.Any]: ...
-
-    @typing.overload
-    def model_dump(
-        self,
-        *,
-        mode: typing.Literal["json", "python"] | str = "python",
-        include: "IncEx" = None,
-        exclude: "IncEx" = None,
-        by_alias: bool = False,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        round_trip: bool = False,
-        warnings: bool = True,
-        include_properties: bool = False,
-    ) -> dict[str, typing.Any]: ...
-
-    def model_dump(
-        self,
-        *,
-        mode: typing.Literal["json", "python"] | str = "python",
-        include: "IncEx" = None,
-        exclude: "IncEx" = None,
-        by_alias: bool = False,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        round_trip: bool = False,
-        warnings: bool = True,
-        include_properties: bool = True,
-    ) -> dict[str, typing.Any] | Box[str, typing.Any]:
-        """Usage docs: https://docs.pydantic.dev/2.4/concepts/serialization/#modelmodel_dump
-
-        Generate a dictionary representation of the model, optionally specifying which fields to include or exclude.
-
-        Args:
-            mode: The mode in which `to_python` should run.
-                If mode is 'json', the dictionary will only contain JSON serializable types.
-                If mode is 'python', the dictionary may contain any Python objects.
-            include: A list of fields to include in the output.
-            exclude: A list of fields to exclude from the output.
-            by_alias: Whether to use the field's alias in the dictionary key if defined.
-            exclude_unset: Whether to exclude fields that are unset or None from the output.
-            exclude_defaults: Whether to exclude fields that are set to their default value from the output.
-            exclude_none: Whether to exclude fields that have a value of `None` from the output.
-            round_trip: Whether to enable serialization and deserialization round-trip support.
-            warnings: Whether to log warnings when invalid fields are encountered.
-            include_properties: Whether to include properties in the dumped data.
-
-        Returns:
-            A dictionary representation of the model. Will be a `Box` if `include_properties` is `True`, otherwise a
-            regular dictionary.
-
-        """
-        dumped_data = typing.cast(BaseModel, super()).model_dump(
-            mode=mode,
-            include=include,
-            exclude=exclude,
-            by_alias=by_alias,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-            round_trip=round_trip,
-            warnings=warnings,
-        )
-
-        if not include_properties:
-            return dumped_data
-
-        properties = self.get_properties()
-
-        # set properties to their values
-        for prop_name in properties:
-            dumped_data[prop_name] = getattr(self, prop_name)
-
-        # if the property is a Pydantic model, dump it as well
-        for k, v in dumped_data.items():
-            if issubclass(type(getattr(self, k)), BaseModel):
-                dumped_data[k] = getattr(self, k).model_dump()
-            elif hasattr(v, "model_dump"):
-                dumped_data[k] = v.model_dump()
-
-        return Box(dumped_data)
-
-
-class OtfItemBase(BetterDumperMixin, BaseModel):
-    model_config: ClassVar[ConfigDict] = ConfigDict(arbitrary_types_allowed=True, extra="forbid")
-
-
-class OtfListBase(BaseModel):
-    model_config: ClassVar[ConfigDict] = ConfigDict(arbitrary_types_allowed=True, extra="forbid")
-    collection_field: ClassVar[str] = "data"
-
-    @property
-    def collection(self) -> list[OtfItemBase]:
-        return getattr(self, self.collection_field)
-
-    def to_json(self, **kwargs) -> str:
-        kwargs.setdefault("indent", 4)
-        kwargs.setdefault("exclude_none", True)
-
-        return self.model_dump_json(**kwargs)