sweatstack 0.38.0__tar.gz → 0.40.1__tar.gz

{sweatstack-0.38.0 → sweatstack-0.40.1}/PKG-INFO

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

{sweatstack-0.38.0 → sweatstack-0.40.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sweatstack"
-version = "0.38.0"
+version = "0.40.1"
 description = "The official Python client for SweatStack"
 readme = "README.md"
 authors = [

{sweatstack-0.38.0 → sweatstack-0.40.1}/src/sweatstack/client.py

@@ -444,7 +444,7 @@ class Client(OAuth2Mixin, DelegationMixin):
         tags: list[str] | None = None,
         limit: int = 100,
         as_dataframe: bool = False,
-    ) -> Generator[ActivitySummary, None, None] | pd.DataFrame:
+    ) -> list[ActivitySummary] | pd.DataFrame:
         """Gets a list of activities based on specified filters.
 
         Args:
@@ -456,28 +456,27 @@ class Client(OAuth2Mixin, DelegationMixin):
             as_dataframe: Whether to return results as a pandas DataFrame. Defaults to False.
 
         Returns:
-            Either a generator yielding ActivitySummary objects or a pandas DataFrame containing
+            Either a list of ActivitySummary objects or a pandas DataFrame containing
             the activities data, depending on the value of as_dataframe.
 
         Raises:
             HTTPStatusError: If the API request fails.
         """
-        generator = self._get_activities_generator(
+        activities = list(self._get_activities_generator(
             start=start,
             end=end,
             sports=sports,
             tags=tags,
             limit=limit,
-        )
+        ))
         if as_dataframe:
-            df = pd.DataFrame([activity.model_dump() for activity in generator])
-            df = df.set_index(df["start"].rename("timestamp"))
+            df = pd.DataFrame([activity.model_dump() for activity in activities])
             df = self._normalize_dataframe_column(df, "summary")
             df = self._normalize_dataframe_column(df, "laps")
             df = self._normalize_dataframe_column(df, "traces")
             return self._postprocess_dataframe(df)
         else:
-            return generator
+            return activities
 
     def get_latest_activity(
         self,
@@ -502,7 +501,7 @@ class Client(OAuth2Mixin, DelegationMixin):
             StopIteration: If no activities match the filters.
             HTTPStatusError: If the API request fails.
         """
-        return next(self.get_activities(
+        return next(self._get_activities_generator(
             start=start,
             end=end,
             sports=[sport] if sport is not None else None,
@@ -841,7 +840,7 @@ class Client(OAuth2Mixin, DelegationMixin):
         tags: list[str] | None = None,
         limit: int = 100,
         as_dataframe: bool = False,
-    ) -> Generator[TraceDetails, None, None] | pd.DataFrame:
+    ) -> list[TraceDetails] | pd.DataFrame:
         """Gets a list of traces based on specified filters.
 
         Args:
@@ -853,23 +852,23 @@ class Client(OAuth2Mixin, DelegationMixin):
             as_dataframe: Whether to return results as a pandas DataFrame. Defaults to False.
 
         Returns:
-            Either a generator yielding TraceDetails objects or a pandas DataFrame containing
+            Either a list of TraceDetails objects or a pandas DataFrame containing
             the traces data, depending on the value of as_dataframe.
 
         Raises:
             HTTPStatusError: If the API request fails.
         """
-        generator = self._get_traces_generator(
+        traces = list(self._get_traces_generator(
             start=start,
             end=end,
             sports=sports,
             tags=tags,
             limit=limit,
-        )
+        ))
         if not as_dataframe:
-            return generator
+            return traces
 
-        data = pd.DataFrame([trace.model_dump() for trace in generator])
+        data = pd.DataFrame([trace.model_dump() for trace in traces])
 
         if "activity" in data.columns:
             data = self._normalize_dataframe_column(data, "activity")

{sweatstack-0.38.0 → sweatstack-0.40.1}/src/sweatstack/openapi_schemas.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.json
-#   timestamp: 2025-04-08T11:14:52+00:00
+#   timestamp: 2025-04-11T08:42:56+00:00
 
 from __future__ import annotations
 
@@ -332,6 +332,8 @@ class Lap(BaseModel):
     start: datetime = Field(..., title='Start')
     end: datetime = Field(..., title='End')
     duration: timedelta = Field(..., title='Duration')
+    start_local: datetime = Field(..., title='Start Local')
+    end_local: datetime = Field(..., title='End Local')
 
 
 class ActivityDetails(BaseModel):
@@ -347,6 +349,8 @@ class ActivityDetails(BaseModel):
     traces: Optional[List[TraceDetails]] = Field(None, title='Traces')
     distance: Optional[float] = Field(None, title='Distance')
     duration: timedelta = Field(..., title='Duration')
+    start_local: datetime = Field(..., title='Start Local')
+    end_local: datetime = Field(..., title='End Local')
 
 
 class ActivitySummary(BaseModel):
@@ -361,6 +365,8 @@ class ActivitySummary(BaseModel):
     laps: Optional[List[Lap]] = Field(None, title='Laps')
     traces: Optional[List[TraceDetails]] = Field(None, title='Traces')
     duration: timedelta = Field(..., title='Duration')
+    start_local: datetime = Field(..., title='Start Local')
+    end_local: datetime = Field(..., title='End Local')
 
 
 class TraceDetails(BaseModel):
@@ -376,6 +382,7 @@ class TraceDetails(BaseModel):
     lap: Optional[Lap] = None
     activity: Optional[ActivitySummary] = None
     sport: Optional[Sport] = None
+    timestamp_local: datetime = Field(..., title='Timestamp Local')
 
 
 ActivityDetails.model_rebuild()

{sweatstack-0.38.0 → sweatstack-0.40.1}/src/sweatstack/streamlit.py

@@ -15,7 +15,7 @@ import httpx
 from .client import Client
 from .constants import DEFAULT_URL
 from .schemas import Metric, Scope, Sport
-from .utils import format_sport
+
 
 class StreamlitAuth:
     def __init__(
@@ -253,7 +253,7 @@ class StreamlitAuth:
         selected_activity = st.selectbox(
             "Select an activity",
             activities,
-            format_func=lambda activity: f"{activity.start.date().isoformat()} {format_sport(activity.sport)}",
+            format_func=lambda activity: f"{activity.start.date().isoformat()} {activity.sport.display_name()}",
         )
         return selected_activity
 
@@ -272,7 +272,7 @@ class StreamlitAuth:
             Sport or list[Sport]: The selected sport or list of sports, depending on allow_multiple.
 
         Note:
-            Sports are displayed in a human-readable format using the format_sport function.
+            Sports are displayed in a human-readable format using the display_name function.
         """
         if only_available:
             sports = self.client.get_sports(only_root)
@@ -286,13 +286,13 @@ class StreamlitAuth:
             selected_sport = st.multiselect(
                 "Select sports",
                 sports,
-                format_func=format_sport,
+                format_func=lambda sport: sport.display_name(),
             )
         else:
             selected_sport = st.selectbox(
                 "Select a sport",
                 sports,
-                format_func=format_sport,
+                format_func=lambda sport: sport.display_name(),
             )
         return selected_sport