sweatstack 0.16.0__tar.gz → 0.18.0__tar.gz

{sweatstack-0.16.0 → sweatstack-0.18.0}/PKG-INFO

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

{sweatstack-0.16.0 → sweatstack-0.18.0}/pyproject.toml

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

{sweatstack-0.16.0 → sweatstack-0.18.0}/src/sweatstack/client.py

@@ -18,7 +18,9 @@ import httpx
 import pandas as pd
 
 from .constants import DEFAULT_URL
-from .schemas import ActivityDetails, ActivitySummary, Sport, TraceDetails
+from .schemas import (
+    ActivityDetails, ActivitySummary, Sport, TraceDetails, UserSummary
+)
 from .utils import decode_jwt_body, make_dataframe_streamlit_compatible
 
 
@@ -62,6 +64,7 @@ class OAuth2Mixin:
             "redirect_uri": redirect_uri,
             "code_challenge": code_challenge,
             "scope": "data:read",
+            "prompt": "none",
         }
         base_url = self.url
         path = "/oauth/authorize"
@@ -83,7 +86,7 @@ class OAuth2Mixin:
                 "grant_type": "authorization_code",
                 "client_id": OAUTH2_CLIENT_ID,
                 "code": server.code,
-                "code_verifier": code_verifier
+                "code_verifier": code_verifier,
             }
             response = httpx.post(
                 f"{self.url}/api/v1/oauth/token",
@@ -103,7 +106,55 @@ class OAuth2Mixin:
             raise Exception("SweatStack Python login failed. Please try again.")
 
 
-class Client(OAuth2Mixin):
+class DelegationMixin:
+    def _get_delegated_token(self, user_id: str):
+        with self._http_client() as client:
+            response = client.post(
+                "/api/v1/oauth/delegated-token",
+                json={"sub": user_id},
+            )
+            response.raise_for_status()
+
+        return response.json()
+
+    def switch_user(self, user_id: str):
+        token_response = self._get_delegated_token(user_id)
+        self.api_key = token_response["access_token"]
+        self.refresh_token = token_response["refresh_token"]
+
+    def _get_principal_token(self):
+        with self._http_client() as client:
+            response = client.get(
+                "/api/v1/oauth/principal-token",
+            )
+            response.raise_for_status()
+        return response.json()
+
+    def switch_back(self):
+        token_response = self._get_principal_token()
+        self.api_key = token_response["access_token"]
+        self.refresh_token = token_response["refresh_token"]
+
+    def delegated_client(self, user_id: str):
+        token_response = self._get_delegated_token(user_id)
+        return self.__class__(
+            api_key=token_response["access_token"],
+            refresh_token=token_response["refresh_token"],
+            url=self.url,
+            streamlit_compatible=self.streamlit_compatible,
+        )
+
+    def principal_client(self):
+        token_response = self._get_principal_token()
+        return self.__class__(
+            api_key=token_response["access_token"],
+            refresh_token=token_response["refresh_token"],
+            url=self.url,
+            streamlit_compatible=self.streamlit_compatible,
+        )
+
+
+class Client(OAuth2Mixin, DelegationMixin):
     def __init__(
         self,
         api_key: str | None = None,
@@ -553,6 +604,13 @@ class Client(OAuth2Mixin):
             response.raise_for_status()
             return response.json()
 
+    def list_users(self) -> list[UserSummary]:
+        with self._http_client() as client:
+            response = client.get(
+                url="/api/v1/users/",
+            )
+            response.raise_for_status()
+            return [UserSummary.model_validate(user) for user in response.json()]
 
 _default_client = Client()
 
@@ -593,6 +651,8 @@ _generate_singleton_methods(
     [
         "login",
 
+        "list_users",
+
         "get_activities",
 
         "get_activity",
@@ -611,5 +671,10 @@ _generate_singleton_methods(
 
         "get_sports",
         "get_tags",
+
+        "switch_user",
+        "switch_back",
+        "delegated_client",
+        "principal_client",
     ]
 )

{sweatstack-0.16.0 → sweatstack-0.18.0}/src/sweatstack/openapi_schemas.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.json
-#   timestamp: 2025-02-13T12:03:28+00:00
+#   timestamp: 2025-03-03T13:21:38+00:00
 
 from __future__ import annotations
 
@@ -59,16 +59,6 @@ class BodySaveOrUpdateIntegrationProviderTenantsTenantIdIntegrationProvidersInte
     redirect_url: str = Field(..., title='Redirect Url')
 
 
-class BodyTokenOauthTokenPost(BaseModel):
-    grant_type: Literal['authorization_code'] = Field(..., title='Grant Type')
-    code: str = Field(..., title='Code')
-    client_id: str = Field(..., title='Client Id')
-    client_secret: Optional[str] = Field(None, title='Client Secret')
-    code_verifier: Optional[str] = Field(None, title='Code Verifier')
-    refresh_token: Optional[str] = Field(None, title='Refresh Token')
-    tz_offset: Optional[int] = Field(0, title='Tz Offset')
-
-
 class BodyUpdateApplicationApplicationsApplicationIdPut(BaseModel):
     name: str = Field(..., title='Name')
     description: str = Field(..., title='Description')
@@ -122,7 +112,6 @@ class GarminFileTypes(Enum):
 class GrantType(Enum):
     authorization_code = 'authorization_code'
     refresh_token = 'refresh_token'
-    implicit = 'implicit'
 
 
 class HeartRateSummary(BaseModel):
@@ -166,6 +155,8 @@ class Scope(Enum):
     data_read = 'data:read'
     data_write = 'data:write'
     admin = 'admin'
+    openid = 'openid'
+    profile = 'profile'
 
 
 class Smo2Summary(BaseModel):
@@ -233,13 +224,12 @@ class TemperatureSummary(BaseModel):
 
 class TokenRequest(BaseModel):
     grant_type: GrantType
+    client_id: Optional[str] = Field(None, title='Client Id')
     code: Optional[str] = Field(None, title='Code')
+    client_secret: Optional[str] = Field(None, title='Client Secret')
+    code_verifier: Optional[str] = Field(None, title='Code Verifier')
     refresh_token: Optional[str] = Field(None, title='Refresh Token')
-    client_id: Optional[str] = Field(None, title='Client Id')
-    client_secret: Optional[SecretStr] = Field(None, title='Client Secret')
-    tz_offset: Optional[int] = Field(
-        3600, description='Timezone DST offset in seconds', title='Tz Offset'
-    )
+    tz_offset: Optional[int] = Field(0, title='Tz Offset')
 
 
 class TokenResponse(BaseModel):
@@ -248,6 +238,7 @@ class TokenResponse(BaseModel):
     expires_in: int = Field(..., title='Expires In')
     refresh_token: str = Field(..., title='Refresh Token')
     scope: Optional[str] = Field(None, title='Scope')
+    id_token: Optional[str] = Field(None, title='Id Token')
 
 
 class TraceCreateOrUpdate(BaseModel):
@@ -259,6 +250,22 @@ class TraceCreateOrUpdate(BaseModel):
     speed: Optional[confloat(ge=0.0)] = Field(None, title='Speed')
     heart_rate: Optional[conint(ge=0)] = Field(None, title='Heart Rate')
     tags: Optional[List[str]] = Field(None, title='Tags')
+    sport: Optional[Sport] = None
+
+
+class UserInfoResponse(BaseModel):
+    sub: str = Field(..., title='Sub')
+    given_name: Optional[str] = Field(None, title='Given Name')
+    family_name: Optional[str] = Field(None, title='Family Name')
+    name: str = Field(..., title='Name')
+
+
+class UserSummary(BaseModel):
+    id: str = Field(..., title='Id')
+    first_name: Optional[str] = Field(..., title='First Name')
+    last_name: Optional[str] = Field(..., title='Last Name')
+    scopes: List[Scope] = Field(..., title='Scopes')
+    display_name: str = Field(..., title='Display Name')
 
 
 class ValidationError(BaseModel):
@@ -283,10 +290,16 @@ class BodyAuthorizeOauthAuthorizePost(BaseModel):
     redirect_uri: Optional[str] = Field(None, title='Redirect Uri')
     scopes: List[Scope] = Field(..., min_length=1, title='Scopes')
     state: Optional[str] = Field(None, title='State')
+    nonce: Optional[str] = Field(None, title='Nonce')
     code_challenge: Optional[str] = Field(None, title='Code Challenge')
     code_challenge_method: Optional[str] = Field(None, title='Code Challenge Method')
 
 
+class DelegatedTokenRequest(BaseModel):
+    sub: str = Field(..., title='Sub')
+    scopes: List[Scope] = Field(..., title='Scopes')
+
+
 class GarminActivityFileData(BaseModel):
     userId: str = Field(..., title='Userid')
     userAccessToken: str = Field(..., title='Useraccesstoken')
@@ -362,6 +375,7 @@ class TraceDetails(BaseModel):
     heart_rate: Optional[conint(ge=0)] = Field(None, title='Heart Rate')
     lap: Optional[Lap] = None
     activity: Optional[ActivitySummary] = None
+    sport: Optional[Sport] = None
 
 
 ActivityDetails.model_rebuild()

sweatstack-0.18.0/src/sweatstack/schemas.py

@@ -0,0 +1,3 @@
+from .openapi_schemas import (
+    ActivityDetails, ActivitySummary, Sport, TraceDetails, UserSummary
+)

{sweatstack-0.16.0 → sweatstack-0.18.0}/src/sweatstack/streamlit.py

@@ -113,6 +113,7 @@ class StreamlitAuth:
 
     def authenticate(self):
         if self.is_authenticated():
+            st.toast("SweatStack authentication successful!", icon="✅")
             self._show_sweatstack_logout()
         elif code := st.query_params.get("code"):
             self._exchange_token(code)

{sweatstack-0.16.0 → sweatstack-0.18.0}/uv.lock

@@ -1857,7 +1857,7 @@ wheels = [
 
 [[package]]
 name = "sweatstack"
-version = "0.13.2"
+version = "0.17.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },

sweatstack-0.16.0/src/sweatstack/schemas.py

@@ -1,3 +0,0 @@
-from .openapi_schemas import (
-    ActivityDetails, ActivitySummary, Sport, TraceDetails
-)