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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.15.4
+Version: 0.16.1
 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
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer>=0.12.1
 Requires-Dist: rich>=10.11.0
-Requires-Dist: click<=8.3.3
+Requires-Dist: click<=8.5.0
 Requires-Dist: questionary>=2.0.0
 Requires-Dist: qbraid-core>=0.6.5
 Provides-Extra: compute

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qbraid-cli"
-version = "0.15.4"
+version = "0.16.1"
 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" }]
@@ -30,7 +30,7 @@ classifiers = [
 dependencies = [
     "typer>=0.12.1",
     "rich>=10.11.0",
-    "click<=8.3.3",
+    "click<=8.5.0",
     "questionary>=2.0.0",
     "qbraid-core>=0.6.5",
 ]

{qbraid_cli-0.15.4 → qbraid_cli-0.16.1}/qbraid_cli/agents/app.py

@@ -327,7 +327,12 @@ def agents_list(
             remote_flags.extend(["--limit", str(limit)])
             remote_flags.extend(["--page", str(page)])
 
-            console.print(f"[dim]Listing agents on {compute}...[/dim]")
+            # Nothing but the payload on stdout when --json is set: a caller
+            # piping this into a parser gets the status line too, and Rich
+            # would read square brackets in the payload as markup and mangle
+            # it. Status goes to stderr, the payload through plain print.
+            if not json_output:
+                console.print(f"[dim]Listing agents on {compute}...[/dim]")
             result = subprocess.run(
                 ["ssh", "-o", "ConnectTimeout=10", compute, " ".join(remote_flags)],
                 capture_output=True,
@@ -336,8 +341,27 @@ def agents_list(
                 timeout=30,
             )
             if result.returncode == 0:
-                console.print(result.stdout)
+                if json_output:
+                    payload = result.stdout.strip()
+                    if not payload:
+                        # Exit 0 with nothing on stdout means the remote did
+                        # not produce a listing -- most likely a remote CLI
+                        # too old to know --json. Printing the blank through
+                        # would hand a parser a bare newline while still
+                        # reporting success; an empty result is "[]", never "".
+                        typer.echo(
+                            f"No JSON returned by 'qbraid agents list' on {compute} "
+                            "(is the remote qbraid-cli recent enough to support --json?)",
+                            err=True,
+                        )
+                        raise typer.Exit(code=1)
+                    print(payload)
+                else:
+                    console.print(result.stdout)
             else:
+                if json_output:
+                    typer.echo(f"Failed: {result.stderr.strip()}", err=True)
+                    raise typer.Exit(code=1)
                 console.print(f"[red]Failed: {result.stderr.strip()}[/red]")
             return
 
@@ -825,11 +849,25 @@ def agents_update(
 def agents_kill(
     target: str = typer.Argument(..., help="Agent name, ID prefix, or PID"),
     force: bool = typer.Option(False, "--force", "-f", help="Use SIGKILL instead of SIGTERM"),
+    compute: Optional[str] = typer.Option(None, "--compute", "-c", help="SSH alias for remote compute"),
 ):
-    """Stop an agent by name, session ID, or PID."""
+    """Stop an agent by name, session ID, or PID.
+
+    With ``--compute`` the agent is stopped on that machine. Without it, an
+    agent running elsewhere is simply not in this host's registry and reports
+    as not found -- the registry is per-host.
+    """
     try:
         from qbraid_core.services.agents import AgentSessionRegistryManager
 
+        if compute:
+            import shlex
+
+            flags = " --force" if force else ""
+            _ssh_cmd(compute, f"qbraid agents kill {shlex.quote(target)}{flags}")
+            console.print(f"[green]Stopped '{target}' on {compute}.[/green]")
+            return
+
         registry = AgentSessionRegistryManager()
         all_sessions = registry.load_registry().sessions
 
@@ -1712,6 +1750,12 @@ def agents_send(
 ):
     """Send text to a running agent's terminal."""
     try:
+        # Imported before anything else in this try: the `except
+        # AgentLauncherError` clause below cannot be evaluated unless the name
+        # is bound, so a failure in the --compute branch above would raise
+        # UnboundLocalError and bury the real error instead of reporting it.
+        from qbraid_core.services.agents import AgentLauncher, AgentLauncherError
+
         if compute:
             import shlex
 
@@ -1719,8 +1763,6 @@ def agents_send(
             console.print(f"[green]Sent text to session {session_id} on {compute}.[/green]")
             return
 
-        from qbraid_core.services.agents import AgentLauncher, AgentLauncherError
-
         launcher = AgentLauncher()
         launcher.send(session_id, text)
         console.print(f"[green]Sent text to session {session_id}.[/green]")
@@ -1748,6 +1790,12 @@ def agents_read(
 ):
     """Read recent terminal output from an agent."""
     try:
+        # Imported before anything else in this try: the `except
+        # AgentLauncherError` clause below cannot be evaluated unless the name
+        # is bound, so a failure in the --compute branch above would raise
+        # UnboundLocalError and bury the real error instead of reporting it.
+        from qbraid_core.services.agents import AgentLauncher, AgentLauncherError
+
         if compute:
             import shlex
 
@@ -1755,8 +1803,6 @@ def agents_read(
             console.print(output)
             return
 
-        from qbraid_core.services.agents import AgentLauncher, AgentLauncherError
-
         launcher = AgentLauncher()
         output = launcher.read(session_id, lines)
         console.print(output)

{qbraid_cli-0.15.4 → qbraid_cli-0.16.1}/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.4 → qbraid_cli-0.16.1/qbraid_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.15.4
+Version: 0.16.1
 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
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer>=0.12.1
 Requires-Dist: rich>=10.11.0
-Requires-Dist: click<=8.3.3
+Requires-Dist: click<=8.5.0
 Requires-Dist: questionary>=2.0.0
 Requires-Dist: qbraid-core>=0.6.5
 Provides-Extra: compute

{qbraid_cli-0.15.4 → qbraid_cli-0.16.1}/qbraid_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
 typer>=0.12.1
 rich>=10.11.0
-click<=8.3.3
+click<=8.5.0
 questionary>=2.0.0
 qbraid-core>=0.6.5