qwak-sdk 0.5.13__tar.gz → 0.5.15__tar.gz

{qwak_sdk-0.5.13 → qwak_sdk-0.5.15}/PKG-INFO

@@ -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 → qwak_sdk-0.5.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qwak-sdk"
-version = "0.5.13"
+version = "0.5.15"
 description = "Qwak SDK and CLI for qwak models"
 authors = ["Qwak <info@qwak.com>"]
 readme = "README.md"
@@ -27,8 +27,8 @@ qwak = "qwak_sdk.main:qwak_cli"
 
 [tool.poetry.dependencies]
 python = ">=3.7.1,<3.10"
-qwak-core = "==0.0.120"
-qwak-inference = "==0.1.4"
+qwak-core = "==0.0.157"
+qwak-inference = "==0.1.7"
 tabulate = ">=0.8.0"
 python-json-logger = ">=2.0.2"
 yaspin = ">=2.0.0"

{qwak_sdk-0.5.13 → qwak_sdk-0.5.15}/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-0.5.13 → qwak_sdk-0.5.15}/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-0.5.13 → qwak_sdk-0.5.15}/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-0.5.13 → qwak_sdk-0.5.15}/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-0.5.13 → qwak_sdk-0.5.15}/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-0.5.13 → qwak_sdk-0.5.15}/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-0.5.13 → qwak_sdk-0.5.15}/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-0.5.13 → qwak_sdk-0.5.15}/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 → qwak_sdk-0.5.15}/setup.py

@@ -134,8 +134,8 @@ install_requires = \
 ['cookiecutter',
  'gitpython>=2.1.0',
  'python-json-logger>=2.0.2',
- 'qwak-core==0.0.120',
- 'qwak-inference==0.1.4',
+ 'qwak-core==0.0.157',
+ 'qwak-inference==0.1.7',
  'tabulate>=0.8.0',
  'yaspin>=2.0.0']
 
@@ -158,7 +158,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'qwak-sdk',
-    'version': '0.5.13',
+    'version': '0.5.15',
     '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',