lightning-sdk 0.1.55__py3-none-any.whl → 0.1.56__py3-none-any.whl

lightning_sdk/lightning_cloud/openapi/models/v1_report_restart_timings_response.py

@@ -0,0 +1,97 @@
+# coding: utf-8
+
+"""
+    external/v1/auth_service.proto
+
+    No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)  # noqa: E501
+
+    OpenAPI spec version: version not set
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+    NOTE
+    ----
+    standard swagger-codegen-cli for this python client has been modified
+    by custom templates. The purpose of these templates is to include
+    typing information in the API and Model code. Please refer to the
+    main grid repository for more info
+"""
+
+import pprint
+import re  # noqa: F401
+
+from typing import TYPE_CHECKING
+
+import six
+
+if TYPE_CHECKING:
+    from datetime import datetime
+    from lightning_sdk.lightning_cloud.openapi.models import *
+
+class V1ReportRestartTimingsResponse(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self):  # noqa: E501
+        """V1ReportRestartTimingsResponse - a model defined in Swagger"""  # noqa: E501
+        self.discriminator = None
+
+    def to_dict(self) -> dict:
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(V1ReportRestartTimingsResponse, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self) -> str:
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other: 'V1ReportRestartTimingsResponse') -> bool:
+        """Returns true if both objects are equal"""
+        if not isinstance(other, V1ReportRestartTimingsResponse):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other: 'V1ReportRestartTimingsResponse') -> bool:
+        """Returns true if both objects are not equal"""
+        return not self == other

lightning_sdk/lightning_cloud/openapi/models/v1_restart_timing.py

@@ -0,0 +1,175 @@
+# coding: utf-8
+
+"""
+    external/v1/auth_service.proto
+
+    No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)  # noqa: E501
+
+    OpenAPI spec version: version not set
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+    NOTE
+    ----
+    standard swagger-codegen-cli for this python client has been modified
+    by custom templates. The purpose of these templates is to include
+    typing information in the API and Model code. Please refer to the
+    main grid repository for more info
+"""
+
+import pprint
+import re  # noqa: F401
+
+from typing import TYPE_CHECKING
+
+import six
+
+if TYPE_CHECKING:
+    from datetime import datetime
+    from lightning_sdk.lightning_cloud.openapi.models import *
+
+class V1RestartTiming(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'counter': 'int',
+        'end': 'datetime',
+        'start': 'datetime'
+    }
+
+    attribute_map = {
+        'counter': 'counter',
+        'end': 'end',
+        'start': 'start'
+    }
+
+    def __init__(self, counter: 'int' =None, end: 'datetime' =None, start: 'datetime' =None):  # noqa: E501
+        """V1RestartTiming - a model defined in Swagger"""  # noqa: E501
+        self._counter = None
+        self._end = None
+        self._start = None
+        self.discriminator = None
+        if counter is not None:
+            self.counter = counter
+        if end is not None:
+            self.end = end
+        if start is not None:
+            self.start = start
+
+    @property
+    def counter(self) -> 'int':
+        """Gets the counter of this V1RestartTiming.  # noqa: E501
+
+
+        :return: The counter of this V1RestartTiming.  # noqa: E501
+        :rtype: int
+        """
+        return self._counter
+
+    @counter.setter
+    def counter(self, counter: 'int'):
+        """Sets the counter of this V1RestartTiming.
+
+
+        :param counter: The counter of this V1RestartTiming.  # noqa: E501
+        :type: int
+        """
+
+        self._counter = counter
+
+    @property
+    def end(self) -> 'datetime':
+        """Gets the end of this V1RestartTiming.  # noqa: E501
+
+
+        :return: The end of this V1RestartTiming.  # noqa: E501
+        :rtype: datetime
+        """
+        return self._end
+
+    @end.setter
+    def end(self, end: 'datetime'):
+        """Sets the end of this V1RestartTiming.
+
+
+        :param end: The end of this V1RestartTiming.  # noqa: E501
+        :type: datetime
+        """
+
+        self._end = end
+
+    @property
+    def start(self) -> 'datetime':
+        """Gets the start of this V1RestartTiming.  # noqa: E501
+
+
+        :return: The start of this V1RestartTiming.  # noqa: E501
+        :rtype: datetime
+        """
+        return self._start
+
+    @start.setter
+    def start(self, start: 'datetime'):
+        """Sets the start of this V1RestartTiming.
+
+
+        :param start: The start of this V1RestartTiming.  # noqa: E501
+        :type: datetime
+        """
+
+        self._start = start
+
+    def to_dict(self) -> dict:
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(V1RestartTiming, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self) -> str:
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other: 'V1RestartTiming') -> bool:
+        """Returns true if both objects are equal"""
+        if not isinstance(other, V1RestartTiming):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other: 'V1RestartTiming') -> bool:
+        """Returns true if both objects are not equal"""
+        return not self == other

lightning_sdk/lightning_cloud/openapi/models/v1_validate_deployment_image_request.py

@@ -42,21 +42,26 @@ class V1ValidateDeploymentImageRequest(object):
     """
     swagger_types = {
         'image': 'str',
+        'project_id': 'str',
         'secret': 'str'
     }
 
     attribute_map = {
         'image': 'image',
+        'project_id': 'projectId',
         'secret': 'secret'
     }
 
-    def __init__(self, image: 'str' =None, secret: 'str' =None):  # noqa: E501
+    def __init__(self, image: 'str' =None, project_id: 'str' =None, secret: 'str' =None):  # noqa: E501
         """V1ValidateDeploymentImageRequest - a model defined in Swagger"""  # noqa: E501
         self._image = None
+        self._project_id = None
         self._secret = None
         self.discriminator = None
         if image is not None:
             self.image = image
+        if project_id is not None:
+            self.project_id = project_id
         if secret is not None:
             self.secret = secret
 
@@ -81,6 +86,27 @@ class V1ValidateDeploymentImageRequest(object):
 
         self._image = image
 
+    @property
+    def project_id(self) -> 'str':
+        """Gets the project_id of this V1ValidateDeploymentImageRequest.  # noqa: E501
+
+
+        :return: The project_id of this V1ValidateDeploymentImageRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._project_id
+
+    @project_id.setter
+    def project_id(self, project_id: 'str'):
+        """Sets the project_id of this V1ValidateDeploymentImageRequest.
+
+
+        :param project_id: The project_id of this V1ValidateDeploymentImageRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._project_id = project_id
+
     @property
     def secret(self) -> 'str':
         """Gets the secret of this V1ValidateDeploymentImageRequest.  # noqa: E501

lightning_sdk/machine.py

@@ -1,32 +1,64 @@
-from lightning_sdk.utils.enum import DeprecationEnum
+from dataclasses import dataclass
+from typing import ClassVar, Optional
 
 
-class Machine(DeprecationEnum):
-    """Enum holding all supported machine types for studios."""
+@dataclass(frozen=True)
+class Machine:
+    # Default Machines
+    CPU_SMALL: ClassVar["Machine"]
+    CPU: ClassVar["Machine"]
+    DATA_PREP: ClassVar["Machine"]
+    DATA_PREP_MAX: ClassVar["Machine"]
+    DATA_PREP_ULTRA: ClassVar["Machine"]
+    T4: ClassVar["Machine"]
+    T4_X_4: ClassVar["Machine"]
+    L4: ClassVar["Machine"]
+    L4_X_4: ClassVar["Machine"]
+    L4_X_8: ClassVar["Machine"]
+    A10G: ClassVar["Machine"]
+    A10G_X_4: ClassVar["Machine"]
+    A10G_X_8: ClassVar["Machine"]
+    L40S: ClassVar["Machine"]
+    L40S_X_4: ClassVar["Machine"]
+    L40S_X_8: ClassVar["Machine"]
+    A100_X_8: ClassVar["Machine"]
+    H100_X_8: ClassVar["Machine"]
+    H200_X_8: ClassVar["Machine"]
 
-    CPU_SMALL = "CPU_SMALL"
-    CPU = "CPU"
-    DATA_PREP = "DATA_PREP"
-    DATA_PREP_MAX = "DATA_PREP_MAX"
-    DATA_PREP_ULTRA = "DATA_PREP_ULTRA"
-    T4 = "T4"
-    T4_X_4 = "T4_X_4"
-    L4 = "L4"
-    L4_X_4 = "L4_X_4"
-    L4_X_8 = "L4_X_8"
-    A10G = "A10G"
-    A10G_X_4 = "A10G_X_4"
-    A10G_X_8 = "A10G_X_8"
-    L40S = "L40S"
-    L40 = "L40", "L40S"  # deprecated
-    L40S_X_4 = "L40S_X_4"
-    L40_X_4 = "L40_X_4", "L40S_X_4"  # deprecated
-    L40S_X_8 = "L40S_X_8"
-    L40_X_8 = "L40_X_8", "L40S_X_8"  # deprecated
-    A100_X_8 = "A100_X_8"
-    H100_X_8 = "H100_X_8"
-    H200_X_8 = "H200_X_8"
+    name: str
+    instance_type: str
+    cost: Optional[float] = None
+    interruptible_cost: Optional[float] = None
+    wait_time: Optional[float] = None
+    interruptible_wait_time: Optional[float] = None
 
     def __str__(self) -> str:
-        """String representation of the enum."""
-        return str(self.value)
+        """String representation of the Machine."""
+        return str(self.name) if self.name else str(self.instance_type)
+
+    def __eq__(self, other: object) -> bool:
+        """Machines are equal if the instance type is equal."""
+        if isinstance(other, Machine):
+            return self.instance_type == other.instance_type
+        return False
+
+
+Machine.CPU_SMALL = Machine(name="CPU_SMALL", instance_type="m3.medium")
+Machine.CPU = Machine(name="CPU", instance_type="cpu-4")
+Machine.DATA_PREP = Machine(name="DATA_PREP", instance_type="data-large")
+Machine.DATA_PREP_MAX = Machine(name="DATA_PREP_MAX", instance_type="data-max")
+Machine.DATA_PREP_ULTRA = Machine(name="DATA_PREP_ULTRA", instance_type="data-ultra")
+Machine.T4 = Machine(name="T4", instance_type="g4dn.2xlarge")
+Machine.T4_X_4 = Machine(name="T4_X_4", instance_type="g4dn.12xlarge")
+Machine.L4 = Machine(name="L4", instance_type="g6.4xlarge")
+Machine.L4_X_4 = Machine(name="L4_X_4", instance_type="g6.12xlarge")
+Machine.L4_X_8 = Machine(name="L4_X_8", instance_type="g6.48xlarge")
+Machine.A10G = Machine(name="A10G", instance_type="g5.8xlarge")
+Machine.A10G_X_4 = Machine(name="A10G_X_4", instance_type="g5.12xlarge")
+Machine.A10G_X_8 = Machine(name="A10G_X_8", instance_type="g5.48xlarge")
+Machine.L40S = Machine(name="L40S", instance_type="g6e.4xlarge")
+Machine.L40S_X_4 = Machine(name="L40S_X_4", instance_type="g6e.12xlarge")
+Machine.L40S_X_8 = Machine(name="L40S_X_8", instance_type="g6e.48xlarge")
+Machine.A100_X_8 = Machine(name="A100_X_8", instance_type="p4d.24xlarge")
+Machine.H100_X_8 = Machine(name="H100_X_8", instance_type="p5.48xlarge")
+Machine.H200_X_8 = Machine(name="H200_X_8", instance_type="p5e.48xlarge")

lightning_sdk/studio.py

@@ -155,9 +155,13 @@ class Studio:
     def cloud_account(self) -> str:
         return self._studio.cluster_id
 
-    def start(self, machine: Union[Machine, str] = Machine.CPU, interruptible: bool = False) -> None:
+    def start(self, machine: Union[Machine, str] = Machine.CPU, interruptible: Optional[bool] = None) -> None:
         """Starts a Studio on the specified machine type (default: CPU-4)."""
         status = self.status
+
+        if interruptible is None:
+            interruptible = self.teamspace.start_studions_on_interruptible
+
         if status == Status.Running:
             curr_machine = _machine_to_compute_name(self.machine) if self.machine is not None else None
             if curr_machine != _machine_to_compute_name(machine):

lightning_sdk/teamspace.py

@@ -1,9 +1,11 @@
+import os
 import warnings
 from pathlib import Path
 from typing import TYPE_CHECKING, List, Optional, Tuple, Union
 
 from lightning_sdk.agents import Agent
 from lightning_sdk.api import TeamspaceApi
+from lightning_sdk.machine import Machine
 from lightning_sdk.models import UploadedModelInfo
 from lightning_sdk.organization import Organization
 from lightning_sdk.owner import Owner
@@ -112,6 +114,10 @@ class Teamspace:
     def default_cloud_account(self) -> str:
         return self._teamspace.project_settings.preferred_cluster
 
+    @property
+    def start_studions_on_interruptible(self) -> bool:
+        return self._teamspace.project_settings.start_studio_on_spot_instance
+
     @property
     def cloud_accounts(self) -> List[str]:
         """All cloud accounts associated with that teamspace."""
@@ -176,6 +182,25 @@ class Teamspace:
 
         return tuple(mmts)
 
+    def list_machines(self, cloud_account: Optional[str] = None) -> List[Machine]:
+        if cloud_account is None:
+            cloud_account = os.getenv("LIGHTNING_CLUSTER_ID") or self.default_cloud_account
+
+        cluster_machines = self._teamspace_api.list_machines(self.id, cloud_account=cloud_account)
+        return [
+            Machine(
+                cluster_machine.instance_id,
+                cluster_machine.instance_id,
+                cost=cluster_machine.cost,
+                interruptible_cost=cluster_machine.spot_price,
+                wait_time=float(cluster_machine.available_in_seconds) if cluster_machine.available_in_seconds else None,
+                interruptible_wait_time=float(cluster_machine.available_in_seconds_spot)
+                if cluster_machine.available_in_seconds_spot
+                else None,
+            )
+            for cluster_machine in cluster_machines
+        ]
+
     def __eq__(self, other: "Teamspace") -> bool:
         """Checks whether the provided other object is equal to this one."""
         return (

{lightning_sdk-0.1.55.dist-info → lightning_sdk-0.1.56.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightning_sdk
-Version: 0.1.55
+Version: 0.1.56
 Summary: SDK to develop using Lightning AI Studios
 Author-email: Lightning-AI <justus@lightning.ai>
 License: MIT License
@@ -46,6 +46,7 @@ Requires-Dist: fire
 Requires-Dist: simple-term-menu
 Requires-Dist: lightning-utilities
 Requires-Dist: docker
+Requires-Dist: wget
 Provides-Extra: serve
 Requires-Dist: litserve>=0.2.5; extra == "serve"