qbraid-cli 0.15.3__tar.gz → 0.15.4__tar.gz

{qbraid_cli-0.15.3/qbraid_cli.egg-info → qbraid_cli-0.15.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.15.3
+Version: 0.15.4
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License-Expression: LicenseRef-Proprietary

{qbraid_cli-0.15.3 → qbraid_cli-0.15.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qbraid-cli"
-version = "0.15.3"
+version = "0.15.4"
 description = "Command Line Interface for interacting with all parts of the qBraid platform."
 readme = "README.md"
 authors = [{ name = "qBraid Development Team", email = "contact@qbraid.com" }]

{qbraid_cli-0.15.3 → qbraid_cli-0.15.4}/qbraid_cli/compute/ssh.py

@@ -60,9 +60,12 @@ def setup_subscription_ssh(
     """Configure SSH for the subscription (JupyterHub) server.
 
     The one implementation for `ssh setup`, `instances ssh subscription` and
-    `up --ssh`: checks the server is running, reads token/host/user from the
-    status URL, honours ssh-only profiles (``ide``), registers the key and
-    prints the connection panel. Exits 1 with a message when nothing is up.
+    `up --ssh`: checks the server is running, mints a session token, honours
+    ssh-only profiles (``ide``), registers the key and prints the connection
+    panel. Exits 1 with a message when nothing is up.
+
+    Re-running this is the supported way to recover from a stale token: each
+    call mints a fresh one.
     """
     # Check if server is running
     console.print("Checking server status...")
@@ -73,34 +76,46 @@ def setup_subscription_ssh(
         console.print("Start a server first: qbraid compute instances launch <profile>")
         raise typer.Exit(code=1)
 
-    # Extract token, hostname, and user path from server status URL
-    # URL format: https://<host>/user/<username>/s-<session>/<ide>?token=<token>
+    # Mint a session token rather than scraping one out of the status URL.
+    #
+    # The old path read `?token=` off `status.url`. That query parameter is
+    # only present in the handful of flows that hand back a click-through link;
+    # the Hub's own record of a running server is just `/user/<name>/`, with no
+    # query string at all. So the scrape usually found nothing and the command
+    # died with "Could not extract token from server URL" -- which reads like
+    # the instance is unhealthy and sends you debugging the wrong thing. It
+    # also meant a stale token could never be refreshed: the only supply was a
+    # URL that no longer carried one.
+    #
+    # `get_session_token()` is the supported source, is what `ssh token`
+    # already uses, and returns a fresh token on every call.
     console.print("Getting session token...")
-    token = None
-    username = None
-    resolved_cluster = status.cluster_id
-    hub_host = None
+    from qbraid_core.services.compute import parse_lab_url
 
-    if status.url:
-        import re
-        from urllib.parse import parse_qs, urlparse
-
-        parsed = urlparse(status.url)
-        token = parse_qs(parsed.query).get("token", [None])[0]
-        hub_host = parsed.hostname
+    resolved_cluster = status.cluster_id
+    parts = parse_lab_url(status.url) if status.url else {}
+    hub_host = parts.get("hub_domain")
 
-        # Extract user path prefix: everything between /user/ and /lab or /ssh or end
-        # e.g., /user/507f1f-kanavs/s-0e146b01/lab → 507f1f-kanavs/s-0e146b01
-        user_match = re.search(r"/user/(.+?)/(lab|ssh|tree|vscode)(\?|$)", parsed.path)
-        if user_match:
-            username = user_match.group(1)
-        else:
-            # Fallback: use user_info.name
-            username = status.user_info.name if status.user_info else None
+    try:
+        session = client.get_session_token(cluster_id)
+    except Exception as err:  # pylint: disable=broad-exception-caught
+        console.print(f"[red]Could not get a session token for this server:[/red] {err}")
+        raise typer.Exit(code=1) from err
+
+    token = session.token.token
+    # The API resolves the account's own cluster; prefer what it reports over
+    # whatever the caller guessed, and over the status response.
+    resolved_cluster = session.cluster_id or resolved_cluster
+
+    # Username still comes from the URL, and only falls back to the token's.
+    # `parse_lab_url` keeps a named server's session segment attached (
+    # "507f1f-kanavs/s-0e146b01"), and that segment is part of the proxy path
+    # -- /user/<name>/s-<id>/sshd/. The token reports the bare user, so using
+    # it first would silently drop the segment and address the wrong pod.
+    username = (
+        parts.get("username") or session.token.user or (status.user_info.name if status.user_info else None)
+    )
 
-    if not token:
-        console.print("[red]Could not extract token from server URL.[/red]")
-        raise typer.Exit(code=1)
     if not username:
         console.print("[red]Could not determine username from server status.[/red]")
         raise typer.Exit(code=1)

{qbraid_cli-0.15.3 → qbraid_cli-0.15.4/qbraid_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.15.3
+Version: 0.15.4
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License-Expression: LicenseRef-Proprietary