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

lightning_sdk/lightning_cloud/openapi/models/v1_weka_data_connection.py

@@ -42,38 +42,33 @@ class V1WekaDataConnection(object):
     """
     swagger_types = {
         'backend_ips': 'list[str]',
-        'cores': 'int',
         'file_system_name': 'str',
-        'management_ip': 'str',
-        'memory_mb': 'int'
+        'memory_mb': 'int',
+        'readonly': 'bool'
     }
 
     attribute_map = {
         'backend_ips': 'backendIps',
-        'cores': 'cores',
         'file_system_name': 'fileSystemName',
-        'management_ip': 'managementIp',
-        'memory_mb': 'memoryMb'
+        'memory_mb': 'memoryMb',
+        'readonly': 'readonly'
     }
 
-    def __init__(self, backend_ips: 'list[str]' =None, cores: 'int' =None, file_system_name: 'str' =None, management_ip: 'str' =None, memory_mb: 'int' =None):  # noqa: E501
+    def __init__(self, backend_ips: 'list[str]' =None, file_system_name: 'str' =None, memory_mb: 'int' =None, readonly: 'bool' =None):  # noqa: E501
         """V1WekaDataConnection - a model defined in Swagger"""  # noqa: E501
         self._backend_ips = None
-        self._cores = None
         self._file_system_name = None
-        self._management_ip = None
         self._memory_mb = None
+        self._readonly = None
         self.discriminator = None
         if backend_ips is not None:
             self.backend_ips = backend_ips
-        if cores is not None:
-            self.cores = cores
         if file_system_name is not None:
             self.file_system_name = file_system_name
-        if management_ip is not None:
-            self.management_ip = management_ip
         if memory_mb is not None:
             self.memory_mb = memory_mb
+        if readonly is not None:
+            self.readonly = readonly
 
     @property
     def backend_ips(self) -> 'list[str]':
@@ -96,27 +91,6 @@ class V1WekaDataConnection(object):
 
         self._backend_ips = backend_ips
 
-    @property
-    def cores(self) -> 'int':
-        """Gets the cores of this V1WekaDataConnection.  # noqa: E501
-
-
-        :return: The cores of this V1WekaDataConnection.  # noqa: E501
-        :rtype: int
-        """
-        return self._cores
-
-    @cores.setter
-    def cores(self, cores: 'int'):
-        """Sets the cores of this V1WekaDataConnection.
-
-
-        :param cores: The cores of this V1WekaDataConnection.  # noqa: E501
-        :type: int
-        """
-
-        self._cores = cores
-
     @property
     def file_system_name(self) -> 'str':
         """Gets the file_system_name of this V1WekaDataConnection.  # noqa: E501
@@ -138,27 +112,6 @@ class V1WekaDataConnection(object):
 
         self._file_system_name = file_system_name
 
-    @property
-    def management_ip(self) -> 'str':
-        """Gets the management_ip of this V1WekaDataConnection.  # noqa: E501
-
-
-        :return: The management_ip of this V1WekaDataConnection.  # noqa: E501
-        :rtype: str
-        """
-        return self._management_ip
-
-    @management_ip.setter
-    def management_ip(self, management_ip: 'str'):
-        """Sets the management_ip of this V1WekaDataConnection.
-
-
-        :param management_ip: The management_ip of this V1WekaDataConnection.  # noqa: E501
-        :type: str
-        """
-
-        self._management_ip = management_ip
-
     @property
     def memory_mb(self) -> 'int':
         """Gets the memory_mb of this V1WekaDataConnection.  # noqa: E501
@@ -180,6 +133,27 @@ class V1WekaDataConnection(object):
 
         self._memory_mb = memory_mb
 
+    @property
+    def readonly(self) -> 'bool':
+        """Gets the readonly of this V1WekaDataConnection.  # noqa: E501
+
+
+        :return: The readonly of this V1WekaDataConnection.  # noqa: E501
+        :rtype: bool
+        """
+        return self._readonly
+
+    @readonly.setter
+    def readonly(self, readonly: 'bool'):
+        """Sets the readonly of this V1WekaDataConnection.
+
+
+        :param readonly: The readonly of this V1WekaDataConnection.  # noqa: E501
+        :type: bool
+        """
+
+        self._readonly = readonly
+
     def to_dict(self) -> dict:
         """Returns the model properties as a dict"""
         result = {}

lightning_sdk/lightning_cloud/openapi/models/validate.py

@@ -48,6 +48,7 @@ class Validate(object):
         'filestore': 'V1FilestoreDataConnection',
         'gcp': 'V1GcpDataConnection',
         'gcs_folder': 'V1GCSFolderDataConnection',
+        'r2': 'V1R2DataConnection',
         's3_folder': 'V1S3FolderDataConnection'
     }
 
@@ -59,10 +60,11 @@ class Validate(object):
         'filestore': 'filestore',
         'gcp': 'gcp',
         'gcs_folder': 'gcsFolder',
+        'r2': 'r2',
         's3_folder': 's3Folder'
     }
 
-    def __init__(self, aws: 'V1AwsDataConnection' =None, check_is_public: 'bool' =None, cluster_ids: 'list[str]' =None, efs: 'V1EfsConfig' =None, filestore: 'V1FilestoreDataConnection' =None, gcp: 'V1GcpDataConnection' =None, gcs_folder: 'V1GCSFolderDataConnection' =None, s3_folder: 'V1S3FolderDataConnection' =None):  # noqa: E501
+    def __init__(self, aws: 'V1AwsDataConnection' =None, check_is_public: 'bool' =None, cluster_ids: 'list[str]' =None, efs: 'V1EfsConfig' =None, filestore: 'V1FilestoreDataConnection' =None, gcp: 'V1GcpDataConnection' =None, gcs_folder: 'V1GCSFolderDataConnection' =None, r2: 'V1R2DataConnection' =None, s3_folder: 'V1S3FolderDataConnection' =None):  # noqa: E501
         """Validate - a model defined in Swagger"""  # noqa: E501
         self._aws = None
         self._check_is_public = None
@@ -71,6 +73,7 @@ class Validate(object):
         self._filestore = None
         self._gcp = None
         self._gcs_folder = None
+        self._r2 = None
         self._s3_folder = None
         self.discriminator = None
         if aws is not None:
@@ -87,6 +90,8 @@ class Validate(object):
             self.gcp = gcp
         if gcs_folder is not None:
             self.gcs_folder = gcs_folder
+        if r2 is not None:
+            self.r2 = r2
         if s3_folder is not None:
             self.s3_folder = s3_folder
 
@@ -237,6 +242,27 @@ class Validate(object):
 
         self._gcs_folder = gcs_folder
 
+    @property
+    def r2(self) -> 'V1R2DataConnection':
+        """Gets the r2 of this Validate.  # noqa: E501
+
+
+        :return: The r2 of this Validate.  # noqa: E501
+        :rtype: V1R2DataConnection
+        """
+        return self._r2
+
+    @r2.setter
+    def r2(self, r2: 'V1R2DataConnection'):
+        """Sets the r2 of this Validate.
+
+
+        :param r2: The r2 of this Validate.  # noqa: E501
+        :type: V1R2DataConnection
+        """
+
+        self._r2 = r2
+
     @property
     def s3_folder(self) -> 'V1S3FolderDataConnection':
         """Gets the s3_folder of this Validate.  # noqa: E501

lightning_sdk/lit_container.py

@@ -80,7 +80,8 @@ class LitContainer:
         tag: str = "latest",
         cloud_account: Optional[str] = None,
         platform: Optional[str] = "linux/amd64",
-    ) -> None:
+        return_final_dict: bool = False,
+    ) -> Optional[Dict]:
         """Upload a container to the docker registry.
 
         Args:
@@ -91,15 +92,24 @@ class LitContainer:
             tag: The tag to use for the container.
             cloud_account: The cloud account where the container is stored.
             platform: The platform the container is meant to run on.
+            return_final_dict: Instructs function to return metadata about container location in platform.
         """
         try:
             teamspace = _resolve_teamspace(teamspace=teamspace, org=org, user=user)
         except Exception as e:
             raise ValueError(f"Could not resolve teamspace: {e}") from e
 
-        resp = self._api.upload_container(container, teamspace, tag, cloud_account, platform=platform)
+        resp = self._api.upload_container(
+            container, teamspace, tag, cloud_account, platform=platform, return_final_dict=return_final_dict
+        )
+
+        final_dict = None
         for line in resp:
             print(line)
+            if return_final_dict and isinstance(line, dict) and line.get("finish") is True:
+                final_dict = line
+
+        return final_dict if return_final_dict else None
 
     def download_container(
         self,

lightning_sdk/models.py

@@ -85,7 +85,7 @@ def _extend_model_name_with_teamspace(name: str) -> str:
     return f"{teamspace.owner.name}/{teamspace.name}/{name}"
 
 
-def _parse_model_name_and_version(name: str) -> Tuple[str, str, str, str]:
+def _parse_org_teamspace_model_version(name: str) -> Tuple[str, str, str, Optional[str]]:
     """Parse the name argument into its components."""
     try:
         org_name, teamspace_name, model_name = name.split("/")
@@ -119,19 +119,14 @@ def download_model(
         progress_bar: Whether to show a progress bar when downloading.
     """
     name = _extend_model_name_with_teamspace(name)
-    teamspace_owner_name, teamspace_name, model_name, version = _parse_model_name_and_version(name)
-    if version is None:
-        version = "default"
-
-    download_dir = Path(download_dir)
-
+    teamspace_owner_name, teamspace_name, model_name, version = _parse_org_teamspace_model_version(name)
     api = TeamspaceApi()
 
     try:
         return api.download_model_files(
             name=model_name,
             version=version,
-            download_dir=download_dir,
+            download_dir=Path(download_dir),
             teamspace_name=teamspace_name,
             teamspace_owner_name=teamspace_owner_name,
             progress_bar=progress_bar,
@@ -160,9 +155,11 @@ def upload_model(
         cloud_account: The name of the cloud account to store the Model in.
             If not provided, the default cloud account for the Teamspace will be used.
         progress_bar: Whether to show a progress bar for the upload.
+        metadata: Metadata to attach to the uploaded model.
+            If not provided, an empty dictionary will be used.
     """
     name = _extend_model_name_with_teamspace(name)
-    org_name, teamspace_name, model_name, version = _parse_model_name_and_version(name)
+    org_name, teamspace_name, model_name, version = _parse_org_teamspace_model_version(name)
     teamspace = _get_teamspace(name=teamspace_name, organization=org_name)
     return teamspace.upload_model(
         path=path,
@@ -172,3 +169,19 @@ def upload_model(
         progress_bar=progress_bar,
         metadata=metadata,
     )
+
+
+def delete_model(
+    name: str,
+) -> None:
+    """Delete a model or a version of model.
+
+    Args:
+        name: The name of the model you want to delete or with specified version it deltes only that version.
+            This should have the format <ORGANIZATION-NAME>/<TEAMSPACE-NAME>/<MODEL-NAME> for full model deletion
+            or <ORGANIZATION-NAME>/<TEAMSPACE-NAME>/<MODEL-NAME>:<VERSION> for version deletion.
+    """
+    name = _extend_model_name_with_teamspace(name)
+    org_name, teamspace_name, model_name, version = _parse_org_teamspace_model_version(name)
+    teamspace = _get_teamspace(name=teamspace_name, organization=org_name)
+    teamspace.delete_model(name=model_name)

lightning_sdk/serve.py

@@ -248,6 +248,7 @@ Update [underline]{os.path.abspath("Dockerfile")}[/underline] to add any additio
         cloud_account: Optional[str] = None,
         port: Optional[int] = 8000,
         include_credentials: Optional[bool] = True,
+        cloudspace_id: Optional[str] = None,
     ) -> dict:
         """Run a deployment on the cloud. If the deployment already exists, it will be updated.
 
@@ -264,6 +265,7 @@ Update [underline]{os.path.abspath("Dockerfile")}[/underline] to add any additio
             cloud_account: The cloud account to run the deployment on. Defaults to None.
             port: The port to run the deployment on. Defaults to 8000.
             include_credentials: Whether to include credentials in the deployment. Defaults to True.
+            cloudspace_id: Connect to a Studio.
 
         Returns:
             dict: The deployment and the URL of the deployment.
@@ -297,6 +299,7 @@ Update [underline]{os.path.abspath("Dockerfile")}[/underline] to add any additio
             cloud_account=cloud_account,
             ports=[port],
             include_credentials=include_credentials,
+            cloudspace_id=cloudspace_id,
         )
 
         return {"deployment": deployment, "url": url}

lightning_sdk/teamspace.py

@@ -262,6 +262,8 @@ class Teamspace:
         Args:
             path: Path to the model file or folder to upload.
             name: Name tag of the model to upload.
+            version: Version tag of the model to upload.
+                If not provided, the ``vX`` version will be used where X is running index.
             cloud_account: The name of the cloud account to store the Model in.
                 If not provided, the default cloud account for the Teamspace will be used.
             progress_bar: Whether to show a progress bar for the upload.

lightning_sdk/utils/resolve.py

@@ -179,16 +179,23 @@ def skip_studio_init() -> Generator[None, None, None]:
     Studio._skip_init = prev_studio_init_state
 
 
-def _parse_model_and_version(name: str) -> Tuple[str, str]:
+def _parse_model_and_version(name: str) -> Tuple[str, Optional[str]]:
+    """Parse the model name and version from the given string.
+
+    >>> _parse_model_and_version("org/teamspace/modelname")
+    ('org/teamspace/modelname', None)
+    >>> _parse_model_and_version("org/teamspace/modelname:version")
+    ('org/teamspace/modelname', 'version')
+    """
     parts = name.split(":")
     if len(parts) == 1:
-        return parts[0], "default"
+        return parts[0], None
     if len(parts) == 2:
         return parts[0], parts[1]
     # The rest of the validation for name and version happens in the backend
     raise ValueError(
-        "Model version is expected to be in the format `entity/modelname:version` separated by a"
-        f" single colon, but got: {name}"
+        "Model version is expected to be in the format `entity/modelname:version` separated by a single colon,"
+        f" but got: {name}"
     )
 
 

{lightning_sdk-0.2.9.dist-info → lightning_sdk-0.2.10.dist-info}/METADATA

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