lightning-sdk 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

lightning_sdk/serve.py

@@ -2,7 +2,7 @@ import os
 import shlex
 import subprocess
 from pathlib import Path
-from typing import Generator, Optional
+from typing import Generator, List, Optional, Union
 from urllib.parse import urlencode
 
 import docker
@@ -10,7 +10,7 @@ from rich.console import Console
 from rich.progress import Progress
 
 from lightning_sdk import Deployment, Machine, Teamspace
-from lightning_sdk.api.deployment_api import AutoScaleConfig
+from lightning_sdk.api.deployment_api import AutoScaleConfig, DeploymentApi, Env, Secret
 from lightning_sdk.api.lit_container_api import LitContainerApi
 from lightning_sdk.api.utils import _get_cloud_url
 from lightning_sdk.lightning_cloud import env
@@ -35,16 +35,18 @@ class _Auth(Auth):
         _AuthServer().login_with_browser(self)
 
 
+def authenticate() -> None:
+    auth = _Auth()
+    auth.authenticate()
+
+
 class _LitServeDeployer:
-    def __init__(self) -> None:
+    def __init__(self, name: Optional[str], teamspace: Optional[Teamspace]) -> None:
+        self.name = name
+        self.teamspace = teamspace
         self._console = Console()
         self._client = None
 
-    @staticmethod
-    def authenticate() -> None:
-        auth = _Auth()
-        auth.authenticate()
-
     @property
     def client(self) -> docker.DockerClient:
         if self._client is None:
@@ -56,6 +58,10 @@ class _LitServeDeployer:
                 raise RuntimeError(_DOCKER_NOT_RUNNING_MSG) from None
         return self._client
 
+    @property
+    def created(self) -> bool:
+        return DeploymentApi().get_deployment_by_name(self.name, self.teamspace.id) is not None
+
     def dockerize_api(
         self,
         server_filename: str,
@@ -194,13 +200,19 @@ Update [underline]{os.path.abspath("Dockerfile")}[/underline] to add any additio
         progress.update(build_task, description="[green]Build completed![/green]")
 
     def push_container(
-        self, repository: str, tag: str, teamspace: Teamspace, lit_cr: LitContainerApi, progress: Progress
+        self,
+        repository: str,
+        tag: str,
+        teamspace: Teamspace,
+        lit_cr: LitContainerApi,
+        progress: Progress,
+        cloud_account: str,
     ) -> dict:
         console = self._console
         push_task = progress.add_task("Pushing to registry", total=None)
         console.print("\nPushing image...", style="bold blue")
         lit_cr.authenticate()
-        push_status = lit_cr.upload_container(repository, teamspace, tag=tag)
+        push_status = lit_cr.upload_container(repository, teamspace, tag=tag, cloud_account=cloud_account)
         last_status = {}
         for line in push_status:
             last_status = line
@@ -214,7 +226,38 @@ Update [underline]{os.path.abspath("Dockerfile")}[/underline] to add any additio
         progress.update(push_task, description="[green]Push completed![/green]")
         return last_status
 
-    def _run_on_cloud(
+    def _update_deployment(
+        self,
+        deployment: Deployment,
+        machine: Optional[Machine] = None,
+        image: Optional[str] = None,
+        entrypoint: Optional[str] = None,
+        command: Optional[str] = None,
+        env: Optional[List[Union[Env, Secret]]] = None,
+        min_replica: Optional[int] = 0,
+        max_replica: Optional[int] = 1,
+        spot: Optional[bool] = None,
+        replicas: Optional[int] = 1,
+        cloud_account: Optional[str] = None,
+        port: Optional[int] = 8000,
+        include_credentials: Optional[bool] = True,
+    ) -> None:
+        return deployment.update(
+            machine=machine,
+            image=image,
+            entrypoint=entrypoint,
+            command=command,
+            env=env,
+            max_replicas=max_replica,
+            min_replicas=min_replica,
+            replicas=replicas,
+            spot=spot,
+            cloud_account=cloud_account,
+            ports=[port],
+            include_credentials=include_credentials,
+        )
+
+    def run_on_cloud(
         self,
         deployment_name: str,
         teamspace: Teamspace,
@@ -229,16 +272,44 @@ Update [underline]{os.path.abspath("Dockerfile")}[/underline] to add any additio
         port: Optional[int] = 8000,
         include_credentials: Optional[bool] = True,
     ) -> dict:
+        """Run a deployment on the cloud. If the deployment already exists, it will be updated.
+
+        Args:
+            deployment_name: The name of the deployment.
+            teamspace: The teamspace to run the deployment on.
+            image: The image to run the deployment on.
+            metric: The metric to use for autoscaling. Defaults to None.
+            machine: The machine to run the deployment on. Defaults to None.
+            min_replica: The minimum number of replicas to run. Defaults to 0.
+            max_replica: The maximum number of replicas to run. Defaults to 1.
+            spot: Whether to run the deployment on spot instances. Defaults to None.
+            replicas: The number of replicas to run. Defaults to 1.
+            cloud_account: The cloud account to run the deployment on. Defaults to None.
+            port: The port to run the deployment on. Defaults to 8000.
+            include_credentials: Whether to include credentials in the deployment. Defaults to True.
+
+        Returns:
+            dict: The deployment and the URL of the deployment.
+        """
         url = f"{_get_cloud_url()}/{teamspace.owner.name}/{teamspace.name}/jobs/{deployment_name}"
         machine = machine or Machine.CPU
         metric = metric or ("CPU" if machine.is_cpu() else "GPU")
         deployment = Deployment(deployment_name, teamspace)
         if deployment.is_started:
-            raise RuntimeError(
-                f"Deployment with name {deployment_name} already running. "
-                "Please stop the deployment before starting a new one.\n"
-                f"You can access the deployment at {url}"
+            self._console.print(f"Deployment with name {deployment_name} already running. Updating the deployment.")
+            self._update_deployment(
+                deployment,
+                machine,
+                image,
+                min_replica=min_replica,
+                max_replica=max_replica,
+                spot=spot,
+                replicas=replicas,
+                cloud_account=cloud_account,
+                port=port,
+                include_credentials=include_credentials,
             )
+            return {"deployment": deployment, "url": url, "updated": True}
         autoscale = AutoScaleConfig(min_replicas=min_replica, max_replicas=max_replica, metric=metric, threshold=0.95)
         deployment.start(
             machine=machine,

lightning_sdk/teamspace.py

@@ -243,7 +243,7 @@ class Teamspace:
 
     def upload_model(
         self,
-        path: Union[str, Path],
+        path: Union[str, Path, List[Union[str, Path]]],
         name: str,
         cloud_account: Optional[str] = None,
         progress_bar: bool = True,
@@ -261,30 +261,33 @@ class Teamspace:
             raise ValueError("No path provided to upload")
         if not name:
             raise ValueError("No name provided for the model")
-        path = Path(path).resolve()
-        if not path.exists():
-            raise FileNotFoundError(str(path))
 
-        cloud_account = (
-            self._teamspace_api._determine_cloud_account(self.id) if cloud_account is None else cloud_account
-        )
-        filepaths = [path] if path.is_file() else [p for p in path.rglob("*") if p.is_file()]
+        if isinstance(path, (str, Path)):
+            path = [path]
+        file_paths, relative_paths = [], []
+        for p in path:
+            lpaths, rpaths = _list_files(p)
+            file_paths.extend(lpaths)
+            relative_paths.extend(rpaths)
 
-        if not filepaths:
+        if not file_paths:
             raise FileNotFoundError(
                 "The path to upload doesn't contain any files. Make sure it points to a file or"
                 f" non-empty folder: {path}"
             )
+        if len(relative_paths) != len(set(relative_paths)):
+            raise RuntimeError(
+                "The paths to upload contain files with the same name or relative path in folders."
+                f"The listed files are: {file_paths}\nThe relative paths are: {relative_paths}"
+            )
 
-        root_path = path
-        if len(filepaths) == 1:
-            root_path = path.parent
-
-        filenames = ",".join(str(f.relative_to(root_path)) for f in filepaths)
+        cloud_account = (
+            self._teamspace_api._determine_cloud_account(self.id) if cloud_account is None else cloud_account
+        )
 
         model = self._teamspace_api.create_model(
             name=name,
-            metadata={"filenames": filenames},
+            metadata={"filenames": ",".join(relative_paths)},
             private=True,
             teamspace_id=self.id,
             cloud_account=cloud_account,
@@ -292,9 +295,8 @@ class Teamspace:
         self._teamspace_api.upload_model_files(
             model_id=model.model_id,
             version=model.version,
-            root_path=root_path,
-            filepaths=filepaths,
-            cloud_account=cloud_account,
+            file_paths=file_paths,
+            remote_paths=relative_paths,
             teamspace_id=self.id,
             progress_bar=progress_bar,
         )
@@ -371,6 +373,18 @@ class Teamspace:
         self._teamspace_api.delete_model(name=name, version=version, teamspace_id=self.id)
 
 
+def _list_files(path: Union[str, Path]) -> Tuple[List[Path], List[str]]:
+    """List all folders in a directory and return them as a list and relative path."""
+    path = Path(path).resolve()
+    if not path.exists():
+        raise FileNotFoundError(f"Path {path} does not exist")
+    if not path.is_dir():
+        return [path], [str(path.name)]
+    local_paths = [p for p in path.rglob("*") if p.is_file()]
+    relative_paths = [str(p.relative_to(path)) for p in local_paths]
+    return local_paths, relative_paths
+
+
 def _resolve_valueerror_message(error: ValueError, owner: Owner, teamspace_name: str) -> ValueError:
     """Resolves the ValueError Message and replaces it with a nicer message."""
     message = error.args[0]

{lightning_sdk-0.2.5.dist-info → lightning_sdk-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightning_sdk
-Version: 0.2.5
+Version: 0.2.7
 Summary: SDK to develop using Lightning AI Studios
 Author-email: Lightning-AI <justus@lightning.ai>
 License: MIT License