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

lightning_sdk/__init__.py

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

lightning_sdk/api/deployment_api.py

@@ -224,6 +224,7 @@ class DeploymentApi:
     def create_deployment(
         self,
         deployment: V1Deployment,
+        from_onboarding: Optional[bool] = None,
     ) -> V1Deployment:
         return self._client.jobs_service_create_deployment(
             project_id=deployment.project_id,
@@ -236,6 +237,7 @@ class DeploymentApi:
                 replicas=deployment.replicas,
                 spec=deployment.spec,
                 strategy=deployment.strategy,
+                from_onboarding=from_onboarding,
             ),
         )
 
@@ -458,7 +460,7 @@ def to_autoscaling(
     if target_metrics is None and (threshold < 0 or threshold > 100):
         raise ValueError("The autoscaling threshold should be defined between 0 and 100.")
 
-    if target_metrics is not None and len(target_metrics) == 0:
+    if target_metrics is not None and len(target_metrics) == 0 and metric is None:
         raise ValueError("The target_metrics must be provided.")
 
     if target_metrics is not None:
@@ -522,8 +524,14 @@ def to_endpoint(
 def to_health_check(
     health_check: Optional[Union[HttpHealthCheck, ExecHealthCheck]] = None
 ) -> Optional[V1JobHealthCheckConfig]:
+    # Use Default health check if none is provided
     if not health_check:
-        return None
+        return V1JobHealthCheckConfig(
+            failure_threshold=600,
+            initial_delay_seconds=0,
+            interval_seconds=1,
+            timeout_seconds=600,
+        )
 
     health_check_config = V1JobHealthCheckConfig(
         failure_threshold=health_check.failure_threshold,
@@ -553,6 +561,7 @@ def to_spec(
     health_check: Optional[Union[HttpHealthCheck, ExecHealthCheck]] = None,
     quantity: Optional[int] = None,
     include_credentials: Optional[bool] = None,
+    cloudspace_id: Optional[None] = None,
 ) -> V1JobSpec:
     if cloud_account is None:
         raise ValueError("The cloud account should be defined.")
@@ -560,9 +569,15 @@ def to_spec(
     if machine is None:
         raise ValueError("The machine should be defined.")
 
-    if image is None:
+    if image is None and cloudspace_id is None:
         raise ValueError("The image should be defined.")
 
+    if entrypoint is not None and cloudspace_id is not None:
+        raise ValueError("The entrypoint shouldn't be defined when a Studio is provided.")
+
+    if command is None and cloudspace_id is not None:
+        raise ValueError("The command should be defined.")
+
     return V1JobSpec(
         cluster_id=cloud_account,
         command=command,
@@ -574,6 +589,7 @@ def to_spec(
         readiness_probe=to_health_check(health_check),
         quantity=quantity,
         include_credentials=include_credentials,
+        cloudspace_id=cloudspace_id,
     )
 
 
@@ -598,3 +614,21 @@ def apply_change(spec: Any, key: str, value: Any) -> bool:
         return True
 
     return False
+
+
+def compose_commands(commands: List[str]) -> str:
+    composite_command = []
+
+    for command in commands:
+        command = command.strip()
+
+        # Check if the command already has '&'
+        if command.endswith("&"):
+            # It's a background command, add it as a subshell without further adjustment
+            composite_command.append(f"( {command} )")
+        else:
+            # Sequential execution, add as-is and use `&&` to connect if followed by another command
+            composite_command.append(command)
+
+    # Joining commands, using `&&` between sequential parts and respecting subshell backgrounds
+    return " && ".join(composite_command)

lightning_sdk/api/lit_container_api.py

@@ -125,6 +125,17 @@ class LitContainerApi:
         except Exception as e:
             raise ValueError(f"Could not delete container {container} from project {project_id}: {e!s}") from e
 
+    def get_container_url(
+        self, repository: str, tag: str, teamspace: Teamspace, cloud_account: Optional[str] = None
+    ) -> str:
+        """Docker container will be pushed to the URL returned from this function."""
+        registry_url = _get_registry_url()
+        container_basename = repository.split("/")[-1]
+        return (
+            f"{registry_url}/lit-container{f'-{cloud_account}' if cloud_account is not None else ''}/"
+            f"{teamspace.owner.name}/{teamspace.name}/{container_basename}"
+        )
+
     @retry_on_lcr_auth_failure
     def upload_container(
         self,
@@ -147,7 +158,6 @@ 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:
@@ -163,18 +173,14 @@ class LitContainerApi:
             except Exception as e:
                 raise ValueError(f"Unable to upload {container}:{tag}") from e
 
-        registry_url = _get_registry_url()
-        container_basename = container.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}"
-        )
+        repository = self.get_container_url(container, tag, teamspace, cloud_account)
         tagged = self._docker_client.api.tag(f"{container}:{tag}", repository, tag)
         if not tagged:
             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:
+            container_basename = repository.split("/")[-1]
             yield {
                 "finish": True,
                 "url": f"{LIGHTNING_CLOUD_URL}/{teamspace.owner.name}/{teamspace.name}/containers/"

lightning_sdk/api/llm_api.py

@@ -0,0 +1,34 @@
+from typing import List, Optional
+
+from lightning_sdk.lightning_cloud.openapi.models.v1_conversation_response_chunk import V1ConversationResponseChunk
+from lightning_sdk.lightning_cloud.rest_client import LightningClient
+
+
+class LLMApi:
+    def __init__(self) -> None:
+        self._client = LightningClient(retry=False, max_tries=0)
+
+    def list_models(self) -> List[str]:
+        result = self._client.assistants_service_list_assistant_managed_endpoints()
+        return result.endpoints
+
+    def get_public_models(self) -> List[str]:
+        result = self._client.assistants_service_list_assistants(published=True)
+        return result.assistants
+
+    def start_conversation(
+        self, prompt: str, system_prompt: Optional[str], assistant_id: str
+    ) -> V1ConversationResponseChunk:
+        body = {
+            "message": {
+                "author": {"role": "user"},
+                "content": [
+                    {
+                        "contentType": "text",
+                        "parts": [prompt],
+                    }
+                ],
+            },
+        }
+        result = self._client.assistants_service_start_conversation(body, assistant_id)
+        return result.result

lightning_sdk/api/teamspace_api.py

@@ -17,6 +17,7 @@ from lightning_sdk.lightning_cloud.openapi import (
     V1ClusterAccelerator,
     V1Endpoint,
     V1Job,
+    V1Model,
     V1ModelVersionArchive,
     V1MultiMachineJob,
     V1Project,
@@ -199,9 +200,7 @@ class TeamspaceApi:
 
     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_api.models_store_list_models(project_id=teamspace_id, name=name).models
-        assert len(models) == 1, "Multiple models with the same name found"
-        model = models[0]
+        model = self.get_model(teamspace_id=teamspace_id, model_name=name)
         # decide if delete only version of whole model
         if version:
             if version == "default":
@@ -257,7 +256,7 @@ class TeamspaceApi:
             if main_pbar:
                 main_pbar.update(1)
 
-    def complete_model_upload(self, model_id: str, version: str, teamspace_id: str) -> None:
+    def _complete_model_upload(self, model_id: str, version: str, teamspace_id: str) -> None:
         self.models_api.models_store_complete_model_upload(
             body=_DummyBody(),
             project_id=teamspace_id,
@@ -306,3 +305,29 @@ class TeamspaceApi:
             project_id=teamspace_id, id=cloud_account
         )
         return response.accelerator
+
+    def get_model(self, teamspace_id: str, model_id: Optional[str] = None, model_name: Optional[str] = None) -> V1Model:
+        if model_id:
+            return self.models_api.models_store_get_model(project_id=teamspace_id, model_id=model_id)
+        if not model_name:
+            raise ValueError("Either `model_id` or `model_name` must be provided.")
+        # list models with specific name
+        models = self.models_api.models_store_list_models(project_id=teamspace_id, name=model_name).models
+        if len(models) == 0:
+            raise ValueError(f"Model '{model_name}' does not exist.")
+        if len(models) > 1:
+            raise RuntimeError(f"Model name '{model_name}' is not a unique with this teamspace.")
+        # if there is only one model with the name, return it
+        return models[0]
+
+    def list_models(self, teamspace_id: str) -> List[V1Model]:
+        response = self.models_api.models_store_list_models(project_id=teamspace_id)
+        return response.models
+
+    def list_model_versions(
+        self, teamspace_id: str, model_id: Optional[str] = None, model_name: Optional[str] = None
+    ) -> List[V1ModelVersionArchive]:
+        if model_name and not model_id:
+            model_id = self.get_model(teamspace_id=teamspace_id, model_name=model_name).id
+        response = self.models_api.models_store_list_model_versions(project_id=teamspace_id, model_id=model_id)
+        return response.versions

lightning_sdk/cli/serve.py

@@ -6,6 +6,7 @@ import webbrowser
 from datetime import datetime
 from enum import Enum
 from pathlib import Path
+from threading import Thread
 from typing import List, Optional, TypedDict, Union
 from urllib.parse import urlencode
 
@@ -17,6 +18,7 @@ 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.api.utils import _get_registry_url
 from lightning_sdk.cli.teamspace_menu import _TeamspacesMenu
 from lightning_sdk.lightning_cloud import env
 from lightning_sdk.lightning_cloud.login import Auth, AuthServer
@@ -27,6 +29,7 @@ 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
+LITSERVE_CODE = os.environ.get("LITSERVE_CODE", "j39bzk903h")
 
 
 class _ServeGroup(click.Group):
@@ -233,7 +236,7 @@ def api_impl(
 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"})
+        params = urlencode({"redirectTo": redirect_uri, "okbhrt": LITSERVE_CODE})
         return f"{env.LIGHTNING_CLOUD_URL}/sign-in?{params}"
 
 
@@ -333,12 +336,13 @@ class _Onboarding:
             return _OnboardingStatus.ONBOARDED
         return _OnboardingStatus.ONBOARDING
 
-    def _wait(self, timeout: int = _POLL_TIMEOUT) -> None:
+    def _wait_user_onboarding(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
 
+        self.console.print("Waiting for account setup. Visit lightning.ai")
         start_time = datetime.now()
         while self.status != _OnboardingStatus.ONBOARDED:
             time.sleep(5)
@@ -351,9 +355,13 @@ class _Onboarding:
 
     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
+        cloudspaces = sorted(cloudspaces, key=lambda cloudspace: cloudspace.created_at, reverse=True)
+        if len(cloudspaces) == 0:
+            raise RuntimeError("Error creating deployment! Finish account setup at lightning.ai first.")
+        # get the first cloudspace
+        cloudspace = cloudspaces[0]
+        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:
@@ -368,15 +376,8 @@ class _Onboarding:
 
         # 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()
-
+        self._wait_user_onboarding()
+        # Onboarding has been completed - user already selected organization if they could
         possible_teamspaces = menu._get_possible_teamspaces(self.user)
         if len(possible_teamspaces) == 1:
             # User didn't select any org
@@ -400,6 +401,38 @@ def is_connected(host: str = "8.8.8.8", port: int = 53, timeout: int = 10) -> bo
         return False
 
 
+def _upload_container(
+    console: Console,
+    ls_deployer: _LitServeDeployer,
+    repository: str,
+    tag: str,
+    resolved_teamspace: Teamspace,
+    lit_cr: LitContainerApi,
+    cloud_account: Optional[str],
+) -> bool:
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+        TimeElapsedColumn(),
+        console=console,
+        transient=True,
+    ) as progress:
+        try:
+            push_task = progress.add_task("Uploading container to Lightning registry", total=None)
+            for line in ls_deployer.push_container(
+                repository, tag, resolved_teamspace, lit_cr, cloud_account=cloud_account
+            ):
+                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 False
+    console.print(f"\n✅ Image pushed to {repository}:{tag}")
+    return True
+
+
 def _handle_cloud(
     script_path: Union[str, Path],
     console: Console,
@@ -465,13 +498,16 @@ def _handle_cloud(
     authenticate(shall_confirm=not non_interactive)
     user_status = poll_verified_status()
     cloudspace_id: Optional[str] = None
+    from_onboarding = False
     if not user_status["verified"]:
         console.print("❌ Verify phone number to continue. Visit lightning.ai.", style="red")
         return
     if not user_status["onboarded"]:
+        console.print("onboarding user")
         onboarding = _Onboarding(console)
         resolved_teamspace = onboarding.select_teamspace(teamspace, org, user)
         cloudspace_id = onboarding.get_cloudspace_id(resolved_teamspace)
+        from_onboarding = True
     else:
         resolved_teamspace = select_teamspace(teamspace, org, user)
 
@@ -479,29 +515,43 @@ def _handle_cloud(
     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(
-                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")
+    registry_url = _get_registry_url()
+    container_basename = repository.split("/")[-1]
+    image = (
+        f"{registry_url}/lit-container{f'-{cloud_account}' if cloud_account is not None else ''}/"
+        f"{resolved_teamspace.owner.name}/{resolved_teamspace.name}/{container_basename}"
+    )
+
+    if from_onboarding:
+        thread = Thread(
+            target=ls_deployer.run_on_cloud,
+            kwargs={
+                "deployment_name": deployment_name,
+                "image": image,
+                "teamspace": resolved_teamspace,
+                "metric": None,
+                "machine": machine,
+                "spot": interruptible,
+                "cloud_account": cloud_account,
+                "port": port,
+                "min_replica": min_replica,
+                "max_replica": max_replica,
+                "replicas": replicas,
+                "include_credentials": include_credentials,
+                "cloudspace_id": cloudspace_id,
+                "from_onboarding": from_onboarding,
+            },
+        )
+        thread.start()
+        console.print("🚀 Deployment started")
+        if not _upload_container(console, ls_deployer, repository, tag, resolved_teamspace, lit_cr, cloud_account):
+            thread.join()
             return
-    console.print(f"\n✅ Image pushed to {repository}:{tag}")
-    image = push_status.get("image")
+        thread.join()
+        return
+
+    if not _upload_container(console, ls_deployer, repository, tag, resolved_teamspace, lit_cr, cloud_account):
+        return
 
     deployment_status = ls_deployer.run_on_cloud(
         deployment_name=deployment_name,
@@ -517,6 +567,7 @@ def _handle_cloud(
         replicas=replicas,
         include_credentials=include_credentials,
         cloudspace_id=cloudspace_id,
+        from_onboarding=from_onboarding,
     )
     console.print(f"🚀 Deployment started, access at [i]{deployment_status.get('url')}[/i]")
     if user_status["onboarded"]:

lightning_sdk/deployment/deployment.py

@@ -1,4 +1,5 @@
 import os
+from datetime import datetime
 from typing import Any, Dict, List, Optional, Union
 
 import requests
@@ -15,6 +16,7 @@ from lightning_sdk.api.deployment_api import (
     ReleaseStrategy,
     Secret,
     TokenAuth,
+    compose_commands,
     restore_auth,
     restore_autoscale,
     restore_env,
@@ -30,6 +32,7 @@ from lightning_sdk.lightning_cloud.openapi import V1Deployment
 from lightning_sdk.machine import Machine
 from lightning_sdk.organization import Organization
 from lightning_sdk.services.utilities import _get_cluster
+from lightning_sdk.studio import Studio
 from lightning_sdk.teamspace import Teamspace
 from lightning_sdk.user import User
 from lightning_sdk.utils.resolve import _resolve_deprecated_cluster, _resolve_org, _resolve_teamspace, _resolve_user
@@ -55,7 +58,7 @@ class Deployment:
 
     def __init__(
         self,
-        name: str,
+        name: Optional[str] = None,
         teamspace: Optional[Union[str, Teamspace]] = None,
         org: Optional[Union[str, Organization]] = None,
         user: Optional[Union[str, User]] = None,
@@ -72,6 +75,9 @@ class Deployment:
         except ConnectionError as e:
             raise e
 
+        if name is None:
+            name = "dep_" + datetime.now().strftime("%m-%d_%H:%M:%S")
+
         self._name = name
         self._user = _resolve_user(self._user or user)
         self._org = _resolve_org(org)
@@ -102,13 +108,15 @@ class Deployment:
 
     def start(
         self,
+        studio: Optional[Union[str, Studio]] = None,
         machine: Optional[Machine] = None,
         image: Optional[str] = None,
         autoscale: Optional[AutoScaleConfig] = None,
-        ports: Optional[List[float]] = None,
+        ports: Optional[Union[float, List[float]]] = None,
         release_strategy: Optional[ReleaseStrategy] = None,
         entrypoint: Optional[str] = None,
         command: Optional[str] = None,
+        commands: Optional[List[str]] = None,
         env: Union[List[Union[Secret, Env]], Dict[str, str], None] = None,
         spot: Optional[bool] = None,
         replicas: Optional[int] = None,
@@ -120,6 +128,7 @@ class Deployment:
         cloudspace_id: Optional[str] = None,
         quantity: Optional[int] = None,
         include_credentials: Optional[bool] = None,
+        from_onboarding: Optional[bool] = None,
     ) -> None:
         """The Lightning AI Deployment.
 
@@ -146,6 +155,7 @@ class Deployment:
             cloudspace_id: Connect deployment to a Studio.
             quantity: The number of machines per replica to deploy.
             include_credentials: Whether to include the environment variables for the SDK to authenticate
+            from_onboarding: Whether the deployment is from onboarding.
 
         Note:
             Since a teamspace can either be owned by an org or by a user directly,
@@ -155,12 +165,45 @@ class Deployment:
         if self._is_created:
             raise RuntimeError("This deployment has already been started.")
 
-        cloud_account = _resolve_deprecated_cluster(cloud_account, cluster)
+        if isinstance(studio, Studio):
+            cloudspace_id = studio._studio.id
+            cloud_account = studio._studio.cluster_id
+
+        if isinstance(studio, str):
+            studio = Studio(studio)
+            cloudspace_id = studio._studio.id
+            cloud_account = studio._studio.cluster_id
+
+        if cloud_account is None:
+            cloud_account = _resolve_deprecated_cluster(cloud_account, cluster)
 
         if cloud_account is None and self._cloud_account is not None:
             print(f"No cloud account was provided, defaulting to {self._cloud_account.cluster_id}")
             cloud_account = os.getenv("LIGHTNING_CLUSTER_ID") or self._cloud_account.cluster_id
 
+        if isinstance(ports, float):
+            ports = [ports]
+
+        if replicas is None and autoscale is None:
+            replicas = 1
+
+        if machine is None:
+            machine = Machine.CPU
+
+        if commands is not None and command is not None:
+            raise ValueError("Commands and command are mutually exclusive")
+
+        if commands is not None:
+            command = compose_commands(commands)
+
+        if autoscale is None:
+            autoscale = AutoScaleConfig(
+                min_replicas=0,
+                max_replicas=1,
+                metric="CPU" if machine.is_cpu() else "GPU",
+                threshold=90,
+            )
+
         self._deployment = self._deployment_api.create_deployment(
             V1Deployment(
                 autoscaling=to_autoscaling(autoscale, replicas),
@@ -180,9 +223,11 @@ class Deployment:
                     health_check=health_check,
                     quantity=quantity,
                     include_credentials=include_credentials if include_credentials is not None else True,
+                    cloudspace_id=cloudspace_id,
                 ),
                 strategy=to_strategy(release_strategy),
-            )
+            ),
+            from_onboarding=from_onboarding,
         )
 
         # Overrides the name
@@ -196,6 +241,7 @@ class Deployment:
         image: Optional[str] = None,
         entrypoint: Optional[str] = None,
         command: Optional[str] = None,
+        commands: Optional[List[str]] = None,
         env: Optional[List[Union[Env, Secret]]] = None,
         spot: Optional[bool] = None,
         cloud_account: Optional[str] = None,
@@ -215,6 +261,9 @@ class Deployment:
     ) -> None:
         cloud_account = _resolve_deprecated_cluster(cloud_account, cluster)
 
+        if command is None and commands is not None:
+            command = compose_commands(commands)
+
         self._deployment = self._deployment_api.update_deployment(
             self._deployment,
             name=name or self._name,
@@ -225,8 +274,8 @@ class Deployment:
             cloud_account=cloud_account,
             machine=machine,
             image=image,
-            entrypoint=entrypoint,
-            command=command,
+            entrypoint=entrypoint or "",
+            command=command or "",
             ports=ports,
             custom_domain=custom_domain,
             auth=auth,

lightning_sdk/lightning_cloud/openapi/__init__.py

@@ -104,7 +104,6 @@ from lightning_sdk.lightning_cloud.openapi.models.datasets_id_body import Datase
 from lightning_sdk.lightning_cloud.openapi.models.deployments_id_body import DeploymentsIdBody
 from lightning_sdk.lightning_cloud.openapi.models.deploymenttemplates_id_body import DeploymenttemplatesIdBody
 from lightning_sdk.lightning_cloud.openapi.models.endpoints_id_body import EndpointsIdBody
-from lightning_sdk.lightning_cloud.openapi.models.environmenttemplates_id_body import EnvironmenttemplatesIdBody
 from lightning_sdk.lightning_cloud.openapi.models.experiment_name_variant_name_body import ExperimentNameVariantNameBody
 from lightning_sdk.lightning_cloud.openapi.models.externalv1_cloud_space_instance_status import Externalv1CloudSpaceInstanceStatus
 from lightning_sdk.lightning_cloud.openapi.models.externalv1_cluster import Externalv1Cluster
@@ -214,6 +213,7 @@ from lightning_sdk.lightning_cloud.openapi.models.stream_result_of_v1_conversati
 from lightning_sdk.lightning_cloud.openapi.models.stream_result_of_v1_get_long_running_command_in_cloud_space_response import StreamResultOfV1GetLongRunningCommandInCloudSpaceResponse
 from lightning_sdk.lightning_cloud.openapi.models.studioapp_jobs_body import StudioappJobsBody
 from lightning_sdk.lightning_cloud.openapi.models.update import Update
+from lightning_sdk.lightning_cloud.openapi.models.update1 import Update1
 from lightning_sdk.lightning_cloud.openapi.models.upload_id_complete_body import UploadIdCompleteBody
 from lightning_sdk.lightning_cloud.openapi.models.upload_id_complete_body1 import UploadIdCompleteBody1
 from lightning_sdk.lightning_cloud.openapi.models.upload_id_parts_body import UploadIdPartsBody
@@ -556,8 +556,10 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_job_health_check_config imp
 from lightning_sdk.lightning_cloud.openapi.models.v1_job_log_entry import V1JobLogEntry
 from lightning_sdk.lightning_cloud.openapi.models.v1_job_logs_page import V1JobLogsPage
 from lightning_sdk.lightning_cloud.openapi.models.v1_job_logs_response import V1JobLogsResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_job_resource import V1JobResource
 from lightning_sdk.lightning_cloud.openapi.models.v1_job_spec import V1JobSpec
 from lightning_sdk.lightning_cloud.openapi.models.v1_job_timing import V1JobTiming
+from lightning_sdk.lightning_cloud.openapi.models.v1_job_type import V1JobType
 from lightning_sdk.lightning_cloud.openapi.models.v1_joinable_organization import V1JoinableOrganization
 from lightning_sdk.lightning_cloud.openapi.models.v1_keep_alive_cloud_space_instance_response import V1KeepAliveCloudSpaceInstanceResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_knowledge_configuration import V1KnowledgeConfiguration
@@ -624,6 +626,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_list_filesystem_snowflake_r
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_gallery_components_response import V1ListGalleryComponentsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_gallery_lightningapps_response import V1ListGalleryLightningappsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_job_files_response import V1ListJobFilesResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_list_job_resources_response import V1ListJobResourcesResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_jobs_response import V1ListJobsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_joinable_organizations_response import V1ListJoinableOrganizationsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_lightning_run_response import V1ListLightningRunResponse
@@ -788,6 +791,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_report_restart_timings_resp
 from lightning_sdk.lightning_cloud.openapi.models.v1_request_cluster_access_request import V1RequestClusterAccessRequest
 from lightning_sdk.lightning_cloud.openapi.models.v1_request_cluster_access_response import V1RequestClusterAccessResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_request_verification_code_response import V1RequestVerificationCodeResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_reservation_billing_session import V1ReservationBillingSession
 from lightning_sdk.lightning_cloud.openapi.models.v1_reservation_details import V1ReservationDetails
 from lightning_sdk.lightning_cloud.openapi.models.v1_resource_tag import V1ResourceTag
 from lightning_sdk.lightning_cloud.openapi.models.v1_resource_visibility import V1ResourceVisibility