Merge pull request #97 from NodeJSmith/fix/improve_idp_id_clients

Fix/improve idp id clients by making them cached properties, remove get/set state dunders

Author: NodeJSmith

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.14.0"
+current_version = "0.14.1"
 
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(?:-(?P<rc_l>rc)(?P<rc>0|[1-9]\\d*))?"
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "otf-api"
-version = "0.14.0"
+version = "0.14.1"
 description = "Python OrangeTheory Fitness API Client"
 authors = [{ name = "Jessica Smith", email = "[email protected]" }]
 requires-python = ">=3.11"

source/conf.py

@@ -14,7 +14,7 @@
 project = "OrangeTheory API"
 copyright = "2025, Jessica Smith"
 author = "Jessica Smith"
-release = "0.14.0"
+release = "0.14.1"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

src/otf_api/__init__.py

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

src/otf_api/auth/auth.py

@@ -3,6 +3,7 @@
 import typing
 from collections.abc import Generator
 from datetime import datetime
+from functools import lru_cache
 from logging import getLogger
 from time import sleep
 from typing import Any, ClassVar
@@ -119,15 +120,21 @@ def __init__(
         self.mfa_tokens: dict[str, Any] = {}
         self.pool_domain_url: str | None = None
 
-        self.idp_client: CognitoIdentityProviderClient = Session().client(
-            "cognito-idp", config=BOTO_CONFIG, region_name=REGION
-        )  # type: ignore
+        self.handle_login(password)
 
-        self.id_client: CognitoIdentityClient = Session().client(
-            "cognito-identity", config=BOTO_CONFIG, region_name=REGION
-        )  # type: ignore
+    @property
+    @lru_cache(maxsize=1)
+    def idp_client(self) -> "CognitoIdentityProviderClient":
+        """Returns the Cognito Identity Provider client."""
+        LOGGER.debug("Creating Cognito Identity Provider client")
+        return Session().client("cognito-idp", config=BOTO_CONFIG, region_name=REGION)  # type: ignore
 
-        self.handle_login(password)
+    @property
+    @lru_cache(maxsize=1)
+    def id_client(self) -> "CognitoIdentityClient":
+        """Returns the Cognito Identity client."""
+        LOGGER.debug("Creating Cognito Identity client")
+        return Session().client("cognito-identity", config=BOTO_CONFIG, region_name=REGION)  # type: ignore
 
     def handle_login(self, password: str | None = None) -> None:
         """Handles the login process for the user.
@@ -340,20 +347,6 @@ def _set_tokens(self, tokens: "InitiateAuthResponseTypeDef") -> None:
         self.device_group_key = device_metadata.get("DeviceGroupKey", self.device_group_key)
         CACHE.write_device_data_to_cache(self.device_metadata)
 
-    def __getstate__(self):
-        """Get the state of the object for pickling."""
-        state = self.__dict__.copy()
-        del state["idp_client"]
-        del state["id_client"]
-        return state
-
-    def __setstate__(self, state):  # noqa
-        """Set the state of the object from a pickled state."""
-        self.__dict__.update(state)
-        self.idp_client = Session().client("cognito-idp", config=BOTO_CONFIG, region_name=REGION)  # type: ignore
-
-        self.id_client = Session().client("cognito-identity", config=BOTO_CONFIG, region_name=REGION)  # type: ignore
-
 
 class HttpxCognitoAuth(httpx.Auth):
     http_header: str = "Authorization"

src/otf_api/cache.py

@@ -130,3 +130,13 @@ def get_cache() -> OtfCache:
         LOGGER.debug("Using cache directory: %s", cache_dir)
         _CACHE = OtfCache(cache_dir)
     return _CACHE
+
+
+def clear_cache() -> None:
+    """Clears the cache."""
+    try:
+        cache = get_cache()
+        cache.clear_device_data()
+        cache.clear_tokens()
+    except Exception:
+        LOGGER.exception("Failed to clear cache")