sweatstack 0.55.0__py3-none-any.whl → 0.56.0__py3-none-any.whl

sweatstack/client.py

@@ -669,6 +669,8 @@ class Client(_OAuth2Mixin, _DelegationMixin, _TokenStorageMixin, _LocalCacheMixi
         refresh_token: str | None = None,
         url: str | None = None,
         streamlit_compatible: bool = False,
+        client_id: str | None = None,
+        client_secret: str | None = None,
     ):
         """Initialize a SweatStack client.
 
@@ -682,18 +684,28 @@ class Client(_OAuth2Mixin, _DelegationMixin, _TokenStorageMixin, _LocalCacheMixi
         self.refresh_token = refresh_token
         self.url = url
         self.streamlit_compatible = streamlit_compatible
+        self.client_id = client_id or OAUTH2_CLIENT_ID
+        self.client_secret = client_secret
 
     def _do_token_refresh(self, tz: str) -> str:
-        with self._http_client() as client:
+        refresh_token = self.refresh_token
+        if refresh_token is None:
+            raise ValueError(
+                "Cannot refresh token: no refresh_token available. "
+                "If using Streamlit, ensure you're using StreamlitAuth which handles token refresh automatically."
+            )
+
+        with self._http_client(skip_token_check=True) as client:
             response = client.post(
                 "/api/v1/oauth/token",
-                json={
+                data={
                     "grant_type": "refresh_token",
-                    "refresh_token": self.refresh_token,
+                    "refresh_token": refresh_token,
                     "tz": tz,
+                    "client_id": self.client_id,
+                    "client_secret": self.client_secret,
                 },
             )
-
             self._raise_for_status(response)
             return response.json()["access_token"]
 
@@ -701,12 +713,13 @@ class Client(_OAuth2Mixin, _DelegationMixin, _TokenStorageMixin, _LocalCacheMixi
         try:
             body = decode_jwt_body(token)
             # Margin in seconds to account for time to token validation of the next request
-            TOKEN_EXPIRY_MARGIN = 5
+            TOKEN_EXPIRY_MARGIN = 5  # 5 seconds. Meaning that if the token is within 5 seconds of expiring, it will be refreshed.
             if body["exp"] - TOKEN_EXPIRY_MARGIN < time.time():
                 # Token is (almost) expired, refresh it
                 token = self._do_token_refresh(body["tz"])
                 self._api_key = token
-        except Exception:
+        except Exception as exception:
+            logging.warning("Exception checking token expiry: %s", exception)
             # If token can't be decoded, just return as-is
             # @TODO: This probably should be handled differently
             pass
@@ -776,16 +789,27 @@ class Client(_OAuth2Mixin, _DelegationMixin, _TokenStorageMixin, _LocalCacheMixi
         self._url = value
     
     @contextlib.contextmanager
-    def _http_client(self):
+    def _http_client(self, skip_token_check: bool = False):
         """
         Creates an httpx client with the base URL and authentication headers pre-configured.
+
+        Args:
+            skip_token_check: If True, uses the raw _api_key without triggering token expiry check.
+                              This prevents recursive token refresh attempts.
         """
         headers = {
             "User-Agent": f"python-sweatstack/{__version__}",
         }
-        if self.api_key:
-            headers["Authorization"] = f"Bearer {self.api_key}"
-        
+        if skip_token_check:
+            # Use raw token without triggering expiry check (used during refresh)
+            token = self._api_key
+        else:
+            # Normal path: may trigger token refresh
+            token = self.api_key
+
+        if token:
+            headers["Authorization"] = f"Bearer {token}"
+
         with httpx.Client(base_url=self.url, headers=headers, timeout=60) as client:
             yield client
 

sweatstack/streamlit.py

@@ -115,7 +115,14 @@ class StreamlitAuth:
         self.redirect_uri = redirect_uri or os.environ.get("SWEATSTACK_REDIRECT_URI")
 
         self.api_key = st.session_state.get("sweatstack_api_key")
-        self.client = Client(self.api_key, streamlit_compatible=True)
+        self.refresh_token = st.session_state.get("sweatstack_refresh_token")
+        self.client = Client(
+            self.api_key,
+            refresh_token=self.refresh_token,
+            streamlit_compatible=True,
+            client_id=self.client_id,
+            client_secret=self.client_secret,
+        )
 
     def logout_button(self):
         """Displays a logout button and handles user logout.
@@ -125,8 +132,10 @@ class StreamlitAuth:
         """
         if st.button("Logout"):
             self.api_key = None
+            self.refresh_token = None
             self.client = Client(streamlit_compatible=True)
-            st.session_state.pop("sweatstack_api_key")
+            st.session_state.pop("sweatstack_api_key", None)
+            st.session_state.pop("sweatstack_refresh_token", None)
             st.rerun()
 
     def _running_on_streamlit_cloud(self):
@@ -193,15 +202,21 @@ class StreamlitAuth:
 
         return authorization_url
 
-    def _set_api_key(self, api_key):
-        """Sets the API key in instance and session state, then refreshes the client.
+    def _set_api_key(self, api_key, refresh_token=None):
+        """Sets the API key and refresh token in instance and session state, then refreshes the client.
 
         Args:
             api_key: The API access token to set.
+            refresh_token: The refresh token to set. If None, keeps the existing refresh token.
         """
         self.api_key = api_key
         st.session_state["sweatstack_api_key"] = api_key
-        self.client = Client(self.api_key, streamlit_compatible=True)
+
+        if refresh_token is not None:
+            self.refresh_token = refresh_token
+            st.session_state["sweatstack_refresh_token"] = refresh_token
+
+        self.client = Client(self.api_key, refresh_token=self.refresh_token, streamlit_compatible=True)
 
     def _exchange_token(self, code):
         """Exchanges an authorization code for an access token.
@@ -230,7 +245,10 @@ class StreamlitAuth:
             raise Exception(f"SweatStack Python login failed. Please try again.") from e
         token_response = response.json()
 
-        self._set_api_key(token_response.get("access_token"))
+        self._set_api_key(
+            token_response.get("access_token"),
+            refresh_token=token_response.get("refresh_token")
+        )
 
         return
 

{sweatstack-0.55.0.dist-info → sweatstack-0.56.0.dist-info}/METADATA

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

{sweatstack-0.55.0.dist-info → sweatstack-0.56.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=1JW7c_yPR4YARYBo6E_mx6iN13pU0zyl8rs6oTxdiUc,65126
+sweatstack/client.py,sha256=dTx7Cqpd56NH32-Ndc6vo1WnzsN1C9BfpFrchV9NTdQ,66366
 sweatstack/constants.py,sha256=fGO6ksOv5HeISv9lHRoYm4besW1GTveXS8YD3K0ljg0,41
 sweatstack/ipython_init.py,sha256=OtBB9dQvyLXklD4kA2x1swaVtU9u73fG4V4-zz4YRAg,139
 sweatstack/jupyterlab_oauth2_startup.py,sha256=YcjXvzeZ459vL_dCkFi1IxX_RNAu80ZX9rwa0OXJfTM,1023
 sweatstack/openapi_schemas.py,sha256=VvquBdbssdB9D1KeJYQCx51hy1Df4SS0PjzGWXcUaew,46221
 sweatstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sweatstack/schemas.py,sha256=Xh9E8DjFx5NIEBnVqS6ixFVb0E06ANZbdOlnMofCpZw,4481
-sweatstack/streamlit.py,sha256=sJSVWRAY-CT3FuEPKA41h4S0BsaVFChs0M_oVIj0VFQ,16520
+sweatstack/streamlit.py,sha256=fVTgTyb8a2c7IC-lCs32ocILvyj1dFXP4iQaTV9D4Is,17287
 sweatstack/sweatshell.py,sha256=MYLNcWbOdceqKJ3S0Pe8dwHXEeYsGJNjQoYUXpMTftA,333
 sweatstack/utils.py,sha256=AwHRdC1ziOZ5o9RBIB21Uxm-DoClVRAJSVvgsmSmvps,1801
 sweatstack/Sweat Stack examples/Getting started.ipynb,sha256=k2hiSffWecoQ0VxjdpDcgFzBXDQiYEebhnAYlu8cgX8,6335204
-sweatstack-0.55.0.dist-info/METADATA,sha256=sRtgay1gBJG-kQVB0InAV0tnAPbZKFZaPl0NS5sQvpk,852
-sweatstack-0.55.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sweatstack-0.55.0.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
-sweatstack-0.55.0.dist-info/RECORD,,
+sweatstack-0.56.0.dist-info/METADATA,sha256=N732fwIaJz4h5uVfOCZUwSaMbaLk7CB1leB6dHpvpw4,852
+sweatstack-0.56.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sweatstack-0.56.0.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
+sweatstack-0.56.0.dist-info/RECORD,,