qwak-sdk 0.5.66__tar.gz → 0.5.71__tar.gz

{qwak_sdk-0.5.66 → qwak_sdk-0.5.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qwak-sdk
-Version: 0.5.66
+Version: 0.5.71
 Summary: Qwak SDK and CLI for qwak models
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
@@ -37,8 +37,8 @@ Requires-Dist: pandas (>1.1.3) ; (python_version >= "3.9" and python_version < "
 Requires-Dist: pandas (>=1.4.0) ; (python_version >= "3.10" and python_version < "3.12") 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.3.166)
-Requires-Dist: qwak-inference (>=0.1.7,<0.2.0)
+Requires-Dist: qwak-core (==0.4.30)
+Requires-Dist: qwak-inference (>=0.1.16,<0.2.0)
 Requires-Dist: rich (>=13.0.0)
 Requires-Dist: tabulate (>=0.8.0)
 Requires-Dist: yaspin (>=2.0.0)

{qwak_sdk-0.5.66 → qwak_sdk-0.5.71}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qwak-sdk"
-version = "0.5.66"
+version = "0.5.71"
 description = "Qwak SDK and CLI for qwak models"
 authors = ["Qwak <info@qwak.com>"]
 readme = "README.md"
@@ -29,8 +29,8 @@ qwak = "qwak_sdk.main:qwak_cli"
 
 [tool.poetry.dependencies]
 python = ">=3.7.1,<3.12"
-qwak-core = "==0.3.166"
-qwak-inference = "~0.1.7"
+qwak-core = "==0.4.30"
+qwak-inference = "~0.1.16"
 croniter = "==1.4.1"
 tabulate = ">=0.8.0"
 python-json-logger = ">=2.0.2"

{qwak_sdk-0.5.66 → qwak_sdk-0.5.71}/qwak_sdk/__init__.py

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

qwak_sdk-0.5.71/qwak_sdk/commands/models/build/_logic/wait_until_finished.py

@@ -0,0 +1,27 @@
+from logging import Logger
+import time
+from typing import List
+from _qwak_proto.qwak.builds.builds_pb2 import BuildStatus
+from qwak.clients.build_orchestrator import BuildOrchestratorClient
+
+
+def __get_current_status(build_id) -> BuildStatus:
+    return BuildOrchestratorClient().get_build(build_id).build.build_status
+
+
+def __end_state_statuses() -> List[BuildStatus.ValueType]:
+    return [BuildStatus.FAILED, BuildStatus.SUCCESSFUL, BuildStatus.REMOTE_BUILD_CANCELLED, BuildStatus.REMOTE_BUILD_TIMED_OUT]
+
+
+def wait_until_finished(build_id, log: Logger, pool_interval_seconds=10) -> None:
+    status = __get_current_status(build_id)
+    log.info(f"Waiting for build {build_id} to finish. Aborting this process will not stop the build!")
+    log.debug(f"Current status of build {build_id}: {BuildStatus.DESCRIPTOR.values_by_number[status].name}")
+    while status not in __end_state_statuses():
+        time.sleep(pool_interval_seconds)
+        status = __get_current_status(build_id)
+        log.debug(f"Current status of build {build_id}: {BuildStatus.DESCRIPTOR.values_by_number[status].name}")
+
+
+def is_final_status_successful(build_id) -> bool:
+    return __get_current_status(build_id) == BuildStatus.SUCCESSFUL

{qwak_sdk-0.5.66 → qwak_sdk-0.5.71}/qwak_sdk/commands/models/build/ui.py

@@ -1,12 +1,22 @@
 import click
-from qwak.inner.build_config.build_config_v1 import ModelUri, RemoteBuildResources, BuildProperties, DockerConf, \
-    BuildConfigV1
+from qwak.inner.build_config.build_config_v1 import (
+    BuildConfigV1,
+    BuildProperties,
+    DockerConf,
+    ModelUri,
+    RemoteBuildResources,
+)
 from qwak.inner.build_logic.execute_build_pipeline import execute_build_pipeline
-from qwak.inner.build_logic.run_handlers.programmatic_phase_run_handler import ProgrammaticPhaseRunHandler
+from qwak.inner.build_logic.run_handlers.programmatic_phase_run_handler import (
+    ProgrammaticPhaseRunHandler,
+)
 from qwak.inner.const import QwakConstants
 
 from qwak_sdk.commands.models.build._logic.build_steps import create_pipeline
-from qwak_sdk.commands.models.build._logic.client_logs.cli_phase_run_handler import CLIPhaseRunHandler
+from qwak_sdk.commands.models.build._logic.wait_until_finished import wait_until_finished, is_final_status_successful
+from qwak_sdk.commands.models.build._logic.client_logs.cli_phase_run_handler import (
+    CLIPhaseRunHandler,
+)
 from qwak_sdk.commands.models.build._logic.client_logs.logger import get_build_logger
 from qwak_sdk.commands.models.build._logic.client_logs.utils import zip_logs
 from qwak_sdk.inner.tools.cli_tools import QwakCommand
@@ -14,7 +24,12 @@ from qwak_sdk.inner.tools.config_handler import config_handler
 
 
 @click.command("build", cls=QwakCommand)
-@click.option("--model-id", metavar="NAME", required=False, help="Model ID")
+@click.option(
+    "--model-id",
+    metavar="NAME",
+    required=False,
+    help="Model ID to assign the build for",
+)
 @click.option(
     "--main-dir",
     metavar="NAME",
@@ -60,7 +75,7 @@ from qwak_sdk.inner.tools.config_handler import config_handler
     "--git-credentials-secret",
     metavar="NAME",
     required=False,
-    help="[REMOTE BUILD] Predefined Qwak secret secret name, that contains access credentials to private repositories"
+    help="Predefined Qwak secret secret name, that contains access credentials to private repositories"
     + "Secrets should be of the form USERNAME:ACCESS_TOKEN. For info regarding defining Qwak Secrets using the"
     + "`qwak secret` command",
 )
@@ -68,7 +83,7 @@ from qwak_sdk.inner.tools.config_handler import config_handler
     "--cpus",
     metavar="NAME",
     required=False,
-    help="[REMOTE BUILD] Number of cpus to use on the remote build. [Default (If GPU not configured): 2] "
+    help="Number of cpus to use on the remote build. [Default (If GPU not configured): 2] "
     "(DO NOT CONFIGURE GPU AND CPU TOGETHER)",
     type=click.FLOAT,
 )
@@ -76,14 +91,14 @@ from qwak_sdk.inner.tools.config_handler import config_handler
     "--memory",
     metavar="NAME",
     required=False,
-    help="[REMOTE BUILD] Memory to use on the remote build. [Default (If GPU not configured): 4Gi] "
+    help="Memory to use on the remote build. [Default (If GPU not configured): 4Gi] "
     "(DO NOT CONFIGURE GPU AND CPU TOGETHER)",
 )
 @click.option(
     "--gpu-type",
     metavar="NAME",
     required=False,
-    help=f"[REMOTE BUILD] Type of GPU to use on the remote build ({', '.join([x for x in QwakConstants.GPU_TYPES])})."
+    help=f"Type of GPU to use on the remote build ({', '.join([x for x in QwakConstants.GPU_TYPES])})."
     f"\n[Default: {RemoteBuildResources.gpu_type}]"
     "(DO NOT CONFIGURE GPU AND CPU TOGETHER)",
     type=click.STRING,
@@ -93,13 +108,13 @@ from qwak_sdk.inner.tools.config_handler import config_handler
     metavar="NAME",
     required=False,
     type=int,
-    help=f"[REMOTE BUILD] Amount of GPU to use on the remote build."
+    help=f"Amount of GPU's to use on the remote build."
     f"\n[Default: {RemoteBuildResources.gpu_amount}] "
     "(DO NOT CONFIGURE GPU AND CPU TOGETHER)",
 )
 @click.option(
     "--gpu-compatible",
-    help=f"[REMOTE BUILD] Whether to build an image that is compatible to be deployd on a GPU instance."
+    help=f"Whether to build an image that is compatible to be deployd on a GPU instance."
     f"\n[Default: {BuildProperties.gpu_compatible}] ",
     default=False,
     is_flag=True,
@@ -108,12 +123,12 @@ from qwak_sdk.inner.tools.config_handler import config_handler
     "--iam-role-arn",
     required=False,
     type=str,
-    help="[REMOTE BUILD] Custom IAM Role ARN.",
+    help="Custom IAM Role ARN for AWS based builds",
 )
 @click.option(
     "--service-account-key-secret-name",
     type=str,
-    help="Custom service account for Gcp.",
+    help="Custom service account for GCP",
 )
 @click.option(
     "--cache/--no-cache",
@@ -224,6 +239,12 @@ from qwak_sdk.inner.tools.config_handler import config_handler
     default=False,
     is_flag=True,
 )
+@click.option(
+    "--sync",
+    help="Waits until the build is finished (successfully or not) and return the build status",
+    default=False,
+    is_flag=True,
+)
 @click.option(
     "--git-secret-ssh",
     metavar="NAME",
@@ -234,10 +255,15 @@ from qwak_sdk.inner.tools.config_handler import config_handler
 )
 @click.option(
     "--push/--no-push",
-    help="Whether to push the built image to the registry (default is True)",
+    help="Whether to push the build image to the registry (default is True)",
     default=True,
     is_flag=True,
 )
+@click.option(
+    "--provision-instance-timeout",
+    help="Timeout in minutes for the provision instance step",
+    default=120,
+)
 @click.argument("uri", required=False)
 def models_build(**kwargs):
     return build(**kwargs)
@@ -262,21 +288,32 @@ def build(
         return
     else:
         id_only = kwargs.get("id_only")
+        is_sync = kwargs.get("sync")
         pipeline, success_msg = create_pipeline(config)
         with get_build_logger(config=config, json_logs=json_logs) as (
-                logger,
-                log_path,
+            logger,
+            log_path,
         ):
             if programmatic:
-                build_runner = ProgrammaticPhaseRunHandler(logger, config.verbose, json_logs)
+                build_runner = ProgrammaticPhaseRunHandler(
+                    logger, config.verbose, json_logs
+                )
             else:
-                build_runner = CLIPhaseRunHandler(logger, log_path, config.verbose, json_logs)
+                build_runner = CLIPhaseRunHandler(
+                    logger, log_path, config.verbose, json_logs
+                )
 
             execute_build_pipeline(
                 pipeline,
                 build_runner,
             )
 
+            if is_sync:
+                wait_until_finished(pipeline.context.build_id, logger)
+                if not is_final_status_successful(pipeline.context.build_id):
+                    click.echo(f"Build {pipeline.context.build_id} failed")
+                    exit(1)
+
             if id_only:
                 print(pipeline.context.build_id)
             else:

{qwak_sdk-0.5.66 → qwak_sdk-0.5.71}/setup.py

@@ -134,8 +134,8 @@ install_requires = \
  'croniter==1.4.1',
  'gitpython>=2.1.0',
  'python-json-logger>=2.0.2',
- 'qwak-core==0.3.166',
- 'qwak-inference>=0.1.7,<0.2.0',
+ 'qwak-core==0.4.30',
+ 'qwak-inference>=0.1.16,<0.2.0',
  'rich>=13.0.0',
  'tabulate>=0.8.0',
  'yaspin>=2.0.0']
@@ -184,7 +184,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'qwak-sdk',
-    'version': '0.5.66',
+    'version': '0.5.71',
     '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',