sweatstack 0.35.1__py3-none-any.whl → 0.37.0__py3-none-any.whl

sweatstack/client.py

@@ -22,7 +22,7 @@ import pandas as pd
 
 from .constants import DEFAULT_URL
 from .schemas import (
-    ActivityDetails, ActivitySummary, Metric, Sport, TraceDetails, UserSummary
+    ActivityDetails, ActivitySummary, Metric, Sport, TraceDetails, UserInfoResponse, UserSummary
 )
 from .utils import decode_jwt_body, make_dataframe_streamlit_compatible
 
@@ -106,7 +106,7 @@ class OAuth2Mixin:
             "client_id": OAUTH2_CLIENT_ID,
             "redirect_uri": redirect_uri,
             "code_challenge": code_challenge,
-            "scope": "data:read",
+            "scope": "data:read profile",
             "prompt": "none",
         }
         base_url = self.url
@@ -991,6 +991,27 @@ class Client(OAuth2Mixin, DelegationMixin):
             self._raise_for_status(response)
             return [UserSummary.model_validate(user) for user in response.json()]
 
+    def get_userinfo(self) -> UserInfoResponse:
+        """Gets detailed information about the current user.
+
+        This method retrieves comprehensive information about the user currently
+        authenticated with the client.
+
+        Returns:
+            UserInfoResponse: A UserInfoResponse object containing detailed user information
+                including profile data, permissions, and authentication details.
+
+        Raises:
+            HTTPStatusError: If the API request fails.
+        """
+        with self._http_client() as client:
+            response = client.get(
+                url="/api/v1/oauth/userinfo",
+            )
+            self._raise_for_status(response)
+            return UserInfoResponse.model_validate(response.json())
+
+
 _default_client = Client()
 
 
@@ -1031,6 +1052,7 @@ _generate_singleton_methods(
         "login",
 
         "get_users",
+        "get_userinfo",
 
         "get_activities",
 

sweatstack/openapi_schemas.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.json
-#   timestamp: 2025-03-03T13:21:38+00:00
+#   timestamp: 2025-04-08T11:14:52+00:00
 
 from __future__ import annotations
 
@@ -15,10 +15,6 @@ class ActivityUpdate(BaseModel):
     tags: Optional[List[str]] = Field(None, title='Tags')
 
 
-class BodyAddEmailToWhitelistAdminEmailWhitelistPost(BaseModel):
-    email: str = Field(..., title='Email')
-
-
 class BodyCreateApplicationApplicationsPost(BaseModel):
     name: str = Field(..., title='Name')
     description: str = Field(..., title='Description')
@@ -26,6 +22,7 @@ class BodyCreateApplicationApplicationsPost(BaseModel):
     image: AnyUrl = Field(..., title='Image')
     redirect_uris: List[AnyUrl] = Field(..., title='Redirect Uris')
     privacy_statement: AnyUrl = Field(..., title='Privacy Statement')
+    published: Optional[bool] = Field(False, title='Published')
 
 
 class BodyCreateApplicationSecretApplicationsApplicationIdSecretsPost(BaseModel):
@@ -36,10 +33,6 @@ class BodyCreateTagTagsPost(BaseModel):
     tag: str = Field(..., title='Tag')
 
 
-class BodyDeleteEmailFromWhitelistAdminEmailWhitelistDelete(BaseModel):
-    email: str = Field(..., title='Email')
-
-
 class BodyLoginPostLoginPost(BaseModel):
     email: str = Field(..., title='Email')
     password: SecretStr = Field(..., title='Password')
@@ -49,6 +42,7 @@ class BodyLoginPostLoginPost(BaseModel):
 class BodyRegisterPostRegisterPost(BaseModel):
     email: str = Field(..., title='Email')
     password: SecretStr = Field(..., title='Password')
+    tz_offset: int = Field(..., title='Tz Offset')
 
 
 class BodySaveOrUpdateIntegrationProviderTenantsTenantIdIntegrationProvidersIntegrationNamePost(
@@ -66,6 +60,7 @@ class BodyUpdateApplicationApplicationsApplicationIdPut(BaseModel):
     image: AnyUrl = Field(..., title='Image')
     redirect_uris: List[AnyUrl] = Field(..., title='Redirect Uris')
     privacy_statement: AnyUrl = Field(..., title='Privacy Statement')
+    published: Optional[bool] = Field(False, title='Published')
 
 
 class BodyUpdateUserUsersUserIdPut(BaseModel):
@@ -257,6 +252,7 @@ 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')
+    email: Optional[str] = Field(None, title='Email')
     name: str = Field(..., title='Name')
 
 
@@ -295,9 +291,13 @@ class BodyAuthorizeOauthAuthorizePost(BaseModel):
     code_challenge_method: Optional[str] = Field(None, title='Code Challenge Method')
 
 
+class BodyGenerateApiKeyPartialsGenerateApiKeyPost(BaseModel):
+    scopes: List[Scope] = Field(..., title='Scopes')
+
+
 class DelegatedTokenRequest(BaseModel):
     sub: str = Field(..., title='Sub')
-    scopes: List[Scope] = Field(..., title='Scopes')
+    scopes: Optional[List[Scope]] = Field(None, title='Scopes')
 
 
 class GarminActivityFileData(BaseModel):

sweatstack/schemas.py

@@ -1,5 +1,5 @@
 from enum import Enum
 
 from .openapi_schemas import (
-    ActivityDetails, ActivitySummary, Metric, Sport, TraceDetails, UserSummary
+    ActivityDetails, ActivitySummary, Metric, Scope, Sport, TraceDetails, UserInfoResponse, UserSummary
 )

sweatstack/streamlit.py

@@ -1,6 +1,7 @@
 import os
 import urllib.parse
 from datetime import date
+from typing import List, Union
 try:
     import streamlit as st
 except ImportError:
@@ -13,21 +14,37 @@ import httpx
 
 from .client import Client
 from .constants import DEFAULT_URL
-from .schemas import Metric, Sport
+from .schemas import Metric, Scope, Sport
 from .utils import format_sport
 
 class StreamlitAuth:
-    def __init__(self, client_id=None, client_secret=None, scope=None, redirect_uri=None):
+    def __init__(
+        self,
+        client_id=None,
+        client_secret=None,
+        scopes: List[Union[str, Scope]]=None,
+        redirect_uri=None,
+    ):
         """
         Args:
             client_id: The client ID to use. If not provided, the SWEATSTACK_CLIENT_ID environment variable will be used.
             client_secret: The client secret to use. If not provided, the SWEATSTACK_CLIENT_SECRET environment variable will be used.
-            scope: The scope to use. If not provided, the SWEATSTACK_SCOPE environment variable will be used.
+            scopes: The scopes to use. If not provided, the SWEATSTACK_SCOPES environment variable will be used. Defaults to data:read, profile.
             redirect_uri: The redirect URI to use. If not provided, the SWEATSTACK_REDIRECT_URI environment variable will be used.
         """
         self.client_id = client_id or os.environ.get("SWEATSTACK_CLIENT_ID")
         self.client_secret = client_secret or os.environ.get("SWEATSTACK_CLIENT_SECRET")
-        self.scope = scope or os.environ.get("SWEATSTACK_SCOPE")
+
+        if scopes is not None:
+            self.scopes = [Scope(scope.strip().lower()) if isinstance(scope, str) else scope
+                          for scope in scopes] if scopes else []
+        elif os.environ.get("SWEATSTACK_SCOPES"):
+            scopes = os.environ.get("SWEATSTACK_SCOPES").split(",")
+            self.scopes = [Scope(scope.strip().lower()) if isinstance(scope, str) else scope
+                          for scope in scopes]
+        else:
+            self.scopes = [Scope.data_read, Scope.profile]
+
         self.redirect_uri = redirect_uri or os.environ.get("SWEATSTACK_REDIRECT_URI")
 
         self.api_key = st.session_state.get("sweatstack_api_key")
@@ -81,7 +98,7 @@ class StreamlitAuth:
         params = {
             "client_id": self.client_id,
             "redirect_uri": self.redirect_uri,
-            "scope": "data:read",
+            "scope": ",".join([scope.value for scope in self.scopes]),
             "prompt": "none",
         }
         path = "/oauth/authorize"

{sweatstack-0.35.1.dist-info → sweatstack-0.37.0.dist-info}/METADATA

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

{sweatstack-0.35.1.dist-info → sweatstack-0.37.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
 sweatstack/__init__.py,sha256=tiVfgKlswRPaDMEy0gA7u8rveqEYZTA_kyB9lJ3J6Sc,21
 sweatstack/cli.py,sha256=N1NWOgEZR2yaJvIXxo9qvp_jFlypZYb0nujpbVNYQ6A,720
-sweatstack/client.py,sha256=t6UeZxP8-aiZ8K35G0LDqd0vuAf59WSskccQ-lDX-RQ,38340
+sweatstack/client.py,sha256=KAvrvf-NChmGh7yx7b-kG02MoGPCsEBRdKU1xBanntM,39150
 sweatstack/constants.py,sha256=fGO6ksOv5HeISv9lHRoYm4besW1GTveXS8YD3K0ljg0,41
 sweatstack/ipython_init.py,sha256=zBGUlMFkdpLvsNpOpwrNaKRUpUZhzaICvH8ODJgMPcI,229
 sweatstack/jupyterlab_oauth2_startup.py,sha256=eZ6xi0Sa4hO4vUanimq0SqjduHtiywCURSDNWk_I-7s,1200
-sweatstack/openapi_schemas.py,sha256=XlgiL7qkfcfoDHcQrIm9e5hvhY98onC0QmZWG69bl-s,13441
+sweatstack/openapi_schemas.py,sha256=rB_gdkob49AISTebZXmNjOOz3it28Y42_PEKcBF24c0,13576
 sweatstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sweatstack/schemas.py,sha256=Lkx0rH8LNIHfX8obHSa4EdJF5q4DzDursnhofzSTddQ,134
-sweatstack/streamlit.py,sha256=QV_lPykNgcOR1cAO9F0B4hB_sax2IAMZGHOQLwG_0Rw,12368
+sweatstack/schemas.py,sha256=zRxssFvsXmCTtLr69a7n_EHUUbfAG27w6cTr730ZeUY,159
+sweatstack/streamlit.py,sha256=dtli4RpBiS8cH4GAQ9lDI_ZRDMLoU7GnTc676nLV_4A,13008
 sweatstack/sweatshell.py,sha256=MYLNcWbOdceqKJ3S0Pe8dwHXEeYsGJNjQoYUXpMTftA,333
 sweatstack/utils.py,sha256=WMY0THAfktzeDNH3kuwYNtVaoS1OQMaobONtGhpLI2E,2547
 sweatstack/Sweat Stack examples/Getting started.ipynb,sha256=k2hiSffWecoQ0VxjdpDcgFzBXDQiYEebhnAYlu8cgX8,6335204
-sweatstack-0.35.1.dist-info/METADATA,sha256=GB_6xc2dkdb3UiDZLGKfZeiHl-wOPky349eT3CDsnfM,779
-sweatstack-0.35.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sweatstack-0.35.1.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
-sweatstack-0.35.1.dist-info/RECORD,,
+sweatstack-0.37.0.dist-info/METADATA,sha256=MQf29vXxKG9b22yMQvH9apE5uWwljU1RY0NQRVSuUng,779
+sweatstack-0.37.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sweatstack-0.37.0.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
+sweatstack-0.37.0.dist-info/RECORD,,