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

lightning_sdk/__init__.py

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

lightning_sdk/api/llm_api.py

@@ -8,16 +8,25 @@ 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 get_org_models(self, org_id: str) -> List[str]:
+        result = self._client.assistants_service_list_assistants(org_id=org_id)
+        return result.assistants
+
+    def get_user_models(self, user_id: str) -> List[str]:
+        result = self._client.assistants_service_list_assistants(user_id=user_id)
+        return result.assistants
+
     def start_conversation(
-        self, prompt: str, system_prompt: Optional[str], assistant_id: str
+        self,
+        prompt: str,
+        system_prompt: Optional[str],
+        max_completion_tokens: Optional[int],
+        assistant_id: str,
+        conversation_id: Optional[str],
     ) -> V1ConversationResponseChunk:
         body = {
             "message": {
@@ -29,6 +38,9 @@ class LLMApi:
                     }
                 ],
             },
+            "max_completion_tokens": max_completion_tokens,
         }
+        if conversation_id:
+            body["conversation_id"] = conversation_id
         result = self._client.assistants_service_start_conversation(body, assistant_id)
         return result.result

lightning_sdk/api/studio_api.py

@@ -36,13 +36,16 @@ from lightning_sdk.lightning_cloud.openapi import (
     V1CloudSpaceInstanceConfig,
     V1CloudSpaceSeedFile,
     V1CloudSpaceState,
+    V1EndpointType,
     V1GetCloudSpaceInstanceStatusResponse,
     V1GetLongRunningCommandInCloudSpaceResponse,
     V1LoginRequest,
     V1Plugin,
     V1PluginsListResponse,
+    V1UpstreamCloudSpace,
     V1UserRequestedComputeConfig,
 )
+from lightning_sdk.lightning_cloud.openapi.models import ProjectIdEndpointsBody
 from lightning_sdk.lightning_cloud.rest_client import LightningClient
 from lightning_sdk.machine import Machine
 
@@ -668,6 +671,20 @@ class StudioApi:
             interruptible=interruptible,
         )
 
+    def start_new_port(self, teamspace_id: str, studio_id: str, name: str, port: int, auto_start: bool = False) -> str:
+        """Starts a new port to the given Studio."""
+        endpoint = self._client.endpoint_service_create_endpoint(
+            project_id=teamspace_id,
+            body=ProjectIdEndpointsBody(
+                name=name,
+                ports=[str(port)],
+                cloudspace=V1UpstreamCloudSpace(
+                    cloudspace_id=studio_id, port=str(port), type=V1EndpointType.PLUGIN_PORT, auto_start=auto_start
+                ),
+            ),
+        )
+        return endpoint.urls[0]
+
     def _create_app(
         self, studio_id: str, teamspace_id: str, cloud_account: str, plugin_type: str, **other_arguments: Any
     ) -> Externalv1LightningappInstance:

lightning_sdk/cli/entrypoint.py

@@ -14,7 +14,7 @@ from lightning_sdk.cli.configure import configure
 from lightning_sdk.cli.connect import connect
 from lightning_sdk.cli.create import create
 from lightning_sdk.cli.delete import delete
-from lightning_sdk.cli.docker import dockerize
+from lightning_sdk.cli.docker_cli import dockerize
 from lightning_sdk.cli.download import download
 from lightning_sdk.cli.generate import generate
 from lightning_sdk.cli.inspect import inspect

lightning_sdk/cli/serve.py

@@ -1,3 +1,4 @@
+import concurrent.futures
 import os
 import socket
 import subprocess
@@ -7,7 +8,7 @@ from datetime import datetime
 from enum import Enum
 from pathlib import Path
 from threading import Thread
-from typing import List, Optional, TypedDict, Union
+from typing import Dict, List, Optional, TypedDict, Union
 from urllib.parse import urlencode
 
 import click
@@ -20,12 +21,18 @@ 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.cli.upload import (
+    _dump_current_upload_state,
+    _resolve_previous_upload_state,
+    _start_parallel_upload,
+)
 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
+from lightning_sdk.studio import Studio
+from lightning_sdk.utils.resolve import _get_authed_user, _get_studio_url, _resolve_teamspace
 
 _MACHINE_VALUES = tuple([machine.name for machine in Machine.__dict__.values() if isinstance(machine, Machine)])
 _POLL_TIMEOUT = 600
@@ -86,7 +93,14 @@ def deploy() -> None:
     default="CPU",
     show_default=True,
     type=click.Choice(_MACHINE_VALUES),
-    help="The machine type to deploy the API on.",
+    help="Machine type to deploy the API on. Defaults to CPU.",
+)
+@click.option(
+    "--devbox",
+    default=None,
+    show_default=True,
+    type=click.Choice(_MACHINE_VALUES),
+    help="Machine type to build the API on. Setting this argument will open the server in a Studio.",
 )
 @click.option(
     "--interruptible",
@@ -134,7 +148,8 @@ def api(
     local: bool,
     name: Optional[str],
     non_interactive: bool,
-    machine: str,
+    machine: Optional[str],
+    devbox: Optional[str],
     interruptible: bool,
     teamspace: Optional[str],
     org: Optional[str],
@@ -151,9 +166,10 @@ def api(
         script_path=script_path,
         easy=easy,
         local=local,
-        repository=name,
+        name=name,
         non_interactive=non_interactive,
         machine=machine,
+        devbox=devbox,
         interruptible=interruptible,
         teamspace=teamspace,
         org=org,
@@ -171,10 +187,11 @@ def api_impl(
     script_path: Union[str, Path],
     easy: bool = False,
     local: bool = False,
-    repository: [str] = None,
+    name: Optional[str] = None,
     tag: Optional[str] = None,
     non_interactive: bool = False,
     machine: str = "CPU",
+    devbox: Optional[str] = None,
     interruptible: bool = False,
     teamspace: Optional[str] = None,
     org: Optional[str] = None,
@@ -196,41 +213,44 @@ def api_impl(
 
     _LitServeDeployer.generate_client() if easy else None
 
-    if not repository:
+    if not name:
         timestr = datetime.now().strftime("%b-%d-%H_%M")
-        repository = f"litserve-{timestr}".lower()
-
-    if not local:
-        repository = repository or "litserve-model"
-        machine = Machine.from_str(machine)
-        return _handle_cloud(
-            script_path,
-            console,
-            repository=repository,
-            tag=tag,
-            non_interactive=non_interactive,
-            machine=machine,
-            interruptible=interruptible,
-            teamspace=teamspace,
-            org=org,
-            user=user,
-            cloud_account=cloud_account,
-            port=port,
-            min_replica=min_replica,
-            max_replica=max_replica,
-            replicas=replicas,
-            include_credentials=include_credentials,
-        )
+        name = f"litserve-{timestr}".lower()
 
-    try:
-        subprocess.run(
-            ["python", str(script_path)],
-            check=True,
-            text=True,
-        )
-    except subprocess.CalledProcessError as e:
-        error_msg = f"Script execution failed with exit code {e.returncode}\nstdout: {e.stdout}\nstderr: {e.stderr}"
-        raise RuntimeError(error_msg) from None
+    if local:
+        try:
+            subprocess.run(
+                ["python", str(script_path)],
+                check=True,
+                text=True,
+            )
+            return None
+        except subprocess.CalledProcessError as e:
+            error_msg = f"Script execution failed with exit code {e.returncode}\nstdout: {e.stdout}\nstderr: {e.stderr}"
+            raise RuntimeError(error_msg) from None
+
+    if devbox:
+        return _handle_devbox(name, script_path, console, non_interactive, devbox, interruptible, teamspace, org, user)
+
+    machine = Machine.from_str(machine)
+    return _handle_cloud(
+        script_path,
+        console,
+        repository=name,
+        tag=tag,
+        non_interactive=non_interactive,
+        machine=machine,
+        interruptible=interruptible,
+        teamspace=teamspace,
+        org=org,
+        user=user,
+        cloud_account=cloud_account,
+        port=port,
+        min_replica=min_replica,
+        max_replica=max_replica,
+        replicas=replicas,
+        include_credentials=include_credentials,
+    )
 
 
 class _AuthServer(AuthServer):
@@ -433,6 +453,96 @@ def _upload_container(
     return True
 
 
+# TODO: Move the rest of the devbox logic here
+class _LitServeDevbox:
+    """Build LitServe API in a Studio."""
+
+    def resolve_previous_upload(self, studio: Studio, folder: str) -> Dict[str, str]:
+        remote_path = "."
+        pairs = {}
+        for root, _, files in os.walk(folder):
+            rel_root = os.path.relpath(root, folder)
+            for f in files:
+                pairs[os.path.join(root, f)] = os.path.join(remote_path, rel_root, f)
+        return _resolve_previous_upload_state(studio, remote_path, pairs)
+
+    def upload_folder(self, studio: Studio, folder: str, upload_state: Dict[str, str]) -> None:
+        with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
+            futures = _start_parallel_upload(executor, studio, upload_state)
+            total_files = len(upload_state)
+
+            with Progress(
+                SpinnerColumn(),
+                TextColumn("[progress.description]{task.description}"),
+                TimeElapsedColumn(),
+                console=Console(),
+                transient=True,
+            ) as progress:
+                upload_task = progress.add_task(f"[cyan]Uploading {total_files} files to Studio...", total=total_files)
+                for f in concurrent.futures.as_completed(futures):
+                    upload_state.pop(f.result())
+                    _dump_current_upload_state(studio, ".", upload_state)
+                    progress.update(upload_task, advance=1)
+
+
+def _handle_devbox(
+    name: str,
+    script_path: Path,
+    console: Console,
+    non_interactive: bool = False,
+    devbox: Machine = "CPU",
+    interruptible: bool = False,
+    teamspace: Optional[str] = None,
+    org: Optional[str] = None,
+    user: Optional[str] = None,
+) -> None:
+    if script_path.suffix != ".py":
+        console.print("❌ Error: Only Python files (.py) are supported for development servers", style="red")
+        return
+
+    resolved_teamspace = select_teamspace(teamspace, org, user)
+    studio = Studio(name=name, teamspace=resolved_teamspace)
+    lit_devbox = _LitServeDevbox()
+
+    studio_url = _get_studio_url(studio, turn_on=True)
+    pathlib_path = Path(script_path).resolve()
+    ok = False
+    studio_path = f"{studio.owner.name}/{studio.teamspace.name}/{studio.name}"
+
+    console.print("\n=== Lightning Studio Setup ===")
+    console.print(f"🔧 [bold]Setting up Studio:[/bold] {studio_path}")
+    console.print(f"📁 [bold]Local project:[/bold] {pathlib_path.parent}")
+
+    upload_state = lit_devbox.resolve_previous_upload(studio, pathlib_path.parent)
+    if non_interactive:
+        console.print(f"🌐 [bold]Opening Studio:[/bold] [link={studio_url}]{studio_url}[/link]")
+        ok = webbrowser.open(studio_url)
+    else:
+        if Confirm.ask("Would you like to open your Studio in the browser?", default=True):
+            console.print(f"🌐 [bold]Opening Studio:[/bold] [link={studio_url}]{studio_url}[/link]")
+            ok = webbrowser.open(studio_url)
+
+    if not ok:
+        console.print(f"🔗 [bold]Access Studio:[/bold] [link={studio_url}]{studio_url}[/link]")
+
+    console.print("\n⚡ Initializing Studio (this typically takes 1-2 minutes)...")
+    studio.start(machine=devbox, interruptible=interruptible)
+    studio.install_plugin("custom-port")
+    console.print("🔌 Configuring server port...")
+    studio.run_plugin("custom-port", port=8000)  # TODO: Remove hardcoded port and fetch from LitServe
+
+    console.print("📤 Syncing project files to Studio...")
+    lit_devbox.upload_folder(studio, pathlib_path.parent, upload_state)
+
+    # Add completion message with next steps
+    console.print("\n✅ Studio ready!")
+    console.print("\n📋 [bold]Next steps:[/bold]")
+    console.print("  [bold]1.[/bold] Server code will be available in the Studio")
+    console.print("  [bold]2.[/bold] The Studio is now running with the specified configuration")
+    console.print("  [bold]3.[/bold] Modify and run your server directly in the Studio")
+    # TODO: Once server running is implemented
+
+
 def _handle_cloud(
     script_path: Union[str, Path],
     console: Console,

lightning_sdk/deployment/deployment.py

@@ -283,7 +283,7 @@ class Deployment:
             health_check=health_check,
             release_strategy=release_strategy,
             quantity=quantity,
-            include_credentials=include_credentials if include_credentials is not None else True,
+            include_credentials=include_credentials,
         )
 
     def stop(self) -> None:
@@ -362,7 +362,7 @@ class Deployment:
         return None
 
     @property
-    def env(self) -> Optional[AutoScaleConfig]:
+    def env(self) -> Optional[List[Union[Secret, Env]]]:
         """The env configuration of the deployment."""
         if self._deployment:
             self._deployment = self._deployment_api.get_deployment_by_name(self._name, self._teamspace.id)

lightning_sdk/lightning_cloud/openapi/__init__.py

@@ -36,6 +36,7 @@ from lightning_sdk.lightning_cloud.openapi.api.deployment_templates_service_api
 from lightning_sdk.lightning_cloud.openapi.api.endpoint_service_api import EndpointServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.experiments_service_api import ExperimentsServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.file_system_service_api import FileSystemServiceApi
+from lightning_sdk.lightning_cloud.openapi.api.git_credentials_service_api import GitCredentialsServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.jobs_service_api import JobsServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.lightningapp_instance_service_api import LightningappInstanceServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.lightningapp_v2_service_api import LightningappV2ServiceApi
@@ -345,6 +346,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_create_cluster_request impo
 from lightning_sdk.lightning_cloud.openapi.models.v1_create_cluster_response import V1CreateClusterResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_create_deployment_request import V1CreateDeploymentRequest
 from lightning_sdk.lightning_cloud.openapi.models.v1_create_deployment_template_request import V1CreateDeploymentTemplateRequest
+from lightning_sdk.lightning_cloud.openapi.models.v1_create_git_credentials_request import V1CreateGitCredentialsRequest
 from lightning_sdk.lightning_cloud.openapi.models.v1_create_job_request import V1CreateJobRequest
 from lightning_sdk.lightning_cloud.openapi.models.v1_create_lit_dataset_multi_part_upload_response import V1CreateLitDatasetMultiPartUploadResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_create_lit_page_request import V1CreateLitPageRequest
@@ -391,6 +393,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_delete_deployment_release_r
 from lightning_sdk.lightning_cloud.openapi.models.v1_delete_deployment_response import V1DeleteDeploymentResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_delete_endpoint_response import V1DeleteEndpointResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_delete_file_endpoint_response import V1DeleteFileEndpointResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_delete_git_credentials_response import V1DeleteGitCredentialsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_delete_index_response import V1DeleteIndexResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_delete_job_response import V1DeleteJobResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_delete_lightning_run_response import V1DeleteLightningRunResponse
@@ -534,6 +537,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_get_user_notification_prefe
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_user_response import V1GetUserResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_user_storage_breakdown_response import V1GetUserStorageBreakdownResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_user_storage_response import V1GetUserStorageResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_git_credentials import V1GitCredentials
 from lightning_sdk.lightning_cloud.openapi.models.v1_google_cloud_direct_v1 import V1GoogleCloudDirectV1
 from lightning_sdk.lightning_cloud.openapi.models.v1_google_cloud_direct_v1_status import V1GoogleCloudDirectV1Status
 from lightning_sdk.lightning_cloud.openapi.models.v1_header import V1Header
@@ -625,6 +629,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_list_filesystem_slurm_jobs_
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_filesystem_snowflake_response import V1ListFilesystemSnowflakeResponse
 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_git_credentials_response import V1ListGitCredentialsResponse
 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
@@ -720,6 +725,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_multi_machine_job_fault_tol
 from lightning_sdk.lightning_cloud.openapi.models.v1_multi_machine_job_state import V1MultiMachineJobState
 from lightning_sdk.lightning_cloud.openapi.models.v1_multi_machine_job_status import V1MultiMachineJobStatus
 from lightning_sdk.lightning_cloud.openapi.models.v1_named_get_logger_metrics import V1NamedGetLoggerMetrics
+from lightning_sdk.lightning_cloud.openapi.models.v1_nebius_direct_v1 import V1NebiusDirectV1
 from lightning_sdk.lightning_cloud.openapi.models.v1_network_config import V1NetworkConfig
 from lightning_sdk.lightning_cloud.openapi.models.v1_new_feature import V1NewFeature
 from lightning_sdk.lightning_cloud.openapi.models.v1_notification_preference import V1NotificationPreference

lightning_sdk/lightning_cloud/openapi/api/__init__.py

@@ -17,6 +17,7 @@ from lightning_sdk.lightning_cloud.openapi.api.deployment_templates_service_api
 from lightning_sdk.lightning_cloud.openapi.api.endpoint_service_api import EndpointServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.experiments_service_api import ExperimentsServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.file_system_service_api import FileSystemServiceApi
+from lightning_sdk.lightning_cloud.openapi.api.git_credentials_service_api import GitCredentialsServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.jobs_service_api import JobsServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.lightningapp_instance_service_api import LightningappInstanceServiceApi
 from lightning_sdk.lightning_cloud.openapi.api.lightningapp_v2_service_api import LightningappV2ServiceApi