qbraid-cli 0.8.0.dev3__py3-none-any.whl → 0.8.0.dev4__py3-none-any.whl

qbraid_cli/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.8.0.dev3'
-__version_tuple__ = version_tuple = (0, 8, 0, 'dev3')
+__version__ = version = '0.8.0.dev4'
+__version_tuple__ = version_tuple = (0, 8, 0, 'dev4')

qbraid_cli/handlers.py

@@ -44,7 +44,11 @@ def handle_error(
     full_message = f"\n{error_prefix} {message}\n"
     if include_traceback:
         tb_string = traceback.format_exc()
-        full_message += f"\n{tb_string}"
+        # TODO: find out reason for weird traceback emitted from
+        # qbraid jobs enable/disable when library not installed.
+        # For now, if matches, just don't print it.
+        if tb_string.strip() != "NoneType: None":
+            full_message += f"\n{tb_string}"
     typer.echo(full_message, err=True)
     raise typer.Exit(code=1)
 

qbraid_cli/jobs/app.py

@@ -5,8 +5,6 @@
 Module defining commands in the 'qbraid jobs' namespace.
 
 """
-
-import sys
 from typing import Any, Callable, Dict, Tuple
 
 import typer
@@ -68,7 +66,8 @@ def jobs_state(
     )
 ) -> None:
     """Display the state of qBraid Quantum Jobs for the current environment."""
-    state_values: Dict[str, Tuple[bool, bool]] = run_progress_get_state(library)
+    result: Tuple[str, Dict[str, Tuple[bool, bool]]] = run_progress_get_state(library)
+    python_exe, state_values = result
     state_values = dict(sorted(state_values.items()))
 
     console = Console()
@@ -76,7 +75,7 @@ def jobs_state(
     max_lib_length = max((len(lib) for lib in state_values.keys()), default=len(header_1))
     padding = max_lib_length + 9
 
-    console.print(f"Executable: {sys.executable}")
+    console.print(f"Executable: {python_exe}")
     console.print(f"\n{header_1:<{padding}}{header_2}", style="bold")
 
     for lib, (installed, enabled) in state_values.items():

qbraid_cli/jobs/toggle_braket.py

@@ -9,17 +9,10 @@ Module supporting 'qbraid jobs enable/disable braket' and commands.
 import logging
 import os
 import subprocess
-import sys
 from pathlib import Path
 from typing import Optional, Tuple
 
 import typer
-from qbraid_core.system import (
-    QbraidSystemError,
-    get_active_site_packages_path,
-    get_latest_package_version,
-    get_local_package_version,
-)
 
 from qbraid_cli.exceptions import QbraidException
 from qbraid_cli.handlers import handle_error, handle_filesystem_operation, run_progress_task
@@ -28,33 +21,38 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 
-def get_package_data(package: str) -> Tuple[str, str, str]:
+def get_package_data(package: str) -> Tuple[str, str, str, str]:
     """Retrieve package version and location data.
 
     Args:
         package (str): The name of the package to retrieve data for.
 
     Returns:
-        Tuple[str, str, str]: The installed and latest versions of the package, and the
-                              local site-packages path where it is / would be installed.
+        Tuple[str, str, str, str]: The installed and latest versions of the package, and the
+                                   local site-packages path where it is / would be installed.
 
     Raises:
         QbraidException: If package version or location data cannot be retrieved.
 
     """
+    # pylint: disable=import-outside-toplevel
+    from qbraid_core.system import (
+        QbraidSystemError,
+        get_active_python_path,
+        get_active_site_packages_path,
+        get_latest_package_version,
+        get_local_package_version,
+    )
 
     try:
-        installed_version = get_local_package_version(package)
+        python_pathlib = get_active_python_path()
+        site_packages_path = get_active_site_packages_path(python_path=python_pathlib)
+        installed_version = get_local_package_version(package, python_path=python_pathlib)
         latest_version = get_latest_package_version(package)
     except QbraidSystemError as err:
-        raise QbraidException("Failed to retrieve package version information") from err
-
-    try:
-        site_packages_path = get_active_site_packages_path()
-    except QbraidSystemError as err:
-        raise QbraidException("Failed to retrieve site-package location") from err
+        raise QbraidException("Failed to retrieve required system and/or package metadata") from err
 
-    return installed_version, latest_version, site_packages_path
+    return installed_version, latest_version, str(site_packages_path), str(python_pathlib)
 
 
 def confirm_updates(
@@ -117,8 +115,6 @@ def confirm_updates(
         typer.echo("\nqBraidSystemExit: Exiting.")
         raise typer.Exit()
 
-    typer.echo("")
-
 
 def aws_configure_dummy() -> None:
     """
@@ -156,23 +152,23 @@ def aws_configure_dummy() -> None:
 
 def enable_braket(auto_confirm: bool = False):
     """Enable qBraid quantum jobs for Amazon Braket."""
-    installed, latest, path = run_progress_task(
+    installed, latest, path, python_exe = run_progress_task(
         get_package_data, "boto3", description="Solving environment..."
     )
 
     if not auto_confirm:
         confirm_updates("enable", path, installed_version=installed, latest_version=latest)
+    typer.echo("")
 
     aws_configure_dummy()  # TODO: possibly add another confirmation for writing aws config files
+
     try:
-        subprocess.check_call([sys.executable, "-m", "pip", "install", "--upgrade", "boto3"])
+        subprocess.check_call([python_exe, "-m", "pip", "install", "--upgrade", "boto3"])
+        subprocess.check_call([python_exe, "-m", "pip", "uninstall", "botocore", "-y", "--quiet"])
         subprocess.check_call(
-            [sys.executable, "-m", "pip", "uninstall", "botocore", "-y", "--quiet"]
+            [python_exe, "-m", "pip", "install", "git+https://github.com/qBraid/botocore.git"]
         )
-        subprocess.check_call(
-            [sys.executable, "-m", "pip", "install", "git+https://github.com/qBraid/botocore.git"]
-        )
-    except subprocess.CalledProcessError:
+    except (subprocess.CalledProcessError, FileNotFoundError):
         handle_error(message="Failed to enable qBraid quantum jobs.")
 
     typer.secho("\nSuccessfully enabled qBraid quantum jobs.", fg=typer.colors.GREEN, bold=True)
@@ -182,18 +178,19 @@ def enable_braket(auto_confirm: bool = False):
 def disable_braket(auto_confirm: bool = False):
     """Disable qBraid quantum jobs for Amazon Braket."""
     package = "botocore"
-    installed, latest, path = run_progress_task(
+    installed, latest, path, python_exe = run_progress_task(
         get_package_data, package, description="Solving environment..."
     )
     package = f"{package}~={installed}" if installed < latest else package
 
     if not auto_confirm:
         confirm_updates("disable", path)
+    typer.echo("")
 
     try:
         subprocess.check_call(
             [
-                sys.executable,
+                python_exe,
                 "-m",
                 "pip",
                 "install",
@@ -202,7 +199,7 @@ def disable_braket(auto_confirm: bool = False):
             ],
             stderr=subprocess.DEVNULL,
         )
-    except subprocess.CalledProcessError:
+    except (subprocess.CalledProcessError, FileNotFoundError):
         handle_error(message="Failed to disable qBraid quantum jobs.")
 
     typer.secho("\nSuccessfully disabled qBraid quantum jobs.", fg=typer.colors.GREEN, bold=True)

qbraid_cli/jobs/validation.py

@@ -5,39 +5,59 @@
 Module for validating command arguments for qBraid Quantum Jobs.
 
 """
-
-from typing import Callable, Dict, Optional, Tuple
+import sys
+from typing import Any, Callable, Dict, Optional, Tuple
 
 import typer
-from qbraid_core.services.quantum.proxy import SUPPORTED_QJOB_LIBS, quantum_lib_proxy_state
 from rich.console import Console
 
 from qbraid_cli.handlers import handle_error, run_progress_task, validate_item
 
+LEGACY_ARGS: Dict[str, str] = {
+    "amazon_braket": "braket",
+    "aws_braket": "braket",
+}
+
 
 def validate_library(value: str) -> str:
     """Validate quantum jobs library."""
-    return validate_item(value, SUPPORTED_QJOB_LIBS, "Library")
+    # pylint:disable-next=import-outside-toplevel
+    from qbraid_core.services.quantum.proxy import SUPPORTED_QJOB_LIBS
+
+    qjobs_libs = list(SUPPORTED_QJOB_LIBS.keys())
 
+    if value in LEGACY_ARGS:
+        old_value = value
+        value = LEGACY_ARGS[value]
 
-def get_state(library: Optional[str] = None) -> Dict[str, Tuple[bool, bool]]:
+        console = Console()
+        console.print(
+            f"[red]DeprecationWarning:[/red] Argument '{old_value}' "
+            f"is deprecated. Use '{value}' instead.\n"
+        )
+
+    return validate_item(value, qjobs_libs, "Library")
+
+
+def get_state(library: Optional[str] = None) -> Tuple[str, Dict[str, Tuple[bool, bool]]]:
     """Get the state of qBraid Quantum Jobs for the specified library."""
+    from qbraid_core.services.quantum import QuantumClient
 
-    state_values = {}
+    jobs_state = QuantumClient.qbraid_jobs_state(device_lib=library)
 
-    if library:
-        libraries_to_check = [library]
-    else:
-        libraries_to_check = SUPPORTED_QJOB_LIBS
+    python_exe: str = jobs_state.get("exe", sys.executable)
+    libs_state: Dict[str, Any] = jobs_state.get("libs", {})
 
-    for lib in libraries_to_check:
-        state = quantum_lib_proxy_state(lib)
-        state_values[lib] = state["supported"], state["enabled"]
+    state_values = {
+        lib: (state["supported"], state["enabled"]) for lib, state in libs_state.items()
+    }
 
-    return state_values
+    return python_exe, state_values
 
 
-def run_progress_get_state(library: Optional[str] = None) -> Dict[str, Tuple[bool, bool]]:
+def run_progress_get_state(
+    library: Optional[str] = None,
+) -> Tuple[str, Dict[str, Tuple[bool, bool]]]:
     """Run get state function with rich progress UI."""
     return run_progress_task(
         get_state,
@@ -53,21 +73,20 @@ def handle_jobs_state(
     action_callback: Callable[[], None],
 ) -> None:
     """Handle the common logic for enabling or disabling qBraid Quantum Jobs."""
-    state_values: Dict[str, Tuple[bool, bool]] = run_progress_get_state(library)
+    _, state_values = run_progress_get_state(library)
     installed, enabled = state_values[library]
 
     if not installed:
-        handle_error(message=f"{library} not installed.")
+        handle_error(
+            message=f"{library} not installed."
+        )  # TODO: Provide command to install library?
     if (enabled and action == "enable") or (not enabled and action == "disable"):
         action_color = "green" if enabled else "red"
         console = Console()
         console.print(
             f"\nqBraid quantum jobs already [bold {action_color}]{action}d[/bold {action_color}] "
-            f"for [magenta]{library}[/magenta]."
-        )
-        console.print(
-            "To check the state of all quantum jobs libraries in this environment, "
-            "use: \n\n\t$ qbraid jobs state\n"
+            f"for [magenta]{library}[/magenta].\n\nCheck the state of all quantum jobs "
+            "libraries in this environment with: \n\n\t$ qbraid jobs state\n"
         )
         raise typer.Exit()
 

{qbraid_cli-0.8.0.dev3.dist-info → qbraid_cli-0.8.0.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qbraid-cli
-Version: 0.8.0.dev3
+Version: 0.8.0.dev4
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License: Proprietary
@@ -29,7 +29,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: typer >=0.12.1
 Requires-Dist: rich >=10.11.0
 Requires-Dist: jupyter-client <9.0.0,>=7.0.0
-Requires-Dist: qbraid-core >=0.1.1
+Requires-Dist: qbraid-core >=0.1.2
 Provides-Extra: dev
 Requires-Dist: black ; extra == 'dev'
 Requires-Dist: isort ; extra == 'dev'
@@ -41,6 +41,8 @@ Requires-Dist: sphinx-rtd-theme <2.1,>=1.3 ; extra == 'docs'
 Requires-Dist: docutils <0.21 ; extra == 'docs'
 Requires-Dist: toml ; extra == 'docs'
 Requires-Dist: build ; extra == 'docs'
+Requires-Dist: m2r ; extra == 'docs'
+Requires-Dist: typer ; extra == 'docs'
 Provides-Extra: jobs
 Requires-Dist: amazon-braket-sdk >=1.48.1 ; extra == 'jobs'
 

{qbraid_cli-0.8.0.dev3.dist-info → qbraid_cli-0.8.0.dev4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 qbraid_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qbraid_cli/_version.py,sha256=gmvID9vFrR93SKxjTAMGcHF8k0zAbpA7V0aBbjfr5jw,424
+qbraid_cli/_version.py,sha256=slOqxGpZ52igr23ftZbPTgtbqVPwjKuyUyILwEde3R4,424
 qbraid_cli/exceptions.py,sha256=KjlhYJhSHMVazaNiBjD_Ur06w4sekP8zRsFzBdyIpno,672
-qbraid_cli/handlers.py,sha256=rGxHrwrPHvwP3CKVlJSCZ_KkgGvFlLXd3SsxcC4LqS0,6306
+qbraid_cli/handlers.py,sha256=i3vdRtdy4bZKg3j6fwfVMz1ddhMgzlc2hhmj-vewxpI,6542
 qbraid_cli/main.py,sha256=ko3c8fkzwcNlNb0AFLFgwlSoOOC4DJgeHlRuHbz-dyw,2504
 qbraid_cli/configure/__init__.py,sha256=6GU7vR6JYRGcMsmdrpFbwLO5VSUmnLgwSbtmGWMQND4,158
 qbraid_cli/configure/actions.py,sha256=3rrWHaCAsogyx0Ll-lcjbSzldD4kPuz1z6VQiWebSWw,3203
@@ -17,13 +17,13 @@ qbraid_cli/envs/app.py,sha256=t6bRwJGy-M3PAu870ZsttsM8tpSB0OFasgCJiV9nTSA,8620
 qbraid_cli/envs/create.py,sha256=uCRex_TcFYw26jUOU06Ta5I8Mq5pRqLVaOE6MxrrExs,4337
 qbraid_cli/envs/data_handling.py,sha256=mTVzsj6KleeeYDKGhgD-IesF9KQQMSszKFSEo8Wrv9w,4001
 qbraid_cli/jobs/__init__.py,sha256=bj9XmZ4JL8OtMMZbHIu-DPhpOMXGLSB-W1b0wO7wKro,148
-qbraid_cli/jobs/app.py,sha256=LsyYFh2949-6eCVfdzcY-Nvt4rSN5lNBDZ57j0OBzWE,4870
-qbraid_cli/jobs/toggle_braket.py,sha256=2vCkKcDsQmVYpElHwOI-fQCVbIH-0HBnnDZSfp_bSlk,7553
-qbraid_cli/jobs/validation.py,sha256=6QKkFINk8Jqw1wuwPivbD5HuFTzT1cUT_G2WVqaKcnc,2405
+qbraid_cli/jobs/app.py,sha256=kmg9mYla3Nd7EdjQlFu7IOvm7sejLNfPPA6Qeet-IfE,4898
+qbraid_cli/jobs/toggle_braket.py,sha256=jlmVEGB30ZQmLePiKj48mCXltluUUb47BZlgZT85yuY,7718
+qbraid_cli/jobs/validation.py,sha256=xNbjUggMhUs4wzkuRm4PuFPi_wrElYicUgYXLznHz3U,2983
 qbraid_cli/kernels/__init__.py,sha256=VhpBota_v7OoiGxrPCqJU4XBVcolf81mbCYGSxXzVhc,154
 qbraid_cli/kernels/app.py,sha256=ZJWVdKzCDfzGnA1pqp01vDbE7fh8p84jC-y6DDgWlxc,3373
-qbraid_cli-0.8.0.dev3.dist-info/METADATA,sha256=Ud547dThxdfsRnAXTcTy_J2s3xQcLVglP9houT2FNSw,5818
-qbraid_cli-0.8.0.dev3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qbraid_cli-0.8.0.dev3.dist-info/entry_points.txt,sha256=c5ZJ7NjbxhDqMpou9q5F03_b_KG34HzFDijIDmEIwgQ,47
-qbraid_cli-0.8.0.dev3.dist-info/top_level.txt,sha256=LTYJgeYSCHo9Il8vZu0yIPuGdGyNaIw6iRy6BeoZo8o,11
-qbraid_cli-0.8.0.dev3.dist-info/RECORD,,
+qbraid_cli-0.8.0.dev4.dist-info/METADATA,sha256=zL1Ut9rcHVtO1mZeduN5dqpe9H5H_Wu8R3rn7t7NBww,5894
+qbraid_cli-0.8.0.dev4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qbraid_cli-0.8.0.dev4.dist-info/entry_points.txt,sha256=c5ZJ7NjbxhDqMpou9q5F03_b_KG34HzFDijIDmEIwgQ,47
+qbraid_cli-0.8.0.dev4.dist-info/top_level.txt,sha256=LTYJgeYSCHo9Il8vZu0yIPuGdGyNaIw6iRy6BeoZo8o,11
+qbraid_cli-0.8.0.dev4.dist-info/RECORD,,