tobiko-cloud-api-client 202508.58.0__tar.gz → 202508.60.0__tar.gz

{tobiko_cloud_api_client-202508.58.0/tobiko_cloud_api_client.egg-info → tobiko_cloud_api_client-202508.60.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tobiko-cloud-api-client
-Version: 202508.58.0
+Version: 202508.60.0
 Author: TobikoData Inc.
 Author-email: engineering@tobikodata.com
 Requires-Python: <3.13,>=3.9
@@ -10,4 +10,4 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
 Requires-Dist: tenacity
-Requires-Dist: tobiko-cloud-helpers==202508.58.0
+Requires-Dist: tobiko-cloud-helpers==202508.60.0

{tobiko_cloud_api_client-202508.58.0 → tobiko_cloud_api_client-202508.60.0}/setup.py

@@ -14,7 +14,7 @@ setup(**{
         'rich[jupyter]',
         'ruamel.yaml',
         'tenacity',
-        'tobiko-cloud-helpers==202508.58.0',
+        'tobiko-cloud-helpers==202508.60.0',
     ),
     'name': 'tobiko-cloud-api-client',
     'namespace_packages': (
@@ -27,5 +27,5 @@ setup(**{
         'tobikodata.http_client.api_models.v1',
     ),
     'python_requires': '<3.13,>=3.9',
-    'version': '202508.58.0',
+    'version': '202508.60.0',
 })

{tobiko_cloud_api_client-202508.58.0 → tobiko_cloud_api_client-202508.60.0/tobiko_cloud_api_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tobiko-cloud-api-client
-Version: 202508.58.0
+Version: 202508.60.0
 Author: TobikoData Inc.
 Author-email: engineering@tobikodata.com
 Requires-Python: <3.13,>=3.9
@@ -10,4 +10,4 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
 Requires-Dist: tenacity
-Requires-Dist: tobiko-cloud-helpers==202508.58.0
+Requires-Dist: tobiko-cloud-helpers==202508.60.0

{tobiko_cloud_api_client-202508.58.0 → tobiko_cloud_api_client-202508.60.0}/tobiko_cloud_api_client.egg-info/requires.txt

@@ -4,4 +4,4 @@ pydantic>=2.0.0
 rich[jupyter]
 ruamel.yaml
 tenacity
-tobiko-cloud-helpers==202508.58.0
+tobiko-cloud-helpers==202508.60.0

{tobiko_cloud_api_client-202508.58.0 → tobiko_cloud_api_client-202508.60.0}/tobikodata/http_client/auth.py

@@ -25,14 +25,20 @@ yaml = YAML()
 
 # This is duplicated from tcloud in order to avoid pulling in tcloud deps into
 # http client
+SCOPE = os.environ.get("TCLOUD_SCOPE", "tbk:scope:projects")
+"""The scopes to request from the tobiko auth service"""
+
 TCLOUD_PATH = Path(os.environ.get("TCLOUD_HOME", Path.home() / ".tcloud"))
 """The location of the tcloud config folder"""
 
-CLIENT_ID = "f695a000-bc5b-43c2-bcb7-8e0179ddff0c"
-"""The oauth client ID to use"""
+CLIENT_ID = os.environ.get("TCLOUD_CLIENT_ID", "f695a000-bc5b-43c2-bcb7-8e0179ddff0c")
+"""The OAuth client ID to use"""
+
+CLIENT_SECRET = os.environ.get("TCLOUD_CLIENT_SECRET")
+"""The OAuth client secret to use for the client credentials (service-to-service) flow"""
 
-TOKEN_URL = "https://cloud.tobikodata.com/auth/token"
-"""The oauth token endpoint to use"""
+TOKEN_URL = os.environ.get("TCLOUD_TOKEN_URL", "https://cloud.tobikodata.com/auth/token")
+"""The OAuth token endpoint to use"""
 
 THEME = Theme(
     {
@@ -100,7 +106,7 @@ class SSOAuth:
 
     def __init__(self) -> None:
         self.console = Console(theme=THEME)
-        self.session = OAuth2Session(CLIENT_ID)
+        self.session = OAuth2Session(CLIENT_ID, CLIENT_SECRET, scope=SCOPE)
         self.tokenInfo = SSOAuth._load_auth_yaml()
 
     def id_token(self) -> t.Optional[str]:
@@ -131,9 +137,24 @@ class SSOAuth:
                     # We failed to refresh, logout
                     SSOAuth._delete_auth_yaml()
 
+        # Can we use client credentials?
+        if CLIENT_SECRET:
+            return self.login_with_client_credentials()
+
         return None
 
+    def login_with_client_credentials(self) -> t.Optional[str]:
+        self.session.fetch_token(
+            TOKEN_URL,
+            grant_type="client_credentials",
+        )
+        return self._create_token_info(self.session.token)["id_token"]
+
     def refresh_token(self) -> t.Optional[str]:
+        # Can we use client credentials?
+        if CLIENT_SECRET:
+            return self.login_with_client_credentials()
+
         if not self.tokenInfo:
             self.console.print("Not currently authenticated", style="error")
             return None
@@ -159,10 +180,12 @@ class SSOAuth:
             "token_type": token["token_type"],
             "expires_at": token["expires_at"],
             "access_token": token["access_token"],
-            "refresh_token": token["refresh_token"],
             "id_token": token["id_token"],
         }
 
+        if "refresh_token" in token:
+            self.tokenInfo["refresh_token"] = token["refresh_token"]
+
         SSOAuth._save_auth_yaml(self.tokenInfo)
 
         return self.tokenInfo