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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qwak-sdk"
-version = "0.5.22"
+version = "0.5.24"
 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.209"
+qwak-core = "==0.0.212"
 qwak-inference = "==0.1.8"
 tabulate = ">=0.8.0"
 python-json-logger = ">=2.0.2"

{qwak_sdk-0.5.22 → qwak_sdk-0.5.24}/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-0.5.22 → qwak_sdk-0.5.24}/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-0.5.22 → qwak_sdk-0.5.24}/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-0.5.24/qwak_sdk/commands/workspaces/create/_logic.py

@@ -0,0 +1,54 @@
+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 (
+    _validate_workspace_name,
+    _verify_image_id,
+    _verify_instance,
+)
+from qwak_sdk.commands.workspaces.config.workspace_config import WorkspaceConfig
+
+
+def _create_workspace(config: WorkspaceConfig):
+    """
+    Creating a new workspace
+
+    Args:
+        config: The workspace configuration
+
+    """
+    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)
+    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
+    )
+
+    print(
+        f"Workspace {config.workspace.name} was created successfully with id: {response.workspace_id}"
+    )

{qwak_sdk-0.5.22 → qwak_sdk-0.5.24}/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-0.5.22 → qwak_sdk-0.5.24}/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-0.5.22 → qwak_sdk-0.5.24}/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-0.5.22 → qwak_sdk-0.5.24}/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-0.5.22/qwak_sdk/commands/workspaces/workspace_commands_group.py → qwak_sdk-0.5.24/qwak_sdk/commands/workspaces/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 → qwak_sdk-0.5.24}/setup.py

@@ -145,7 +145,7 @@ install_requires = \
 ['cookiecutter',
  'gitpython>=2.1.0',
  'python-json-logger>=2.0.2',
- 'qwak-core==0.0.209',
+ 'qwak-core==0.0.212',
  '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.22',
+    'version': '0.5.24',
     '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.22/qwak_sdk/commands/workspaces/create/_logic.py

@@ -1,31 +0,0 @@
-from qwak.clients.workspace_manager import WorkspaceManagerClient
-
-from qwak_sdk.commands.workspaces._logic.workspace_validations import (
-    _validate_workspace_name,
-    _verify_image_id,
-    _verify_instance,
-)
-from qwak_sdk.commands.workspaces.config.workspace_config import WorkspaceConfig
-
-
-def _create_workspace(config: WorkspaceConfig):
-    """
-    Creating a new workspace
-
-    Args:
-        config: The workspace configuration
-
-    """
-    print(f"Creating a new workspace with the name {config.workspace.name}")
-    workspace_manager_client = WorkspaceManagerClient()
-    _validate_workspace_name(config.workspace.name)
-    _verify_image_id(config.workspace.image, workspace_manager_client)
-    _verify_instance(config.workspace.instance)
-
-    response = workspace_manager_client.create_workspace(
-        config.workspace.name, config.workspace.image, config.workspace.instance
-    )
-
-    print(
-        f"Workspace {config.workspace.name} was created successfully with id: {response.workspace_id}"
-    )