qctrl-workflow-client 4.0.0__tar.gz → 5.0.1__tar.gz

{qctrl_workflow_client-4.0.0 → qctrl_workflow_client-5.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qctrl-workflow-client
-Version: 4.0.0
+Version: 5.0.1
 Summary: Q-CTRL Client
 Home-page: https://q-ctrl.com
 License: https://q-ctrl.com/terms
@@ -31,7 +31,7 @@ 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 (>=10.0.0,<11.0.0)
+Requires-Dist: qctrl-client (>=10.1.0,<11.0.0)
 Requires-Dist: qctrl-commons (>=23.0.0,<24.0.0)
 Requires-Dist: requests (>=2.32.0,<3.0.0)
 Requires-Dist: tenacity (>=8.1.0,<9.0.0)

{qctrl_workflow_client-4.0.0 → qctrl_workflow_client-5.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qctrl-workflow-client"
-version = "4.0.0"
+version = "5.0.1"
 description = "Q-CTRL Client"
 license = "https://q-ctrl.com/terms"
 authors = ["Q-CTRL <support@q-ctrl.com>"]
@@ -82,7 +82,7 @@ tenacity = "^8.1.0"
 requests = "^2.32.0"
 packaging = "^23.1.0"
 qctrl-commons = { version = "^23.0.0", source = "PyPI" }
-qctrl-client = { version = "^10.0.0", source = "PyPI" }
+qctrl-client = { version = "^10.1.0", source = "PyPI" }
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.3.0"

{qctrl_workflow_client-4.0.0 → qctrl_workflow_client-5.0.1}/qctrlworkflowclient/__init__.py

@@ -11,14 +11,9 @@
 # distributed under the License is distributed on an "AS IS" BASIS. See the
 # License for the specific language.
 
-__version__ = "4.0.0"
+__version__ = "5.0.1"
 
-from .defaults import (
-    get_authenticated_client_for_product,
-    get_default_api_url,
-    get_default_cli_auth,
-    get_default_oidc_url,
-)
+from .defaults import get_authenticated_client_for_product
 from .functions import (
     core_workflow,
     print_warnings,

{qctrl_workflow_client-4.0.0 → qctrl_workflow_client-5.0.1}/qctrlworkflowclient/defaults.py

@@ -13,50 +13,22 @@
 
 from __future__ import annotations
 
-import os
 from typing import Optional
 
-from qctrlclient.auth import (
-    BaseAuth,
+from qctrlclient import (
     CliAuth,
-)
-from qctrlclient.client import (
     GraphQLClient,
-    GraphQLClientError,
 )
+from qctrlclient.auth import BaseAuth
+from qctrlclient.defaults import (
+    get_default_cli_auth,
+    get_default_oidc_url,
+)
+from qctrlclient.exceptions import GraphQLClientError
 from qctrlcommons.utils import generate_user_agent
 
-from .globals import global_value
 from .utils import get_installed_version
 
-_DEFAULT_API_URL = "https://federation-service.q-ctrl.com"
-_DEFAULT_OIDC_URL = "https://id.q-ctrl.com"
-
-
-def get_default_api_url() -> str:
-    """
-    Return the default API URL. Can be overridden by
-    setting the `QCTRL_API_URL` environment variable.
-    """
-    return os.getenv("QCTRL_API_URL", _DEFAULT_API_URL)
-
-
-def get_default_oidc_url() -> str:
-    """
-    Return the default OIDC URL. Can be overridden by
-    setting the `QCTRL_OIDC_URL` environment variable.
-    """
-    return os.getenv("QCTRL_OIDC_URL", _DEFAULT_OIDC_URL)
-
-
-@global_value("DEFAULT_CLI_AUTH")
-def get_default_cli_auth() -> CliAuth:
-    """
-    Return default `CliAuth` object.
-    """
-    url = get_default_oidc_url()
-    return CliAuth(url)
-
 
 def get_authenticated_client_for_product(
     product_access_required: str,

{qctrl_workflow_client-4.0.0 → qctrl_workflow_client-5.0.1}/qctrlworkflowclient/router/api.py

@@ -480,13 +480,15 @@ class ApiRouter(BaseRouter):
         """
         return self.update_action_status(action)
 
-    def get_result(self, action: Action) -> DecodedResult:
+    def get_result(
+        self, action: Action, revoke_on_interrupt: bool = True
+    ) -> DecodedResult:
         """
         Return the result of the action.
         """
-        return self._fetch_action(action).result
+        return self._fetch_action(action, revoke_on_interrupt).result
 
-    def _fetch_action(self, action: Action) -> Any:
+    def _fetch_action(self, action: Action, revoke_on_interrupt: bool = True) -> Any:
         """
         Fetch the action from the server. If the action
         has not finished, the API will be polled until it has.
@@ -497,9 +499,12 @@ class ApiRouter(BaseRouter):
         if not action.is_finished():
             try:
                 action = self._poll_for_completion(action)
-            except KeyboardInterrupt:
-                self._revoke_action(action)
-                action = self._poll_for_completion(action)
+            except KeyboardInterrupt as exc:
+                if revoke_on_interrupt:
+                    self._revoke_action(action)
+                    action = self._poll_for_completion(action)
+                else:
+                    raise KeyboardInterrupt from exc
 
         if action.is_failed():
             self._settings.event_dispatch("action.failure", action=action)

qctrl_workflow_client-4.0.0/qctrlworkflowclient/globals.py

@@ -1,60 +0,0 @@
-# Copyright 2024 Q-CTRL. All rights reserved.
-#
-# Licensed under the Q-CTRL Terms of service (the "License"). Unauthorized
-# copying or use of this file, via any medium, is strictly prohibited.
-# Proprietary and confidential. You may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#    https://q-ctrl.com/terms
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS. See the
-# License for the specific language.
-
-from functools import wraps
-from typing import (
-    Any,
-    Callable,
-)
-
-_REGISTRY = {}
-
-
-def global_value(key: str) -> Callable:
-    """
-    Add values to a global registry. If the
-    `key` already exists in the registry, the
-    stored value is returned.
-    """
-
-    def decorator(func: Callable) -> Callable:
-        @wraps(func)
-        def customized_decorator() -> Any:
-            try:
-                value = _REGISTRY[key]
-            except KeyError:
-                value = func()
-                _REGISTRY[key] = value
-
-            return value
-
-        return customized_decorator
-
-    return decorator
-
-
-def update_global_value(key, value: Any):
-    """Update global registry value."""
-    if key in _REGISTRY:
-        _REGISTRY[key] = value
-    else:
-        raise KeyError(f"Key not found in the registry: {key}")
-
-
-def invalidate_global_value(*keys: str):
-    """
-    Remove the globally registered values, if they exist.
-    """
-    for key in keys:
-        if key in _REGISTRY:
-            del _REGISTRY[key]