qwak-sdk 0.5.24__tar.gz → 0.5.26__tar.gz

{qwak_sdk-0.5.24 → qwak_sdk-0.5.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qwak-sdk
-Version: 0.5.24
+Version: 0.5.26
 Summary: Qwak SDK and CLI for qwak models
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
@@ -27,7 +27,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.0.212)
+Requires-Dist: qwak-core (==0.0.217)
 Requires-Dist: qwak-inference (==0.1.8)
 Requires-Dist: tabulate (>=0.8.0)
 Requires-Dist: yaspin (>=2.0.0)

{qwak_sdk-0.5.24 → qwak_sdk-0.5.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qwak-sdk"
-version = "0.5.24"
+version = "0.5.26"
 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.0.212"
+qwak-core = "==0.0.217"
 qwak-inference = "==0.1.8"
 tabulate = ">=0.8.0"
 python-json-logger = ">=2.0.2"
@@ -44,6 +44,7 @@ pyarrow = { version=">=6.0.0, <11.0.0", optional=true } # Inference dependencies
 
 [tool.poetry.group.dev.dependencies]
 pytest = "7.2.1"
+pytest-lazy-fixture = "^0.6.3"
 assertpy = "^1.1"
 black = "23.1.0"
 flake8 = "5.0.0"

{qwak_sdk-0.5.24 → qwak_sdk-0.5.26}/qwak_sdk/__init__.py

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

{qwak_sdk-0.5.24 → qwak_sdk-0.5.26}/qwak_sdk/commands/feature_store/register/_logic.py

@@ -2,6 +2,7 @@ from typing import List, Optional, Tuple
 
 from _qwak_proto.qwak.feature_store.features.feature_set_pb2 import Feature
 from _qwak_proto.qwak.features_operator.v3.features_operator_pb2 import (
+    Outputs,
     SparkColumnDescription,
     ValidationSuccessResponse,
 )
@@ -129,6 +130,7 @@ def _handle_data_source_validation(
 
     response = getattr(result, result.WhichOneof("type"))
     if isinstance(response, ValidationSuccessResponse):
+        print_validation_outputs(response)
         print("✅ Validation completed successfully, got data source columns:")
 
         table = [
@@ -219,6 +221,7 @@ def _handle_batch_v1_feature_set_validation(
 
     response = getattr(result, result.WhichOneof("type"))
     if isinstance(response, ValidationSuccessResponse):
+        print_validation_outputs(response)
         print("✅ Validation completed successfully, got data source columns:")
         table = [
             (x.column_name, x.spark_type) for x in response.spark_column_description
@@ -288,3 +291,22 @@ def _batch_v1_feature_set_validation(
     else:
         print(f"Skipping validation for '{feature_set.name}' feature set")
     return spark_columns_features
+
+
+def print_validation_outputs(response: ValidationSuccessResponse) -> bool:
+    did_print = False
+    outputs = response.outputs
+
+    if isinstance(outputs, Outputs) and (outputs.stdout or outputs.stderr):
+        message = "Validation outputs: "
+
+        if outputs.stdout:
+            message += f"stdout: {outputs.stdout}\n "
+
+        if outputs.stderr:
+            message += f"stderr: {outputs.stderr}"
+
+        print(message)
+        did_print = True
+
+    return did_print

{qwak_sdk-0.5.24 → qwak_sdk-0.5.26}/qwak_sdk/commands/models/build/_logic/config/config_v1.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass, field
 from os.path import expandvars
 from typing import Dict, List, Optional, Tuple, Union
 
+from _qwak_proto.qwak.builds.build_pb2 import BaseDockerImageType
 from _qwak_proto.qwak.builds.builds_pb2 import (
     BuildConfiguration,
     BuildEnvironment,
@@ -16,10 +17,9 @@ from _qwak_proto.qwak.builds.builds_pb2 import (
     Step,
     VirtualEnvironmentBuild,
 )
+from _qwak_proto.qwak.instance_template.instance_template_pb2 import InstanceType
 from qwak.clients.build_orchestrator import BuildOrchestratorClient
 from qwak.clients.instance_template.client import InstanceTemplateManagementClient
-from _qwak_proto.qwak.builds.build_pb2 import BaseDockerImageType
-from _qwak_proto.qwak.instance_template.instance_template_pb2 import InstanceType
 from qwak.inner.tool.run_config import (
     QwakConfigBase,
     YamlConfigMixin,
@@ -32,6 +32,7 @@ from qwak.inner.tool.run_config import (
 
 from qwak_sdk.commands.models.build._logic.util.protobuf_factory import protobuf_factory
 from qwak_sdk.common.run_config import ConfigCliMap
+from qwak_sdk.common.run_config.utils import purchase_option_validation
 
 CONFIG_MAPPING: List[ConfigCliMap] = [
     # ConfigV1
@@ -97,6 +98,7 @@ CONFIG_MAPPING: List[ConfigCliMap] = [
     ConfigCliMap("verbose", "verbose", validate_int),
     ConfigCliMap("deploy", "deploy", validate_bool),
     ConfigCliMap("deployment_instance", "deployment_instance", validate_string),
+    ConfigCliMap("purchase_option", "purchase_option", purchase_option_validation),
 ]
 
 
@@ -217,6 +219,7 @@ class ConfigV1(YamlConfigMixin, QwakConfigBase):
     step: Step = field(default_factory=Step)
     deploy: bool = field(default=False)
     deployment_instance: Optional[str] = field(default=None)
+    purchase_option: Optional[str] = field(default=None)
     verbose: int = field(default=0)
 
     def __post_init__(self):
@@ -235,19 +238,33 @@ class ConfigV1(YamlConfigMixin, QwakConfigBase):
         self.build_env.docker.env_vars = list(self.build_env.docker.env_vars)
         self.build_env.docker.params = list(self.build_env.docker.params)
 
-    def fetch_base_docker_image_name(self, build_orchestrator: BuildOrchestratorClient, instance_template: InstanceTemplateManagementClient):
+    def fetch_base_docker_image_name(
+        self,
+        build_orchestrator: BuildOrchestratorClient,
+        instance_template: InstanceTemplateManagementClient,
+    ):
         if not self.build_env.docker.base_image:
-            is_gpu_used = self.build_env.remote.resources.gpu_type \
-                          and self.build_env.remote.resources.gpu_amount \
-                          and self.build_env.remote.resources.gpu_amount > 0
+            is_gpu_used = (
+                self.build_env.remote.resources.gpu_type
+                and self.build_env.remote.resources.gpu_amount
+                and self.build_env.remote.resources.gpu_amount > 0
+            )
 
             if self.build_env.remote.resources.instance and not is_gpu_used:
-                instance_spec = instance_template.get_instance_template(self.build_env.remote.resources.instance)
-                is_gpu_used = instance_spec.instance_type == InstanceType.INSTANCE_TYPE_GPU
+                instance_spec = instance_template.get_instance_template(
+                    self.build_env.remote.resources.instance
+                )
+                is_gpu_used = (
+                    instance_spec.instance_type == InstanceType.INSTANCE_TYPE_GPU
+                )
 
             if is_gpu_used or self.build_properties.gpu_compatible:
-                result = build_orchestrator.fetch_base_docker_image_name(BaseDockerImageType.GPU)
+                result = build_orchestrator.fetch_base_docker_image_name(
+                    BaseDockerImageType.GPU
+                )
                 self.build_env.docker.base_image = result.base_docker_image_name
             else:
-                result = build_orchestrator.fetch_base_docker_image_name(BaseDockerImageType.CPU)
+                result = build_orchestrator.fetch_base_docker_image_name(
+                    BaseDockerImageType.CPU
+                )
                 self.build_env.docker.base_image = result.base_docker_image_name

{qwak_sdk-0.5.24 → qwak_sdk-0.5.26}/qwak_sdk/commands/models/build/ui.py

@@ -201,6 +201,13 @@ from qwak_sdk.inner.tools.config_handler import config_handler
     help="The instance size to deploy on - 'small', 'medium', 'large', etc...",
     default=None,
 )
+@click.option(
+    "--purchase-option",
+    required=False,
+    type=str,
+    help="The type of the instance to build on - 'ondemand' or 'spot'",
+    default=None,
+)
 @click.argument("uri", required=False)
 def models_build(**kwargs):
     return build(**kwargs)

{qwak_sdk-0.5.24 → qwak_sdk-0.5.26}/qwak_sdk/commands/workspaces/update/_logic.py

@@ -12,7 +12,7 @@ from qwak_sdk.commands.workspaces.config.workspace_config import WorkspaceConfig
 
 def _update_workspace(config: WorkspaceConfig):
     """
-    Updating a new workspace
+    Updating a workspace
 
     Args:
         config: The workspace configuration

{qwak_sdk-0.5.24 → qwak_sdk-0.5.26}/qwak_sdk/common/run_config/utils.py

@@ -198,6 +198,40 @@ def validate_variation(value: Any) -> bool:
     return True
 
 
+def purchase_option_validation(purchase_option: str, is_required: bool):
+    """Validate purchase option strings
+
+    Args:
+        purchase_option: the purchase option to validate.
+        is_required: True if value is required.
+
+    Returns:
+        bool: True if value is valid.
+
+    Examples:
+        >>> purchase_option_validation("spot", False)
+        True
+        >>> purchase_option_validation("ondemand", False)
+        True
+        >>> purchase_option_validation(None, False)
+        True
+        >>> purchase_option_validation("Ondemand", False)
+        False
+    """
+    if not purchase_option and not is_required:
+        return True
+    if purchase_option and (
+        not validate_string(purchase_option, False)
+        or purchase_option
+        not in [
+            "ondemand",
+            "spot",
+        ]
+    ):
+        return False
+    return True
+
+
 def validate_variations(value: Any, is_required: bool) -> bool:
     """Validate if value is a variation.
 

{qwak_sdk-0.5.24 → qwak_sdk-0.5.26}/setup.py

@@ -145,7 +145,7 @@ install_requires = \
 ['cookiecutter',
  'gitpython>=2.1.0',
  'python-json-logger>=2.0.2',
- 'qwak-core==0.0.212',
+ 'qwak-core==0.0.217',
  'qwak-inference==0.1.8',
  'tabulate>=0.8.0',
  'yaspin>=2.0.0']
@@ -169,7 +169,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'qwak-sdk',
-    'version': '0.5.24',
+    'version': '0.5.26',
     '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',