qctrl-workflow-client 5.7.0__tar.gz → 6.0.0__tar.gz

{qctrl_workflow_client-5.7.0 → qctrl_workflow_client-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qctrl-workflow-client
-Version: 5.7.0
+Version: 6.0.0
 Summary: Q-CTRL Workflow Client
 License: https://q-ctrl.com/terms
 Keywords: black opal,boulder opal,fire opal,nisq,open controls,q control,q ctrl,q-control,q-ctrl,qcontrol,qctrl,quantum,quantum algorithms,quantum circuits,quantum coding,quantum coding software,quantum computing,quantum control,quantum control software,quantum control theory,quantum engineering,quantum error correction,quantum firmware,quantum fundamentals,quantum sensing,qubit,qudit
@@ -30,9 +30,9 @@ Classifier: Topic :: System :: Distributed Computing
 Requires-Dist: gql (>=3.4.0,<4.0.0)
 Requires-Dist: importlib-metadata (>=6.8.0,<7.0.0)
 Requires-Dist: packaging (>=23.1.0,<24.0.0)
-Requires-Dist: qctrl-client (>=11.4.0,<12.0.0)
+Requires-Dist: qctrl-client (>=12.0.0,<13.0.0)
 Requires-Dist: qctrl-commons (>=25.0.0,<26.0.0)
-Requires-Dist: requests (>=2.32.0,<3.0.0)
+Requires-Dist: requests (>=2.32.4,<3.0.0)
 Requires-Dist: tenacity (>=8.1.0,<9.0.0)
 Requires-Dist: tomli (>=2.2.1,<3.0.0)
 Project-URL: Documentation, https://docs.q-ctrl.com

{qctrl_workflow_client-5.7.0 → qctrl_workflow_client-6.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qctrl-workflow-client"
-version = "5.7.0"
+version = "6.0.0"
 description = "Q-CTRL Workflow Client"
 license = "https://q-ctrl.com/terms"
 authors = ["Q-CTRL <support@q-ctrl.com>"]
@@ -79,10 +79,10 @@ tomli = "^2.2.1"
 importlib-metadata = "^6.8.0"
 gql = "^3.4.0"
 tenacity = "^8.1.0"
-requests = "^2.32.0"
+requests = "^2.32.4"
 packaging = "^23.1.0"
 qctrl-commons = { version = "^25.0.0", source = "PyPI" }
-qctrl-client = { version = "^11.4.0", source = "PyPI" }
+qctrl-client = { version = "^12.0.0", source = "PyPI" }
 
 [tool.poetry.group.dev.dependencies]
 black = "^25.1.0"

{qctrl_workflow_client-5.7.0 → qctrl_workflow_client-6.0.0}/qctrlworkflowclient/__init__.py

@@ -11,7 +11,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS. See the
 # License for the specific language.
 
-__version__ = "5.5.1"
+__version__ = "6.0.0"
 
 from .defaults import get_authenticated_client_for_product
 from .functions import (

{qctrl_workflow_client-5.7.0 → qctrl_workflow_client-6.0.0}/qctrlworkflowclient/defaults.py

@@ -21,21 +21,18 @@ from qctrlclient import (
 )
 from qctrlclient.auth import BaseAuth
 from qctrlclient.defaults import (
+    get_default_api_url,
     get_default_cli_auth,
-    get_default_oidc_url,
 )
-from qctrlclient.exceptions import GraphQLClientError
 from qctrlcommons.utils import generate_user_agent
 
 from .utils import get_installed_version
 
 
 def get_authenticated_client_for_product(
-    product_access_required: str,
     package_name: str,
     api_url: Optional[str] = None,
     auth: Optional[BaseAuth | str] = None,
-    invalid_access_error_message: Optional[str] = None,
 ) -> GraphQLClient:
     """
     Return a `GraphQLClient` using default URL and Auth (if not provided)
@@ -43,8 +40,6 @@ def get_authenticated_client_for_product(
 
     Parameters
     ----------
-    product_access_required : str
-        The product access required for the user to use the CLI.
     package_name : str
         The package name to include in the User-Agent header.
     api_url : str, optional
@@ -52,8 +47,6 @@ def get_authenticated_client_for_product(
     auth : BaseAuth or str, optional
         The authentication object (or a URL as str to create one) to use.
         If not provided, the default authentication object will be used.
-    invalid_access_error_message : str, optional
-        The error message to show if the user does not have the required access.
     """
 
     if isinstance(auth, str):
@@ -65,17 +58,9 @@ def get_authenticated_client_for_product(
         ),
     }
     client = GraphQLClient(
-        url=api_url or get_default_oidc_url(),
+        url=api_url or get_default_api_url(),
         headers=headers,
         auth=auth or get_default_cli_auth(),
     )
 
-    try:
-        client.check_user_role(product_access_required)
-    except GraphQLClientError as exc:
-        raise RuntimeError(
-            invalid_access_error_message
-            or f"Invalid access for CLI usage, requires `{product_access_required}` access"
-        ) from exc
-
     return client

{qctrl_workflow_client-5.7.0 → qctrl_workflow_client-6.0.0}/qctrlworkflowclient/router/api.py

@@ -243,14 +243,21 @@ class ApiRouter(BaseRouter):
 
             if not found:
                 raise RuntimeError(
-                    f"Configured organization not found: `{self._settings.organization}`"
+                    f"Configured organization not found, is not set up, or does not have valid "
+                    f"product access: `{self._settings.organization}`"
                 )
 
         # organization not configured by user
         else:
-            # user is not a member of any organization
+            # no valid organizations found for the user
             if not self._organizations:
-                raise RuntimeError("No organizations found")
+                raise RuntimeError(
+                    "No organizations are set up or have a valid subscription to the product. "
+                    "Please ensure that your organization is set up and has an active subscription "
+                    "to the product you are trying to access. If you believe this is an error, "
+                    "contact your Q-CTRL representative or visit the Q-CTRL support portal at "
+                    "https://support.q-ctrl.com."
+                )
 
             # user is a member of multiple organizations
             if len(self._organizations) > 1: