PyPI - sweatstack - Versions diffs - 0.42.0__py3-none-any.whl → 0.44.0__py3-none-any.whl - Mend

sweatstack 0.42.0py3-none-any.whl → 0.44.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

sweatstack/client.py CHANGED Viewed

@@ -1,5 +1,6 @@
 import base64
 import contextlib
+import json
 import random
 import hashlib
 import logging
@@ -14,11 +15,13 @@ from functools import wraps
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from importlib.metadata import version
 from io import BytesIO
+from pathlib import Path
 from typing import Any, Generator, get_type_hints, List, Literal
 from urllib.parse import parse_qs, urlparse
 import httpx
 import pandas as pd
+from platformdirs import user_data_dir
 from .constants import DEFAULT_URL
 from .schemas import (
@@ -45,6 +48,45 @@ AUTH_SUCCESSFUL_RESPONSE = """<!DOCTYPE html>
 OAUTH2_CLIENT_ID = "5382f68b0d254378"
+class TokenStorageMixin:
+    """Mixin for handling persistent token storage using platformdirs."""
+    def _get_token_file_path(self) -> Path:
+        """Get the path to the token storage file."""
+        data_dir = user_data_dir("SweatStack", "SweatStack")
+        return Path(data_dir) / "tokens.json"
+    def _save_tokens(self, access_token: str, refresh_token: str) -> None:
+        """Save tokens to the user data directory."""
+        token_file = self._get_token_file_path()
+        token_file.parent.mkdir(parents=True, exist_ok=True)
+        token_data = {
+            "access_token": access_token,
+            "refresh_token": refresh_token
+        }
+        with open(token_file, "w") as f:
+            json.dump(token_data, f, indent=2)
+        # Set restrictive permissions (user read/write only)
+        token_file.chmod(0o600)
+    def _load_persistent_tokens(self) -> tuple[str | None, str | None]:
+        """Load tokens from the user data directory."""
+        token_file = self._get_token_file_path()
+        if not token_file.exists():
+            return None, None
+        try:
+            with open(token_file, "r") as f:
+                token_data = json.load(f)
+            return token_data.get("access_token"), token_data.get("refresh_token")
+        except (json.JSONDecodeError, FileNotFoundError, KeyError):
+            return None, None
 try:
     __version__ = version("sweatstack")
 except ImportError:
@@ -52,7 +94,7 @@ except ImportError:
 class OAuth2Mixin:
-    def login(self):
+    def login(self, persist_api_key: bool = True):
         """Initiates the OAuth2 login flow for SweatStack authentication.
         This method starts a local HTTP server to receive the OAuth2 callback,
@@ -62,6 +104,10 @@ class OAuth2Mixin:
         The method uses PKCE (Proof Key for Code Exchange) for enhanced security
         during the OAuth2 authorization code flow.
+        Args:
+            persist_api_key: Whether to save the API key to persistent storage for future use.
+                Defaults to True.
         Returns:
             None
@@ -144,10 +190,45 @@ class OAuth2Mixin:
             self.jwt = token_response.get("access_token")
             self.api_key = self.jwt
             self.refresh_token = token_response.get("refresh_token")
+            if persist_api_key:
+                self._save_tokens(self.api_key, self.refresh_token)
             print(f"SweatStack Python login successful.")
         else:
             raise Exception("SweatStack Python login failed. Please try again.")
+    def authenticate(self, *, persist_api_key: bool = True, force_login: bool = False) -> None:
+        """Ensures the client is authenticated, either using existing tokens or by initiating login.
+        This method checks for authentication in the following order:
+        1. Current instance tokens (if already set)
+        2. Environment variables (SWEATSTACK_API_KEY, SWEATSTACK_REFRESH_TOKEN)
+        3. Persistent storage tokens
+        4. If none found or force_login is True, initiates OAuth2 login flow
+        Args:
+            persist_api_key: Whether to save tokens to persistent storage after login.
+                Defaults to True.
+            force_login: Whether to force a new login even if tokens are available.
+                Defaults to False.
+        Returns:
+            None
+        Raises:
+            Exception: If the authentication process fails.
+        """
+        if force_login:
+            self.login(persist_api_key=persist_api_key)
+            return
+        # Check if we already have valid tokens
+        if self.api_key:
+            return
+        # If no tokens available, initiate login
+        self.login(persist_api_key=persist_api_key)
 class DelegationMixin:
     def _validate_user(self, user: str | UserSummary):
@@ -352,7 +433,7 @@ class DelegationMixin:
         )
-class Client(OAuth2Mixin, DelegationMixin):
+class Client(OAuth2Mixin, DelegationMixin, TokenStorageMixin):
     def __init__(
         self,
         api_key: str | None = None,
@@ -399,8 +480,10 @@ class Client(OAuth2Mixin, DelegationMixin):
     def api_key(self) -> str:
         if self._api_key is not None:
             value = self._api_key
+        elif value := os.getenv("SWEATSTACK_API_KEY"):
+            pass
         else:
-            value = os.getenv("SWEATSTACK_API_KEY")
+            value, _ = self._load_persistent_tokens()
         if value is None:
             # A non-authenticated client is a potentially valid use-case.
@@ -416,8 +499,12 @@ class Client(OAuth2Mixin, DelegationMixin):
     def refresh_token(self) -> str:
         if self._refresh_token is not None:
             return self._refresh_token
+        elif value := os.getenv("SWEATSTACK_REFRESH_TOKEN"):
+            pass
         else:
-            return os.getenv("SWEATSTACK_REFRESH_TOKEN")
+            _, value = self._load_persistent_tokens()
+        return value
     @refresh_token.setter
     def refresh_token(self, value: str):
@@ -1156,6 +1243,7 @@ def _generate_singleton_methods(method_names: List[str]) -> None:
 _generate_singleton_methods(
     [
         "login",
+        "authenticate",
         "get_user",
         "get_users",

sweatstack/ipython_init.py CHANGED Viewed

@@ -1,12 +1,8 @@
-import time
 import sweatstack as ss
 print("\n")
 print(">>>>>>>>>> Sweat Stack Initialization <<<<<<<<<")
 print("Initializing....")
-print("You will be redirected to your browser for authentication.\n")
-time.sleep(2)
-ss.login()
+ss.authenticate()

sweatstack/jupyterlab_oauth2_startup.py CHANGED Viewed

@@ -5,7 +5,6 @@ from pathlib import Path
 import sweatstack as ss
 from jupyterlab.labapp import LabApp
-from sweatstack.client import _default_client
 def start_jupyterlab_with_oauth():
@@ -24,9 +23,7 @@ def start_jupyterlab_with_oauth():
         if not target_dir.exists():
             shutil.copytree(examples_dir, target_dir)
-    ss.login()
-    os.environ["SWEATSTACK_API_KEY"] = _default_client.api_key
-    os.environ["SWEATSTACK_REFRESH_TOKEN"] = _default_client.refresh_token
+    ss.authenticate()
     return LabApp.launch_instance(argv=remaining_args)

sweatstack/streamlit.py CHANGED Viewed

@@ -60,8 +60,9 @@ class StreamlitAuth:
     def _running_on_streamlit_cloud(self):
         return os.environ.get("HOSTNAME") == "streamlit"
-    def _show_sweatstack_login(self):
-        authorization_url = self._get_authorization_url()
+    def _show_sweatstack_login(self, login_label: str | None = None):
+        authorization_url = self.get_authorization_url()
+        login_label = login_label or "Connect with SweatStack"
         if not self._running_on_streamlit_cloud():
             st.markdown(
                 f"""
@@ -87,14 +88,14 @@ class StreamlitAuth:
                         border: none;
                         transition: all 0.3s ease;
                         cursor: pointer;"
-                    >Login with SweatStack</a>
+                    >{login_label}</a>
                 """,
                 unsafe_allow_html=True,
             )
         else:
-            st.link_button("Login with SweatStack", authorization_url)
+            st.link_button(login_label, authorization_url)
-    def _get_authorization_url(self):
+    def get_authorization_url(self):
         params = {
             "client_id": self.client_id,
             "redirect_uri": self.redirect_uri,
@@ -145,7 +146,7 @@ class StreamlitAuth:
         """
         return self.api_key is not None
-    def authenticate(self):
+    def authenticate(self, login_label: str | None = None):
         """Authenticates the user with SweatStack.
         This method handles the authentication flow for SweatStack in a Streamlit app.
@@ -157,6 +158,9 @@ class StreamlitAuth:
         to the Streamlit app with an authorization code, which is exchanged for an
         access token.
+        Args:
+            login_label: The label to display on the login button. Defaults to "Login with SweatStack".
         Returns:
             None
         """
@@ -170,7 +174,7 @@ class StreamlitAuth:
             st.query_params.clear()
             st.rerun()
         else:
-            self._show_sweatstack_login()
+            self._show_sweatstack_login(login_label)
     def select_user(self):
         """Displays a user selection dropdown and switches the client to the selected user.

{sweatstack-0.42.0.dist-info → sweatstack-0.44.0.dist-info}/METADATA RENAMED Viewed

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: sweatstack
-Version: 0.42.0
+Version: 0.44.0
 Summary: The official Python client for SweatStack
 Author-email: Aart Goossens <aart@gssns.io>
 Requires-Python: >=3.9
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: pandas>=2.2.3
+Requires-Dist: platformdirs>=4.0.0
 Requires-Dist: pyarrow>=18.0.0
 Requires-Dist: pydantic>=2.10.5
 Provides-Extra: jupyter

{sweatstack-0.42.0.dist-info → sweatstack-0.44.0.dist-info}/RECORD RENAMED Viewed

@@ -1,17 +1,17 @@
 sweatstack/__init__.py,sha256=tiVfgKlswRPaDMEy0gA7u8rveqEYZTA_kyB9lJ3J6Sc,21
 sweatstack/cli.py,sha256=N1NWOgEZR2yaJvIXxo9qvp_jFlypZYb0nujpbVNYQ6A,720
-sweatstack/client.py,sha256=yEDFLnzp5mK1cM9Q2Ejx7kxnYTVTm9FmYKQwO47GS3g,42785
+sweatstack/client.py,sha256=aOTzYsTVHWsWDTlpw79-7yH-lTRMg_CBn3tDVW1BaVw,45914
 sweatstack/constants.py,sha256=fGO6ksOv5HeISv9lHRoYm4besW1GTveXS8YD3K0ljg0,41
-sweatstack/ipython_init.py,sha256=zBGUlMFkdpLvsNpOpwrNaKRUpUZhzaICvH8ODJgMPcI,229
-sweatstack/jupyterlab_oauth2_startup.py,sha256=eZ6xi0Sa4hO4vUanimq0SqjduHtiywCURSDNWk_I-7s,1200
+sweatstack/ipython_init.py,sha256=OtBB9dQvyLXklD4kA2x1swaVtU9u73fG4V4-zz4YRAg,139
+sweatstack/jupyterlab_oauth2_startup.py,sha256=YcjXvzeZ459vL_dCkFi1IxX_RNAu80ZX9rwa0OXJfTM,1023
 sweatstack/openapi_schemas.py,sha256=uS5p_ksdF605FNTOhJ_VPPUCxJHOVJwyIOwVfXS-wEI,37019
 sweatstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sweatstack/schemas.py,sha256=d6KRMJalaABO61CPm3afs-hM6zUcwbGrZ5mc6SVuc54,3370
-sweatstack/streamlit.py,sha256=C5uAKFwLAUKIyQ7SRIyxMtQEdmRTY-jZsfGQzkYxg9c,13022
+sweatstack/streamlit.py,sha256=_PER03s0dYu5eF1MZdewPDqSvYHqMr0lZLu_EnGit3Y,13257
 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.42.0.dist-info/METADATA,sha256=jwuQ-MzqeL_p5NQHOvG_HFFBFo2keSK-YZT6NKKwKUg,779
-sweatstack-0.42.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sweatstack-0.42.0.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
-sweatstack-0.42.0.dist-info/RECORD,,
+sweatstack-0.44.0.dist-info/METADATA,sha256=TyoWIhA3YVSgPHL0X95S4SuM9Am-sgbX5rMyfifhQ54,814
+sweatstack-0.44.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sweatstack-0.44.0.dist-info/entry_points.txt,sha256=kCzOUQI3dqbTpEYqtgYDeiKFaqaA7BMlV6D24BMzCFU,208
+sweatstack-0.44.0.dist-info/RECORD,,

{sweatstack-0.42.0.dist-info → sweatstack-0.44.0.dist-info}/WHEEL RENAMED Viewed

File without changes

{sweatstack-0.42.0.dist-info → sweatstack-0.44.0.dist-info}/entry_points.txt RENAMED Viewed

File without changes

sweatstack 0.42.0__py3-none-any.whl → 0.44.0__py3-none-any.whl

sweatstack 0.42.0py3-none-any.whl → 0.44.0py3-none-any.whl