qwak-sdk 0.5.31__tar.gz → 0.5.32__tar.gz

{qwak_sdk-0.5.31 → qwak_sdk-0.5.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qwak-sdk
-Version: 0.5.31
+Version: 0.5.32
 Summary: Qwak SDK and CLI for qwak models
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
@@ -28,7 +28,7 @@ Requires-Dist: pandas (<1.4) ; (python_full_version >= "3.7.1" and python_versio
 Requires-Dist: pandas (>=1.4.3,<2.0.0) ; (python_version >= "3.8" and python_version < "3.10") and (extra == "batch" or extra == "feedback")
 Requires-Dist: pyarrow (>=6.0.0,<11.0.0) ; extra == "batch"
 Requires-Dist: python-json-logger (>=2.0.2)
-Requires-Dist: qwak-core (==0.1.17)
+Requires-Dist: qwak-core (==0.1.36)
 Requires-Dist: qwak-inference (==0.1.8)
 Requires-Dist: tabulate (>=0.8.0)
 Requires-Dist: yaspin (>=2.0.0)

{qwak_sdk-0.5.31 → qwak_sdk-0.5.32}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qwak-sdk"
-version = "0.5.31"
+version = "0.5.32"
 description = "Qwak SDK and CLI for qwak models"
 authors = ["Qwak <info@qwak.com>"]
 readme = "README.md"
@@ -27,7 +27,7 @@ qwak = "qwak_sdk.main:qwak_cli"
 
 [tool.poetry.dependencies]
 python = ">=3.7.1,<3.10"
-qwak-core = "==0.1.17"
+qwak-core = "==0.1.36"
 qwak-inference = "==0.1.8"
 croniter = "==1.4.1"
 tabulate = ">=0.8.0"

{qwak_sdk-0.5.31 → qwak_sdk-0.5.32}/qwak_sdk/__init__.py

@@ -1,6 +1,6 @@
 # fmt: off
 __author__ = '''Qwak.ai'''
-__version__ = '0.5.31'
+__version__ = '0.5.32'
 
 from qwak.inner import wire_dependencies
 

{qwak_sdk-0.5.31 → qwak_sdk-0.5.32}/qwak_sdk/commands/models/deployments/undeploy/_logic/request_undeploy.py

@@ -1,3 +1,4 @@
+from time import sleep
 from typing import Dict, List, Set
 
 from _qwak_proto.qwak.audience.v1.audience_pb2 import AudienceRoutesEntry
@@ -24,13 +25,19 @@ from qwak_sdk.commands.models.deployments.deploy._logic.deploy_config import (
 from qwak_sdk.commands.models.deployments.undeploy._logic.variations import (
     validate_variations_for_undeploy,
 )
+from qwak_sdk.tools.utils import qwak_spinner
 
 NO_DEPLOYED_VARIATIONS_ERROR_MSG = (
     "There are currently no deployed variations for model {model_id} in {env_name}"
 )
-
+UNDEPLOY_ERROR_MSG = "Environment {environment_id} failed with status: {status}"
 logger = get_qwak_logger()
 
+FAILED_UNDEPLOYMENT_STATUS = ["FAILED_UNDEPLOYMENT"]
+SUCCESSFUL_UNDEPLOYMENT_STATUS = ["SUCCESSFUL_UNDEPLOYMENT"]
+END_UNDEPLOYMENT_STATUSES = SUCCESSFUL_UNDEPLOYMENT_STATUS + FAILED_UNDEPLOYMENT_STATUS
+TIME_TO_WAIT_FOR_UNDEPLOYMENT_POLLING = 5
+
 
 def get_deployed_variation_name(existing_variations_names: Set[str]) -> str:
     return list(existing_variations_names)[0]
@@ -123,6 +130,7 @@ def undeploy(
     model_id: str,
     config: DeployConfig,
     model_uuid: str = "",
+    sync: bool = False,
 ):
     deployment_client = DeploymentManagementClient()
     ecosystem_client = EcosystemClient()
@@ -161,14 +169,108 @@ def undeploy(
         config.realtime.fallback_variation,
     )
 
+    environment_to_deployment_id = {}
+    if sync:
+        environment_to_deployment_id = __get_environment_to_deployment_id(
+            deployment_client, model_id, model_uuid, env_undeployment_requests
+        )
+
     undeployment_response = deployment_client.undeploy_model(
         model_id=model_id,
         model_uuid=model_uuid,
         env_undeployment_requests=env_undeployment_requests,
     )
 
+    if sync:
+        __sync_undeploy(
+            environment_to_deployment_id=environment_to_deployment_id,
+            model_id=model_id,
+            deployment_client=deployment_client,
+        )
     logger.info(
         f"Current status is {ModelDeploymentStatus.Name(undeployment_response.status)}."
     )
 
     return undeployment_response
+
+
+def __get_environment_to_deployment_id(
+    deployment_client: DeploymentManagementClient,
+    model_id: str,
+    model_uuid: str,
+    env_undeployment_requests: Dict,
+) -> Dict:
+    deployment_details = deployment_client.get_deployment_details(
+        model_id, model_uuid
+    ).environment_to_deployment_details
+    result = {}
+    for env_id, env_deployment_details in env_undeployment_requests.items():
+        deployment_detail_by_env = deployment_details.get(env_id)
+        if deployment_detail_by_env:
+            for deployment_detail in deployment_detail_by_env.deployments_details:
+                if (
+                    env_id == deployment_detail.environment_id
+                    and deployment_detail.variation.name
+                    == env_deployment_details.traffic_config.selected_variation_name
+                ):
+                    result[env_id] = deployment_detail.deployment_id
+    return result
+
+
+def __sync_undeploy(
+    environment_to_deployment_id: Dict,
+    model_id: str,
+    deployment_client: DeploymentManagementClient,
+):
+    with qwak_spinner(
+        begin_text=f"Undeploy - model: {model_id}",
+        end_text="Successful undeployment",
+        print_callback=print,
+    ):
+        for environment_id, deployment_id in environment_to_deployment_id.items():
+            status_result = _poll_undeployment_status(
+                deployment_id=deployment_id,
+                deployment_client=deployment_client,
+                check_every_n_seconds=TIME_TO_WAIT_FOR_UNDEPLOYMENT_POLLING,
+            )
+            failed_to_undeployment = []
+            for _, status in status_result.items():
+                if status in FAILED_UNDEPLOYMENT_STATUS:
+                    failed_to_undeployment.append(
+                        UNDEPLOY_ERROR_MSG.format(
+                            environment_id=environment_id, status=status
+                        )
+                    )
+            if failed_to_undeployment:
+                raise QwakException("\n".join(failed_to_undeployment))
+
+
+def _poll_undeployment_status(
+    deployment_id: str,
+    deployment_client: DeploymentManagementClient,
+    check_every_n_seconds: int,
+) -> Dict:
+    deployment_status = ""
+
+    while deployment_status not in END_UNDEPLOYMENT_STATUSES:
+        sleep(check_every_n_seconds)
+        deployment_status = __get_deployment_status(
+            deployment_id=deployment_id, deployment_client=deployment_client
+        )
+    return {deployment_id: deployment_status}
+
+
+def __get_deployment_status(
+    deployment_id: str, deployment_client: DeploymentManagementClient
+):
+    try:
+        return ModelDeploymentStatus.Name(
+            deployment_client.get_deployment_status(
+                deployment_named_id=deployment_id,
+            ).status
+        )
+    except QwakException as e:
+        logger.error(
+            f"Got error while trying to get deployment id: {deployment_id} status. Error is: {e.message}"
+        )
+        return ""

{qwak_sdk-0.5.31 → qwak_sdk-0.5.32}/qwak_sdk/commands/models/deployments/undeploy/ui.py

@@ -42,11 +42,18 @@ logger = get_qwak_logger()
     required=False,
     type=click.Path(exists=True, resolve_path=True, dir_okay=False),
 )
+@click.option(
+    "--sync",
+    is_flag=True,
+    default=False,
+    help="Waiting for deployments to be undeploy",
+)
 def models_undeploy(
     model_id: str,
     variation_name: str,
     environment_name: List[str],
     from_file: str = None,
+    sync: bool = False,
     **kwargs,
 ):
     logger.info(f"Initiating undeployment for model '{model_id}'")
@@ -62,8 +69,4 @@ def models_undeploy(
     )
     model_uuid = models_management.get_model_uuid(model_id)
 
-    undeploy(
-        model_id=model_id,
-        config=config,
-        model_uuid=model_uuid,
-    )
+    undeploy(model_id=model_id, config=config, model_uuid=model_uuid, sync=sync)

{qwak_sdk-0.5.31 → qwak_sdk-0.5.32}/setup.py

@@ -148,7 +148,7 @@ install_requires = \
  'croniter==1.4.1',
  'gitpython>=2.1.0',
  'python-json-logger>=2.0.2',
- 'qwak-core==0.1.17',
+ 'qwak-core==0.1.36',
  'qwak-inference==0.1.8',
  'tabulate>=0.8.0',
  'yaspin>=2.0.0']
@@ -172,7 +172,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'qwak-sdk',
-    'version': '0.5.31',
+    'version': '0.5.32',
     'description': 'Qwak SDK and CLI for qwak models',
     'long_description': '# Qwak SDK\n\nQwak is an end-to-end production ML platform designed to allow data scientists to build, deploy, and monitor their models in production with minimal engineering friction.\n',
     'author': 'Qwak',