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

sweatstack/schemas.py

@@ -1,5 +1,5 @@
 from enum import Enum
 
 from .openapi_schemas import (
-    ActivityDetails, ActivitySummary, Metric, Sport, TraceDetails, UserInfoResponse, 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.36.0.dist-info → sweatstack-0.37.0.dist-info}/METADATA

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

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

@@ -6,12 +6,12 @@ sweatstack/ipython_init.py,sha256=zBGUlMFkdpLvsNpOpwrNaKRUpUZhzaICvH8ODJgMPcI,22
 sweatstack/jupyterlab_oauth2_startup.py,sha256=eZ6xi0Sa4hO4vUanimq0SqjduHtiywCURSDNWk_I-7s,1200
 sweatstack/openapi_schemas.py,sha256=rB_gdkob49AISTebZXmNjOOz3it28Y42_PEKcBF24c0,13576
 sweatstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sweatstack/schemas.py,sha256=RUbM70A4znSyEJojrvfB17894qd0sn0xhu0LhfbXaHw,152
-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.36.0.dist-info/METADATA,sha256=MU9jzkXLTmBSAKSk9EBVSks3MTg81xYz0Z89TQwOye8,779
-sweatstack-0.36.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sweatstack-0.36.0.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
-sweatstack-0.36.0.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,,