qbraid-cli 0.12.0a3__tar.gz → 0.12.0a4__tar.gz

{qbraid_cli-0.12.0a3/qbraid_cli.egg-info → qbraid_cli-0.12.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.12.0a3
+Version: 0.12.0a4
 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.12.0a3 → qbraid_cli-0.12.0a4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qbraid-cli"
-version = "0.12.0a3"
+version = "0.12.0a4"
 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.12.0a3 → qbraid_cli-0.12.0a4}/qbraid_cli/account/app.py

@@ -22,9 +22,9 @@ def account_credits():
     """Get number of qBraid credits remaining."""
 
     def get_credits() -> float:
-        from qbraid_core import QbraidClient
+        from qbraid_core.client import QbraidClientV1
 
-        client = QbraidClient()
+        client = QbraidClientV1()
         return client.user_credits_value()
 
     qbraid_credits: float = run_progress_task(get_credits)

{qbraid_cli-0.12.0a3 → qbraid_cli-0.12.0a4}/qbraid_cli/devices/app.py

@@ -6,7 +6,7 @@ Module defining commands in the 'qbraid devices' namespace.
 
 """
 
-from typing import Any, Callable, Optional
+from typing import Any, Optional
 
 import typer
 from rich.console import Console
@@ -18,9 +18,13 @@ devices_app = typer.Typer(help="Manage qBraid quantum devices.", no_args_is_help
 
 
 @devices_app.command(name="list")
-def devices_list(  # pylint: disable=too-many-branches
+def devices_list(
     status: Optional[str] = typer.Option(
-        None, "--status", "-s", help="'ONLINE'|'OFFLINE'|'RETIRED'", callback=validate_status
+        None,
+        "--status",
+        "-s",
+        help="'ONLINE'|'OFFLINE'|'UNAVAILABLE'|'RETIRED'",
+        callback=validate_status,
     ),
     device_type: Optional[str] = typer.Option(
         None, "--type", "-t", help="'QPU'|'SIMULATOR'", callback=validate_type
@@ -37,51 +41,58 @@ def devices_list(  # pylint: disable=too-many-branches
     ),
 ) -> None:
     """List qBraid quantum devices."""
-    filters = {}
-    if status:
-        filters["status"] = status
-    if device_type:
-        filters["type"] = "Simulator" if device_type == "SIMULATOR" else device_type
-    if provider:
-        filters["provider"] = provider
 
-    def import_devices() -> tuple[Any, Callable]:
-        from qbraid_core.services.quantum import QuantumClient, process_device_data
+    def fetch_devices():
+        from qbraid_core.services.runtime import QuantumRuntimeClient
 
-        client = QuantumClient()
+        client = QuantumRuntimeClient()
+        return client.list_devices()
 
-        return client, process_device_data
+    devices = run_progress_task(fetch_devices)
 
-    result: tuple[Callable, Callable] = run_progress_task(import_devices)
-    client, process_device_data = result
-    raw_data = client.search_devices(filters)
-    device_data, msg = process_device_data(raw_data)
+    # Apply filters (client returns all devices, we filter locally)
+    if status:
+        devices = [d for d in devices if d.status.value == status]
+    if device_type:
+        devices = [d for d in devices if d.deviceType == device_type]
+    if provider:
+        devices = [d for d in devices if d.vendor.lower() == provider.lower()]
 
     console = Console()
-    header_1 = "Provider"
+    header_1 = "Vendor"
     header_2 = "Device Name"
-    header_3 = "ID"
+    header_3 = "QRN"
     header_4 = "Status"
     console.print(
-        f"[bold]{header_1.ljust(12)}{header_2.ljust(35)}{header_3.ljust(41)}{header_4}[/bold]"
+        f"[bold]{header_1.ljust(12)}{header_2.ljust(35)}{header_3.ljust(50)}{header_4}[/bold]"
     )
-    for device_provider, device_name, device_id, device_status in device_data:
+
+    for device in devices:
+        device_status = device.status.value
         if device_status == "ONLINE":
             status_color = "green"
         elif device_status == "OFFLINE":
             status_color = "red"
+        elif device_status == "UNAVAILABLE":
+            status_color = "yellow"
         else:
             status_color = "grey"
+
+        # Truncate long names/qrns for display
+        name = device.name[:33] + ".." if len(device.name) > 35 else device.name
+        qrn = device.qrn[:48] + ".." if len(device.qrn) > 50 else device.qrn
+
         console.print(
-            f"{device_provider.ljust(12)}{device_name.ljust(35)}{device_id.ljust(40)}",
+            f"{device.vendor.ljust(12)}{name.ljust(35)}{qrn.ljust(50)}",
             f"[{status_color}]{device_status}[/{status_color}]",
         )
-    console.print(f"\n{msg}", style="italic", justify="left")
+
+    console.print(f"\n[italic]Displaying {len(devices)} devices[/italic]")
 
 
 @devices_app.command(name="get")
 def devices_get(
-    device_id: str = typer.Argument(..., help="The ID of the device to get."),
+    device_id: str = typer.Argument(..., help="The QRN or ID of the device to get."),
     fmt: bool = typer.Option(
         True, "--no-fmt", help="Disable rich console formatting (output raw data)"
     ),
@@ -89,12 +100,15 @@ def devices_get(
     """Get a qBraid quantum device."""
 
     def get_device():
-        from qbraid_core.services.quantum import QuantumClient
+        from qbraid_core.services.runtime import QuantumRuntimeClient
 
-        client = QuantumClient()
+        client = QuantumRuntimeClient()
         return client.get_device(device_id)
 
-    data: dict[str, Any] = run_progress_task(get_device)
+    device = run_progress_task(get_device)
+
+    # Convert Pydantic model to dict for display
+    data: dict[str, Any] = device.model_dump()
 
     print_formatted_data(data, fmt)
 

{qbraid_cli-0.12.0a3 → qbraid_cli-0.12.0a4}/qbraid_cli/devices/validation.py

@@ -13,7 +13,7 @@ from qbraid_cli.handlers import validate_item
 
 def validate_status(value: Optional[str]) -> Union[str, None]:
     """Validate device status query parameter."""
-    return validate_item(value, ["ONLINE", "OFFLINE", "RETIRED"], "Status")
+    return validate_item(value, ["ONLINE", "OFFLINE", "UNAVAILABLE", "RETIRED"], "Status")
 
 
 def validate_type(value: Optional[str]) -> Union[str, None]:
@@ -23,4 +23,8 @@ def validate_type(value: Optional[str]) -> Union[str, None]:
 
 def validate_provider(value: Optional[str]) -> Union[str, None]:
     """Validate device provider query parameter."""
-    return validate_item(value, ["AWS", "IBM", "IonQ", "Rigetti", "OQC", "QuEra"], "Provider")
+    return validate_item(
+        value,
+        ["aws", "azure", "ibm", "ionq", "qbraid"],
+        "Provider",
+    )

{qbraid_cli-0.12.0a3 → qbraid_cli-0.12.0a4}/qbraid_cli/jobs/app.py

@@ -6,7 +6,7 @@ Module defining commands in the 'qbraid jobs' namespace.
 
 """
 
-from typing import Any, Callable
+from typing import Any, Callable, Optional
 
 import typer
 from rich.console import Console
@@ -95,59 +95,80 @@ def jobs_list(
     limit: int = typer.Option(
         10, "--limit", "-l", help="Limit the maximum number of results returned"
     ),
+    status: Optional[str] = typer.Option(
+        None,
+        "--status",
+        "-s",
+        help="Filter by status (QUEUED, RUNNING, COMPLETED, FAILED, CANCELLED)",
+    ),
+    vendor: Optional[str] = typer.Option(
+        None, "--vendor", "-v", help="Filter by vendor (aws, azure, ibm, ionq, qbraid)"
+    ),
 ) -> None:
     """List qBraid Quantum Jobs."""
 
-    def import_jobs() -> tuple[Any, Callable]:
-        from qbraid_core.services.quantum import QuantumClient, process_job_data
+    def fetch_jobs():
+        from qbraid_core.services.runtime import QuantumRuntimeClient
+
+        client = QuantumRuntimeClient()
+        return client.list_jobs(limit=limit, status=status, vendor=vendor)
 
-        client = QuantumClient()
+    try:
+        jobs = run_progress_task(fetch_jobs)
 
-        return client, process_job_data
+        if not jobs:
+            console = Console()
+            console.print("[dim]No jobs found.[/dim]")
+            return
 
-    result: tuple[Any, Callable] = run_progress_task(import_jobs)
-    client, process_job_data = result
-    raw_data = client.search_jobs(query={"resultsPerPage": limit, "page": 0})
-    job_data, msg = process_job_data(raw_data)
+        # Calculate column width based on longest job QRN
+        longest_job_id = max(len(job.jobQrn) for job in jobs)
+        spacing = min(longest_job_id + 3, 50)
 
-    longest_job_id = max(len(item[0]) for item in job_data)
-    spacing = longest_job_id + 5
-    try:
         console = Console()
-        header_1 = "Job ID"
+        header_1 = "Job QRN"
         header_2 = "Submitted"
         header_3 = "Status"
-        console.print(f"[bold]{header_1.ljust(spacing)}{header_2.ljust(36)}{header_3}[/bold]")
-        for job_id, submitted, status in job_data:
-            if status == "COMPLETED":
+        console.print(f"[bold]{header_1.ljust(spacing)}{header_2.ljust(28)}{header_3}[/bold]")
+
+        for job in jobs:
+            job_status = job.status.value if hasattr(job.status, "value") else str(job.status)
+
+            # Format timestamp
+            if job.timeStamps and job.timeStamps.createdAt:
+                submitted = job.timeStamps.createdAt.strftime("%Y-%m-%d %H:%M:%S")
+            else:
+                submitted = "N/A"
+
+            # Color based on status
+            if job_status == "COMPLETED":
                 status_color = "green"
-            elif status in ["FAILED", "CANCELLED"]:
+            elif job_status in ["FAILED", "CANCELLED"]:
                 status_color = "red"
-            elif status in [
-                "INITIALIZING",
-                "INITIALIZED",
-                "CREATED",
-                "QUEUED",
-                "VALIDATING",
-                "RUNNING",
-            ]:
+            elif job_status in ["INITIALIZING", "QUEUED", "VALIDATING", "RUNNING"]:
                 status_color = "blue"
             else:
                 status_color = "grey"
+
+            # Truncate long QRNs
+            job_qrn = job.jobQrn
+            if len(job_qrn) > spacing - 2:
+                job_qrn = job_qrn[: spacing - 4] + ".."
+
             console.print(
-                f"{job_id.ljust(spacing)}{submitted.ljust(35)}",
-                f"[{status_color}]{status}[/{status_color}]",
+                f"{job_qrn.ljust(spacing)}{submitted.ljust(28)}",
+                f"[{status_color}]{job_status}[/{status_color}]",
             )
 
-        console.print(f"\n{msg}", style="italic", justify="left")
+        console.print(f"\n[italic]Displaying {len(jobs)} jobs[/italic]")
 
-    except Exception:  # pylint: disable=broad-exception-caught
-        handle_error(message="Failed to fetch quantum jobs.")
+    except Exception as err:  # pylint: disable=broad-exception-caught
+        handle_error(message=f"Failed to fetch quantum jobs: {err}")
 
 
 @jobs_app.command(name="get")
 def jobs_get(
-    job_id: str = typer.Argument(..., help="The ID of the job to get."),
+    job_id: str = typer.Argument(..., help="The QRN or ID of the job to get."),
     fmt: bool = typer.Option(
         True, "--no-fmt", help="Disable rich console formatting (output raw data)"
     ),
@@ -155,12 +176,15 @@ def jobs_get(
     """Get a qBraid Quantum Job."""
 
     def get_job():
-        from qbraid_core.services.quantum import QuantumClient
+        from qbraid_core.services.runtime import QuantumRuntimeClient
 
-        client = QuantumClient()
+        client = QuantumRuntimeClient()
         return client.get_job(job_id)
 
-    data: dict[str, Any] = run_progress_task(get_job)
+    job = run_progress_task(get_job)
+
+    # Convert Pydantic model to dict for display
+    data: dict[str, Any] = job.model_dump()
 
     print_formatted_data(data, fmt)
 

{qbraid_cli-0.12.0a3 → qbraid_cli-0.12.0a4/qbraid_cli.egg-info}/PKG-INFO

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