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

lightning_sdk/__init__.py

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

lightning_sdk/api/lit_container_api.py

@@ -7,7 +7,6 @@ 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
@@ -103,10 +102,11 @@ class LitContainerApi:
         """Lists containers of the project ID.
 
         :param project_id: The non-human readable project ID used internally to identify projects.
+        :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=cloud_account
+            project_id, cluster_id="" if cloud_account is None else cloud_account
         )  # cloud account on the CLI is cluster_id
         return project.repositories
 
@@ -138,7 +138,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: Generator[dict, None, None]
+        :return: Generator[dict, None, dict]
         """
         try:
             self._docker_client.images.get(f"{container}:{tag}")
@@ -164,13 +164,6 @@ class LitContainerApi:
             raise ValueError(f"Could not tag container {container}:{tag} with {repository}:{tag}")
         yield from self._push_with_retry(repository, tag=tag)
 
-        yield {
-            "finish": True,
-            "url": f"{LIGHTNING_CLOUD_URL}/{teamspace.owner.name}/{teamspace.name}/containers/{container_basename}"
-            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/cli/serve.py

@@ -17,17 +17,26 @@ from lightning_sdk.serve import _LitServeDeployer, authenticate
 _MACHINE_VALUES = tuple([machine.name for machine in Machine.__dict__.values() if isinstance(machine, Machine)])
 
 
-@click.group("serve")
+class _ServeGroup(click.Group):
+    def parse_args(self, ctx: click.Context, args: list) -> click.Group:
+        # Check if first arg is a file path and not a command name
+        if args and os.path.exists(args[0]) and args[0] not in self.commands:
+            # Insert the 'api' command before the file path
+            args.insert(0, "api")
+        return super().parse_args(ctx, args)
+
+
+@click.group("serve", cls=_ServeGroup)
 def serve() -> None:
     """Serve a LitServe model.
 
     Example:
-        lightning serve api server.py  # serve locally
+        lightning serve server.py  # serve locally
 
     Example:
-        lightning serve api server.py --cloud --name litserve-api  # deploy to the cloud
+        lightning serve server.py --cloud  # deploy to the cloud
 
-    You can deploy the API to the cloud by running `lightning serve api server.py --cloud`.
+    You can deploy the API to the cloud by running `lightning serve server.py --cloud`.
     This will build a docker container for the server.py script and deploy it to the Lightning AI platform.
     """
 
@@ -42,11 +51,11 @@ def serve() -> None:
     help="Generate a client for the model",
 )
 @click.option(
-    "--cloud",
+    "--local",
     is_flag=True,
     default=False,
     flag_value=True,
-    help="Deploy the model to the Lightning AI platform",
+    help="Run the model locally",
 )
 @click.option("--name", default=None, help="Name of the deployed API (e.g., 'classification-api', 'Llama-api')")
 @click.option(
@@ -107,7 +116,7 @@ def serve() -> None:
 def api(
     script_path: str,
     easy: bool,
-    cloud: bool,
+    local: bool,
     name: Optional[str],
     non_interactive: bool,
     machine: str,
@@ -126,7 +135,7 @@ def api(
     return api_impl(
         script_path=script_path,
         easy=easy,
-        cloud=cloud,
+        local=local,
         repository=name,
         non_interactive=non_interactive,
         machine=machine,
@@ -146,7 +155,7 @@ def api(
 def api_impl(
     script_path: Union[str, Path],
     easy: bool = False,
-    cloud: bool = False,
+    local: bool = False,
     repository: [str] = None,
     tag: Optional[str] = None,
     non_interactive: bool = False,
@@ -176,7 +185,7 @@ def api_impl(
         timestr = datetime.now().strftime("%b-%d-%H_%M")
         repository = f"litserve-{timestr}".lower()
 
-    if cloud:
+    if not local:
         repository = repository or "litserve-model"
         machine = Machine.from_str(machine)
         return _handle_cloud(
@@ -263,17 +272,31 @@ def _handle_cloud(
         transient=True,
     ) as progress:
         try:
-            # TODO: @aniketmaurya improve the console prints here
-            ls_deployer.build_container(path, repository, tag, console, progress)
-            push_status = ls_deployer.push_container(
-                repository, tag, resolved_teamspace, lit_cr, progress, cloud_account=cloud_account
-            )
+            # Build the container
+            build_task = progress.add_task("Building Docker image", total=None)
+            for line in ls_deployer.build_container(path, repository, tag):
+                console.print(line.strip())
+                progress.update(build_task, advance=1)
+            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")
+            push_task = progress.add_task("Pushing to registry", total=None)
+            push_status = {}
+            for line in ls_deployer.push_container(
+                repository, tag, resolved_teamspace, lit_cr, cloud_account=cloud_account
+            ):
+                push_status = line
+                progress.update(push_task, advance=1)
+                if not ("Pushing" in line["status"] or "Waiting" in line["status"]):
+                    console.print(line["status"])
+            progress.update(push_task, description="[green]Push completed![/green]")
         except Exception as e:
             console.print(f"❌ Deployment failed: {e}", style="red")
             return
     console.print(f"\n✅ Image pushed to {repository}:{tag}")
-    console.print(f"🔗 You can access the container at: [i]{push_status.get('url')}[/i]")
-    image = push_status.get("repository")
+    image = push_status.get("image")
 
     deployment_status = ls_deployer.run_on_cloud(
         deployment_name=deployment_name,

lightning_sdk/serve.py

@@ -7,13 +7,13 @@ from urllib.parse import urlencode
 
 import docker
 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, DeploymentApi, Env, Secret
 from lightning_sdk.api.lit_container_api import LitContainerApi
-from lightning_sdk.api.utils import _get_cloud_url
+from lightning_sdk.api.utils import _get_cloud_url, _get_registry_url
 from lightning_sdk.lightning_cloud import env
+from lightning_sdk.lightning_cloud.env import LIGHTNING_CLOUD_URL
 from lightning_sdk.lightning_cloud.login import Auth, AuthServer
 
 _DOCKER_NOT_RUNNING_MSG = (
@@ -182,22 +182,14 @@ Update [underline]{os.path.abspath("Dockerfile")}[/underline] to add any additio
 
         return log_generator()
 
-    def build_container(self, path: str, repository: str, tag: str, console: Console, progress: Progress) -> None:
-        build_task = progress.add_task("Building Docker image", total=None)
+    def build_container(self, path: str, repository: str, tag: str) -> Generator[str, None, None]:
         build_logs = self._docker_build_with_logs(path, repository, tag=tag)
 
         for line in build_logs:
             if "error" in line:
-                progress.stop()
-                console.print(f"\n[red]{line}[/red]")
                 raise RuntimeError(f"Failed to build image: {line}")
             else:
-                console.print(
-                    line.strip(),
-                )
-                progress.update(build_task, description="Building Docker image")
-
-        progress.update(build_task, description="[green]Build completed![/green]")
+                yield line.strip()
 
     def push_container(
         self,
@@ -205,26 +197,31 @@ Update [underline]{os.path.abspath("Dockerfile")}[/underline] to add any additio
         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")
+    ) -> Generator[dict, None, dict]:
         lit_cr.authenticate()
-        push_status = lit_cr.upload_container(repository, teamspace, tag=tag, cloud_account=cloud_account)
-        last_status = {}
+        push_status = lit_cr.upload_container(
+            repository, teamspace, tag=tag, cloud_account=cloud_account, platform=None
+        )
         for line in push_status:
-            last_status = line
             if "error" in line:
-                progress.stop()
-                console.print(f"\n[red]{line}[/red]")
                 raise RuntimeError(f"Failed to push image: {line}")
             if "status" in line:
-                console.print(line["status"].strip())
-                progress.update(push_task, description="Pushing to registry")
-        progress.update(push_task, description="[green]Push completed![/green]")
-        return last_status
+                yield {"status": line["status"].strip()}
+
+        registry_url = _get_registry_url()
+        container_basename = repository.split("/")[-1]
+        repository = (
+            f"{registry_url}/lit-container{f'-{cloud_account}' if cloud_account is not None else ''}/"
+            f"{teamspace.owner.name}/{teamspace.name}/{container_basename}"
+        )
+        yield {
+            "finish": True,
+            "status": "Container pushed successfully",
+            "url": f"{LIGHTNING_CLOUD_URL}/{teamspace.owner.name}/{teamspace.name}/containers/{container_basename}"
+            f"{f'?clusterId={cloud_account}' if cloud_account is not None else ''}",
+            "image": repository,
+        }
 
     def _update_deployment(
         self,

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

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

{lightning_sdk-0.2.7.dist-info → lightning_sdk-0.2.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 docs/source/conf.py,sha256=r8yX20eC-4mHhMTd0SbQb5TlSWHhO6wnJ0VJ_FBFpag,13249
-lightning_sdk/__init__.py,sha256=2YlLVkcc_oSxRiBA9ZX7-ItwTff8JwvMihcSY8xDC-Q,1104
+lightning_sdk/__init__.py,sha256=pERZUbSd9UKX5PCO6GMnFKZFWbSw_05kILfckZAZGxo,1104
 lightning_sdk/agents.py,sha256=ly6Ma1j0ZgGPFyvPvMN28JWiB9dATIstFa5XM8pMi6I,1577
 lightning_sdk/ai_hub.py,sha256=iI1vNhgcz_Ff1c3rN1ogN7dK-r-HXRj6NMtS2cA14UA,6925
 lightning_sdk/constants.py,sha256=ztl1PTUBULnqTf3DyKUSJaV_O20hNtUYT6XvAYIrmIk,749
@@ -10,7 +10,7 @@ lightning_sdk/models.py,sha256=5DCfv2M0b8iYKj8tAMIX7gIUXrk2CgALANX14N5OFgo,6255
 lightning_sdk/organization.py,sha256=WCfzdgjtvY1_A07DnxOpp74V2JR2gQwtXbIEcFDnoVU,1232
 lightning_sdk/owner.py,sha256=t5svD2it4C9pbSpVuG9WJL46CYi37JXNziwnXxhiU5U,1361
 lightning_sdk/plugin.py,sha256=_K0m-PSyXE86B-SFQVQm0JEvfdIVXeARmnlATCAiMdo,14632
-lightning_sdk/serve.py,sha256=F2vBWXG4HOoTO3-sEzrghvJ7vWSFNoNpcdTPtv5Ljs4,12287
+lightning_sdk/serve.py,sha256=yuBPy4w8n2Es7O2dlQStUZ-HcI8H12pB16ZY8SFe4WA,12139
 lightning_sdk/status.py,sha256=lLGAuSvXBoXQFEEsEYwdCi0RcSNatUn5OPjJVjDtoM0,386
 lightning_sdk/studio.py,sha256=hyvAiVhkETAtbu0RRF1Aw6F8Y__E1SSAmsB8PHfmqHo,19935
 lightning_sdk/teamspace.py,sha256=EqMDDXtePCDD3JZHzx_qx7xn2tSxtH-LqwSc1JtIwEM,15073
@@ -20,7 +20,7 @@ lightning_sdk/api/agents_api.py,sha256=G47TbFo9kYqnBMqdw2RW-lfS1VAUBSXDmzs6fpIEM
 lightning_sdk/api/ai_hub_api.py,sha256=azqDZ-PzasVAcoQHno7k7OO_xFOHQ4NDozxF8jEh83Y,7864
 lightning_sdk/api/deployment_api.py,sha256=z_D7ZZAnsVe3Q_ZVx1azcLK2_pP5xj63tmU97qhgyOw,22583
 lightning_sdk/api/job_api.py,sha256=_mMAI_BG_48i-BLwCP_U72zgmM5zYa2KUZ7u66HWkIc,13568
-lightning_sdk/api/lit_container_api.py,sha256=lI66uqzVYuyCAQ1d9yCir67ir7t6fUKA7O_ML-Vj94A,10730
+lightning_sdk/api/lit_container_api.py,sha256=m8X2uiM6Ze6qxuoAkfMgZEUNUyc93m8SnO0xDWt3O9E,10509
 lightning_sdk/api/mmt_api.py,sha256=-v7ATab-ThAM-HRClS92Ehxuu9MlBfdKWWFCGvVUHiM,8962
 lightning_sdk/api/org_api.py,sha256=Ze3z_ATVrukobujV5YdC42DKj45Vuwl7X52q_Vr-o3U,803
 lightning_sdk/api/pipeline_api.py,sha256=P5P9C6qOpyBGU0t5N68h1LuFAsAKmPPgkac6uObrYKw,1676
@@ -47,7 +47,7 @@ lightning_sdk/cli/list.py,sha256=dAZ94QPvE4IkH6GfL7171TMrMfcuWB53cvW6wk2eL4w,101
 lightning_sdk/cli/mmts_menu.py,sha256=HUXo3ZoZ3fWOCNWTQWoJgUlFXYq5uVm_6uFjAq7BDe8,2219
 lightning_sdk/cli/open.py,sha256=sgMLWBnkXdIq8H9XK_rph2bye3b07AKTJBQIk9fCGVc,1937
 lightning_sdk/cli/run.py,sha256=8JZiDrKwDhlaTOJd6qq2mCWJRqKm6shCWLzpbmFYIkE,13929
-lightning_sdk/cli/serve.py,sha256=BC8JsaN0QVmPT_W4x1QC93Yyur9w5czAJCcIt2UJx5Q,9654
+lightning_sdk/cli/serve.py,sha256=kpegDpQVfBccXPR7Zhs0IG8A1CMx9ch17NFmcNLPk1s,10750
 lightning_sdk/cli/start.py,sha256=jUk52lkEFC_fqiEPkwM8GwE68WMNEtzBuzjkvr3POd0,1840
 lightning_sdk/cli/stop.py,sha256=5nCrUe1BONpX1nKNhbSFqLaXXKaRhSO7PvM1BVYLgn4,2864
 lightning_sdk/cli/studios_menu.py,sha256=TA9rO6_fFHGMz0Nt4rJ6iV80X5pZE4xShrSiyXoU-oQ,4129
@@ -992,9 +992,9 @@ lightning_sdk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 lightning_sdk/utils/dynamic.py,sha256=glUTO1JC9APtQ6Gr9SO02a3zr56-sPAXM5C3NrTpgyQ,1959
 lightning_sdk/utils/enum.py,sha256=h2JRzqoBcSlUdanFHmkj_j5DleBHAu1esQYUsdNI-hU,4106
 lightning_sdk/utils/resolve.py,sha256=uYAMAZ-emtFnjdg_sXbKRo3VTe5YWx7WEgCpNlHhHG8,6462
-lightning_sdk-0.2.7.dist-info/LICENSE,sha256=uFIuZwj5z-4TeF2UuacPZ1o17HkvKObT8fY50qN84sg,1064
-lightning_sdk-0.2.7.dist-info/METADATA,sha256=AfTdQ9ctYrQ5bNUh-yjMOxIwyHZZbLwizcAnqldNS6E,3991
-lightning_sdk-0.2.7.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-lightning_sdk-0.2.7.dist-info/entry_points.txt,sha256=msB9PJWIJ784dX-OP8by51d4IbKYH3Fj1vCuA9oXjHY,68
-lightning_sdk-0.2.7.dist-info/top_level.txt,sha256=ps8doKILFXmN7F1mHncShmnQoTxKBRPIcchC8TpoBw4,19
-lightning_sdk-0.2.7.dist-info/RECORD,,
+lightning_sdk-0.2.8.dist-info/LICENSE,sha256=uFIuZwj5z-4TeF2UuacPZ1o17HkvKObT8fY50qN84sg,1064
+lightning_sdk-0.2.8.dist-info/METADATA,sha256=8arXcOw6kN0kchU9glNKNiLzAe0vuUrdjIPdl90C52k,3991
+lightning_sdk-0.2.8.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+lightning_sdk-0.2.8.dist-info/entry_points.txt,sha256=msB9PJWIJ784dX-OP8by51d4IbKYH3Fj1vCuA9oXjHY,68
+lightning_sdk-0.2.8.dist-info/top_level.txt,sha256=ps8doKILFXmN7F1mHncShmnQoTxKBRPIcchC8TpoBw4,19
+lightning_sdk-0.2.8.dist-info/RECORD,,