sweatstack 0.31.1__py3-none-any.whl → 0.33.0__py3-none-any.whl

sweatstack/client.py

@@ -8,6 +8,7 @@ import time
 import urllib
 import webbrowser
 from datetime import date, datetime
+from enum import Enum
 from functools import wraps
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from importlib.metadata import version
@@ -20,7 +21,7 @@ import pandas as pd
 
 from .constants import DEFAULT_URL
 from .schemas import (
-    ActivityDetails, ActivitySummary, Sport, TraceDetails, UserSummary
+    ActivityDetails, ActivitySummary, Metric, Sport, TraceDetails, UserSummary
 )
 from .utils import decode_jwt_body, make_dataframe_streamlit_compatible
 
@@ -114,7 +115,7 @@ class OAuth2Mixin:
                 data=token_data,
             )
             try:
-                response.raise_for_status()
+                self._raise_for_status(response)
             except httpx.HTTPStatusError as e:
                 raise Exception(f"SweatStack Python login failed. Please try again.") from e
             token_response = response.json()
@@ -141,7 +142,7 @@ class DelegationMixin:
                 "/api/v1/oauth/delegated-token",
                 json={"sub": user_id},
             )
-            response.raise_for_status()
+            self._raise_for_status(response)
 
         return response.json()
 
@@ -155,7 +156,7 @@ class DelegationMixin:
             response = client.get(
                 "/api/v1/oauth/principal-token",
             )
-            response.raise_for_status()
+            self._raise_for_status(response)
         return response.json()
 
     def switch_back(self):
@@ -206,7 +207,7 @@ class Client(OAuth2Mixin, DelegationMixin):
                 },
             )
 
-            response.raise_for_status()
+            self._raise_for_status(response)
             return response.json()["access_token"]
 
     def _check_token_expiry(self, token: str) -> str:
@@ -286,6 +287,15 @@ class Client(OAuth2Mixin, DelegationMixin):
         with httpx.Client(base_url=self.url, headers=headers) as client:
             yield client
 
+    def _raise_for_status(self, response: httpx.Response):
+        if response.status_code == 422:
+            raise ValueError(response.json())
+        else:
+            response.raise_for_status()
+
+    def _enums_to_strings(self, values: list[Enum | str]) -> list[str]:
+        return [value.value if isinstance(value, Enum) else value for value in values]
+
     def _get_activities_generator(
         self,
         *,
@@ -306,8 +316,7 @@ class Client(OAuth2Mixin, DelegationMixin):
         if end is not None:
             params["end"] = end.isoformat()
         if sports is not None:
-            sports = [sport.value if isinstance(sport, Sport) else sport for sport in sports]
-            params["sports"] = sports
+            params["sports"] = self._enums_to_strings(sports)
         if tags is not None:
             params["tags"] = tags
 
@@ -317,7 +326,7 @@ class Client(OAuth2Mixin, DelegationMixin):
                     url="/api/v1/activities/",
                     params=params,
                 )
-                response.raise_for_status()
+                self._raise_for_status(response)
                 activities = response.json()
                 for activity in activities:
                     yield ActivitySummary.model_validate(activity)
@@ -383,7 +392,7 @@ class Client(OAuth2Mixin, DelegationMixin):
     def get_activity(self, activity_id: str) -> ActivityDetails:
         with self._http_client() as client:
             response = client.get(url=f"/api/v1/activities/{activity_id}")
-            response.raise_for_status()
+            self._raise_for_status(response)
             return ActivityDetails.model_validate(response.json())
 
     def get_activity_data(
@@ -400,8 +409,7 @@ class Client(OAuth2Mixin, DelegationMixin):
                 url=f"/api/v1/activities/{activity_id}/data",
                 params=params,
             )
-
-        response.raise_for_status()
+            self._raise_for_status(response)
 
         df = pd.read_parquet(BytesIO(response.content))
         return self._postprocess_dataframe(df)
@@ -409,9 +417,10 @@ class Client(OAuth2Mixin, DelegationMixin):
     def get_activity_mean_max(
         self,
         activity_id: str,
-        metric: str,
+        metric: Literal[Metric.power, Metric.speed] | Literal["power", "speed"],
         adaptive_sampling: bool = False,
     ) -> pd.DataFrame:
+        metric = self._enums_to_strings([metric])[0]
         with self._http_client() as client:
             response = client.get(
                 url=f"/api/v1/activities/{activity_id}/mean-max",
@@ -420,13 +429,13 @@ class Client(OAuth2Mixin, DelegationMixin):
                     "adaptive_sampling": adaptive_sampling,
                 },
             )
-            response.raise_for_status()
+            self._raise_for_status(response)
             df = pd.read_parquet(BytesIO(response.content))
             return self._postprocess_dataframe(df)
 
     def get_latest_activity_data(
         self,
-        sport: Sport | None = None,
+        sport: Sport | str | None = None,
         adaptive_sampling_on: Literal["power", "speed"] | None = None,
     ) -> pd.DataFrame:
         activity = self.get_latest_activity(sport=sport)
@@ -434,8 +443,8 @@ class Client(OAuth2Mixin, DelegationMixin):
 
     def get_latest_activity_mean_max(
         self,
-        metric: str,
-        sport: Sport | None = None,
+        metric: Literal[Metric.power, Metric.speed] | Literal["power", "speed"],
+        sport: Sport | str | None = None,
         adaptive_sampling: bool = False,
     ) -> pd.DataFrame:
         activity = self.get_latest_activity(sport=sport)
@@ -444,11 +453,11 @@ class Client(OAuth2Mixin, DelegationMixin):
     def get_longitudinal_data(
         self,
         *,
-        sport: Sport | None = None,
+        sport: Sport | str | None = None,
         sports: list[Sport | str] | None = None,
         start: date | str,
         end: date | str | None = None,
-        metrics: list[str] | None = None,
+        metrics: list[Metric | str] | None = None,
         adaptive_sampling_on: Literal["power", "speed"] | None = None,
     ) -> pd.DataFrame:
         if sport and sports:
@@ -458,6 +467,9 @@ class Client(OAuth2Mixin, DelegationMixin):
         elif sports is None:
             sports = []
 
+        sports = self._enums_to_strings(sports)
+        metrics = self._enums_to_strings(metrics)
+
         params = {
             "sports": sports,
             "start": start,
@@ -474,7 +486,7 @@ class Client(OAuth2Mixin, DelegationMixin):
                 url="/api/v1/activities/longitudinal-data",
                 params=params,
             )
-            response.raise_for_status()
+            self._raise_for_status(response)
 
             df = pd.read_parquet(BytesIO(response.content))
             return self._postprocess_dataframe(df)
@@ -483,10 +495,13 @@ class Client(OAuth2Mixin, DelegationMixin):
         self,
         *,
         sport: Sport | str,
-        metric: str,
+        metric: Literal[Metric.power, Metric.speed] | Literal["power", "speed"],
         date: date | str | None = None,
         window_days: int | None = None,
     ) -> pd.DataFrame:
+        sport = self._enums_to_strings([sport])[0]
+        metric = self._enums_to_strings([metric])[0]
+
         params = {
             "sport": sport,
             "metric": metric,
@@ -501,7 +516,7 @@ class Client(OAuth2Mixin, DelegationMixin):
                 url="/api/v1/activities/longitudinal-mean-max",
                 params=params,
             )
-            response.raise_for_status()
+            self._raise_for_status(response)
 
             df = pd.read_parquet(BytesIO(response.content))
             return self._postprocess_dataframe(df)
@@ -526,8 +541,7 @@ class Client(OAuth2Mixin, DelegationMixin):
         if end is not None:
             params["end"] = end.isoformat()
         if sports is not None:
-            sports = [sport.value if isinstance(sport, Sport) else sport for sport in sports]
-            params["sports"] = sports
+            params["sports"] = self._enums_to_strings(sports)
         if tags is not None:
             params["tags"] = tags
 
@@ -537,7 +551,7 @@ class Client(OAuth2Mixin, DelegationMixin):
                     url="/api/v1/traces/",
                     params=params,
                 )
-                response.raise_for_status()
+                self._raise_for_status(response)
                 traces = response.json()
                 for trace in traces:
                     yield TraceDetails.model_validate(trace)
@@ -636,7 +650,7 @@ class Client(OAuth2Mixin, DelegationMixin):
                     "tags": tags,
                 },
             )
-            response.raise_for_status()
+            self._raise_for_status(response)
             return TraceDetails.model_validate(response.json())
 
     def get_sports(self, only_root: bool = False) -> list[Sport]:
@@ -645,7 +659,7 @@ class Client(OAuth2Mixin, DelegationMixin):
                 url="/api/v1/profile/sports/",
                 params={"only_root": only_root},
             )
-            response.raise_for_status()
+            self._raise_for_status(response)
             return [Sport(sport) for sport in response.json()]
 
     def get_tags(self) -> list[str]:
@@ -653,7 +667,7 @@ class Client(OAuth2Mixin, DelegationMixin):
             response = client.get(
                 url="/api/v1/profile/tags/",
             )
-            response.raise_for_status()
+            self._raise_for_status(response)
             return response.json()
 
     def get_users(self) -> list[UserSummary]:
@@ -661,7 +675,7 @@ class Client(OAuth2Mixin, DelegationMixin):
             response = client.get(
                 url="/api/v1/users/",
             )
-            response.raise_for_status()
+            self._raise_for_status(response)
             return [UserSummary.model_validate(user) for user in response.json()]
 
 _default_client = Client()

{sweatstack-0.31.1.dist-info → sweatstack-0.33.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sweatstack
-Version: 0.31.1
+Version: 0.33.0
 Summary: The official Python client for SweatStack
 Author-email: Aart Goossens <aart@gssns.io>
 Requires-Python: >=3.9

{sweatstack-0.31.1.dist-info → sweatstack-0.33.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 sweatstack/__init__.py,sha256=tiVfgKlswRPaDMEy0gA7u8rveqEYZTA_kyB9lJ3J6Sc,21
 sweatstack/cli.py,sha256=N1NWOgEZR2yaJvIXxo9qvp_jFlypZYb0nujpbVNYQ6A,720
-sweatstack/client.py,sha256=jzTjKcgfooADa9JUqKJPV2Z-HbAmNZOeqgVkk6Y89eU,24106
+sweatstack/client.py,sha256=NpZjqDION-cets4B87brCL3sFMBAuNiP9_HKc9l6Cy4,24898
 sweatstack/constants.py,sha256=fGO6ksOv5HeISv9lHRoYm4besW1GTveXS8YD3K0ljg0,41
 sweatstack/ipython_init.py,sha256=zBGUlMFkdpLvsNpOpwrNaKRUpUZhzaICvH8ODJgMPcI,229
 sweatstack/jupyterlab_oauth2_startup.py,sha256=eZ6xi0Sa4hO4vUanimq0SqjduHtiywCURSDNWk_I-7s,1200
@@ -11,7 +11,7 @@ sweatstack/streamlit.py,sha256=gsgiIDW-INGTvF24ANnX5LJ17ZxnvXx95sjSmtcTlnY,8062
 sweatstack/sweatshell.py,sha256=MYLNcWbOdceqKJ3S0Pe8dwHXEeYsGJNjQoYUXpMTftA,333
 sweatstack/utils.py,sha256=3K97OSWQy5KZ97QiBbW4Kx1wDGxwyA96ZWpwIbkcQZc,2090
 sweatstack/Sweat Stack examples/Getting started.ipynb,sha256=k2hiSffWecoQ0VxjdpDcgFzBXDQiYEebhnAYlu8cgX8,6335204
-sweatstack-0.31.1.dist-info/METADATA,sha256=GCb3Q6kmp5d74Ap6FFGAeR5o14MfqmcE3773VsEWM3A,775
-sweatstack-0.31.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sweatstack-0.31.1.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
-sweatstack-0.31.1.dist-info/RECORD,,
+sweatstack-0.33.0.dist-info/METADATA,sha256=ULQomRjnvxecWkP2Rg3B6VruKNM26_yfuXZ1jQsTWwI,775
+sweatstack-0.33.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sweatstack-0.33.0.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
+sweatstack-0.33.0.dist-info/RECORD,,