sweatstack 0.48.0__py3-none-any.whl → 0.50.0__py3-none-any.whl

sweatstack/client.py

@@ -692,12 +692,13 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
         sports: list[Sport | str] | None = None,
         tags: list[str] | None = None,
         limit: int = 100,
+        offset: int = 0,
     ) -> Generator[ActivitySummary, None, None]:
         num_returned = 0
         default_limit = 100
         params = {
             "limit": default_limit,
-            "offset": 0,
+            "offset": offset,
         }
         if start is not None:
             params["start"] = start.isoformat()
@@ -742,6 +743,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
         sports: list[Sport | str] | None = None,
         tags: list[str] | None = None,
         limit: int = 100,
+        offset: int = 0,
         as_dataframe: bool = False,
     ) -> list[ActivitySummary] | pd.DataFrame:
         """Gets a list of activities based on specified filters.
@@ -752,6 +754,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
             sports: Optional list of sports to filter activities by. Can be Sport objects or string IDs.
             tags: Optional list of tags to filter activities by.
             limit: Maximum number of activities to return. Defaults to 100.
+            offset: Number of activities to skip. Defaults to 0.
             as_dataframe: Whether to return results as a pandas DataFrame. Defaults to False.
 
         Returns:
@@ -767,6 +770,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
             sports=sports,
             tags=tags,
             limit=limit,
+            offset=offset,
         ))
         if as_dataframe:
             df = pd.DataFrame([activity.model_dump() for activity in activities])
@@ -829,6 +833,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
         self,
         activity_id: str,
         adaptive_sampling_on: Literal["power", "speed"] | None = None,
+        metrics: list[Metric | str] | None = None,
     ) -> pd.DataFrame:
         """Gets the raw data for a specific activity.
 
@@ -839,6 +844,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
             activity_id: The unique identifier of the activity.
             adaptive_sampling_on: Optional parameter to apply adaptive sampling on 
                 either "power" or "speed" data. If None, no adaptive sampling is applied.
+            metrics: Optional list of metrics to include in the results. Can be a list of Metric enums or strings.
 
         Returns:
             pd.DataFrame: A pandas DataFrame containing the activity's time-series data.
@@ -849,6 +855,8 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
         params = {}
         if adaptive_sampling_on is not None:
             params["adaptive_sampling_on"] = adaptive_sampling_on
+        if metrics is not None:
+            params["metrics"] = self._enums_to_strings(metrics)
 
         with self._http_client() as client:
             response = client.get(
@@ -900,6 +908,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
         self,
         sport: Sport | str | None = None,
         adaptive_sampling_on: Literal["power", "speed"] | None = None,
+        metrics: list[Metric | str] | None = None,
     ) -> pd.DataFrame:
         """Gets the data for the latest activity of a specific sport.
 
@@ -910,6 +919,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
             sport: Optional sport to filter by. Can be a Sport enum or string.
             adaptive_sampling_on: Optional metric to apply adaptive sampling for visualization.
                 Can be either "power" or "speed". Defaults to None.
+            metrics: Optional list of metrics to include in the results. Can be a list of Metric enums or strings.
 
         Returns:
             pd.DataFrame: A pandas DataFrame containing the activity data.
@@ -918,7 +928,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
             HTTPStatusError: If the API request fails.
         """
         activity = self.get_latest_activity(sport=sport)
-        return self.get_activity_data(activity.id, adaptive_sampling_on)
+        return self.get_activity_data(activity.id, adaptive_sampling_on, metrics=metrics)
 
     def get_latest_activity_mean_max(
         self,
@@ -1075,12 +1085,13 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
         sports: list[Sport | str] | None = None,
         tags: list[str] | None = None,
         limit: int = 100,
+        offset: int = 0,
     ) -> Generator[TraceDetails, None, None]:
         num_returned = 0
         default_limit = 100
         params = {
             "limit": default_limit,
-            "offset": 0,
+            "offset": offset,
         }
         if start is not None:
             params["start"] = start.isoformat()
@@ -1148,6 +1159,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
         sports: list[Sport | str] | None = None,
         tags: list[str] | None = None,
         limit: int = 100,
+        offset: int = 0,
         as_dataframe: bool = False,
     ) -> list[TraceDetails] | pd.DataFrame:
         """Gets a list of traces based on specified filters.
@@ -1158,6 +1170,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
             sports: Optional list of sports to filter traces by. Can be Sport objects or string IDs.
             tags: Optional list of tags to filter traces by.
             limit: Maximum number of traces to return. Defaults to 100.
+            offset: Number of traces to skip. Defaults to 0.
             as_dataframe: Whether to return results as a pandas DataFrame. Defaults to False.
 
         Returns:
@@ -1173,6 +1186,7 @@ class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin, LocalCacheMixin):
             sports=sports,
             tags=tags,
             limit=limit,
+            offset=offset,
         ))
         if not as_dataframe:
             return traces

{sweatstack-0.48.0.dist-info → sweatstack-0.50.0.dist-info}/METADATA

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

{sweatstack-0.48.0.dist-info → sweatstack-0.50.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=389f_XghylIeN-q4FPXFprYZ3Bje-b4d4Ko42bhzf5s,53950
+sweatstack/client.py,sha256=oIp1aoQzVGcMyXYqJg_LNq3624DSIllAWhi_g1iRJWs,54685
 sweatstack/constants.py,sha256=fGO6ksOv5HeISv9lHRoYm4besW1GTveXS8YD3K0ljg0,41
 sweatstack/ipython_init.py,sha256=OtBB9dQvyLXklD4kA2x1swaVtU9u73fG4V4-zz4YRAg,139
 sweatstack/jupyterlab_oauth2_startup.py,sha256=YcjXvzeZ459vL_dCkFi1IxX_RNAu80ZX9rwa0OXJfTM,1023
@@ -11,7 +11,7 @@ sweatstack/streamlit.py,sha256=_PER03s0dYu5eF1MZdewPDqSvYHqMr0lZLu_EnGit3Y,13257
 sweatstack/sweatshell.py,sha256=MYLNcWbOdceqKJ3S0Pe8dwHXEeYsGJNjQoYUXpMTftA,333
 sweatstack/utils.py,sha256=AwHRdC1ziOZ5o9RBIB21Uxm-DoClVRAJSVvgsmSmvps,1801
 sweatstack/Sweat Stack examples/Getting started.ipynb,sha256=k2hiSffWecoQ0VxjdpDcgFzBXDQiYEebhnAYlu8cgX8,6335204
-sweatstack-0.48.0.dist-info/METADATA,sha256=HVIrAr7pmRHAVvSrmiV8hp8KN_BWSsSGc1Mrqr462js,852
-sweatstack-0.48.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sweatstack-0.48.0.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
-sweatstack-0.48.0.dist-info/RECORD,,
+sweatstack-0.50.0.dist-info/METADATA,sha256=2U6hV_PT2DR5SPnJ8bdKlrIF7Iqded55SI6HOMdQ4x8,852
+sweatstack-0.50.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sweatstack-0.50.0.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
+sweatstack-0.50.0.dist-info/RECORD,,