lightning-sdk 0.2.8__py3-none-any.whl → 0.2.10__py3-none-any.whl

lightning_sdk/__init__.py

@@ -31,6 +31,6 @@ __all__ = [
     "User",
 ]
 
-__version__ = "0.2.8"
+__version__ = "0.2.10"
 _check_version_and_prompt_upgrade(__version__)
 _set_tqdm_envvars_noninteractive()

lightning_sdk/api/cluster_api.py

@@ -0,0 +1,22 @@
+from lightning_sdk.lightning_cloud.openapi import Externalv1Cluster
+from lightning_sdk.lightning_cloud.rest_client import LightningClient
+
+
+class ClusterApi:
+    """Internal API client for API requests to cluster endpoints."""
+
+    def __init__(self) -> None:
+        self._client = LightningClient(max_tries=7)
+
+    def get_cluster(self, cluster_id: str, project_id: str, org_id: str) -> Externalv1Cluster:
+        """Gets the cluster from given params cluster_id, project_id and owner.
+
+        :param cluster_id: cluster ID test
+        :param project_id: the project the cluster is supposed to be associated with
+        :param org_id: The owning org of this cluster
+        :return:
+        """
+        res = self._client.cluster_service_get_cluster(id=cluster_id, org_id=org_id, project_id=project_id)
+        if not res:
+            raise ValueError(f"Cluster {cluster_id} does not exist")
+        return res

lightning_sdk/api/deployment_api.py

@@ -228,6 +228,7 @@ class DeploymentApi:
         return self._client.jobs_service_create_deployment(
             project_id=deployment.project_id,
             body=CreateDeploymentRequestDefinesASpecForTheJobThatAllowsForAutoscalingJobs(
+                cloudspace_id=deployment.cloudspace_id,
                 autoscaling=deployment.autoscaling,
                 cluster_id=deployment.spec.cluster_id,
                 endpoint=deployment.endpoint,

lightning_sdk/api/lit_container_api.py

@@ -7,6 +7,7 @@ import requests
 from rich.console import Console
 
 from lightning_sdk.api.utils import _get_registry_url
+from lightning_sdk.lightning_cloud.env import LIGHTNING_CLOUD_URL
 from lightning_sdk.lightning_cloud.openapi.models import V1DeleteLitRepositoryResponse
 from lightning_sdk.lightning_cloud.rest_client import LightningClient
 from lightning_sdk.teamspace import Teamspace
@@ -105,9 +106,11 @@ class LitContainerApi:
         :param cloud_account: The cluster ID of the cloud account. If None, will use the default cluster.
         :return:
         """
-        project = self._client.lit_registry_service_get_lit_project_registry(
-            project_id, cluster_id="" if cloud_account is None else cloud_account
-        )  # cloud account on the CLI is cluster_id
+        if cloud_account is None:
+            project = self._client.lit_registry_service_get_lit_project_registry(project_id)
+        else:
+            project = self._client.lit_registry_service_get_lit_project_registry(project_id, cluster_id=cloud_account)
+
         return project.repositories
 
     def delete_container(self, project_id: str, container: str) -> V1DeleteLitRepositoryResponse:
@@ -124,8 +127,14 @@ class LitContainerApi:
 
     @retry_on_lcr_auth_failure
     def upload_container(
-        self, container: str, teamspace: Teamspace, tag: str, cloud_account: str, platform: str
-    ) -> Generator[dict, None, None]:
+        self,
+        container: str,
+        teamspace: Teamspace,
+        tag: str,
+        cloud_account: str,
+        platform: str,
+        return_final_dict: bool = False,
+    ) -> Generator[dict, None, Dict]:
         """Upload container will push the container to LitCR.
 
         It uses docker push API to interact with docker daemon which will then push the container to a storage
@@ -138,6 +147,7 @@ class LitContainerApi:
             Named cloud-account in the CLI options.
         :param platform: If empty will be linux/amd64. This is important because our entire deployment infra runs on
             linux/amd64. Will show user a warning otherwise.
+        :return_final_dict: Controls whether we respond with the dictionary containing metadata about container upload
         :return: Generator[dict, None, dict]
         """
         try:
@@ -164,6 +174,15 @@ class LitContainerApi:
             raise ValueError(f"Could not tag container {container}:{tag} with {repository}:{tag}")
         yield from self._push_with_retry(repository, tag=tag)
 
+        if return_final_dict:
+            yield {
+                "finish": True,
+                "url": f"{LIGHTNING_CLOUD_URL}/{teamspace.owner.name}/{teamspace.name}/containers/"
+                f"{container_basename}?section=tags"
+                f"{f'?clusterId={cloud_account}' if cloud_account is not None else ''}",
+                "repository": repository,
+            }
+
     def _push_with_retry(self, repository: str, tag: str, max_retries: int = 3) -> Iterator[Dict[str, Any]]:
         def is_auth_error(error_msg: str) -> bool:
             auth_errors = ["unauthorized", "authentication required", "unauth"]

lightning_sdk/api/teamspace_api.py

@@ -34,7 +34,7 @@ class TeamspaceApi:
 
     def __init__(self) -> None:
         self._client = LightningClient(max_tries=7)
-        self._models: Optional[ModelsStoreApi] = None
+        self._models_api: Optional[ModelsStoreApi] = None
 
     def get_teamspace(self, name: str, owner_id: str) -> V1Project:
         """Get the current teamspace from the owner."""
@@ -166,48 +166,51 @@ class TeamspaceApi:
 
     # lazy property which is only created when needed
     @property
-    def models(self) -> ModelsStoreApi:
-        if not self._models:
-            self._models = ModelsStoreApi(self._client.api_client)
-        return self._models
+    def models_api(self) -> ModelsStoreApi:
+        if not self._models_api:
+            self._models_api = ModelsStoreApi(self._client.api_client)
+        return self._models_api
 
-    def get_model_version(self, name: str, version: str, teamspace_id: str) -> V1ModelVersionArchive:
+    def get_model_version(self, name: str, version: Optional[str], teamspace_id: str) -> V1ModelVersionArchive:
         return _get_model_version(client=self._client, name=name, version=version, teamspace_id=teamspace_id)
 
     def create_model(
         self,
         name: str,
+        version: Optional[str],
         metadata: Dict[str, str],
         private: bool,
         teamspace_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
+        models = self.models_api.models_store_list_models(project_id=teamspace_id, name=name).models
         if len(models) == 0:
-            return self.models.models_store_create_model(
+            return self.models_api.models_store_create_model(
                 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=cloud_account),
+        return self.models_api.models_store_create_model_version(
+            body=ModelIdVersionsBody(cluster_id=cloud_account, version=version),
             project_id=teamspace_id,
             model_id=models[0].id,
         )
 
     def delete_model(self, name: str, version: Optional[str], teamspace_id: str) -> None:
         """Delete a model or a version from the model store."""
-        models = self.models.models_store_list_models(project_id=teamspace_id, name=name).models
+        models = self.models_api.models_store_list_models(project_id=teamspace_id, name=name).models
         assert len(models) == 1, "Multiple models with the same name found"
-        model_id = models[0].id
+        model = models[0]
         # decide if delete only version of whole model
         if version:
             if version == "default":
-                version = models[0].default_version
-            self.models.models_store_delete_model_version(project_id=teamspace_id, model_id=model_id, version=version)
+                version = model.default_version
+            self.models_api.models_store_delete_model_version(
+                project_id=teamspace_id, model_id=model.id, version=version
+            )
         else:
-            self.models.models_store_delete_model(project_id=teamspace_id, model_id=model_id)
+            self.models_api.models_store_delete_model(project_id=teamspace_id, model_id=model.id)
 
     def upload_model_file(
         self,
@@ -255,7 +258,7 @@ class TeamspaceApi:
                 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(
+        self.models_api.models_store_complete_model_upload(
             body=_DummyBody(),
             project_id=teamspace_id,
             model_id=model_id,
@@ -265,12 +268,14 @@ class TeamspaceApi:
     def download_model_files(
         self,
         name: str,
-        version: str,
+        version: Optional[str],
         download_dir: Path,
         teamspace_name: str,
         teamspace_owner_name: str,
         progress_bar: bool = True,
     ) -> List[str]:
+        if version is None:
+            version = "default"
         return _download_model_files(
             client=self._client,
             teamspace_name=teamspace_name,

lightning_sdk/api/utils.py

@@ -493,7 +493,7 @@ def _get_model_version(client: LightningClient, teamspace_id: str, name: str, ve
         raise ValueError(f"Model `{name}` does not exist")
     elif len(models) > 1:
         raise ValueError("Multiple models with the same name found")
-    if version == ("default"):
+    if version is None or version == "default":
         return models[0].default_version
     versions = api.models_store_list_model_versions(project_id=teamspace_id, model_id=models[0].id).versions
     if not versions:

lightning_sdk/cli/clusters_menu.py

@@ -0,0 +1,46 @@
+import sys
+from typing import List
+
+from rich.console import Console
+from simple_term_menu import TerminalMenu
+
+from lightning_sdk import Teamspace
+from lightning_sdk.api.cluster_api import ClusterApi
+from lightning_sdk.lightning_cloud.openapi import Externalv1Cluster, V1ProjectClusterBinding
+
+
+class _ClustersMenu:
+    def _get_cluster_from_interactive_menu(self, possible_clusters: List[V1ProjectClusterBinding]) -> str:
+        terminal_menu = self._prepare_terminal_menu_teamspaces([cluster.cluster_id for cluster in possible_clusters])
+        terminal_menu.show()
+
+        return possible_clusters[terminal_menu.chosen_menu_index].cluster_id
+
+    @staticmethod
+    def _prepare_terminal_menu_teamspaces(cluster_ids: List[str]) -> TerminalMenu:
+        title = "Please select a cluster from the following:"
+
+        return TerminalMenu(cluster_ids, title=title, clear_menu_on_exit=True)
+
+    def _resolve_cluster(self, teamspace: Teamspace) -> Externalv1Cluster:
+        selected_cluster_id = None
+        console = Console()
+        try:
+            selected_cluster_id = self._get_cluster_from_interactive_menu(
+                possible_clusters=teamspace.cloud_account_objs
+            )
+            cluster_api = ClusterApi()
+
+            return cluster_api.get_cluster(
+                cluster_id=selected_cluster_id, org_id=teamspace.owner.id, project_id=teamspace.id
+            )
+        except KeyboardInterrupt:
+            console.print("Operation cancelled by user")
+            sys.exit(0)
+
+        except Exception:
+            console.print(
+                f"[red]Could not find the given Cluster:[/red] {selected_cluster_id}. "
+                "Please contact Lightning AI directly to resolve this issue."
+            )
+            sys.exit(1)

lightning_sdk/cli/entrypoint.py

@@ -21,7 +21,7 @@ from lightning_sdk.cli.inspect import inspect
 from lightning_sdk.cli.list import list_cli
 from lightning_sdk.cli.open import open
 from lightning_sdk.cli.run import run
-from lightning_sdk.cli.serve import serve
+from lightning_sdk.cli.serve import deploy
 from lightning_sdk.cli.start import start
 from lightning_sdk.cli.stop import stop
 from lightning_sdk.cli.switch import switch
@@ -76,7 +76,7 @@ main_cli.add_command(generate)
 main_cli.add_command(inspect)
 main_cli.add_command(list_cli)
 main_cli.add_command(run)
-main_cli.add_command(serve)
+main_cli.add_command(deploy)
 main_cli.add_command(start)
 main_cli.add_command(stop)
 main_cli.add_command(switch)

lightning_sdk/cli/list.py

@@ -7,8 +7,9 @@ from rich.table import Table
 from typing_extensions import Literal
 
 from lightning_sdk import Job, Machine, Studio, Teamspace
+from lightning_sdk.cli.clusters_menu import _ClustersMenu
 from lightning_sdk.cli.teamspace_menu import _TeamspacesMenu
-from lightning_sdk.lightning_cloud.openapi import V1MultiMachineJob
+from lightning_sdk.lightning_cloud.openapi import V1ClusterType, V1MultiMachineJob
 from lightning_sdk.lit_container import LitContainer
 from lightning_sdk.utils.resolve import _get_authed_user
 
@@ -232,18 +233,37 @@ def mmts(
         "If not provided, can be selected in an interactive menu."
     ),
 )
-def containers(teamspace: Optional[str] = None) -> None:
+@click.option(
+    "--cloud-account",
+    "--cloud_account",  # The UI will present the above variant, using this as a secondary to be consistent w/ models
+    default=None,
+    help="The name of the cloud account where containers are stored in.",
+)
+def containers(teamspace: Optional[str] = None, cloud_account: Optional[str] = None) -> None:
     """Display the list of available containers."""
     api = LitContainer()
     menu = _TeamspacesMenu()
+    clusters_menu = _ClustersMenu()
     resolved_teamspace = menu._resolve_teamspace(teamspace=teamspace)
-    result = api.list_containers(teamspace=resolved_teamspace.name, org=resolved_teamspace.owner.name)
+
+    if not cloud_account:
+        cloud_account_obj = clusters_menu._resolve_cluster(resolved_teamspace)
+        cloud_account = "" if cloud_account_obj.spec.cluster_type == V1ClusterType.GLOBAL else cloud_account_obj.id
+
+    result = api.list_containers(
+        teamspace=resolved_teamspace.name, org=resolved_teamspace.owner.name, cloud_account=cloud_account
+    )
+
+    if not result:
+        return
+
     table = Table(pad_edge=True, box=None)
     table.add_column("REPOSITORY")
-    table.add_column("IMAGE ID")
+    table.add_column("CLOUD ACCOUNT")
+    table.add_column("LATEST TAG")
     table.add_column("CREATED")
     for repo in result:
-        table.add_row(repo["REPOSITORY"], repo["IMAGE ID"], repo["CREATED"])
+        table.add_row(repo["REPOSITORY"], repo["CLOUD ACCOUNT"], repo["LATEST TAG"], repo["CREATED"])
     Console().print(table)
 
 

lightning_sdk/cli/serve.py

@@ -1,8 +1,13 @@
 import os
+import socket
 import subprocess
+import time
+import webbrowser
 from datetime import datetime
+from enum import Enum
 from pathlib import Path
-from typing import Optional, Union
+from typing import List, Optional, TypedDict, Union
+from urllib.parse import urlencode
 
 import click
 from rich.console import Console
@@ -10,11 +15,18 @@ from rich.progress import Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
 from rich.prompt import Confirm
 
 from lightning_sdk import Machine, Teamspace
+from lightning_sdk.api import UserApi
 from lightning_sdk.api.lit_container_api import LitContainerApi
 from lightning_sdk.cli.teamspace_menu import _TeamspacesMenu
-from lightning_sdk.serve import _LitServeDeployer, authenticate
+from lightning_sdk.lightning_cloud import env
+from lightning_sdk.lightning_cloud.login import Auth, AuthServer
+from lightning_sdk.lightning_cloud.openapi import V1CloudSpace
+from lightning_sdk.lightning_cloud.rest_client import LightningClient
+from lightning_sdk.serve import _LitServeDeployer
+from lightning_sdk.utils.resolve import _get_authed_user, _resolve_teamspace
 
 _MACHINE_VALUES = tuple([machine.name for machine in Machine.__dict__.values() if isinstance(machine, Machine)])
+_POLL_TIMEOUT = 600
 
 
 class _ServeGroup(click.Group):
@@ -26,22 +38,22 @@ class _ServeGroup(click.Group):
         return super().parse_args(ctx, args)
 
 
-@click.group("serve", cls=_ServeGroup)
-def serve() -> None:
-    """Serve a LitServe model.
+@click.group("deploy", cls=_ServeGroup)
+def deploy() -> None:
+    """Deploy a LitServe model.
 
     Example:
-        lightning serve server.py  # serve locally
+        lightning deploy server.py  # deploy to the cloud
 
     Example:
-        lightning serve server.py --cloud  # deploy to the cloud
+        lightning deploy server.py --local  # run locally
 
-    You can deploy the API to the cloud by running `lightning serve server.py --cloud`.
+    You can deploy the API to the cloud by running `lightning deploy server.py`.
     This will build a docker container for the server.py script and deploy it to the Lightning AI platform.
     """
 
 
-@serve.command("api")
+@deploy.command("api")
 @click.argument("script-path", type=click.Path(exists=True))
 @click.option(
     "--easy",
@@ -218,6 +230,176 @@ def api_impl(
         raise RuntimeError(error_msg) from None
 
 
+class _AuthServer(AuthServer):
+    def get_auth_url(self, port: int) -> str:
+        redirect_uri = f"http://localhost:{port}/login-complete"
+        params = urlencode({"redirectTo": redirect_uri, "inviteCode": "litserve"})
+        return f"{env.LIGHTNING_CLOUD_URL}/sign-in?{params}"
+
+
+class _Auth(Auth):
+    def __init__(self, shall_confirm: bool = False) -> None:
+        super().__init__()
+        self._shall_confirm = shall_confirm
+
+    def _run_server(self) -> None:
+        if self._shall_confirm:
+            proceed = Confirm.ask(
+                "Authenticating with Lightning AI. This will open a browser window. Continue?", default=True
+            )
+            if not proceed:
+                raise RuntimeError(
+                    "Login cancelled. Please login to Lightning AI to deploy the API."
+                    " Run `lightning login` to login."
+                ) from None
+        print("Opening browser for authentication...")
+        print("Please come back to the terminal after logging in.")
+        time.sleep(3)
+        _AuthServer().login_with_browser(self)
+
+
+def authenticate(shall_confirm: bool = True) -> None:
+    auth = _Auth(shall_confirm)
+    auth.authenticate()
+
+
+def select_teamspace(teamspace: Optional[str], org: Optional[str], user: Optional[str]) -> Teamspace:
+    if teamspace is None:
+        user = _get_authed_user()
+        menu = _TeamspacesMenu()
+        possible_teamspaces = menu._get_possible_teamspaces(user)
+        if len(possible_teamspaces) == 1:
+            name = next(iter(possible_teamspaces.values()))["name"]
+            return Teamspace(name=name, org=org, user=user)
+
+        return menu._resolve_teamspace(teamspace)
+
+    return _resolve_teamspace(teamspace=teamspace, org=org, user=user)
+
+
+class _UserStatus(TypedDict):
+    verified: bool
+    onboarded: bool
+
+
+def poll_verified_status(timeout: int = _POLL_TIMEOUT) -> _UserStatus:
+    """Polls the verified status of the user until it is True or a timeout occurs."""
+    user_api = UserApi()
+    user = _get_authed_user()
+    start_time = datetime.now()
+    result = {"onboarded": False, "verified": False}
+    while True:
+        user_resp = user_api.get_user(name=user.name)
+        result["onboarded"] = user_resp.status.completed_project_onboarding
+        result["verified"] = user_resp.status.verified
+        if user_resp.status.verified:
+            return result
+        if (datetime.now() - start_time).total_seconds() > timeout:
+            break
+        time.sleep(5)
+    return result
+
+
+class _OnboardingStatus(Enum):
+    NOT_VERIFIED = "not_verified"
+    ONBOARDING = "onboarding"
+    ONBOARDED = "onboarded"
+
+
+class _Onboarding:
+    def __init__(self, console: Console) -> None:
+        self.console = console
+        self.user = _get_authed_user()
+        self.user_api = UserApi()
+        self.client = LightningClient(max_tries=7)
+
+    @property
+    def verified(self) -> bool:
+        return self.user_api.get_user(name=self.user.name).status.verified
+
+    @property
+    def is_onboarded(self) -> bool:
+        return self.user_api.get_user(name=self.user.name).status.completed_project_onboarding
+
+    @property
+    def can_join_org(self) -> bool:
+        return len(self.client.organizations_service_list_joinable_organizations().joinable_organizations) > 0
+
+    @property
+    def status(self) -> _OnboardingStatus:
+        if not self.verified:
+            return _OnboardingStatus.NOT_VERIFIED
+        if self.is_onboarded:
+            return _OnboardingStatus.ONBOARDED
+        return _OnboardingStatus.ONBOARDING
+
+    def _wait(self, timeout: int = _POLL_TIMEOUT) -> None:
+        """Wait for user onboarding if they can join the teamspace otherwise move to select a teamspace."""
+        status = self.status
+        if status == _OnboardingStatus.ONBOARDED:
+            return
+
+        start_time = datetime.now()
+        while self.status != _OnboardingStatus.ONBOARDED:
+            time.sleep(5)
+            if self.is_onboarded:
+                return
+            if (datetime.now() - start_time).total_seconds() > timeout:
+                break
+
+        raise RuntimeError("Timed out waiting for onboarding status")
+
+    def get_cloudspace_id(self, teamspace: Teamspace) -> Optional[str]:
+        cloudspaces: List[V1CloudSpace] = self.client.cloud_space_service_list_cloud_spaces(teamspace.id).cloudspaces
+        for cloudspace in cloudspaces:
+            if "scratch-studio" in cloudspace.name or "scratch-studio" in cloudspace.display_name:
+                return cloudspace.id
+        return None
+
+    def select_teamspace(self, teamspace: Optional[str], org: Optional[str], user: Optional[str]) -> Teamspace:
+        """Select a teamspace while onboarding.
+
+        If user is being onboarded and can't join any org, the teamspace it will be resolved to the default
+         personal teamspace.
+        If user is being onboarded and can join an org then it will select default teamspace from the org.
+        """
+        if self.is_onboarded:
+            return select_teamspace(teamspace, org, user)
+
+        # Run only when user hasn't completed onboarding yet.
+        menu = _TeamspacesMenu()
+        possible_teamspaces = menu._get_possible_teamspaces(self.user)
+        can_join_org = self.can_join_org
+
+        if len(possible_teamspaces) == 1 and can_join_org:
+            # wait for onboarding to complete so that user can join an org
+            # create deployment in the org default teamspace
+            self.console.print("Waiting for account setup. Visit lightning.ai")
+            self._wait()
+
+        possible_teamspaces = menu._get_possible_teamspaces(self.user)
+        if len(possible_teamspaces) == 1:
+            # User didn't select any org
+            value = next(iter(possible_teamspaces.values()))
+            return Teamspace(name=value["name"], org=value["org"], user=value["user"])
+
+        for _, value in possible_teamspaces.items():
+            # User select an org
+            # Onboarding teamspace will be the default teamspace in the selected org
+            if value["org"]:
+                return Teamspace(name=value["name"], org=value["org"], user=value["user"])
+        raise RuntimeError("Unable to select teamspace. Visit lightning.ai")
+
+
+def is_connected(host: str = "8.8.8.8", port: int = 53, timeout: int = 10) -> bool:
+    try:
+        socket.setdefaulttimeout(timeout)
+        socket.create_connection((host, port))
+        return True
+    except OSError:
+        return False
+
+
 def _handle_cloud(
     script_path: Union[str, Path],
     console: Console,
@@ -236,22 +418,19 @@ def _handle_cloud(
     replicas: Optional[int] = 1,
     include_credentials: Optional[bool] = True,
 ) -> None:
+    if not is_connected():
+        console.print("❌ Internet connection required to deploy to the cloud.", style="red")
+        console.print("To run locally instead, use: `lightning serve [SCRIPT | server.py] --local`")
+        return
+
     deployment_name = os.path.basename(repository)
     tag = tag if tag else "latest"
 
     if non_interactive:
         console.print("[italic]non-interactive[/italic] mode enabled, skipping confirmation prompts", style="blue")
 
-    # Authenticate with LitServe affiliate
-    authenticate()
-    if teamspace is None:
-        menu = _TeamspacesMenu()
-        resolved_teamspace = menu._resolve_teamspace(teamspace)
-    else:
-        resolved_teamspace = Teamspace(name=teamspace, org=org, user=user)
-
     port = port or 8000
-    ls_deployer = _LitServeDeployer(name=deployment_name, teamspace=resolved_teamspace)
+    ls_deployer = _LitServeDeployer(name=deployment_name, teamspace=None)
     path = ls_deployer.dockerize_api(script_path, port=port, gpu=not machine.is_cpu(), tag=tag, print_success=False)
 
     console.print(f"\nPlease review the Dockerfile at [u]{path}[/u] and make sure it is correct.", style="bold")
@@ -260,10 +439,6 @@ def _handle_cloud(
         console.print("Please fix the Dockerfile and try again.", style="red")
         return
 
-    # list containers to create the project if it doesn't exist
-    lit_cr = LitContainerApi()
-    lit_cr.list_containers(resolved_teamspace.id, cloud_account=cloud_account)
-
     with Progress(
         SpinnerColumn(),
         TextColumn("[progress.description]{task.description}"),
@@ -280,8 +455,38 @@ def _handle_cloud(
             progress.update(build_task, description="[green]Build completed![/green]", completed=1.0)
             progress.remove_task(build_task)
 
-            # Push the container to the registry
-            console.print("\nPushing image to registry. It may take a while...", style="bold")
+        except Exception as e:
+            console.print(f"❌ Deployment failed: {e}", style="red")
+            return
+
+    # Push the container to the registry
+    console.print("\nPushing container to registry. It may take a while...", style="bold")
+    # Authenticate with LitServe affiliate
+    authenticate(shall_confirm=not non_interactive)
+    user_status = poll_verified_status()
+    cloudspace_id: Optional[str] = None
+    if not user_status["verified"]:
+        console.print("❌ Verify phone number to continue. Visit lightning.ai.", style="red")
+        return
+    if not user_status["onboarded"]:
+        onboarding = _Onboarding(console)
+        resolved_teamspace = onboarding.select_teamspace(teamspace, org, user)
+        cloudspace_id = onboarding.get_cloudspace_id(resolved_teamspace)
+    else:
+        resolved_teamspace = select_teamspace(teamspace, org, user)
+
+    # list containers to create the project if it doesn't exist
+    lit_cr = LitContainerApi()
+    lit_cr.list_containers(resolved_teamspace.id, cloud_account=cloud_account)
+
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+        TimeElapsedColumn(),
+        console=console,
+        transient=True,
+    ) as progress:
+        try:
             push_task = progress.add_task("Pushing to registry", total=None)
             push_status = {}
             for line in ls_deployer.push_container(
@@ -311,5 +516,8 @@ def _handle_cloud(
         max_replica=max_replica,
         replicas=replicas,
         include_credentials=include_credentials,
+        cloudspace_id=cloudspace_id,
     )
     console.print(f"🚀 Deployment started, access at [i]{deployment_status.get('url')}[/i]")
+    if user_status["onboarded"]:
+        webbrowser.open(deployment_status.get("url"))