qbraid-cli 0.8.0.dev4__py3-none-any.whl → 0.8.0.dev5__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.dev4'
-__version_tuple__ = version_tuple = (0, 8, 0, 'dev4')
+__version__ = version = '0.8.0.dev5'
+__version_tuple__ = version_tuple = (0, 8, 0, 'dev5')

qbraid_cli/admin/__init__.py

@@ -0,0 +1,9 @@
+# Copyright (c) 2024, qBraid Development Team
+# All rights reserved.
+
+"""
+Module defining the qbraid admin namespace
+
+"""
+
+from .app import admin_app

qbraid_cli/admin/app.py

@@ -0,0 +1,50 @@
+# Copyright (c) 2024, qBraid Development Team
+# All rights reserved.
+
+"""
+Module defining commands in the 'qbraid admin' namespace.
+
+"""
+
+from typing import List
+
+import typer
+
+from qbraid_cli.admin.headers import check_and_fix_headers
+from qbraid_cli.admin.validation import validate_header_type, validate_paths_exist
+
+# disable pretty_exceptions_show_locals to avoid printing sensative information in the traceback
+admin_app = typer.Typer(
+    help="CI/CD commands for qBraid maintainers.",
+    pretty_exceptions_show_locals=False,
+)
+
+
+@admin_app.command(name="headers")
+def admin_headers(
+    src_paths: List[str] = typer.Argument(
+        ..., help="Source file or directory paths to verify.", callback=validate_paths_exist
+    ),
+    header_type: str = typer.Option(
+        "default",
+        "--type",
+        "-t",
+        help="Type of header to use ('default' or 'gpl').",
+        callback=validate_header_type,
+    ),
+    skip_files: List[str] = typer.Option(
+        [], "--skip", "-s", help="Files to skip during verification.", callback=validate_paths_exist
+    ),
+    fix: bool = typer.Option(
+        False, "--fix", "-f", help="Whether to fix the headers instead of just verifying."
+    ),
+):
+    """
+    Verifies and optionally fixes qBraid headers in specified files and directories.
+
+    """
+    check_and_fix_headers(src_paths, header_type=header_type, skip_files=skip_files, fix=fix)
+
+
+if __name__ == "__main__":
+    admin_app()

qbraid_cli/admin/headers.py

@@ -0,0 +1,193 @@
+# Copyright (c) 2024, qBraid Development Team
+# All rights reserved.
+
+"""
+Script to verify qBraid copyright file headers
+
+"""
+import os
+import sys
+from typing import List, Optional
+
+from rich.console import Console
+
+# pylint: disable=too-many-branches,too-many-statements
+
+DEFAULT_HEADER = """# Copyright (c) 2024, qBraid Development Team
+# All rights reserved.
+"""
+
+DEFAULT_HEADER_GPL = """# Copyright (C) 2024 qBraid
+#
+# This file is part of the qBraid-SDK
+#
+# The qBraid-SDK is free software released under the GNU General Public License v3
+# or later. You can redistribute and/or modify it under the terms of the GPL v3.
+# See the LICENSE file in the project root or <https://www.gnu.org/licenses/gpl-3.0.html>.
+#
+# THERE IS NO WARRANTY for the qBraid-SDK, as per Section 15 of the GPL v3.
+"""
+
+HEADER_TYPES = {
+    "default": DEFAULT_HEADER,
+    "gpl": DEFAULT_HEADER_GPL,
+}
+
+
+def check_and_fix_headers(
+    src_paths: List[str],
+    header_type: str = "default",
+    skip_files: Optional[List[str]] = None,
+    fix: bool = False,
+) -> None:
+    """Script to add or verify qBraid copyright file headers"""
+    try:
+        header = HEADER_TYPES[header_type]
+    except KeyError as err:
+        raise ValueError(
+            f"Invalid header type: {HEADER_TYPES}. Expected one of {list(HEADER_TYPES.keys())}"
+        ) from err
+
+    for path in src_paths:
+        if not os.path.exists(path):
+            sys.stderr.write(
+                f"Usage: qbraid verify_headers [OPTIONS] SRC ...\n"
+                f"Try 'qbraid verify_headers --help' for help.\n\n"
+                f"Error: Invalid value for 'SRC ...': Path '{path}' does not exist.\n"
+            )
+            sys.exit(1)
+
+    header_2023 = header.replace("2024", "2023")
+
+    skip_files = skip_files or []
+
+    failed_headers = []
+    fixed_headers = []
+
+    console = Console()
+
+    def should_skip(file_path: str, content: str) -> bool:
+        if file_path in skip_files:
+            return True
+
+        if os.path.basename(file_path) == "__init__.py":
+            return not content.strip()
+
+        skip_header_tag = "# qbraid: skip-header"
+        line_number = 0
+
+        for line in content.splitlines():
+            line_number += 1
+            if 5 <= line_number <= 30 and skip_header_tag in line:
+                return True
+            if line_number > 30:
+                break
+
+        return False
+
+    def replace_or_add_header(file_path: str, fix: bool = False) -> None:
+        with open(file_path, "r", encoding="ISO-8859-1") as f:
+            content = f.read()
+
+        # This finds the start of the actual content after skipping initial whitespace and comments.
+        lines = content.splitlines()
+        first_non_comment_line_index = next(
+            (i for i, line in enumerate(lines) if not line.strip().startswith("#")), None
+        )
+
+        # Prepare the content by stripping leading and trailing whitespace and separating into lines
+        actual_content = (
+            "\n".join(lines[first_non_comment_line_index:]).strip()
+            if first_non_comment_line_index is not None
+            else ""
+        )
+
+        # Check if the content already starts with the header or if the file should be skipped
+        if (
+            content.lstrip().startswith(header)
+            or content.lstrip().startswith(header_2023)
+            or should_skip(file_path, content)
+        ):
+            return
+
+        if not fix:
+            failed_headers.append(file_path)
+        else:
+            # Form the new content by combining the header, one blank line, and the actual content
+            new_content = header.strip() + "\n\n" + actual_content
+            with open(file_path, "w", encoding="ISO-8859-1") as f:
+                f.write(new_content)
+            fixed_headers.append(file_path)
+
+    def process_files_in_directory(directory: str, fix: bool = False) -> int:
+        count = 0
+        if not os.path.isdir(directory):
+            return count
+        for root, _, files in os.walk(directory):
+            for file in files:
+                if file.endswith(".py"):
+                    file_path = os.path.join(root, file)
+                    replace_or_add_header(file_path, fix)
+                    count += 1
+        return count
+
+    checked = 0
+    for item in src_paths:
+        if os.path.isdir(item):
+            checked += process_files_in_directory(item, fix)
+        elif os.path.isfile(item) and item.endswith(".py"):
+            replace_or_add_header(item, fix)
+            checked += 1
+        else:
+            failed_headers.append(item)
+            print(f"File or directory not found: {item}")
+
+    if not fix:
+        if failed_headers:
+            for file in failed_headers:
+                console.print(f"[bold]would fix {file}[/bold]")
+            num_failed = len(failed_headers)
+            num_passed = checked - num_failed
+            s1, s2 = ("", "s") if num_failed == 1 else ("s", "")
+            s_passed = "" if num_passed == 1 else "s"
+            console.print("[bold]\nOh no![/bold] 💥 💔 💥")
+            if num_passed > 0:
+                punc = ", "
+                passed_msg = f"[blue]{num_passed}[/blue] file{s_passed} would be left unchanged."
+            else:
+                punc = "."
+                passed_msg = ""
+
+            failed_msg = f"[bold][blue]{num_failed}[/blue] file{s1} need{s2} updating{punc}[/bold]"
+            console.print(f"{failed_msg}{passed_msg}")
+        elif checked == 0:
+            console.print("[bold]No Python files present. Nothing to do[/bold] 😴")
+        else:
+            s_checked = "" if checked == 1 else "s"
+            console.print("[bold]All done![/bold] ✨ 🚀 ✨")
+            console.print(f"[blue]{checked}[/blue] file{s_checked} would be left unchanged.")
+
+    else:
+        for file in fixed_headers:
+            console.print(f"[bold]fixed {file}[/bold]")
+        num_fixed = len(fixed_headers)
+        num_ok = checked - num_fixed
+        s_fixed = "" if num_fixed == 1 else "s"
+        s_ok = "" if num_ok == 1 else "s"
+        console.print("\n[bold]All done![/bold] ✨ 🚀 ✨")
+        if num_ok > 0:
+            punc = ", "
+            unchanged_msg = f"[blue]{num_ok}[/blue] file{s_ok} left unchanged."
+        else:
+            punc = "."
+            unchanged_msg = ""
+
+        if num_fixed > 0:
+            fixed_msg = f"[bold][blue]{num_fixed}[/blue] file{s_fixed} fixed{punc}[/bold]"
+        else:
+            fixed_msg = ""
+
+        if fixed_msg or unchanged_msg:
+            console.print(f"{fixed_msg}{unchanged_msg}")
+        else:
+            console.print("[bold]No Python files present. Nothing to do[/bold] 😴")

qbraid_cli/admin/validation.py

@@ -0,0 +1,33 @@
+# Copyright (c) 2024, qBraid Development Team
+# All rights reserved.
+
+"""
+Module for validating command arguments for qBraid admin commands.
+
+"""
+
+import os
+from typing import List
+
+import typer
+
+from qbraid_cli.admin.headers import HEADER_TYPES
+from qbraid_cli.handlers import _format_list_items, validate_item
+
+
+def validate_header_type(value: str) -> str:
+    """Validate header type."""
+    header_types = list(HEADER_TYPES.keys())
+    return validate_item(value, header_types, "Header type")
+
+
+def validate_paths_exist(paths: List[str]) -> List[str]:
+    """Verifies that each path in the provided list exists."""
+    non_existent_paths = [path for path in paths if not os.path.exists(path)]
+    if non_existent_paths:
+        if len(non_existent_paths) == 1:
+            raise typer.BadParameter(f"Path '{non_existent_paths[0]}' does not exist")
+        raise typer.BadParameter(
+            f"The following paths do not exist: {_format_list_items(non_existent_paths)}"
+        )
+    return paths

qbraid_cli/devices/validation.py

@@ -4,7 +4,6 @@
 """
 Module for validating command arguments for qBraid devices commands.
 
-
 """
 
 from typing import Optional, Union

qbraid_cli/jobs/toggle_braket.py

@@ -120,32 +120,11 @@ def aws_configure_dummy() -> None:
     """
     Initializes AWS configuration and credentials files with placeholder values.
 
-    This function ensures the existence of AWS config and credentials files in the user's home
-    directory. If these files do not already exist, it creates them and populates them with
-    placeholder values for the AWS access key and secret access key. While AWS credentials are not
-    required when submitting quantum tasks through qBraid, Amazon Braket requires these files to be
-    present to prevent configuration errors.
     """
-    aws_dir = Path.home() / ".aws"
-    config_path = aws_dir / "config"
-    credentials_path = aws_dir / "credentials"
-
-    def configure_aws():
-        aws_dir.mkdir(exist_ok=True)
-        if not config_path.exists():
-            config_content = "[default]\nregion = us-east-1\noutput = json\n"
-            config_path.write_text(config_content)
-        if not credentials_path.exists():
-            access_key, secret_key = "MYACCESSKEY", "MYSECRETKEY"
-            credentials_content = (
-                f"[default]\n"
-                f"aws_access_key_id = {access_key}\n"
-                f"aws_secret_access_key = {secret_key}\n"
-            )
-            credentials_path.write_text(credentials_content)
+    from qbraid_core.services.quantum.proxy_braket import aws_configure
 
     try:
-        handle_filesystem_operation(configure_aws, aws_dir)
+        handle_filesystem_operation(aws_configure, Path.home() / ".aws")
     except QbraidException:
         handle_error(message="Failed to configure qBraid quantum jobs.")
 

qbraid_cli/main.py

@@ -7,8 +7,8 @@ Entrypoint for the qBraid CLI.
 """
 
 import typer
-import urllib3
 
+from qbraid_cli.admin.app import admin_app
 from qbraid_cli.configure.app import configure_app
 from qbraid_cli.credits.app import credits_app
 from qbraid_cli.devices.app import devices_app
@@ -17,14 +17,14 @@ from qbraid_cli.jobs.app import jobs_app
 from qbraid_cli.kernels.app import kernels_app
 
 app = typer.Typer(context_settings={"help_option_names": ["-h", "--help"]})
+
+app.add_typer(admin_app, name="admin")
 app.add_typer(configure_app, name="configure")
+app.add_typer(credits_app, name="credits")
+app.add_typer(devices_app, name="devices")
 app.add_typer(envs_app, name="envs")
 app.add_typer(jobs_app, name="jobs")
-app.add_typer(devices_app, name="devices")
 app.add_typer(kernels_app, name="kernels")
-app.add_typer(credits_app, name="credits")
-
-urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
 
 def version_callback(value: bool):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qbraid-cli
-Version: 0.8.0.dev4
+Version: 0.8.0.dev5
 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,8 @@ 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.2
+Requires-Dist: ipykernel
+Requires-Dist: qbraid-core >=0.1.3
 Provides-Extra: dev
 Requires-Dist: black ; extra == 'dev'
 Requires-Dist: isort ; extra == 'dev'
@@ -38,7 +39,7 @@ Requires-Dist: pytest ; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: sphinx ~=7.2.6 ; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme <2.1,>=1.3 ; extra == 'docs'
-Requires-Dist: docutils <0.21 ; extra == 'docs'
+Requires-Dist: docutils <0.22 ; extra == 'docs'
 Requires-Dist: toml ; extra == 'docs'
 Requires-Dist: build ; extra == 'docs'
 Requires-Dist: m2r ; extra == 'docs'

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

@@ -1,8 +1,12 @@
 qbraid_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qbraid_cli/_version.py,sha256=slOqxGpZ52igr23ftZbPTgtbqVPwjKuyUyILwEde3R4,424
+qbraid_cli/_version.py,sha256=rUwu2eja7AS4Qp4mUrT-oC2PaWQWiRi_YNlcgdK7tAE,424
 qbraid_cli/exceptions.py,sha256=KjlhYJhSHMVazaNiBjD_Ur06w4sekP8zRsFzBdyIpno,672
 qbraid_cli/handlers.py,sha256=i3vdRtdy4bZKg3j6fwfVMz1ddhMgzlc2hhmj-vewxpI,6542
-qbraid_cli/main.py,sha256=ko3c8fkzwcNlNb0AFLFgwlSoOOC4DJgeHlRuHbz-dyw,2504
+qbraid_cli/main.py,sha256=IRKazFqtFpoiq_xOtqb-IXDKAVs4lacFIRCQCoiGNF4,2503
+qbraid_cli/admin/__init__.py,sha256=Suo_L1_yBodCvLM_fpw8gRIhD4mVVOXKObtxeoMaBVo,150
+qbraid_cli/admin/app.py,sha256=__6lo-iFsbfz-ayD1-AS8X1z_gYhCad1NK17hnrL7HY,1451
+qbraid_cli/admin/headers.py,sha256=oE2Ry9221ZV4tgYqFJNHAPilDw72xR3LqG_gBw7BFxM,6667
+qbraid_cli/admin/validation.py,sha256=LkAVXlHtM0MhCa34MIWrfX59wGXMVlZmdVB4-AQ8fBk,1003
 qbraid_cli/configure/__init__.py,sha256=6GU7vR6JYRGcMsmdrpFbwLO5VSUmnLgwSbtmGWMQND4,158
 qbraid_cli/configure/actions.py,sha256=3rrWHaCAsogyx0Ll-lcjbSzldD4kPuz1z6VQiWebSWw,3203
 qbraid_cli/configure/app.py,sha256=vcPu1Npf8sfGtWGQrjDJQG5vCdeUa3nlpEnZMlVLlWM,1615
@@ -10,7 +14,7 @@ qbraid_cli/credits/__init__.py,sha256=t-3XAJFAXiu_jI4sgjaIOuNne_AoSYaSEsi-SSRkvP
 qbraid_cli/credits/app.py,sha256=iHikmjx8pylMFNzHckuauOg-Nb9pS7xQq_H75ibVJig,774
 qbraid_cli/devices/__init__.py,sha256=_PU3eMQRV4DkPw-oCmfCPh8EbVmgG76ieEKuNsY9Xqc,154
 qbraid_cli/devices/app.py,sha256=zxSxrEQn7irkJoME4S_CBnRqWeB8cqPaBsIMfpdYFk0,2530
-qbraid_cli/devices/validation.py,sha256=Zt0mdg4nXHz-7yGP3qH6UwVoF18yrqW_4jdS4kiFKsQ,810
+qbraid_cli/devices/validation.py,sha256=YhShyUufgrKnx2XjXOXF-PqFJYklJT9CgeqIwKcNam4,809
 qbraid_cli/envs/__init__.py,sha256=YgIoMWxfGqzmwfypO5JHYuCOu6BfFwb9NHgQel1IJM8,148
 qbraid_cli/envs/activate.py,sha256=VpvVYSfQDlcmlNWJOgkLIQ2p8YXPPLG8Jbl5t8GHUDw,2140
 qbraid_cli/envs/app.py,sha256=t6bRwJGy-M3PAu870ZsttsM8tpSB0OFasgCJiV9nTSA,8620
@@ -18,12 +22,12 @@ qbraid_cli/envs/create.py,sha256=uCRex_TcFYw26jUOU06Ta5I8Mq5pRqLVaOE6MxrrExs,433
 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=kmg9mYla3Nd7EdjQlFu7IOvm7sejLNfPPA6Qeet-IfE,4898
-qbraid_cli/jobs/toggle_braket.py,sha256=jlmVEGB30ZQmLePiKj48mCXltluUUb47BZlgZT85yuY,7718
+qbraid_cli/jobs/toggle_braket.py,sha256=d5C_Di80jWMFlh-77eH8YY9pjMKWXK5abenUDtPlE_I,6662
 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.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,,
+qbraid_cli-0.8.0.dev5.dist-info/METADATA,sha256=emAQ5AjqtbZ9_l0lSBUtU4Jizzrru3GPPsxnUfriZds,5919
+qbraid_cli-0.8.0.dev5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qbraid_cli-0.8.0.dev5.dist-info/entry_points.txt,sha256=c5ZJ7NjbxhDqMpou9q5F03_b_KG34HzFDijIDmEIwgQ,47
+qbraid_cli-0.8.0.dev5.dist-info/top_level.txt,sha256=LTYJgeYSCHo9Il8vZu0yIPuGdGyNaIw6iRy6BeoZo8o,11
+qbraid_cli-0.8.0.dev5.dist-info/RECORD,,