PyPI - sweatstack - Versions diffs - 0.14.0__tar.gz → 0.14.2__tar.gz - Mend

sweatstack 0.14.0tar.gz → 0.14.2tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

{sweatstack-0.14.0 → sweatstack-0.14.2}/PKG-INFO RENAMED Viewed

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

{sweatstack-0.14.0 → sweatstack-0.14.2}/pyproject.toml RENAMED Viewed

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

{sweatstack-0.14.0 → sweatstack-0.14.2}/src/sweatstack/client.py RENAMED Viewed

@@ -19,7 +19,7 @@ import pandas as pd
 from .constants import DEFAULT_URL
 from .schemas import ActivityDetails, ActivitySummary, Sport, TraceDetails
-from .utils import decode_jwt_body
+from .utils import decode_jwt_body, make_dataframe_streamlit_compatible
 AUTH_SUCCESSFUL_RESPONSE = "<!DOCTYPE html><html><body><h1>Authentication successful. You can now close this window.</h1></body></html>"
@@ -109,10 +109,12 @@ class Client(OAuth2Mixin):
         api_key: str | None = None,
         refresh_token: str | None = None,
         url: str | None = None,
+        streamlit_compatible: bool = False,
     ):
         self.api_key = api_key
         self.refresh_token = refresh_token
         self.url = url
+        self.streamlit_compatible = streamlit_compatible
     def _do_token_refresh(self, tz_offset: int) -> str:
         with self._http_client() as client:
@@ -247,6 +249,12 @@ class Client(OAuth2Mixin):
                 params["limit"] = min(default_limit, limit - num_returned)
                 params["offset"] += default_limit
+    def _postprocess_dataframe(self, df: pd.DataFrame) -> pd.DataFrame:
+        if self.streamlit_compatible:
+            return make_dataframe_streamlit_compatible(df)
+        else:
+            return df
     def get_activities(
         self,
         *,
@@ -265,7 +273,8 @@ class Client(OAuth2Mixin):
             limit=limit,
         )
         if as_dataframe:
-            return pd.DataFrame([activity.model_dump() for activity in generator])
+            df = pd.DataFrame([activity.model_dump() for activity in generator])
+            return self._postprocess_dataframe(df)
         else:
             return generator
@@ -308,7 +317,8 @@ class Client(OAuth2Mixin):
         response.raise_for_status()
-        return pd.read_parquet(BytesIO(response.content))
+        df = pd.read_parquet(BytesIO(response.content))
+        return self._postprocess_dataframe(df)
     def get_activity_mean_max(
         self,
@@ -325,7 +335,8 @@ class Client(OAuth2Mixin):
                 },
             )
             response.raise_for_status()
-            return pd.read_parquet(BytesIO(response.content))
+            df = pd.read_parquet(BytesIO(response.content))
+            return self._postprocess_dataframe(df)
     def get_latest_activity_data(
         self,
@@ -379,7 +390,8 @@ class Client(OAuth2Mixin):
             )
             response.raise_for_status()
-        return pd.read_parquet(BytesIO(response.content))
+            df = pd.read_parquet(BytesIO(response.content))
+            return self._postprocess_dataframe(df)
     def get_longitudinal_mean_max(
         self,
@@ -405,7 +417,8 @@ class Client(OAuth2Mixin):
             )
             response.raise_for_status()
-        return pd.read_parquet(BytesIO(response.content))
+            df = pd.read_parquet(BytesIO(response.content))
+            return self._postprocess_dataframe(df)
     def _get_traces_generator(
         self,
@@ -488,7 +501,7 @@ class Client(OAuth2Mixin):
         if "lap" in data.columns:
             data = self._normalize_dataframe_column(data, "lap")
-        return data
+        return self._postprocess_dataframe(data)
     def create_trace(
         self,

{sweatstack-0.14.0 → sweatstack-0.14.2}/src/sweatstack/streamlit.py RENAMED Viewed

@@ -61,7 +61,7 @@ class StreamlitAuth:
             "code": code,
         }
         response = httpx.post(
-            f"{DEFAULT_URL}/oauth/token",
+            f"{DEFAULT_URL}/api/v1/oauth/token",
             data=token_data,
         )
         try:
@@ -73,7 +73,7 @@ class StreamlitAuth:
         self.api_key = token_response.get("access_token")
         st.session_state["sweatstack_api_key"] = self.api_key
-        self.client = Client(self.api_key)
+        self.client = Client(self.api_key, streamlit_compatible=True)
         return

sweatstack-0.14.2/src/sweatstack/utils.py ADDED Viewed

@@ -0,0 +1,53 @@
+import base64
+import json
+from enum import Enum
+import pandas as pd
+def decode_jwt_body(jwt: str) -> dict:
+    payload = jwt.split(".")[1]
+    padding = len(payload) % 4
+    if padding:
+        payload += "=" * (4 - padding)
+    decoded = base64.urlsafe_b64decode(payload)
+    return json.loads(decoded)
+def make_dataframe_streamlit_compatible(df):
+    """
+    Converts all columns containing enum values in a DataFrame to their respective string values.
+    Args:
+        df (pd.DataFrame): The DataFrame to process
+    Returns:
+        pd.DataFrame: A new DataFrame with enum values converted to strings
+    """
+    df_copy = None
+    for column in df.columns:
+        # Check if the column contains enum values
+        if df[column].dtype == 'object':
+            # First check if it's a list column of enums
+            if df[column].notna().any():
+                first_value = df[column].dropna().iloc[0]
+                # Handle list of enums
+                if isinstance(first_value, list) and first_value and isinstance(first_value[0], Enum):
+                    if df_copy is None:
+                        df_copy = df.copy()
+                    df_copy[column] = df_copy[column].apply(
+                        lambda x: [item.value if isinstance(item, Enum) else item for item in x] if isinstance(x, list) else x
+                    )
+                # Handle single enum values
+                elif isinstance(first_value, Enum):
+                    if df_copy is None:
+                        df_copy = df.copy()
+                    df_copy[column] = df_copy[column].apply(
+                        lambda x: x.value if isinstance(x, Enum) else x
+                    )
+    return df_copy if df_copy is not None else df

sweatstack-0.14.0/src/sweatstack/utils.py DELETED Viewed

@@ -1,13 +0,0 @@
-import base64
-import json
-def decode_jwt_body(jwt: str) -> dict:
-    payload = jwt.split(".")[1]
-    padding = len(payload) % 4
-    if padding:
-        payload += "=" * (4 - padding)
-    decoded = base64.urlsafe_b64decode(payload)
-    return json.loads(decoded)