qbraid-cli 0.10.7__tar.gz → 0.10.8__tar.gz

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/.github/workflows/bump-version.yml

@@ -29,7 +29,7 @@ jobs:
         run: git checkout -b qbraid-bot/${{ github.run_id }}
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/.github/workflows/ci-pr-target.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
@@ -73,7 +73,7 @@ jobs:
           QBRAID_API_KEY: ${{ secrets.QBRAID_API_KEY }}
       - name: Upload coverage to Codecov
         if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.5.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: false

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/.github/workflows/docs-pr.yml

@@ -81,7 +81,7 @@ jobs:
           sed -i "6iVersion: [$VERSION](https://pypi.org/project/qbraid-cli/$VERSION)\n" qbraid_docs/cli/api-reference/qbraid.mdx
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22'
   

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/.github/workflows/docs.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.11'
         cache: pip

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/.github/workflows/format.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
       - name: Install dependencies

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
@@ -49,7 +49,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
@@ -76,7 +76,7 @@ jobs:
           QBRAID_API_KEY: ${{ secrets.QBRAID_API_KEY }}
       - name: Upload coverage to Codecov
         if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.5.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: false

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/.github/workflows/pre-release.yml

@@ -14,7 +14,7 @@ jobs:
           fetch-depth: 1
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
           fetch-depth: 1
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.10.7
+Version: 0.10.8
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License: Proprietary

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/pyproject.toml

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

@@ -11,6 +11,7 @@ from typing import Any
 import rich
 import typer
 
+from qbraid_cli.configure.actions import QBRAID_ORG_MODEL_ENABLED
 from qbraid_cli.handlers import run_progress_task
 
 account_app = typer.Typer(help="Manage qBraid account.", no_args_is_help=True)
@@ -51,9 +52,10 @@ def account_info():
             "email": user.get("email"),
             "joinedDate": user.get("createdAt", "Unknown"),
             "activePlan": user.get("activePlan", "") or "Free",
-            "organization": personal_info.get("organization", "") or "qbraid",
             "role": personal_info.get("role", "") or "guest",
         }
+        if QBRAID_ORG_MODEL_ENABLED:
+            metadata["organization"] = personal_info.get("organization", "") or "qbraid"
 
         return metadata
 

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/qbraid_cli/configure/actions.py

@@ -25,6 +25,8 @@ from rich.console import Console
 
 from qbraid_cli.handlers import handle_filesystem_operation
 
+QBRAID_ORG_MODEL_ENABLED = False  # Set to True if organization/workspace model is enabled
+
 
 def validate_input(key: str, value: str) -> str:
     """Validate the user input based on the key.
@@ -96,16 +98,21 @@ def default_action(section: str = DEFAULT_CONFIG_SECTION):
 
     default_values = {
         "url": DEFAULT_ENDPOINT_URL,
-        "organization": DEFAULT_ORGANIZATION,
-        "workspace": DEFAULT_WORKSPACE,
     }
+    if QBRAID_ORG_MODEL_ENABLED:
+        default_values["organization"] = DEFAULT_ORGANIZATION
+        default_values["workspace"] = DEFAULT_WORKSPACE
 
     config[section]["url"] = prompt_for_config(config, section, "url", default_values)
     config[section]["api-key"] = prompt_for_config(config, section, "api-key", default_values)
-    config[section]["organization"] = prompt_for_config(
-        config, section, "organization", default_values
-    )
-    config[section]["workspace"] = prompt_for_config(config, section, "workspace", default_values)
+
+    if QBRAID_ORG_MODEL_ENABLED:
+        config[section]["organization"] = prompt_for_config(
+            config, section, "organization", default_values
+        )
+        config[section]["workspace"] = prompt_for_config(
+            config, section, "workspace", default_values
+        )
 
     for key in list(config[section]):
         if not config[section][key]:

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/qbraid_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.10.7
+Version: 0.10.8
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License: Proprietary

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/qbraid_cli.egg-info/SOURCES.txt

@@ -30,7 +30,6 @@ docs/_static/logo.png
 docs/_static/style/custom.css
 docs/_static/style/s4defs-roles.css
 qbraid_cli/__init__.py
-qbraid_cli/_version.py
 qbraid_cli/exceptions.py
 qbraid_cli/handlers.py
 qbraid_cli/main.py

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/tests/account/test_account_credits.py

@@ -51,7 +51,6 @@ def test_account_info_success():
         "email": "mock@example.com",
         "joinedDate": "2022-03-10T03:52:08.743Z",
         "activePlan": "Free",
-        "organization": "qbraid",
         "role": "guest",
     }
 
@@ -66,7 +65,6 @@ def test_account_info_success():
                 "email": "mock@example.com",
                 "createdAt": "2022-03-10T03:52:08.743Z",
                 "activePlan": "Free",
-                "organization": "qbraid",
                 "role": "guest",
             }
 

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/tests/configure/test_configure_commands.py

@@ -41,7 +41,6 @@ def test_configure_list_with_values(capsys):
             "api-key": "abcdef123456",
             "refresh-token": "xyz987654321",
             "url": "https://example.com",
-            "organization": "test-org",
         }
     }
     mock_load_config = MagicMock(return_value=mock_config)
@@ -55,7 +54,32 @@ def test_configure_list_with_values(capsys):
         assert "*****321" in captured.out  # last 3 chars of refresh-token
         # Check that non-sensitive values are shown in full
         assert "https://example.com" in captured.out
-        assert "test-org" in captured.out
+
+
+def test_configure_list_with_org_enabled_config(capsys):
+    """Test configure_list with organization and workspace when org model is enabled."""
+    mock_config = {
+        "default": {
+            "api-key": "abcdef123456",
+            "refresh-token": "xyz987654321",
+            "url": "https://example.com",
+            "organization": "my-org",
+            "workspace": "my-workspace",
+        }
+    }
+    mock_load_config = MagicMock(return_value=mock_config)
+    with patch("qbraid_cli.configure.actions.QBRAID_ORG_MODEL_ENABLED", True):
+        with patch("qbraid_core.config.load_config", mock_load_config):
+            configure_list()
+            captured = capsys.readouterr()
+
+            # Check that sensitive values are masked
+            assert "*****456" in captured.out  # last 3 chars of api-key
+            assert "*****321" in captured.out  # last 3 chars of refresh-token
+            # Check that non-sensitive values are shown in full
+            assert "https://example.com" in captured.out
+            assert "my-org" in captured.out
+            assert "my-workspace" in captured.out
 
 
 def test_configure_get_success(capsys):

qbraid_cli-0.10.8/tests/configure/test_configure_default.py

@@ -0,0 +1,61 @@
+# Copyright (c) 2024, qBraid Development Team
+# All rights reserved.
+
+"""
+Unit tests for the default_action function in the configure app.
+
+"""
+
+import configparser
+from unittest.mock import patch
+
+import pytest
+
+from qbraid_cli.configure.actions import default_action
+
+
+@pytest.mark.parametrize(
+    "org_model_enabled,side_effect,expected_call_count",
+    [
+        (False, ["https://new.example.com", "api-key-123"], 2),
+        (True, ["https://api.qbraid.com", "api-key-456", "qbraid-org", "default-workspace"], 4),
+    ],
+)
+def test_default_action(org_model_enabled, side_effect, expected_call_count):
+    """Test default_action method with mocked dependencies."""
+    # Store original value of QBRAID_ORG_MODEL_ENABLED
+    import qbraid_cli.configure.actions as actions_module
+
+    original_org_model_enabled = actions_module.QBRAID_ORG_MODEL_ENABLED
+
+    try:
+        # Set the org model enabled flag for this test
+        actions_module.QBRAID_ORG_MODEL_ENABLED = org_model_enabled
+
+        with (
+            patch("qbraid_cli.configure.actions.load_config") as mock_load_config,
+            patch("qbraid_cli.configure.actions.prompt_for_config") as mock_prompt,
+            patch("qbraid_cli.configure.actions.handle_filesystem_operation") as mock_handle_fs,
+            patch("qbraid_cli.configure.actions.Console") as mock_console,
+        ):
+            # Setup mock returns
+            config = configparser.ConfigParser()
+            config.add_section("default")
+            mock_load_config.return_value = config
+            mock_prompt.side_effect = side_effect
+            mock_console_instance = mock_console.return_value
+
+            # Call the function to test
+            default_action()
+
+            # Verify prompt_for_config was called the expected number of times
+            assert mock_prompt.call_count == expected_call_count
+            mock_load_config.assert_called_once()
+            mock_handle_fs.assert_called_once()
+            mock_console_instance.print.assert_called_once_with(
+                "\n[bold green]Configuration updated successfully."
+            )
+
+    finally:
+        # Restore original value
+        actions_module.QBRAID_ORG_MODEL_ENABLED = original_org_model_enabled

{qbraid_cli-0.10.7 → qbraid_cli-0.10.8}/tests/configure/test_configure_prompt_for_config.py

@@ -9,7 +9,7 @@ Unit tests for the prompt_for_config function in the configure app.
 import configparser
 from unittest.mock import patch
 
-from qbraid_cli.configure.actions import default_action, prompt_for_config
+from qbraid_cli.configure.actions import prompt_for_config
 
 
 def test_enter_new_values():
@@ -20,8 +20,6 @@ def test_enter_new_values():
     # Initial values
     settings = [
         ("url", "http://example.com", "http://newexample.com"),
-        ("organization", "default-org", "new-org"),
-        ("workspace", "default-workspace", "new-workspace"),
     ]
 
     # Setup config with initial values

qbraid_cli-0.10.7/qbraid_cli/_version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '0.1.dev1+g494c7ce'
-__version_tuple__ = version_tuple = (0, 1, 'dev1', 'g494c7ce')

qbraid_cli-0.10.7/tests/configure/test_configure_default.py

@@ -1,54 +0,0 @@
-# Copyright (c) 2024, qBraid Development Team
-# All rights reserved.
-
-"""
-Unit tests for the default_action function in the configure app.
-
-"""
-
-import configparser
-from unittest.mock import patch
-
-from qbraid_cli.configure.actions import default_action
-
-
-def test_default_action():
-    """Test default_action method with mocked dependencies."""
-    with (
-        patch("qbraid_cli.configure.actions.load_config") as mock_load_config,
-        patch("qbraid_cli.configure.actions.prompt_for_config") as mock_prompt,
-        patch("qbraid_cli.configure.actions.handle_filesystem_operation") as mock_handle_fs,
-        patch("qbraid_cli.configure.actions.Console") as mock_console,
-    ):
-        # Setup mock returns
-        config = configparser.ConfigParser()
-        config.add_section("default")
-        mock_load_config.return_value = config
-
-        # Setup prompt_for_config to return different values
-        mock_prompt.side_effect = [
-            "https://new.example.com",  # url
-            "api-key-123",  # api-key
-            "new-organization",  # organization
-            "new-workspace",  # workspace
-        ]
-
-        # Create mock console
-        mock_console_instance = mock_console.return_value
-
-        # Call the function to test
-        default_action()
-
-        # Verify config load/save was called
-        mock_load_config.assert_called_once()
-
-        # Verify prompt_for_config was called 4 times
-        assert mock_prompt.call_count == 4
-
-        # Verify handle_filesystem_operation was called to save config
-        mock_handle_fs.assert_called_once()
-
-        # Verify console.print was called with success message
-        mock_console_instance.print.assert_called_once_with(
-            "\n[bold green]Configuration updated successfully."
-        )