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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.15.3
+Version: 0.16.0
 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.16.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qbraid-cli"
-version = "0.15.3"
+version = "0.16.0"
 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.16.0}/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.16.0}/qbraid_cli/skills/app.py

@@ -6,6 +6,7 @@ Module defining commands in the 'qbraid skills' namespace.
 
 """
 
+import json
 from enum import Enum
 from typing import Optional
 
@@ -68,6 +69,23 @@ class VisibilityOption(str, Enum):
 # =============================================================================
 
 
+def _emit_skills_json(skills) -> None:
+    """Print skills as a JSON array on stdout, and nothing else.
+
+    Agents discover most skills through `qbraid skills list` / `search` rather
+    than having them installed, so this output is a discovery surface, not a
+    convenience. The table truncates descriptions (40-50 chars), and a
+    description is exactly what an agent matches against to decide whether a
+    skill applies -- truncating it hides the words that would have triggered it.
+    JSON carries them in full.
+
+    Uses `print`, not `console.print`: Rich would interpret square brackets in a
+    description as markup and mangle the payload.
+    """
+    payload = [skill.model_dump(mode="json", by_alias=True, exclude_none=True) for skill in skills]
+    print(json.dumps(payload, indent=2))
+
+
 @skills_app.command(name="list")
 def skills_list(
     query: Optional[str] = typer.Option(None, "--query", "-q", help="Search query for skills"),
@@ -76,8 +94,12 @@ def skills_list(
         None, "--visibility", "-v", help="Filter by visibility"
     ),
     limit: int = typer.Option(20, "--limit", "-l", help="Maximum number of results"),
+    json_output: bool = typer.Option(False, "--json", help="Output as JSON array (for programmatic use)"),
 ) -> None:
-    """List available qBraid skills."""
+    """List available qBraid skills.
+
+    Pass --json for the full, untruncated records.
+    """
 
     def fetch_skills():
         from qbraid_core.services.skills import SkillsClient
@@ -88,7 +110,13 @@ def skills_list(
         return client.list_skills(query=query, tags=tag_list, visibility=vis, limit=limit)
 
     try:
-        skills = run_progress_task(fetch_skills)
+        # Skip the progress spinner for --json: Rich writes it to the same
+        # stream, and a caller piping this into a parser gets the spinner too.
+        skills = fetch_skills() if json_output else run_progress_task(fetch_skills)
+
+        if json_output:
+            _emit_skills_json(skills)
+            return
 
         console = Console()
 
@@ -128,8 +156,12 @@ def skills_list(
 def skills_search(
     query: str = typer.Argument(..., help="Search query"),
     limit: int = typer.Option(10, "--limit", "-l", help="Maximum number of results"),
+    json_output: bool = typer.Option(False, "--json", help="Output as JSON array (for programmatic use)"),
 ) -> None:
-    """Search for qBraid skills."""
+    """Search for qBraid skills.
+
+    Pass --json for the full, untruncated records.
+    """
 
     def fetch_skills():
         from qbraid_core.services.skills import SkillsClient
@@ -138,7 +170,11 @@ def skills_search(
         return client.list_skills(query=query, limit=limit)
 
     try:
-        skills = run_progress_task(fetch_skills)
+        skills = fetch_skills() if json_output else run_progress_task(fetch_skills)
+
+        if json_output:
+            _emit_skills_json(skills)
+            return
 
         console = Console()
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.15.3
+Version: 0.16.0
 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