qwak-sdk 0.5.22__py3-none-any.whl → 0.5.24__py3-none-any.whl

qwak_sdk/__init__.py

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

qwak_sdk/cli.py

@@ -16,8 +16,8 @@ from qwak_sdk.commands.feature_store.feature_store_command_group import (
 from qwak_sdk.commands.models.models_command_group import models_command_group
 from qwak_sdk.commands.projects.projects_command_group import projects_command_group
 from qwak_sdk.commands.secrets.secrets_commands_group import secrets_commands_group
-from qwak_sdk.commands.workspaces.workspace_commands_group import (
-    workspace_commands_group,
+from qwak_sdk.commands.workspaces.workspaces_commands_group import (
+    workspaces_commands_group,
 )
 from qwak_sdk.inner.tools.logger import setup_qwak_logger
 
@@ -57,5 +57,5 @@ def create_qwak_cli():
     qwak_cli.add_command(feature_store_commands_group)
     qwak_cli.add_command(audience_commands_group)
     qwak_cli.add_command(alerts_commands_group)
-    qwak_cli.add_command(workspace_commands_group)
+    qwak_cli.add_command(workspaces_commands_group)
     return qwak_cli

qwak_sdk/commands/workspaces/_logic/tools.py

@@ -10,6 +10,22 @@ def get_workspace_id_by_name(
     """
     Args:
         workspace_name: The name of the workspace
+        workspace_manager_client: The workspace manager client
+    Returns:
+        The id of the workspace
+    """
+    return get_workspace_by_name(
+        workspace_name=workspace_name, workspace_manager_client=workspace_manager_client
+    ).workspace_id
+
+
+def get_workspace_by_name(
+    workspace_name: str, workspace_manager_client: Optional[WorkspaceManagerClient]
+) -> str:
+    """
+    Args:
+        workspace_name: The name of the workspace
+        workspace_manager_client: The workspace manager client
     Returns:
         The id of the workspace
     """
@@ -23,6 +39,6 @@ def get_workspace_id_by_name(
 
     for workspace in response.workspaces:
         if workspace.workspace_name == workspace_name:
-            return workspace.workspace_id
+            return workspace
 
     raise QwakException(f"Failed to find workspace with name {workspace_name}")

qwak_sdk/commands/workspaces/create/_logic.py

@@ -1,3 +1,6 @@
+from _qwak_proto.qwak.instance_template.instance_template_pb2 import InstanceType
+from _qwak_proto.qwak.workspace.workspace_pb2 import DefaultWorkspaceDetails
+from qwak.clients.instance_template.client import InstanceTemplateManagementClient
 from qwak.clients.workspace_manager import WorkspaceManagerClient
 
 from qwak_sdk.commands.workspaces._logic.workspace_validations import (
@@ -18,9 +21,29 @@ def _create_workspace(config: WorkspaceConfig):
     """
     print(f"Creating a new workspace with the name {config.workspace.name}")
     workspace_manager_client = WorkspaceManagerClient()
+    default_details: DefaultWorkspaceDetails = (
+        workspace_manager_client.get_default_workspace_details()
+    )
+
     _validate_workspace_name(config.workspace.name)
-    _verify_image_id(config.workspace.image, workspace_manager_client)
-    _verify_instance(config.workspace.instance)
+    if config.workspace.instance:
+        _verify_instance(config.workspace.instance)
+    else:
+        config.workspace.instance = (
+            default_details.cpu_compute_resources.template_spec.template_id
+        )
+
+    if config.workspace.image:
+        _verify_image_id(config.workspace.image, workspace_manager_client)
+    else:
+        instance_spec = InstanceTemplateManagementClient().get_instance_template(
+            config.workspace.instance
+        )
+        config.workspace.image = (
+            default_details.cpu_image_id
+            if instance_spec.instance_type == InstanceType.INSTANCE_TYPE_CPU
+            else default_details.gpu_image_id
+        )
 
     response = workspace_manager_client.create_workspace(
         config.workspace.name, config.workspace.image, config.workspace.instance

qwak_sdk/commands/workspaces/delete/_logic.py

@@ -14,13 +14,14 @@ def _delete_workspace(workspace_id: Optional[str], workspace_name: Optional[str]
     Args:
     workspace_id: The id of the workspace to delete
     """
-    print(f"Deleting an existing workspace with id {workspace_id}")
     validate_id_or_name(workspace_id=workspace_id, workspace_name=workspace_name)
     workspace_manager_client = WorkspaceManagerClient()
     if workspace_id:
+        print(f"Deleting an existing workspace with id {workspace_id}")
         workspace_manager_client.delete_workspace(workspace_id=workspace_id)
         print(f"Workspace {workspace_id} was deleted successfully")
     if workspace_name:
+        print(f"Deleting an existing workspace with name {workspace_name}")
         workspace_id = get_workspace_id_by_name(
             workspace_name=workspace_name,
             workspace_manager_client=workspace_manager_client,

qwak_sdk/commands/workspaces/start/_logic.py

@@ -17,10 +17,11 @@ def _start_workspace(workspace_id: Optional[str], workspace_name=Optional[str]):
     validate_id_or_name(workspace_id=workspace_id, workspace_name=workspace_name)
     workspace_manager_client = WorkspaceManagerClient()
     if workspace_id:
-        print(f"Deploying an existing workspace with id {workspace_id}")
+        print(f"Starting an existing workspace with id {workspace_id}")
         workspace_manager_client.deploy_workspace(workspace_id=workspace_id)
         print(f"Workspace {workspace_id} started successfully")
     if workspace_name:
+        print(f"Starting an existing workspace with name {workspace_name}")
         workspace_id = get_workspace_id_by_name(
             workspace_name=workspace_name,
             workspace_manager_client=workspace_manager_client,

qwak_sdk/commands/workspaces/stop/_logic.py

@@ -10,20 +10,21 @@ from qwak_sdk.commands.workspaces._logic.workspace_validations import (
 
 def _stop_workspace(workspace_id: Optional[str], workspace_name: Optional[str]):
     """
-    Undeploy an existing workspace
+    Stop an existing workspace
     Args:
     workspace_id: The id of the workspace to deploy
     """
-    print(f"Undeploy an existing workspace with id {workspace_id}")
     validate_id_or_name(workspace_id=workspace_id, workspace_name=workspace_name)
     workspace_manager_client = WorkspaceManagerClient()
     if workspace_id:
+        print(f"Stopping an existing workspace with id {workspace_id}")
         workspace_manager_client.undeploy_workspace(workspace_id=workspace_id)
-        print(f"Workspace {workspace_id} was undeployed successfully")
+        print(f"Workspace {workspace_id} was stopped successfully")
     if workspace_name:
+        print(f"Stopping an existing workspace with name {workspace_name}")
         workspace_id = get_workspace_id_by_name(
             workspace_name=workspace_name,
             workspace_manager_client=workspace_manager_client,
         )
         workspace_manager_client.undeploy_workspace(workspace_id=workspace_id)
-        print(f"Workspace {workspace_name} was undeployed successfully")
+        print(f"Workspace {workspace_name} was stopped successfully")

qwak_sdk/commands/workspaces/update/_logic.py

@@ -1,9 +1,11 @@
 from qwak.clients.workspace_manager import WorkspaceManagerClient
 
+from qwak_sdk.commands.workspaces._logic.tools import get_workspace_by_name
 from qwak_sdk.commands.workspaces._logic.workspace_validations import (
     _validate_workspace_name,
     _verify_image_id,
     _verify_instance,
+    validate_id_or_name,
 )
 from qwak_sdk.commands.workspaces.config.workspace_config import WorkspaceConfig
 
@@ -16,14 +18,25 @@ def _update_workspace(config: WorkspaceConfig):
         config: The workspace configuration
 
     """
-    print(
-        f"Updating a new workspace with the workspace id {config.workspace.workspace_id}"
+    validate_id_or_name(
+        workspace_id=config.workspace.workspace_id, workspace_name=config.workspace.name
     )
     workspace_manager_client = WorkspaceManagerClient()
-    current_workspace = workspace_manager_client.get_workspace_by_id(
-        workspace_id=config.workspace.workspace_id
-    ).workspace
+    if config.workspace.workspace_id:
+        print(
+            f"Updating a workspace with the workspace id {config.workspace.workspace_id}"
+        )
+        current_workspace = workspace_manager_client.get_workspace_by_id(
+            workspace_id=config.workspace.workspace_id
+        ).workspace
+    else:
+        print(f"Updating a workspace with the workspace name {config.workspace.name}")
+        current_workspace = get_workspace_by_name(
+            workspace_name=config.workspace.name,
+            workspace_manager_client=workspace_manager_client,
+        )
 
+    workspace_id = current_workspace.workspace_id
     workspace_name = config.workspace.name
     image_id = config.workspace.image
     instance = config.workspace.instance
@@ -53,13 +66,16 @@ def _update_workspace(config: WorkspaceConfig):
     )
 
     workspace_manager_client.update_workspace(
-        workspace_id=config.workspace.workspace_id,
+        workspace_id=workspace_id,
         image_id=image_id,
         template_id=instance,
         workspace_name=name,
     )
 
-    print(f"Workspace {config.workspace.workspace_id} was updated successfully")
+    if config.workspace.workspace_id:
+        print(f"Workspace {workspace_id} was updated successfully")
+    else:
+        print(f"Workspace {workspace_name} was updated successfully")
 
 
 def _is_not_empty_and_not_none(value: str) -> bool:

qwak_sdk/commands/workspaces/{workspace_commands_group.py → workspaces_commands_group.py}

@@ -8,16 +8,16 @@ from qwak_sdk.commands.workspaces.update.ui import update_workspace
 
 
 @click.group(
-    "workspace",
-    help="Commands for interacting with the workspace manager",
+    "workspaces",
+    help="Commands for interacting with workspaces",
 )
-def workspace_commands_group():
+def workspaces_commands_group():
     # Click commands group injection
     pass
 
 
-workspace_commands_group.add_command(create_workspace)
-workspace_commands_group.add_command(update_workspace)
-workspace_commands_group.add_command(start_workspace)
-workspace_commands_group.add_command(delete_workspace)
-workspace_commands_group.add_command(stop_workspace)
+workspaces_commands_group.add_command(create_workspace)
+workspaces_commands_group.add_command(update_workspace)
+workspaces_commands_group.add_command(start_workspace)
+workspaces_commands_group.add_command(delete_workspace)
+workspaces_commands_group.add_command(stop_workspace)

{qwak_sdk-0.5.22.dist-info → qwak_sdk-0.5.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qwak-sdk
-Version: 0.5.22
+Version: 0.5.24
 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.209)
+Requires-Dist: qwak-core (==0.0.212)
 Requires-Dist: qwak-inference (==0.1.8)
 Requires-Dist: tabulate (>=0.8.0)
 Requires-Dist: yaspin (>=2.0.0)

{qwak_sdk-0.5.22.dist-info → qwak_sdk-0.5.24.dist-info}/RECORD

@@ -1,5 +1,5 @@
-qwak_sdk/__init__.py,sha256=Y1OG9C2lLQqHXjumVNQPM0rnGhW28N-zK19u0TqkyBE,135
-qwak_sdk/cli.py,sha256=7SXVXBv3Yb1aR11EZwEmFcgnbfX9RZoGVzDxrQrrlUo,2455
+qwak_sdk/__init__.py,sha256=piQZEtKNuGjuodFyerNkMl0e7vC_UHb5Eha_YOpRlrw,135
+qwak_sdk/cli.py,sha256=FIK1dUNxR57ypb-CeD7fKSJnPJ02lrjR9G4aj2qMLPU,2458
 qwak_sdk/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/_logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/_logic/instance_template.py,sha256=JFsqaN_T4n_zZvXlVOLphCrF2A9uhp4GPE4pMuFno84,1497
@@ -308,26 +308,26 @@ qwak_sdk/commands/secrets/set/ui.py,sha256=jo4ldlLTybHUBt1MjsI6dwOpaqnoZXnL0EnOR
 qwak_sdk/commands/ui_tools.py,sha256=JSyNs3qIllK5h3Re6A-SDaxt2TXG3987GoIfyK683HE,430
 qwak_sdk/commands/workspaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/workspaces/_logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qwak_sdk/commands/workspaces/_logic/tools.py,sha256=IaT-6h9qP5EKyFH7Skt3rJlikwZEOIV6P3eEgRTmbfI,773
+qwak_sdk/commands/workspaces/_logic/tools.py,sha256=1NXSjL1teLfZPNRn6X3kP1-m3HZRJeb03Cz5fVaF3BE,1272
 qwak_sdk/commands/workspaces/_logic/workspace_validations.py,sha256=J76-pKx1m3RIt5j9Ev5V17HgHam0-36JI5CSmu3-3JQ,1616
 qwak_sdk/commands/workspaces/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/commands/workspaces/config/workspace_config.py,sha256=x3XuJZ-klxIJlLLu9dn41ethNylvdcDO8FZU147veGY,1039
 qwak_sdk/commands/workspaces/create/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qwak_sdk/commands/workspaces/create/_logic.py,sha256=HC4REslUVv-sJYFxMs2RzchG697hH3jhv0MZTrmhdZQ,1018
+qwak_sdk/commands/workspaces/create/_logic.py,sha256=dwKN_GtnP7Adva0Lq4BzqZlynt92EbzLOMfLZofoHZE,1938
 qwak_sdk/commands/workspaces/create/ui.py,sha256=qKD1r5B59aEXY4JZdu2wlXZvXY0JpcJrL_g9eo2Poo8,1329
 qwak_sdk/commands/workspaces/delete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qwak_sdk/commands/workspaces/delete/_logic.py,sha256=A6FJvn3oIXXCOgroUAO858t_wjDYYzAPo995uAF799o,1167
+qwak_sdk/commands/workspaces/delete/_logic.py,sha256=qjsYWdoSeQtE28TdcrefX8xBY_cG9z1nwIMxADTFlQc,1247
 qwak_sdk/commands/workspaces/delete/ui.py,sha256=QC4rilo7ErLZN68UWhVNGyyMofckGDHca8F_kmTSODo,609
 qwak_sdk/commands/workspaces/start/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qwak_sdk/commands/workspaces/start/_logic.py,sha256=LUHlrNzmFCkHiFSULEo-Ls2ORSuxT3sIX_jfenaLaDU,1175
+qwak_sdk/commands/workspaces/start/_logic.py,sha256=dLWmCeZ1SH5VDY5UUHhJAxTKdRTfF589dvYtTpC1DFI,1250
 qwak_sdk/commands/workspaces/start/ui.py,sha256=3OpyGBLUxGeGrDFSnWNe9iSVi7PBZhVY6dyKHmB3_IM,604
 qwak_sdk/commands/workspaces/stop/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qwak_sdk/commands/workspaces/stop/_logic.py,sha256=gSsPBHGjUo2GMnEv5cIAnjKObSk2e6Zi4B0gCC9tSPc,1187
+qwak_sdk/commands/workspaces/stop/_logic.py,sha256=3_dqIr_ae-GQvauykoIXlgBKl8roNesMrP9L8PJy3v4,1257
 qwak_sdk/commands/workspaces/stop/ui.py,sha256=XhuBoU7x1MrEDQcfQuxiuLEb2yQvbrDzlbcDBJ72nvk,599
 qwak_sdk/commands/workspaces/update/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qwak_sdk/commands/workspaces/update/_logic.py,sha256=i-P1iHO7PWg6u0o1CHZX2JKfrqMBB1AFUjPxI80NHCU,1962
+qwak_sdk/commands/workspaces/update/_logic.py,sha256=tSxMOAGhTU0D9C-lbd49Ah7rEtf9eoEMeUXU9--gWMQ,2650
 qwak_sdk/commands/workspaces/update/ui.py,sha256=pqS4SosS145ciZoIkFhW951Y_Ec86PKIldCiv3iEU8w,1515
-qwak_sdk/commands/workspaces/workspace_commands_group.py,sha256=b3UB3wcd5luaSmWIfrzONWu4y19Y3qRqoG5NjhlJxsc,799
+qwak_sdk/commands/workspaces/workspaces_commands_group.py,sha256=yuW-UC73J_vp-i4fILX90TAUrxaFocAmltBrRIg67lY,795
 qwak_sdk/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_sdk/common/run_config/__init__.py,sha256=E73GRxqdEbTYsdd5EE7Wu4YXxTjxF4YkrBY_7-hZ4dU,437
 qwak_sdk/common/run_config/base.py,sha256=lbCl2DXBM90IXyLCFR2dUY35afwJlp9D4KgM8HP5_MQ,3166
@@ -355,7 +355,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.22.dist-info/entry_points.txt,sha256=vSl0ELYDyj640oMM57u0AjBP87wtLYxCcGOendhEx80,47
-qwak_sdk-0.5.22.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-qwak_sdk-0.5.22.dist-info/METADATA,sha256=d-dOnOlnkj4N39CrZpTCY3lA6rtAXnpt85sKuu49Ux4,1852
-qwak_sdk-0.5.22.dist-info/RECORD,,
+qwak_sdk-0.5.24.dist-info/entry_points.txt,sha256=vSl0ELYDyj640oMM57u0AjBP87wtLYxCcGOendhEx80,47
+qwak_sdk-0.5.24.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+qwak_sdk-0.5.24.dist-info/METADATA,sha256=xgkhDuuwxYPcpkoQmBJ9NG4oCyqPlposFOM1vCudhKc,1852
+qwak_sdk-0.5.24.dist-info/RECORD,,