lightning-sdk 0.1.41__py3-none-any.whl → 0.1.42__py3-none-any.whl

lightning_sdk/__init__.py

@@ -27,5 +27,5 @@ __all__ = [
     "AIHub",
 ]
 
-__version__ = "0.1.41"
+__version__ = "0.1.42"
 _check_version_and_prompt_upgrade(__version__)

lightning_sdk/ai_hub.py

@@ -124,7 +124,7 @@ class AIHub:
         api_id: str,
         api_arguments: Optional[Dict[str, Any]] = None,
         name: Optional[str] = None,
-        cluster: Optional[str] = None,
+        cloud_account: Optional[str] = None,
         teamspace: Optional[Union[str, "Teamspace"]] = None,
         org: Optional[Union[str, "Organization"]] = None,
     ) -> Dict[str, Union[str, bool]]:
@@ -143,7 +143,8 @@ class AIHub:
             api_id: The ID of the AIHub template you want to run.
             api_arguments: Additional API argument, such as model name, or batch size.
             name: Name for the deployed API. Defaults to None.
-            cluster: The cluster where you want to run the template, such as "lightning-public-prod". Defaults to None.
+            cloud_account: The cloud account where you want to run the template, such as "lightning-public-prod".
+                Defaults to None.
             teamspace: The team or group for deployment. Defaults to None.
             org: The organization for deployment. Defaults to None.
 
@@ -160,7 +161,11 @@ class AIHub:
 
         api_arguments = api_arguments or {}
         deployment = self._api.run_api(
-            template_id=api_id, cluster_id=cluster, project_id=teamspace_id, name=name, api_arguments=api_arguments
+            template_id=api_id,
+            cloud_account=cloud_account or "",
+            project_id=teamspace_id,
+            name=name,
+            api_arguments=api_arguments,
         )
         url = (
             quote(

lightning_sdk/api/ai_hub_api.py

@@ -105,12 +105,12 @@ class AIHubApi:
             elif not p.required:
                 AIHubApi._update_parameters(job, p.placements, pattern, "")
             else:
-                raise ValueError(f"API reqires argument '{p.name}' but is not provided with api_arguments.")
+                raise ValueError(f"API requires argument '{p.name}' but is not provided with api_arguments.")
 
         return job
 
     def run_api(
-        self, template_id: str, project_id: str, cluster_id: str, name: Optional[str], api_arguments: Dict[str, str]
+        self, template_id: str, project_id: str, cloud_account: str, name: Optional[str], api_arguments: Dict[str, str]
     ) -> V1Deployment:
         template = self._client.deployment_templates_service_get_deployment_template(template_id)
         name = name or template.name
@@ -121,7 +121,7 @@ class AIHubApi:
             project_id=project_id,
             body=CreateDeploymentRequestDefinesASpecForTheJobThatAllowsForAutoscalingJobs(
                 autoscaling=template.spec_v2.autoscaling,
-                cluster_id=cluster_id,
+                cluster_id=cloud_account,
                 endpoint=template.spec_v2.endpoint,
                 name=name,
                 replicas=0,

lightning_sdk/api/deployment_api.py

@@ -239,7 +239,7 @@ class DeploymentApi:
         command: Optional[str] = None,
         env: Optional[List[Union[Env, Secret]]] = None,
         spot: Optional[bool] = None,
-        cluster_id: Optional[str] = None,
+        cloud_account: Optional[str] = None,
         min_replicas: Optional[int] = None,
         max_replicas: Optional[int] = None,
         name: Optional[str] = None,
@@ -270,7 +270,7 @@ class DeploymentApi:
         requires_release |= apply_change(deployment.spec, "command", command)
         requires_release |= apply_change(deployment.spec, "env", to_env(env))
         requires_release |= apply_change(deployment.spec, "env", to_health_check(health_check))
-        requires_release |= apply_change(deployment.spec, "cluster_id", cluster_id)
+        requires_release |= apply_change(deployment.spec, "cluster_id", cloud_account)
         requires_release |= apply_change(deployment.spec, "spot", spot)
 
         if requires_release:
@@ -521,7 +521,7 @@ def to_health_check(
 
 
 def to_spec(
-    cluster_id: Optional[str],
+    cloud_account: Optional[str],
     machine: Optional[Machine],
     environment: Optional[str],
     entrypoint: Optional[str],
@@ -530,8 +530,8 @@ def to_spec(
     env: Optional[List[Union[Secret, Env]]] = None,
     health_check: Optional[Union[HttpHealthCheck, ExecHealthCheck]] = None,
 ) -> V1JobSpec:
-    if cluster_id is None:
-        raise ValueError("The cluster should be defined.")
+    if cloud_account is None:
+        raise ValueError("The cloud account should be defined.")
 
     if machine is None:
         raise ValueError("The machine should be defined.")
@@ -540,7 +540,7 @@ def to_spec(
         raise ValueError("The environment should be defined.")
 
     return V1JobSpec(
-        cluster_id=cluster_id,
+        cluster_id=cloud_account,
         command=command,
         entrypoint=entrypoint,
         env=to_env(env),

lightning_sdk/api/job_api.py

@@ -24,6 +24,7 @@ from lightning_sdk.lightning_cloud.openapi import (
     V1LightningappInstanceState,
     V1LightningappInstanceStatus,
     V1LightningworkSpec,
+    V1LightningworkState,
     V1ListLightningworkResponse,
     V1UserRequestedComputeConfig,
 )
@@ -107,7 +108,7 @@ class JobApiV1:
         command: str,
         studio_id: str,
         teamspace_id: str,
-        cluster_id: str,
+        cloud_account: str,
         machine: Machine,
         interruptible: bool,
     ) -> Externalv1LightningappInstance:
@@ -116,7 +117,7 @@ class JobApiV1:
             self._client,
             studio_id=studio_id,
             teamspace_id=teamspace_id,
-            cluster_id=cluster_id,
+            cloud_account=cloud_account,
             plugin_type="job",
             compute=_MACHINE_TO_COMPUTE_NAME[machine],
             name=name,
@@ -124,6 +125,31 @@ class JobApiV1:
             interruptible=interruptible,
         )
 
+    def get_status_from_work(self, work: Externalv1Lightningwork) -> "Status":
+        from lightning_sdk.status import Status
+
+        internal_status = work.status.phase
+
+        if internal_status in (
+            V1LightningworkState.UNSPECIFIED,
+            V1LightningworkState.IMAGE_BUILDING,
+            V1LightningworkState.PENDING,
+            V1LightningworkState.NOT_STARTED,
+            V1LightningworkState.DELETED,
+        ):
+            return Status.Pending
+
+        if internal_status == V1LightningworkState.RUNNING:
+            return Status.Running
+
+        if internal_status == V1LightningworkState.STOPPED:
+            return Status.Stopped
+
+        if internal_status == V1LightningworkState.FAILED:
+            return Status.Failed
+
+        return Status.Pending
+
 
 class JobApiV2:
     v2_job_state_pending = "pending"
@@ -141,7 +167,7 @@ class JobApiV2:
         self,
         name: str,
         command: Optional[str],
-        cluster_id: Optional[str],
+        cloud_account: Optional[str],
         teamspace_id: str,
         studio_id: Optional[str],
         image: Optional[str],
@@ -149,7 +175,7 @@ class JobApiV2:
         interruptible: bool,
         env: Optional[Dict[str, str]],
         image_credentials: Optional[str],
-        cluster_auth: bool,
+        cloud_account_auth: bool,
         artifacts_local: Optional[str],
         artifacts_remote: Optional[str],
     ) -> V1Job:
@@ -164,14 +190,14 @@ class JobApiV2:
 
         spec = V1JobSpec(
             cloudspace_id=studio_id or "",
-            cluster_id=cluster_id or "",
+            cluster_id=cloud_account or "",
             command=command or "",
             env=env_vars,
             image=image or "",
             instance_name=instance_name,
             run_id=run_id,
             spot=interruptible,
-            image_cluster_credentials=cluster_auth,
+            image_cluster_credentials=cloud_account_auth,
             image_secret_ref=image_credentials or "",
             artifacts_source=artifacts_local or "",
             artifacts_destination=artifacts_remote or "",

lightning_sdk/api/mmt_api.py

@@ -1,18 +1,23 @@
+import json
 import time
-from typing import TYPE_CHECKING, Dict, Optional
+from typing import TYPE_CHECKING, Dict, List, Optional
 
+from lightning_sdk.api.job_api import JobApiV1
 from lightning_sdk.api.utils import (
     _COMPUTE_NAME_TO_MACHINE,
     _MACHINE_TO_COMPUTE_NAME,
+    _create_app,
 )
 from lightning_sdk.api.utils import (
     _get_cloud_url as _cloud_url,
 )
 from lightning_sdk.constants import __GLOBAL_LIGHTNING_UNIQUE_IDS_STORE__
 from lightning_sdk.lightning_cloud.openapi import (
+    Externalv1LightningappInstance,
     MultimachinejobsIdBody,
     ProjectIdMultimachinejobsBody,
     V1EnvVar,
+    V1Job,
     V1JobSpec,
     V1MultiMachineJob,
     V1MultiMachineJobState,
@@ -24,14 +29,43 @@ if TYPE_CHECKING:
     from lightning_sdk.status import Status
 
 
-class MMTApi:
-    mmt_state_unspecified = "MultiMachineJob_STATE_UNSPECIFIED"
-    mmt_state_running = "MultiMachineJob_STATE_RUNNING"
-    mmt_state_stopped = "MultiMachineJob_STATE_STOPPED"
-    mmt_state_deleted = "MultiMachineJob_STATE_DELETED"
-    mmt_state_failed = "MultiMachineJob_STATE_FAILED"
-    mmt_state_completed = "MultiMachineJob_STATE_COMPLETED"
+class MMTApiV1(JobApiV1):
+    def __init__(self) -> None:
+        self._cloud_url = _cloud_url()
+        self._client = LightningClient(max_tries=7)
+
+    def submit_job(
+        self,
+        name: str,
+        num_machines: int,
+        command: Optional[str],
+        cloud_account: Optional[str],
+        teamspace_id: str,
+        studio_id: str,
+        machine: Machine,
+        interruptible: bool,
+        strategy: str,
+    ) -> Externalv1LightningappInstance:
+        """Creates a multi-machine job with given commands."""
+        distributed_args = {
+            "cloud_compute": _MACHINE_TO_COMPUTE_NAME[machine],
+            "num_instances": num_machines,
+            "strategy": strategy,
+        }
+        return _create_app(
+            client=self._client,
+            studio_id=studio_id,
+            teamspace_id=teamspace_id,
+            cloud_account=cloud_account or "",
+            plugin_type="distributed_plugin",
+            entrypoint=command,
+            name=name,
+            distributedArguments=json.dumps(distributed_args),
+            interruptible=interruptible,
+        )
+
 
+class MMTApiV2:
     def __init__(self) -> None:
         self._cloud_url = _cloud_url()
         self._client = LightningClient(max_tries=7)
@@ -41,7 +75,7 @@ class MMTApi:
         name: str,
         num_machines: int,
         command: Optional[str],
-        cluster_id: Optional[str],
+        cloud_account: Optional[str],
         teamspace_id: str,
         studio_id: Optional[str],
         image: Optional[str],
@@ -49,7 +83,7 @@ class MMTApi:
         interruptible: bool,
         env: Optional[Dict[str, str]],
         image_credentials: Optional[str],
-        cluster_auth: bool,
+        cloud_account_auth: bool,
         artifacts_local: Optional[str],
         artifacts_remote: Optional[str],
     ) -> V1MultiMachineJob:
@@ -64,7 +98,7 @@ class MMTApi:
 
         spec = V1JobSpec(
             cloudspace_id=studio_id or "",
-            cluster_id=cluster_id or "",
+            cluster_id=cloud_account or "",
             command=command or "",
             entrypoint="sh -c",
             env=env_vars,
@@ -72,12 +106,14 @@ class MMTApi:
             instance_name=instance_name,
             run_id=run_id,
             spot=interruptible,
-            image_cluster_credentials=cluster_auth,
+            image_cluster_credentials=cloud_account_auth,
             image_secret_ref=image_credentials or "",
             artifacts_source=artifacts_local or "",
             artifacts_destination=artifacts_remote or "",
         )
-        body = ProjectIdMultimachinejobsBody(name=name, spec=spec, cluster_id=cluster_id or "", machines=num_machines)
+        body = ProjectIdMultimachinejobsBody(
+            name=name, spec=spec, cluster_id=cloud_account or "", machines=num_machines
+        )
 
         job: V1MultiMachineJob = self._client.jobs_service_create_multi_machine_job(project_id=teamspace_id, body=body)
         return job
@@ -107,7 +143,7 @@ class MMTApi:
             return
 
         if current_state != Status.Stopped:
-            update_body = MultimachinejobsIdBody(desired_state=self.mmt_state_stopped)
+            update_body = MultimachinejobsIdBody(desired_state=V1MultiMachineJobState.STOPPED)
             self._client.jobs_service_update_multi_machine_job(body=update_body, project_id=teamspace_id, id=job_id)
 
         while True:
@@ -124,18 +160,22 @@ class MMTApi:
     def delete_job(self, job_id: str, teamspace_id: str) -> None:
         self._client.jobs_service_delete_multi_machine_job(project_id=teamspace_id, id=job_id)
 
+    def list_mmt_subjobs(self, job_id: str, teamspace_id: str) -> List[V1Job]:
+        jobs_resp = self._client.jobs_service_list_jobs(project_id=teamspace_id, multi_machine_job_id=job_id)
+        return jobs_resp.jobs
+
     def _job_state_to_external(self, state: V1MultiMachineJobState) -> "Status":
         from lightning_sdk.status import Status
 
-        if str(state) == self.mmt_state_unspecified:
+        if str(state) == V1MultiMachineJobState.UNSPECIFIED:
             return Status.Pending
-        if str(state) == self.mmt_state_running:
+        if str(state) == V1MultiMachineJobState.RUNNING:
             return Status.Running
-        if str(state) == self.mmt_state_stopped:
+        if str(state) == V1MultiMachineJobState.STOPPED:
             return Status.Stopped
-        if str(state) == self.mmt_state_completed:
+        if str(state) == V1MultiMachineJobState.COMPLETED:
             return Status.Completed
-        if str(state) == self.mmt_state_failed:
+        if str(state) == V1MultiMachineJobState.FAILED:
             return Status.Failed
         return Status.Pending
 

lightning_sdk/api/studio_api.py

@@ -108,11 +108,11 @@ class StudioApi:
         self,
         name: str,
         teamspace_id: str,
-        cluster: Optional[str] = None,
+        cloud_account: Optional[str] = None,
     ) -> V1CloudSpace:
-        """Create a Studio with a given name in a given Teamspace on a possibly given cluster."""
+        """Create a Studio with a given name in a given Teamspace on a possibly given cloud_account."""
         body = ProjectIdCloudspacesBody(
-            cluster_id=cluster,
+            cluster_id=cloud_account,
             name=name,
             display_name=name,
             seed_files=[V1CloudSpaceSeedFile(path="main.py", contents="print('Hello, Lightning World!')\n")],
@@ -383,20 +383,32 @@ class StudioApi:
         self._client.cloud_space_service_delete_cloud_space(project_id=teamspace_id, id=studio_id)
 
     def upload_file(
-        self, studio_id: str, teamspace_id: str, cluster_id: str, file_path: str, remote_path: str, progress_bar: bool
+        self,
+        studio_id: str,
+        teamspace_id: str,
+        cloud_account: str,
+        file_path: str,
+        remote_path: str,
+        progress_bar: bool,
     ) -> None:
         """Uploads file to given remote path on the studio."""
         _FileUploader(
             client=self._client,
             teamspace_id=teamspace_id,
-            cluster_id=cluster_id,
+            cloud_account=cloud_account,
             file_path=file_path,
             remote_path=_sanitize_studio_remote_path(remote_path, studio_id),
             progress_bar=progress_bar,
         )()
 
     def download_file(
-        self, path: str, target_path: str, studio_id: str, teamspace_id: str, cluster_id: str, progress_bar: bool = True
+        self,
+        path: str,
+        target_path: str,
+        studio_id: str,
+        teamspace_id: str,
+        cloud_account: str,
+        progress_bar: bool = True,
     ) -> None:
         """Downloads a given file from a Studio to a target location."""
         # TODO: Update this endpoint to permit basic auth
@@ -405,7 +417,7 @@ class StudioApi:
         token = self._client.auth_service_login(V1LoginRequest(auth.api_key)).token
 
         query_params = {
-            "clusterId": cluster_id,
+            "clusterId": cloud_account,
             "key": _sanitize_studio_remote_path(path, studio_id),
             "token": token,
         }
@@ -439,7 +451,13 @@ class StudioApi:
                 pbar_update(len(chunk))
 
     def download_folder(
-        self, path: str, target_path: str, studio_id: str, teamspace_id: str, cluster_id: str, progress_bar: bool = True
+        self,
+        path: str,
+        target_path: str,
+        studio_id: str,
+        teamspace_id: str,
+        cloud_account: str,
+        progress_bar: bool = True,
     ) -> None:
         """Downloads a given folder from a Studio to a target location."""
         # TODO: Update this endpoint to permit basic auth
@@ -448,7 +466,7 @@ class StudioApi:
         token = self._client.auth_service_login(V1LoginRequest(auth.api_key)).token
 
         query_params = {
-            "clusterId": cluster_id,
+            "clusterId": cloud_account,
             "prefix": _sanitize_studio_remote_path(path, studio_id),
             "token": token,
         }
@@ -553,14 +571,14 @@ class StudioApi:
         machine: Machine,
         studio_id: str,
         teamspace_id: str,
-        cluster_id: str,
+        cloud_account: str,
         interruptible: bool,
     ) -> Externalv1LightningappInstance:
         """Creates a job with given commands."""
         return self._create_app(
             studio_id=studio_id,
             teamspace_id=teamspace_id,
-            cluster_id=cluster_id,
+            cloud_account=cloud_account,
             plugin_type="job",
             entrypoint=entrypoint,
             name=name,
@@ -577,7 +595,7 @@ class StudioApi:
         strategy: str,
         studio_id: str,
         teamspace_id: str,
-        cluster_id: str,
+        cloud_account: str,
         interruptible: bool,
     ) -> Externalv1LightningappInstance:
         """Creates a multi-machine job with given commands."""
@@ -589,7 +607,7 @@ class StudioApi:
         return self._create_app(
             studio_id=studio_id,
             teamspace_id=teamspace_id,
-            cluster_id=cluster_id,
+            cloud_account=cloud_account,
             plugin_type="distributed_plugin",
             entrypoint=entrypoint,
             name=name,
@@ -605,7 +623,7 @@ class StudioApi:
         machine: Machine,
         studio_id: str,
         teamspace_id: str,
-        cluster_id: str,
+        cloud_account: str,
         interruptible: bool,
     ) -> Externalv1LightningappInstance:
         """Creates a multi-machine job with given commands."""
@@ -616,7 +634,7 @@ class StudioApi:
         return self._create_app(
             studio_id=studio_id,
             teamspace_id=teamspace_id,
-            cluster_id=cluster_id,
+            cloud_account=cloud_account,
             plugin_type="litdata",
             entrypoint=entrypoint,
             name=name,
@@ -638,14 +656,14 @@ class StudioApi:
         endpoint: str,
         studio_id: str,
         teamspace_id: str,
-        cluster_id: str,
+        cloud_account: str,
         interruptible: bool,
     ) -> Externalv1LightningappInstance:
         """Creates an inference job for given endpoint."""
         return self._create_app(
             studio_id=studio_id,
             teamspace_id=teamspace_id,
-            cluster_id=cluster_id,
+            cloud_account=cloud_account,
             plugin_type="inference_plugin",
             compute=_MACHINE_TO_COMPUTE_NAME[machine],
             entrypoint=entrypoint,
@@ -661,14 +679,14 @@ class StudioApi:
         )
 
     def _create_app(
-        self, studio_id: str, teamspace_id: str, cluster_id: str, plugin_type: str, **other_arguments: Any
+        self, studio_id: str, teamspace_id: str, cloud_account: str, plugin_type: str, **other_arguments: Any
     ) -> Externalv1LightningappInstance:
         """Creates an arbitrary app."""
         return _create_app(
             self._client,
             studio_id=studio_id,
             teamspace_id=teamspace_id,
-            cluster_id=cluster_id,
+            cloud_account=cloud_account,
             plugin_type=plugin_type,
             **other_arguments,
         )

lightning_sdk/api/teamspace_api.py

@@ -2,6 +2,8 @@ import os
 from pathlib import Path
 from typing import Dict, List, Optional
 
+from tqdm.auto import tqdm
+
 from lightning_sdk.api.utils import _download_model_files, _DummyBody, _get_model_version, _ModelFileUploader
 from lightning_sdk.lightning_cloud.login import Auth
 from lightning_sdk.lightning_cloud.openapi import (
@@ -64,12 +66,12 @@ class TeamspaceApi:
                 teamspaces.append(self._get_teamspace_by_id(teamspace.project_id))
         return teamspaces
 
-    def list_studios(self, teamspace_id: str, cluster_id: str = "") -> List[V1CloudSpace]:
+    def list_studios(self, teamspace_id: str, cloud_account: str = "") -> List[V1CloudSpace]:
         """List studios in teamspace."""
         kwargs = {"project_id": teamspace_id, "user_id": self._get_authed_user_id()}
 
-        if cluster_id:
-            kwargs["cluster_id"] = cluster_id
+        if cloud_account:
+            kwargs["cluster_id"] = cloud_account
 
         cloudspaces = []
 
@@ -85,8 +87,8 @@ class TeamspaceApi:
 
         return cloudspaces
 
-    def list_clusters(self, teamspace_id: str) -> List[V1ProjectClusterBinding]:
-        """Lists clusters in a teamspace."""
+    def list_cloud_accounts(self, teamspace_id: str) -> List[V1ProjectClusterBinding]:
+        """Lists cloud_accounts in a teamspace."""
         return self._client.projects_service_list_project_cluster_bindings(project_id=teamspace_id).clusters
 
     def _get_authed_user_id(self) -> str:
@@ -95,32 +97,32 @@ class TeamspaceApi:
         auth.authenticate()
         return auth.user_id
 
-    def get_default_cluster_id(self, teamspace_id: str) -> str:
-        """Get the default cluster id of the teamspace."""
+    def get_default_cloud_account(self, teamspace_id: str) -> str:
+        """Get the default cloud account id of the teamspace."""
         return self._client.projects_service_get_project(teamspace_id).project_settings.preferred_cluster
 
-    def _determine_cluster_id(self, teamspace_id: str) -> str:
-        """Attempts to determine the cluster id of the teamspace.
+    def _determine_cloud_account(self, teamspace_id: str) -> str:
+        """Attempts to determine the cloud account id of the teamspace.
 
         Raises an error if it's ambiguous.
 
         """
-        # when you run  from studio, the cluster is with env. vars
-        cluster_id = os.getenv("LIGHTNING_CLUSTER_ID")
-        if cluster_id:
-            return cluster_id
+        # when you run  from studio, the cloud account is with env. vars
+        cloud_account = os.getenv("LIGHTNING_CLUSTER_ID")
+        if cloud_account:
+            return cloud_account
 
         # if there is only one cluster, use that and ignore default setting :D
-        cluster_ids = [c.cluster_id for c in self.list_clusters(teamspace_id=teamspace_id)]
-        if len(cluster_ids) == 1:
-            return cluster_ids[0]
-        # otherwise, try to determine the default cluster, another API call but we do not care :(
-        default_cluster_id = self.get_default_cluster_id(teamspace_id=teamspace_id)
-        if default_cluster_id:
-            return default_cluster_id
+        cloud_accounts = [c.cluster_id for c in self.list_cloud_accounts(teamspace_id=teamspace_id)]
+        if len(cloud_accounts) == 1:
+            return cloud_accounts[0]
+        # otherwise, try to determine the default cloud_account, another API call but we do not care :(
+        default_cloud_account = self.get_default_cloud_account(teamspace_id=teamspace_id)
+        if default_cloud_account:
+            return default_cloud_account
         raise RuntimeError(
-            "Could not determine the current cluster id. Please provide it manually as input."
-            f" Choices are: {', '.join(cluster_ids)}"
+            "Could not determine the current cloud account. Please provide it manually as input."
+            f" Choices are: {', '.join(cloud_accounts)}"
         )
 
     def create_agent(
@@ -174,18 +176,18 @@ class TeamspaceApi:
         metadata: Dict[str, str],
         private: bool,
         teamspace_id: str,
-        cluster_id: str,
+        cloud_account: str,
     ) -> V1ModelVersionArchive:
         # ask if such model already exists by listing models with specific name
         models = self.models.models_store_list_models(project_id=teamspace_id, name=name).models
         if len(models) == 0:
             return self.models.models_store_create_model(
-                body=ProjectIdModelsBody(cluster_id=cluster_id, metadata=metadata, name=name, private=private),
+                body=ProjectIdModelsBody(cluster_id=cloud_account, metadata=metadata, name=name, private=private),
                 project_id=teamspace_id,
             )
         assert len(models) == 1, "Multiple models with the same name found"
         return self.models.models_store_create_model_version(
-            body=ModelIdVersionsBody(cluster_id=cluster_id),
+            body=ModelIdVersionsBody(cluster_id=cloud_account),
             project_id=teamspace_id,
             model_id=models[0].id,
         )
@@ -209,7 +211,7 @@ class TeamspaceApi:
         version: str,
         local_path: Path,
         remote_path: str,
-        cluster_id: str,
+        cloud_account: str,
         teamspace_id: str,
         progress_bar: bool = True,
     ) -> None:
@@ -218,7 +220,7 @@ class TeamspaceApi:
             model_id=model_id,
             version=version,
             teamspace_id=teamspace_id,
-            cluster_id=cluster_id,
+            cloud_account=cloud_account,
             file_path=str(local_path),
             remote_path=str(remote_path),
             progress_bar=progress_bar,
@@ -231,20 +233,23 @@ class TeamspaceApi:
         version: str,
         root_path: Path,
         filepaths: List[Path],
-        cluster_id: str,
+        cloud_account: str,
         teamspace_id: str,
         progress_bar: bool = True,
     ) -> None:
+        main_pbar = tqdm(total=len(filepaths), desc="Uploading files...", position=0) if progress_bar else None
         for filepath in filepaths:
             self.upload_model_file(
                 model_id=model_id,
                 version=version,
                 local_path=filepath,
                 remote_path=str(filepath.relative_to(root_path)),
-                cluster_id=cluster_id,
+                cloud_account=cloud_account,
                 teamspace_id=teamspace_id,
                 progress_bar=progress_bar,  # TODO: Global progress bar
             )
+            if main_pbar:
+                main_pbar.update(1)
 
     def complete_model_upload(self, model_id: str, version: str, teamspace_id: str) -> None:
         self.models.models_store_complete_model_upload(