qwak-sdk 0.5.13__py3-none-any.whl → 0.5.15__py3-none-any.whl

qwak_sdk/__init__.py

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

qwak_sdk/commands/models/deployments/deploy/_logic/base_deploy_executor.py

@@ -29,7 +29,7 @@ class BaseDeployExecutor(ABC):
         self.user_config = UserAccountConfiguration().get_user_config()
         self.instance_template_client = InstanceTemplateManagementClient()
 
-    def poll_until_complete(self, deployment_id: str, poll_period: int):
+    def poll_until_complete(self, deployment_id: str, check_every_n_seconds: int):
         def deployment_status():
             status_response = self.deploy_client.get_deployment_status(
                 deployment_named_id=deployment_id
@@ -39,11 +39,13 @@ class BaseDeployExecutor(ABC):
 
         status = deployment_status()
         while status not in END_STATUSES:
-            sleep(poll_period)
+            sleep(check_every_n_seconds)
             status = deployment_status()
         return status
 
-    def poll_until_complete_multiple(self, deployment_ids: List[str], poll_period: int):
+    def poll_until_complete_multiple(
+        self, deployment_ids: List[str], check_every_n_seconds: int
+    ):
         def deployment_status(deployment_id: str):
             status_response = self.deploy_client.get_deployment_status(
                 deployment_named_id=deployment_id
@@ -55,7 +57,7 @@ class BaseDeployExecutor(ABC):
             deployment_status(deployment_id) for deployment_id in deployment_ids
         ]
         while all(status not in END_STATUSES for status in statuses):
-            sleep(poll_period)
+            sleep(check_every_n_seconds)
             statuses = [
                 deployment_status(deployment_id) for deployment_id in deployment_ids
             ]

qwak_sdk/commands/models/deployments/deploy/_logic/deployment_response_handler.py

@@ -124,7 +124,7 @@ def __sync_deployments(
         print_callback=print,
     ):
         deployment_id_to_status = deploy.poll_until_complete_multiple(
-            list(deployment_id_to_env.keys()), poll_period=600
+            list(deployment_id_to_env.keys()), check_every_n_seconds=5
         )
         failed_deployments = []
         for deployment_id, status in deployment_id_to_status.items():
@@ -143,7 +143,9 @@ def __sync_deployment(deploy: BaseDeployExecutor, deploy_name: str):
         end_text="Successful deployments",
         print_callback=print,
     ):
-        deployment_status = deploy.poll_until_complete(deploy_name, poll_period=600)
+        deployment_status = deploy.poll_until_complete(
+            deploy_name, check_every_n_seconds=5
+        )
         if deployment_status in FAILED_STATUS:
             raise QwakException(deployment_status)
 

qwak_sdk/commands/models/deployments/deploy/batch/ui.py

@@ -12,7 +12,7 @@ from qwak_sdk.commands.models.deployments.deploy._logic.deployment_response_hand
 from qwak_sdk.commands.models.deployments.deploy.batch._logic.deploy_executor import (
     BatchDeployExecutor,
 )
-from qwak_sdk.inner.tools.cli_tools import QwakCommand
+from qwak_sdk.inner.tools.cli_tools import DeprecatedOption, QwakCommand
 from qwak_sdk.inner.tools.config_handler import config_handler
 
 
@@ -25,8 +25,12 @@ from qwak_sdk.inner.tools.config_handler import config_handler
 @click.option("--model-id", help="Model ID", type=str, required=True)
 @click.option(
     "--pods",
+    "--replicas",
     type=int,
     help="Number of pods to deploy.",
+    deprecated=["--pods"],
+    preferred="--replicas",
+    cls=DeprecatedOption,
 )
 @click.option(
     "--cpus",

qwak_sdk/commands/models/deployments/deploy/realtime/ui.py

@@ -17,7 +17,7 @@ from qwak_sdk.commands.models.deployments.deploy._logic.deployment_response_hand
 from qwak_sdk.commands.models.deployments.deploy.realtime._logic.deploy_executor import (
     RealtimeDeployExecutor,
 )
-from qwak_sdk.inner.tools.cli_tools import QwakCommand
+from qwak_sdk.inner.tools.cli_tools import DeprecatedOption, QwakCommand
 from qwak_sdk.inner.tools.config_handler import config_handler
 
 logger = get_qwak_logger()
@@ -48,8 +48,12 @@ logger = get_qwak_logger()
 )
 @click.option(
     "--pods",
+    "--replicas",
     type=int,
-    help="Number of pods to deploy.",
+    help="Number of replicas to deploy.",
+    deprecated=["--pods"],
+    preferred="--replicas",
+    cls=DeprecatedOption,
 )
 @click.option(
     "--cpus",

qwak_sdk/commands/models/deployments/deploy/streaming/ui.py

@@ -16,7 +16,7 @@ from qwak_sdk.commands.models.deployments.deploy._logic.deployment_response_hand
 from qwak_sdk.commands.models.deployments.deploy.streaming._logic.deploy_executor import (
     StreamDeployExecutor,
 )
-from qwak_sdk.inner.tools.cli_tools import QwakCommand
+from qwak_sdk.inner.tools.cli_tools import DeprecatedOption, QwakCommand
 from qwak_sdk.inner.tools.config_handler import config_handler
 
 logger = get_qwak_logger()
@@ -115,8 +115,12 @@ FAILED_STATUSES = [
 )
 @click.option(
     "--pods",
+    "--replicas",
     type=int,
-    help="Number of pods to deploy.",
+    help="Number of replicas to deploy.",
+    deprecated=["--pods"],
+    preferred="--replicas",
+    cls=DeprecatedOption,
 )
 @click.option(
     "--cpus",

qwak_sdk/commands/models/executions/start/ui.py

@@ -11,7 +11,7 @@ from qwak.tools.logger.logger import get_qwak_logger
 from tabulate import tabulate
 
 from qwak_sdk.commands.models.executions.start._logic import execute_start_execution
-from qwak_sdk.inner.tools.cli_tools import QwakCommand
+from qwak_sdk.inner.tools.cli_tools import DeprecatedOption, QwakCommand
 from qwak_sdk.inner.tools.config_handler import config_handler
 
 logger = get_qwak_logger()
@@ -93,9 +93,13 @@ logger = get_qwak_logger()
 )
 @click.option(
     "--pods",
+    "--replicas",
     type=int,
     default=0,
-    help="Number of pods to deploy. (concurrent files processing). Default is as deployed.",
+    help="Number of replicas to deploy. (concurrent files processing). Default is as deployed.",
+    deprecated=["--pods"],
+    preferred="--replicas",
+    cls=DeprecatedOption,
 )
 @click.option(
     "--cpus",

qwak_sdk/inner/tools/cli_tools.py

@@ -1,9 +1,11 @@
 import functools
 import time
+import warnings
 from collections import namedtuple
 from typing import Any, Callable, Dict, List, Tuple, Union
 
 import click
+from click import Context, OptionParser
 from qwak.exceptions import QwakException
 from qwak.inner.di_configuration import UserAccountConfiguration
 from qwak.inner.di_configuration.session import Session
@@ -80,6 +82,13 @@ def usage_statistics_wrapper(func: Callable):
     return wrapper
 
 
+class DeprecatedOption(click.Option):
+    def __init__(self, *args, **kwargs):
+        self.deprecated = kwargs.pop("deprecated", ())
+        self.preferred = kwargs.pop("preferred", args[0][-1])
+        super(DeprecatedOption, self).__init__(*args, **kwargs)
+
+
 class QwakCommand(click.Command):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -106,6 +115,55 @@ class QwakCommand(click.Command):
             ),
         )
 
+    def make_parser(self, ctx: Context) -> OptionParser:
+        parser = super(QwakCommand, self).make_parser(ctx)
+
+        # get the parser options
+        options = set(parser._short_opt.values())
+        options |= set(parser._long_opt.values())
+
+        for option in options:
+            if not isinstance(option.obj, DeprecatedOption):
+                continue
+
+            def make_process(an_option):
+                """Construct a closure to the parser option processor"""
+
+                orig_process = an_option.process
+                deprecated = getattr(an_option.obj, "deprecated", None)
+                preferred = getattr(an_option.obj, "preferred", None)
+
+                if not deprecated:
+                    f"Expected `deprecated` value for `{an_option.obj.name}`"
+
+                def process(value, state):
+                    """The function above us on the stack used 'opt' to
+                    pick option from a dict, see if it is deprecated"""
+
+                    # reach up the stack and get 'opt'
+                    import inspect
+
+                    frame = inspect.currentframe()
+                    try:
+                        opt = frame.f_back.f_locals.get("opt")
+                    finally:
+                        del frame
+
+                    if opt in deprecated:
+                        warnings.warn(
+                            f"{opt} has been deprecated, use {preferred}."
+                            f" {opt} will be removed in future releases.",
+                            DeprecationWarning,
+                        )
+
+                    return orig_process(value, state)
+
+                return process
+
+            option.process = make_process(option)
+
+        return parser
+
     @profile_setter_wrapper
     @usage_statistics_wrapper
     def invoke(self, ctx: click.Context) -> Any:

{qwak_sdk-0.5.13.dist-info → qwak_sdk-0.5.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qwak-sdk
-Version: 0.5.13
+Version: 0.5.15
 Summary: Qwak SDK and CLI for qwak models
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
@@ -27,8 +27,8 @@ 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.0.120)
-Requires-Dist: qwak-inference (==0.1.4)
+Requires-Dist: qwak-core (==0.0.157)
+Requires-Dist: qwak-inference (==0.1.7)
 Requires-Dist: tabulate (>=0.8.0)
 Requires-Dist: yaspin (>=2.0.0)
 Project-URL: Home page, https://www.qwak.com/

{qwak_sdk-0.5.13.dist-info → qwak_sdk-0.5.15.dist-info}/RECORD

@@ -1,4 +1,4 @@
-qwak_sdk/__init__.py,sha256=HMkbz4CKi7veD1qG8OjP38TD22U5FkcaI7UJHz16PSY,135
+qwak_sdk/__init__.py,sha256=k6bfpPr0lPXa5fGj7XJnmb-TRDTJOk8FWTVtqNnu4j0,135
 qwak_sdk/cli.py,sha256=GP0DChLWRMQuVbnmntom2MUjRfehzfcCFAGGna43TwU,2304
 qwak_sdk/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -165,11 +165,11 @@ qwak_sdk/commands/models/deployments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 qwak_sdk/commands/models/deployments/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/deployments/deploy/_logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/deployments/deploy/_logic/advance_deployment_options_handler.py,sha256=gCo3WuP-IDuA5Sg7WbFmp1hYT5qyXyf6pUD3tZGyZXs,1251
-qwak_sdk/commands/models/deployments/deploy/_logic/base_deploy_executor.py,sha256=6y5GpZgOFr4I8b1jNtji3LBIaQ-okx5d58eTeOjf-ng,2652
+qwak_sdk/commands/models/deployments/deploy/_logic/base_deploy_executor.py,sha256=HYKUG5s4ZrpFwoxJYn3EuTYU71lmM0cFOOjbHqd9ajY,2706
 qwak_sdk/commands/models/deployments/deploy/_logic/deploy_config.py,sha256=j5wt_5tNdJyPyy4YgWUsz6id1We3JmsCACc3284mgSA,8355
 qwak_sdk/commands/models/deployments/deploy/_logic/deployment.py,sha256=zBTjeeEVtTnTwUMwUfGTI3Ip9AgqKDvHAZ6_Wi22XVo,13221
 qwak_sdk/commands/models/deployments/deploy/_logic/deployment_message_helpers.py,sha256=xMr4nd3V-B-9kXx-e2MYDkN5-AIuz0NCJphkQTf7GHE,4087
-qwak_sdk/commands/models/deployments/deploy/_logic/deployment_response_handler.py,sha256=AYzvBGjeDR3gg3jfBetK5ImUivUsnxKFsRRZdXp7lUw,5799
+qwak_sdk/commands/models/deployments/deploy/_logic/deployment_response_handler.py,sha256=cHa2iF_2A8e1wx2a4UZuTjQ5IHgPvua1xziFJwzP_6s,5837
 qwak_sdk/commands/models/deployments/deploy/_logic/deployment_size_mapper.py,sha256=SJk9egX-OW29RcLvsWBogYMFzVMkazWkL8z3bT05O24,2167
 qwak_sdk/commands/models/deployments/deploy/_logic/get_latest_successful_build.py,sha256=NVHjRVM2oQhlJxMYXD1yQ5ZT6Jcd5msO1hpzGdrC64I,1067
 qwak_sdk/commands/models/deployments/deploy/_logic/variations.py,sha256=XyjeypZuuqjyIv8cqnhD6JHQUz2HZJ6XR4N9F_V4__k,3166
@@ -177,19 +177,19 @@ qwak_sdk/commands/models/deployments/deploy/batch/__init__.py,sha256=47DEQpj8HBS
 qwak_sdk/commands/models/deployments/deploy/batch/_logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/deployments/deploy/batch/_logic/advanced_deployment_mapper.py,sha256=1MpmBea3ERNdaDajCPdwYnt04IoGZdh5pwMlIzdBX5U,495
 qwak_sdk/commands/models/deployments/deploy/batch/_logic/deploy_executor.py,sha256=oOKPotp37qdLupYau5Fv2voki4SAIFitHMn_U4ZaJP8,946
-qwak_sdk/commands/models/deployments/deploy/batch/ui.py,sha256=9W7U6njkjW8BuNefa9Supa6V4qexTjeQEacgOKiTwVw,3128
+qwak_sdk/commands/models/deployments/deploy/batch/ui.py,sha256=W8FBHy5F9CD9Xl5_hFCtd_JN-ib22ehsMznQR6yvHKg,3245
 qwak_sdk/commands/models/deployments/deploy/deploy_commands_group.py,sha256=LnfdnfeSTCO90SrJfgXf21xiVRry6Y2sfj_JfdBQu_U,500
 qwak_sdk/commands/models/deployments/deploy/realtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/deployments/deploy/realtime/_logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/deployments/deploy/realtime/_logic/advanced_deployment_mapper.py,sha256=y_qfvoOtwr0615hm123z8li7doF5PjBj1d95g98GEZk,902
 qwak_sdk/commands/models/deployments/deploy/realtime/_logic/deploy_executor.py,sha256=KClooUmWbt4Iym7_PC8jg8oHCFRWNvno-16-aFWwutA,950
 qwak_sdk/commands/models/deployments/deploy/realtime/_logic/serving_strategy_mapper.py,sha256=BJxuds7pf8s7pqhYIs5YIjlO3OByjQHob3jEgVWhR3U,3621
-qwak_sdk/commands/models/deployments/deploy/realtime/ui.py,sha256=ABnMrBcx9JZw0eklksOKPDY-3-RXfHjt4qZ5BG-pNRI,4714
+qwak_sdk/commands/models/deployments/deploy/realtime/ui.py,sha256=yXj4LaAG6Ol1UepbP-KPEz2Cd0EDX5j-qSxAWAmZFEc,4835
 qwak_sdk/commands/models/deployments/deploy/streaming/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/deployments/deploy/streaming/_logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/deployments/deploy/streaming/_logic/deploy_executor.py,sha256=RRkNzFcPhfj70pjFJE5DQDMxDi-gJOiaH5C9ofHEQUA,948
 qwak_sdk/commands/models/deployments/deploy/streaming/_logic/serving_strategy_mapper.py,sha256=97m93afiwmrNL9EQ3tE4JmrBYfcBnKZB9ipcvzrIWDk,1500
-qwak_sdk/commands/models/deployments/deploy/streaming/ui.py,sha256=INIH1oEc4RmQePBQ36s3ePuRUcOG6V3It5n_TG92lxc,5494
+qwak_sdk/commands/models/deployments/deploy/streaming/ui.py,sha256=pqL6F4RuGPuFcGzi97OlIIkrdlvbP50xhcYn5OXF4VI,5615
 qwak_sdk/commands/models/deployments/undeploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/deployments/undeploy/_logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/deployments/undeploy/_logic/request_undeploy.py,sha256=8DMxVBFHa_Hf_iC-RwHZaCoiP3DEXvMeUP1Ah42zuZY,5677
@@ -208,7 +208,7 @@ qwak_sdk/commands/models/executions/report/_logic.py,sha256=f3ISnVUSbqgZoUo_iGZL
 qwak_sdk/commands/models/executions/report/ui.py,sha256=ouqgm0BzqURse-FSB_7cc1L0Ch89zNAQ4w_bdnZDgPg,1435
 qwak_sdk/commands/models/executions/start/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/executions/start/_logic.py,sha256=LQtcfuw9S4-EQoXMKKDR185ZASMQfDQ6smrBT54zNHc,926
-qwak_sdk/commands/models/executions/start/ui.py,sha256=tzfsdyFzvOT7GF4SuxqeA9Rvx8UG4ErzSpOVVdWoq3c,5181
+qwak_sdk/commands/models/executions/start/ui.py,sha256=6F8xLmQV8uXvdM1T8H59g8MhGrUhDM3unUxI9mp95xc,5302
 qwak_sdk/commands/models/executions/status/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/models/executions/status/_logic.py,sha256=RACCYLGh3AaSm7M_a5tunIiO3qH0Tld1ugAvM123_cU,480
 qwak_sdk/commands/models/executions/status/ui.py,sha256=HvViXO0AE9ZXly_4jqJIgxSB45-S48XTeBHwGrAhdU8,820
@@ -313,7 +313,7 @@ qwak_sdk/exceptions/qwak_suggestion_exception.py,sha256=3sIK6s3OB3G0NLC_fGV1WkAo
 qwak_sdk/inner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/inner/file_registry.py,sha256=CViXsi9ipYpLuPfIPY0R4DftSGjY7BN-5mxjjkQcFIY,3164
 qwak_sdk/inner/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qwak_sdk/inner/tools/cli_tools.py,sha256=0ynzlCfnC7U3ViwGc0Bjh729niSC_n6g-783GQVk_vs,4541
+qwak_sdk/inner/tools/cli_tools.py,sha256=VaYvv8e86tfRI7pX1Pa7O48vnZ6-dXEgUIthH1LknJs,6598
 qwak_sdk/inner/tools/config_handler.py,sha256=XYaB7cvjWg4CRFPB9lyKdxEop2qTwcWGxrVkCeg66do,880
 qwak_sdk/inner/tools/dataclasses_utils.py,sha256=Ixm6Bz0qWA4bwqC4djT4XhqF2ua4LCNsadj2Xxwmi_A,793
 qwak_sdk/inner/tools/logger/__init__.py,sha256=LJmj3u5w2AZNVfGPpD6hmEzKhwPLlZNruGTjQdHfN_A,71
@@ -326,7 +326,7 @@ qwak_sdk/tools/colors.py,sha256=7pui_GGjC4uZKYFsIyXaJjYsjLxJVHb4OrfTgr93hqo,287
 qwak_sdk/tools/files.py,sha256=AyKJTOy7NhvP3SrqwIw_lxYNCOy1CvLgMmSJpWZ0OKM,2257
 qwak_sdk/tools/log_handling.py,sha256=CC9XC3z3eHr_fehQgDsXZr4VP29VaMRwC05xvC5Wue4,5616
 qwak_sdk/tools/utils.py,sha256=SHmU4r_m2ABZyFYMC03P17GvltPbYbmB39hvalIZEtI,1168
-qwak_sdk-0.5.13.dist-info/entry_points.txt,sha256=vSl0ELYDyj640oMM57u0AjBP87wtLYxCcGOendhEx80,47
-qwak_sdk-0.5.13.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-qwak_sdk-0.5.13.dist-info/METADATA,sha256=F1AYGfhqikMLcD3vbMmocaACrzfhmLKUP6bLrsxC_S0,1852
-qwak_sdk-0.5.13.dist-info/RECORD,,
+qwak_sdk-0.5.15.dist-info/entry_points.txt,sha256=vSl0ELYDyj640oMM57u0AjBP87wtLYxCcGOendhEx80,47
+qwak_sdk-0.5.15.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+qwak_sdk-0.5.15.dist-info/METADATA,sha256=duJGNVFEE35vuYG-1Mwr1Llvq9F20TCrDLZw4UMtYTs,1852
+qwak_sdk-0.5.15.dist-info/RECORD,,