qwak-sdk 0.5.63__tar.gz → 0.5.64__tar.gz

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qwak-sdk
-Version: 0.5.63
+Version: 0.5.64
 Summary: Qwak SDK and CLI for qwak models
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
@@ -29,7 +29,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.3.143)
+Requires-Dist: qwak-core (==0.3.163)
 Requires-Dist: qwak-inference (>=0.1,<0.2)
 Requires-Dist: rich (>=13.0.0)
 Requires-Dist: tabulate (>=0.8.0)

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qwak-sdk"
-version = "0.5.63"
+version = "0.5.64"
 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.3.143"
+qwak-core = "==0.3.163"
 qwak-inference = "~0.1"
 croniter = "==1.4.1"
 tabulate = ">=0.8.0"

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/qwak_sdk/__init__.py

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

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/qwak_sdk/commands/models/deployments/deploy/_logic/deploy_config.py

@@ -246,7 +246,7 @@ class DeployConfig(YamlConfigMixin, QwakConfigBase):
     @dataclass
     class AdvancedOptions:
         iam_role_arn: str = field(default=None)
-        purchase_option: str = field(default=PurchaseOption.SPOT.value)
+        purchase_option: str = field(default="")
         service_account_key_secret_name: str = field(default=None)
 
     model_id: str = field(default="")

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/qwak_sdk/commands/models/deployments/deploy/_logic/deployment_message_helpers.py

@@ -11,7 +11,6 @@ from _qwak_proto.qwak.deployment.deployment_pb2 import (
     ServingStrategy,
 )
 from qwak.clients.administration.eco_system.client import EcosystemClient
-from qwak.clients.deployment.client import DeploymentManagementClient
 from qwak.clients.instance_template.client import InstanceTemplateManagementClient
 from qwak.exceptions import QwakException
 
@@ -40,7 +39,6 @@ UNKNOWN_SERVING_STRATEGY = (
 def get_env_to_deployment_message(
     deploy_config: DeployConfig,
     kube_deployment_type: KubeDeploymentType,
-    deployment_client: DeploymentManagementClient,
     ecosystem_client: EcosystemClient,
     instance_template_client: InstanceTemplateManagementClient,
 ) -> Dict[str, EnvironmentDeploymentMessage]:
@@ -60,13 +58,8 @@ def get_env_to_deployment_message(
     )
 
     if kube_deployment_type == KubeDeploymentType.ONLINE:
-        model_traffic = deployment_client.get_model_traffic_config(
-            deploy_config.model_id
-        )
-
         env_to_serving_strategy = create_realtime_serving_strategy_from_deploy_config(
             deploy_config,
-            model_traffic,
             environment_name_to_config,
         )
         environment_variables = dictify_params(deploy_config.realtime.env_vars)

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/qwak_sdk/commands/models/deployments/deploy/batch/_logic/deploy_executor.py

@@ -14,7 +14,6 @@ class BatchDeployExecutor(BaseDeployExecutor):
         env_deployment_messages = get_env_to_deployment_message(
             self.config,
             KubeDeploymentType.BATCH,
-            self.deploy_client,
             self.ecosystem_client,
             self.instance_template_client,
         )

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/qwak_sdk/commands/models/deployments/deploy/realtime/_logic/deploy_executor.py

@@ -14,7 +14,6 @@ class RealtimeDeployExecutor(BaseDeployExecutor):
         env_deployment_messages = get_env_to_deployment_message(
             self.config,
             KubeDeploymentType.ONLINE,
-            self.deploy_client,
             self.ecosystem_client,
             self.instance_template_client,
         )

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/qwak_sdk/commands/models/deployments/deploy/realtime/_logic/serving_strategy_mapper.py

@@ -7,24 +7,14 @@ from _qwak_proto.qwak.deployment.deployment_pb2 import (
     RealTimeConfig,
     ServingStrategy,
     TrafficConfig,
-    Variation,
-)
-from _qwak_proto.qwak.deployment.deployment_service_pb2 import (
-    GetDeploymentStatusResponse,
 )
 from _qwak_proto.qwak.ecosystem.v0.ecosystem_pb2 import UserContextEnvironmentDetails
 from qwak.exceptions import QwakException
 
 from qwak_sdk.commands.audience._logic.config.v1.audience_config import AudienceConfig
-from qwak_sdk.commands.models._logic.variations import (
-    create_variation_from_variation_config,
-)
 from qwak_sdk.commands.models.deployments.deploy._logic.deploy_config import (
     DeployConfig,
 )
-from qwak_sdk.commands.models.deployments.deploy._logic.variations import (
-    get_variations_for_deploy,
-)
 
 
 def create_realtime_serving_strategy(
@@ -32,7 +22,6 @@ def create_realtime_serving_strategy(
     audiences: List[AudienceConfig],
     fallback_variation: str,
     variation_name: str,
-    variations: List[Variation],
     variation_protected_state: bool = False,
 ) -> ServingStrategy:
     return ServingStrategy(
@@ -41,7 +30,6 @@ def create_realtime_serving_strategy(
                 auto_scaling_config=auto_scaling,
                 traffic_config=TrafficConfig(
                     selected_variation_name=variation_name,
-                    variations=variations,
                     audience_routes_entries=[
                         audience.to_audience_route_entry(index)
                         for index, audience in enumerate(audiences)
@@ -56,7 +44,6 @@ def create_realtime_serving_strategy(
 
 def create_realtime_serving_strategy_from_deploy_config(
     deploy_config: DeployConfig,
-    model_traffic: GetDeploymentStatusResponse,
     environment_name_to_config: Dict[str, UserContextEnvironmentDetails],
 ) -> Dict[str, ServingStrategy]:
     serving_strategies = {}
@@ -70,34 +57,12 @@ def create_realtime_serving_strategy_from_deploy_config(
         else None
     )
     for env_name, env_config in environment_name_to_config.items():
-        env_variations_response = model_traffic.environment_to_model_traffic.get(
-            env_config.id
-        )
-        existing_variation = (
-            env_variations_response.variations if env_variations_response else []
-        )
         try:
-            variations = []
-            if not deploy_config.realtime.audiences:
-                variations = get_variations_for_deploy(
-                    variation_name=variation_name,
-                    existing_variations=existing_variation,
-                    requested_variations=list(
-                        map(
-                            create_variation_from_variation_config,
-                            deploy_config.realtime.variations,
-                        )
-                    ),
-                    environment_name=env_name,
-                    variation_protected_state=variation_protected_state,
-                )
-
             serving_strategies[env_config.id] = create_realtime_serving_strategy(
                 auto_scaling,
                 deploy_config.realtime.audiences,
                 fallback_variation,
                 variation_name,
-                variations,
                 variation_protected_state,
             )
 

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/qwak_sdk/commands/models/deployments/deploy/streaming/_logic/deploy_executor.py

@@ -14,7 +14,6 @@ class StreamDeployExecutor(BaseDeployExecutor):
         env_deployment_messages = get_env_to_deployment_message(
             self.config,
             KubeDeploymentType.STREAM,
-            self.deploy_client,
             self.ecosystem_client,
             self.instance_template_client,
         )

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/qwak_sdk/commands/models/deployments/undeploy/_logic/request_undeploy.py

@@ -8,7 +8,6 @@ from _qwak_proto.qwak.deployment.deployment_pb2 import (
     EnvironmentUndeploymentMessage,
     ModelDeploymentStatus,
     TrafficConfig,
-    Variation,
 )
 from _qwak_proto.qwak.ecosystem.v0.ecosystem_pb2 import EnvironmentDetails
 from qwak.clients.administration.eco_system.client import EcosystemClient
@@ -16,15 +15,9 @@ from qwak.clients.deployment.client import DeploymentManagementClient
 from qwak.exceptions import QwakException
 from qwak.tools.logger.logger import get_qwak_logger
 
-from qwak_sdk.commands.models._logic.variations import (
-    create_variation_from_variation_config,
-)
 from qwak_sdk.commands.models.deployments.deploy._logic.deploy_config import (
     DeployConfig,
 )
-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 = (
@@ -45,12 +38,10 @@ def get_deployed_variation_name(existing_variations_names: Set[str]) -> str:
 
 def get_environment_undeploy_message(
     audiences: List[AudienceRoutesEntry],
-    env_name: str,
     existing_variations_names: Set[str],
     fallback_variation: str,
     model_id: str,
     model_uuid: str,
-    requested_variations: List[Variation],
     variation_name: str,
 ):
     if not variation_name and len(existing_variations_names) == 1:
@@ -58,20 +49,12 @@ def get_environment_undeploy_message(
             existing_variations_names=existing_variations_names
         )
 
-    if not audiences:
-        validate_variations_for_undeploy(
-            variation_name,
-            existing_variations_names,
-            requested_variations,
-            env_name,
-        )
     return EnvironmentUndeploymentMessage(
         model_id=model_id,
         model_uuid=model_uuid,
         hosting_service_type=DeploymentHostingServiceType.KUBE_DEPLOYMENT,
         traffic_config=TrafficConfig(
             selected_variation_name=variation_name,
-            variations=requested_variations,
             audience_routes_entries=audiences,
             fallback_variation=fallback_variation,
         ),
@@ -84,7 +67,6 @@ def get_env_to_undeploy_message(
     env_id_to_deployment_details: Dict[str, EnvironmentDeploymentDetailsMessage],
     env_name_to_env_details: Dict[str, EnvironmentDetails],
     model_id: str,
-    requested_variations: List[Variation],
     variation_name: str,
     fallback_variation: str,
 ) -> Dict[str, EnvironmentUndeploymentMessage]:
@@ -111,12 +93,10 @@ def get_env_to_undeploy_message(
                 env_details.id
             ] = get_environment_undeploy_message(
                 audiences,
-                env_name,
                 existing_variations_names,
                 fallback_variation,
                 model_id,
                 model_uuid,
-                requested_variations,
                 variation_name,
             )
         except QwakException as e:
@@ -138,12 +118,6 @@ def undeploy(
         audience.to_audience_route_entry(index)
         for index, audience in enumerate(config.realtime.audiences)
     ]
-    requested_variations = list(
-        map(
-            create_variation_from_variation_config,
-            config.realtime.variations if config.realtime else [],
-        )
-    )
 
     if not model_uuid:
         raise QwakException("missing argument model uuid")
@@ -164,7 +138,6 @@ def undeploy(
         env_id_to_deployment_details,
         env_name_to_env_details,
         model_id,
-        requested_variations,
         config.realtime.variation_name,
         config.realtime.fallback_variation,
     )

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/qwak_sdk/commands/models/runtime/runtime_commands_group.py

@@ -1,7 +1,6 @@
 import click
 
 from qwak_sdk.commands.models.runtime.logs.ui import runtime_logs
-from qwak_sdk.commands.models.runtime.traffic_update.ui import runtime_traffic_update
 from qwak_sdk.commands.models.runtime.update.ui import runtime_update
 
 
@@ -15,5 +14,4 @@ def runtime_commands_group():
 
 
 runtime_commands_group.add_command(runtime_logs)
-runtime_commands_group.add_command(runtime_traffic_update)
 runtime_commands_group.add_command(runtime_update)

{qwak_sdk-0.5.63 → qwak_sdk-0.5.64}/setup.py

@@ -42,7 +42,6 @@ packages = \
  'qwak_sdk.commands.feature_store.resume',
  'qwak_sdk.commands.feature_store.trigger',
  'qwak_sdk.commands.models',
- 'qwak_sdk.commands.models._logic',
  'qwak_sdk.commands.models.build',
  'qwak_sdk.commands.models.build._logic',
  'qwak_sdk.commands.models.build._logic.client_logs',
@@ -104,8 +103,6 @@ packages = \
  'qwak_sdk.commands.models.metadata',
  'qwak_sdk.commands.models.runtime',
  'qwak_sdk.commands.models.runtime.logs',
- 'qwak_sdk.commands.models.runtime.traffic_update',
- 'qwak_sdk.commands.models.runtime.traffic_update._logic',
  'qwak_sdk.commands.models.runtime.update',
  'qwak_sdk.commands.projects',
  'qwak_sdk.commands.projects.create',
@@ -137,7 +134,7 @@ install_requires = \
  'croniter==1.4.1',
  'gitpython>=2.1.0',
  'python-json-logger>=2.0.2',
- 'qwak-core==0.3.143',
+ 'qwak-core==0.3.163',
  'qwak-inference>=0.1,<0.2',
  'rich>=13.0.0',
  'tabulate>=0.8.0',
@@ -163,7 +160,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'qwak-sdk',
-    'version': '0.5.63',
+    'version': '0.5.64',
     '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',

qwak_sdk-0.5.63/qwak_sdk/commands/models/_logic/variations.py

@@ -1,55 +0,0 @@
-from __future__ import annotations
-
-from typing import List
-
-from _qwak_proto.qwak.deployment.deployment_pb2 import TrafficSpec, Variation
-from qwak.exceptions import QwakException
-
-from qwak_sdk.commands.models.deployments.deploy._logic.deploy_config import (
-    DeployConfig,
-)
-
-
-def validate_percentages(variations: List[Variation]):
-    for variation in variations:
-        if not (0 <= variation.traffic.percentage <= 100):
-            raise QwakException(
-                f"The variation '{variation.name}' contains invalid value '{variation.traffic.percentage}'. "
-                f"Value must be between 0 and 100."
-            )
-
-    non_shadow_variations = list(filter(lambda v: not v.traffic.is_shadow, variations))
-    non_shadow_variations_percentage_sum = sum(
-        map(lambda v: v.traffic.percentage, non_shadow_variations)
-    )
-    if non_shadow_variations and non_shadow_variations_percentage_sum != 100:
-        raise QwakException(
-            "The variations do not sum to 100 percent. Please go over the variations config file."
-        )
-
-
-def validate_shadow_variation(variations: List[Variation]):
-    shadow_variations = list(filter(lambda v: v.traffic.is_shadow, variations))
-    if len(shadow_variations) > 1:
-        shadow_variations_names = list(map(lambda v: v.name, shadow_variations))
-        raise QwakException(
-            f"The variations contain more than one shadow variation {shadow_variations_names}. "
-            f"Please go over the variations config file."
-        )
-
-
-def create_variation_from_variation_config(
-    variation_def: DeployConfig.Realtime.VariationConfig,
-) -> Variation:
-    try:
-        return Variation(
-            name=variation_def.name,
-            traffic=TrafficSpec(
-                percentage=variation_def.traffic.percentage,
-                is_shadow=variation_def.traffic.shadow,
-            ),
-        )
-    except Exception:
-        raise QwakException(
-            f"Could not parse variation {variation_def}. Please check you variation configuration file."
-        )

qwak_sdk-0.5.63/qwak_sdk/commands/models/deployments/deploy/_logic/variations.py

@@ -1,81 +0,0 @@
-from __future__ import annotations
-
-from typing import List
-
-from _qwak_proto.qwak.deployment.deployment_pb2 import TrafficSpec, Variation
-from qwak.exceptions import QwakException
-
-from qwak_sdk.commands.models._logic.variations import (
-    validate_percentages,
-    validate_shadow_variation,
-)
-
-
-def get_variations_for_deploy(
-    variation_name: str,
-    existing_variations: List[Variation],
-    requested_variations: List[Variation],
-    environment_name: str,
-    variation_protected_state: bool,
-):
-    if not existing_variations:
-        existing_variations: List[Variation] = [
-            Variation(
-                name=variation_name,
-                traffic=TrafficSpec(
-                    percentage=100,
-                    is_shadow=False,
-                ),
-                protected=variation_protected_state,
-            )
-        ]
-    requested_variations_names = set(
-        map(lambda variation: variation.name, requested_variations)
-    )
-    existing_variations_names = set(
-        map(lambda variation: variation.name, existing_variations)
-    )
-    if requested_variations_names:
-        if variation_name not in requested_variations_names:
-            raise QwakException(
-                f"Selected deployment to variation '{variation_name}' in {environment_name}, but provided the "
-                f"following variations {list(requested_variations_names)}. "
-                f"Please modify the variation name, or adjust the requested variations definitions"
-            )
-    elif variation_name not in existing_variations_names:
-        raise QwakException(
-            f"Selected deployment to existing variation '{variation_name}' in {environment_name}, but it is not one of "
-            f"the existing variations {list(existing_variations_names)}. "
-            f"Please modify the variation name, or supply the requested variations definitions with"
-            f" the necessary changes"
-        )
-    else:
-        # We are deploying to an existing variations without any change
-        return existing_variations
-
-    ignored_variations = existing_variations_names.difference(
-        requested_variations_names
-    )
-    if ignored_variations:
-        raise QwakException(
-            f"The given variation configuration does not contain the configuration for the following "
-            f"variations {list(ignored_variations)} in {environment_name}. You must include all the existing "
-            f"variations configuration when passing the configuration"
-        )
-
-    unexpected_variations = requested_variations_names.difference(
-        existing_variations_names
-    )
-    if variation_name in unexpected_variations:
-        unexpected_variations.remove(variation_name)
-    if unexpected_variations:
-        raise QwakException(
-            f"The given variation configuration contains the configuration for the following "
-            f"variations {list(unexpected_variations)} in {environment_name} which are not expected. When deploying, "
-            f"the variations configuration must contain all the existing variations, and an optional new variation."
-        )
-
-    validate_percentages(requested_variations)
-    validate_shadow_variation(requested_variations)
-
-    return requested_variations

qwak_sdk-0.5.63/qwak_sdk/commands/models/deployments/undeploy/_logic/variations.py

@@ -1,74 +0,0 @@
-from __future__ import annotations
-
-from typing import List, Set
-
-from _qwak_proto.qwak.deployment.deployment_pb2 import Variation
-from qwak.exceptions import QwakException
-
-from qwak_sdk.commands.models.deployments.deploy._logic.variations import (
-    validate_percentages,
-    validate_shadow_variation,
-)
-
-
-def validate_variations_for_undeploy(
-    variation_name: str,
-    existing_variations_names: Set[str],
-    requested_variations: List[Variation],
-    environment_name: str,
-):
-    if variation_name not in existing_variations_names:
-        if not variation_name:
-            raise QwakException(
-                f"No selected variation. You must specify a variation since there is more than one deployed in "
-                f"{environment_name}. Currently {list(existing_variations_names)} are deployed"
-            )
-        raise QwakException(
-            f"The selected variation {variation_name} is not deployed in {environment_name}. "
-            f"Only {list(existing_variations_names)} are deployed"
-        )
-
-    requested_variations_names = set(
-        map(lambda variation: variation.name, requested_variations)
-    )
-    if variation_name in requested_variations_names:
-        raise QwakException(
-            f"Selected undeploy to variation '{variation_name}', but it is part of "
-            f"the requested variations {list(requested_variations_names)}. "
-            f"Please modify the variation name, or supply the requested variations definitions with"
-            f" the necessary changes"
-        )
-    if variation_name not in existing_variations_names:
-        raise QwakException(
-            f"Selected undeploy to variation {variation_name} but it is not one of "
-            f"the existing variations {list(existing_variations_names)}. "
-            f"Please modify the variation name."
-        )
-
-    ignored_variations = existing_variations_names.difference(
-        requested_variations_names
-    )
-    if variation_name in ignored_variations:
-        ignored_variations.remove(variation_name)
-
-    if len(existing_variations_names) != 2 and ignored_variations:
-        raise QwakException(
-            f"The given variation configuration does not contain the configuration for the following "
-            f"variations {list(ignored_variations)}. You must include all the variations that will exist after "
-            f"undeploy in the configuration"
-        )
-
-    unexpected_variations = requested_variations_names.difference(
-        existing_variations_names
-    )
-
-    if unexpected_variations:
-        raise QwakException(
-            f"The given variation configuration contains the configuration for the following "
-            f"variations {list(unexpected_variations)} which are not expected. When undeploying, the variations "
-            f"configuration must contain all expected remaining variations (from the existing ones)."
-        )
-
-    if requested_variations:
-        validate_percentages(requested_variations)
-        validate_shadow_variation(requested_variations)

qwak_sdk-0.5.63/qwak_sdk/commands/models/runtime/traffic_update/_logic/execute_runtime_update_traffic.py

@@ -1,54 +0,0 @@
-from typing import Tuple
-
-from qwak.clients.administration.eco_system.client import EcosystemClient
-from qwak.clients.deployment.client import DeploymentManagementClient
-from qwak.tools.logger.logger import get_qwak_logger
-
-from qwak_sdk.commands.models._logic.variations import (
-    create_variation_from_variation_config,
-)
-from qwak_sdk.commands.models.deployments.deploy._logic.deploy_config import (
-    DeployConfig,
-)
-from qwak_sdk.commands.models.runtime.traffic_update._logic.variations import (
-    validate_requested_variations_against_existing_in_apply,
-)
-from qwak_sdk.inner.tools.config_handler import config_handler
-
-logger = get_qwak_logger()
-
-
-def execute_runtime_traffic_update(
-    model_id: str, from_file: str, environment_name: Tuple[str]
-):
-    deployment_client = DeploymentManagementClient()
-    ecosystem_client = EcosystemClient()
-    config: DeployConfig = config_handler(
-        config=DeployConfig,
-        from_file=from_file,
-        out_conf=False,
-        sections=("realtime",),
-        model_id=model_id,
-    )
-    requested_variations = list(
-        map(
-            create_variation_from_variation_config,
-            config.realtime.variations,
-        )
-    )
-    environment_names_to_details = ecosystem_client.get_environments_names_to_details(
-        environment_name if environment_name else config.realtime.environments
-    )
-    validate_requested_variations_against_existing_in_apply(
-        model_id,
-        requested_variations,
-        environment_names_to_details,
-        deployment_client,
-    )
-    environment_ids = [env.id for env in environment_names_to_details.values()]
-
-    deployment_client.apply_model_traffic_config(
-        model_id=model_id,
-        requested_variations=requested_variations,
-        environment_ids=environment_ids,
-    )