sweatstack 0.35.1__tar.gz → 0.37.0__tar.gz

{sweatstack-0.35.1 → sweatstack-0.37.0}/PKG-INFO

@@ -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 → sweatstack-0.37.0}/pyproject.toml

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

{sweatstack-0.35.1 → sweatstack-0.37.0}/src/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-0.35.1 → sweatstack-0.37.0}/src/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-0.37.0/src/sweatstack/schemas.py

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

{sweatstack-0.35.1 → sweatstack-0.37.0}/src/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/src/sweatstack/schemas.py

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