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

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,
@@ -157,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),
@@ -182,6 +223,7 @@ 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),
             ),
@@ -199,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,
@@ -218,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,
@@ -228,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,
@@ -237,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:
@@ -316,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
@@ -104,7 +105,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 +214,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
@@ -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
@@ -556,8 +560,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
@@ -623,7 +629,9 @@ 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
 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
@@ -717,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
@@ -788,6 +797,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

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

lightning_sdk/lightning_cloud/openapi/api/cloud_space_environment_template_service_api.py

@@ -431,7 +431,7 @@ class CloudSpaceEnvironmentTemplateServiceApi(object):
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def cloud_space_environment_template_service_update_cloud_space_environment_template(self, body: 'EnvironmenttemplatesIdBody', id: 'str', **kwargs) -> 'V1CloudSpaceEnvironmentTemplate':  # noqa: E501
+    def cloud_space_environment_template_service_update_cloud_space_environment_template(self, body: 'Update', id: 'str', **kwargs) -> 'V1CloudSpaceEnvironmentTemplate':  # noqa: E501
         """cloud_space_environment_template_service_update_cloud_space_environment_template  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
@@ -440,7 +440,7 @@ class CloudSpaceEnvironmentTemplateServiceApi(object):
         >>> result = thread.get()
 
         :param async_req bool
-        :param EnvironmenttemplatesIdBody body: (required)
+        :param Update body: (required)
         :param str id: (required)
         :return: V1CloudSpaceEnvironmentTemplate
                  If the method is called asynchronously,
@@ -453,7 +453,7 @@ class CloudSpaceEnvironmentTemplateServiceApi(object):
             (data) = self.cloud_space_environment_template_service_update_cloud_space_environment_template_with_http_info(body, id, **kwargs)  # noqa: E501
             return data
 
-    def cloud_space_environment_template_service_update_cloud_space_environment_template_with_http_info(self, body: 'EnvironmenttemplatesIdBody', id: 'str', **kwargs) -> 'V1CloudSpaceEnvironmentTemplate':  # noqa: E501
+    def cloud_space_environment_template_service_update_cloud_space_environment_template_with_http_info(self, body: 'Update', id: 'str', **kwargs) -> 'V1CloudSpaceEnvironmentTemplate':  # noqa: E501
         """cloud_space_environment_template_service_update_cloud_space_environment_template  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
@@ -462,7 +462,7 @@ class CloudSpaceEnvironmentTemplateServiceApi(object):
         >>> result = thread.get()
 
         :param async_req bool
-        :param EnvironmenttemplatesIdBody body: (required)
+        :param Update body: (required)
         :param str id: (required)
         :return: V1CloudSpaceEnvironmentTemplate
                  If the method is called asynchronously,

lightning_sdk/lightning_cloud/openapi/api/cluster_service_api.py

@@ -2328,6 +2328,9 @@ class ClusterServiceApi(object):
         :param async_req bool
         :param str project_id: (required)
         :param str cluster_id: (required)
+        :param datetime start_time:
+        :param datetime end_time:
+        :param bool available_only:
         :return: V1ListClusterCapacityReservationsResponse
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2350,12 +2353,15 @@ class ClusterServiceApi(object):
         :param async_req bool
         :param str project_id: (required)
         :param str cluster_id: (required)
+        :param datetime start_time:
+        :param datetime end_time:
+        :param bool available_only:
         :return: V1ListClusterCapacityReservationsResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['project_id', 'cluster_id']  # noqa: E501
+        all_params = ['project_id', 'cluster_id', 'start_time', 'end_time', 'available_only']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -2388,6 +2394,12 @@ class ClusterServiceApi(object):
             path_params['clusterId'] = params['cluster_id']  # noqa: E501
 
         query_params = []
+        if 'start_time' in params:
+            query_params.append(('startTime', params['start_time']))  # noqa: E501
+        if 'end_time' in params:
+            query_params.append(('endTime', params['end_time']))  # noqa: E501
+        if 'available_only' in params:
+            query_params.append(('availableOnly', params['available_only']))  # noqa: E501
 
         header_params = {}
 

lightning_sdk/lightning_cloud/openapi/api/data_connection_service_api.py

@@ -1025,7 +1025,7 @@ class DataConnectionServiceApi(object):
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def data_connection_service_update_data_connection(self, body: 'Update', project_id: 'str', id: 'str', **kwargs) -> 'V1DataConnection':  # noqa: E501
+    def data_connection_service_update_data_connection(self, body: 'Update1', project_id: 'str', id: 'str', **kwargs) -> 'V1DataConnection':  # noqa: E501
         """data_connection_service_update_data_connection  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
@@ -1034,7 +1034,7 @@ class DataConnectionServiceApi(object):
         >>> result = thread.get()
 
         :param async_req bool
-        :param Update body: (required)
+        :param Update1 body: (required)
         :param str project_id: (required)
         :param str id: (required)
         :return: V1DataConnection
@@ -1048,7 +1048,7 @@ class DataConnectionServiceApi(object):
             (data) = self.data_connection_service_update_data_connection_with_http_info(body, project_id, id, **kwargs)  # noqa: E501
             return data
 
-    def data_connection_service_update_data_connection_with_http_info(self, body: 'Update', project_id: 'str', id: 'str', **kwargs) -> 'V1DataConnection':  # noqa: E501
+    def data_connection_service_update_data_connection_with_http_info(self, body: 'Update1', project_id: 'str', id: 'str', **kwargs) -> 'V1DataConnection':  # noqa: E501
         """data_connection_service_update_data_connection  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
@@ -1057,7 +1057,7 @@ class DataConnectionServiceApi(object):
         >>> result = thread.get()
 
         :param async_req bool
-        :param Update body: (required)
+        :param Update1 body: (required)
         :param str project_id: (required)
         :param str id: (required)
         :return: V1DataConnection