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

lightning_sdk/lightning_cloud/openapi/models/v1_weka_data_connection.py

@@ -0,0 +1,201 @@
+# 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 V1WekaDataConnection(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 = {
+        'backend_ips': 'list[str]',
+        'file_system_name': 'str',
+        'memory_mb': 'int',
+        'readonly': 'bool'
+    }
+
+    attribute_map = {
+        'backend_ips': 'backendIps',
+        'file_system_name': 'fileSystemName',
+        'memory_mb': 'memoryMb',
+        'readonly': 'readonly'
+    }
+
+    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._file_system_name = None
+        self._memory_mb = None
+        self._readonly = None
+        self.discriminator = None
+        if backend_ips is not None:
+            self.backend_ips = backend_ips
+        if file_system_name is not None:
+            self.file_system_name = file_system_name
+        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]':
+        """Gets the backend_ips of this V1WekaDataConnection.  # noqa: E501
+
+
+        :return: The backend_ips of this V1WekaDataConnection.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._backend_ips
+
+    @backend_ips.setter
+    def backend_ips(self, backend_ips: 'list[str]'):
+        """Sets the backend_ips of this V1WekaDataConnection.
+
+
+        :param backend_ips: The backend_ips of this V1WekaDataConnection.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._backend_ips = backend_ips
+
+    @property
+    def file_system_name(self) -> 'str':
+        """Gets the file_system_name of this V1WekaDataConnection.  # noqa: E501
+
+
+        :return: The file_system_name of this V1WekaDataConnection.  # noqa: E501
+        :rtype: str
+        """
+        return self._file_system_name
+
+    @file_system_name.setter
+    def file_system_name(self, file_system_name: 'str'):
+        """Sets the file_system_name of this V1WekaDataConnection.
+
+
+        :param file_system_name: The file_system_name of this V1WekaDataConnection.  # noqa: E501
+        :type: str
+        """
+
+        self._file_system_name = file_system_name
+
+    @property
+    def memory_mb(self) -> 'int':
+        """Gets the memory_mb of this V1WekaDataConnection.  # noqa: E501
+
+
+        :return: The memory_mb of this V1WekaDataConnection.  # noqa: E501
+        :rtype: int
+        """
+        return self._memory_mb
+
+    @memory_mb.setter
+    def memory_mb(self, memory_mb: 'int'):
+        """Sets the memory_mb of this V1WekaDataConnection.
+
+
+        :param memory_mb: The memory_mb of this V1WekaDataConnection.  # noqa: E501
+        :type: int
+        """
+
+        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 = {}
+
+        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(V1WekaDataConnection, 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: 'V1WekaDataConnection') -> bool:
+        """Returns true if both objects are equal"""
+        if not isinstance(other, V1WekaDataConnection):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other: 'V1WekaDataConnection') -> bool:
+        """Returns true if both objects are not equal"""
+        return not self == other

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

@@ -1,6 +1,8 @@
 from datetime import datetime
 from typing import Dict, List, Optional
 
+from rich.console import Console
+
 from lightning_sdk.api.lit_container_api import LitContainerApi
 from lightning_sdk.utils.resolve import _resolve_teamspace
 
@@ -10,7 +12,7 @@ class LitContainer:
         self._api = LitContainerApi()
 
     def list_containers(
-        self, teamspace: str, org: Optional[str] = None, user: Optional[str] = None
+        self, teamspace: str, org: Optional[str] = None, user: Optional[str] = None, cloud_account: Optional[str] = None
     ) -> List[Dict[str, str]]:
         """List available docker repositories.
 
@@ -18,16 +20,19 @@ class LitContainer:
             teamspace: The teamspace to list containers from.
             org: The organization to list containers from.
             user: The user to list the containers from.
+            cloud_account: The cloud account to list the containers from.
 
         Returns:
             A list of dictionaries containing repository details.
         """
+        console = Console()
         try:
             teamspace = _resolve_teamspace(teamspace=teamspace, org=org, user=user)
-        except Exception as e:
-            raise ValueError(f"Could not resolve teamspace: {e}") from e
+        except Exception:
+            console.print(f"[bold red]Could not resolve teamspace: {teamspace}[/bold red]")
+            return []
         project_id = teamspace.id
-        repositories = self._api.list_containers(project_id)
+        repositories = self._api.list_containers(project_id, cloud_account=cloud_account)
         table = []
         for repo in repositories:
             created_date = repo.creation_time
@@ -39,8 +44,11 @@ class LitContainer:
             table.append(
                 {
                     "REPOSITORY": repo.name,
-                    "IMAGE ID": repo.id,
+                    "CLOUD ACCOUNT": cloud_account
+                    if cloud_account != "" and cloud_account is not None
+                    else "Lightning cloud",
                     "CREATED": created,
+                    "LATEST TAG": repo.latest_artifact.tag_name,
                 }
             )
         return table
@@ -72,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:
@@ -83,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("/")
@@ -95,7 +95,7 @@ def _parse_model_name_and_version(name: str) -> Tuple[str, str, str, str]:
         ) from err
     parts = model_name.split(":")
     if len(parts) == 1:
-        return org_name, teamspace_name, parts[0], "default"
+        return org_name, teamspace_name, parts[0], None
     if len(parts) == 2:
         return org_name, teamspace_name, parts[0], parts[1]
     # The rest of the validation for name and version happens in the backend
@@ -119,17 +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)
-
-    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,
@@ -147,6 +144,7 @@ def upload_model(
     path: Union[str, Path, List[Union[str, Path]]] = ".",
     cloud_account: Optional[str] = None,
     progress_bar: bool = True,
+    metadata: Optional[Dict[str, Any]] = None,
 ) -> UploadedModelInfo:
     """Upload a Model.
 
@@ -157,13 +155,33 @@ 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, _ = _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,
         name=model_name,
+        version=version,
         cloud_account=cloud_account,
         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

@@ -3,7 +3,6 @@ import shlex
 import subprocess
 from pathlib import Path
 from typing import Generator, List, Optional, Union
-from urllib.parse import urlencode
 
 import docker
 from rich.console import Console
@@ -12,9 +11,7 @@ from lightning_sdk import Deployment, Machine, Teamspace
 from lightning_sdk.api.deployment_api import AutoScaleConfig, DeploymentApi, Env, Secret
 from lightning_sdk.api.lit_container_api import LitContainerApi
 from lightning_sdk.api.utils import _get_cloud_url, _get_registry_url
-from lightning_sdk.lightning_cloud import env
 from lightning_sdk.lightning_cloud.env import LIGHTNING_CLOUD_URL
-from lightning_sdk.lightning_cloud.login import Auth, AuthServer
 
 _DOCKER_NOT_RUNNING_MSG = (
     "Deploying LitServe requires Docker to be running on the machine. "
@@ -23,23 +20,6 @@ _DOCKER_NOT_RUNNING_MSG = (
 )
 
 
-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"})
-        return f"{env.LIGHTNING_CLOUD_URL}/sign-in?{params}"
-
-
-class _Auth(Auth):
-    def _run_server(self) -> None:
-        _AuthServer().login_with_browser(self)
-
-
-def authenticate() -> None:
-    auth = _Auth()
-    auth.authenticate()
-
-
 class _LitServeDeployer:
     def __init__(self, name: Optional[str], teamspace: Optional[Teamspace]) -> None:
         self.name = name
@@ -268,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.
 
@@ -284,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.
@@ -317,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

@@ -3,8 +3,10 @@ import warnings
 from pathlib import Path
 from typing import TYPE_CHECKING, List, Optional, Tuple, Union
 
+import lightning_sdk
 from lightning_sdk.agents import Agent
 from lightning_sdk.api import TeamspaceApi
+from lightning_sdk.lightning_cloud.openapi import V1ProjectClusterBinding
 from lightning_sdk.machine import Machine
 from lightning_sdk.models import UploadedModelInfo
 from lightning_sdk.organization import Organization
@@ -124,6 +126,11 @@ class Teamspace:
         clusters = self._teamspace_api.list_cloud_accounts(teamspace_id=self.id)
         return [cl.cluster_name for cl in clusters]
 
+    @property
+    def cloud_account_objs(self) -> List[V1ProjectClusterBinding]:
+        """All cloud accounts associated with that teamspace."""
+        return self._teamspace_api.list_cloud_accounts(teamspace_id=self.id)
+
     @property
     def clusters(self) -> List[str]:
         """All clusters associated with that teamspace."""
@@ -245,17 +252,22 @@ class Teamspace:
         self,
         path: Union[str, Path, List[Union[str, Path]]],
         name: str,
+        version: Optional[str] = None,
         cloud_account: Optional[str] = None,
         progress_bar: bool = True,
+        metadata: Optional[dict] = None,
     ) -> UploadedModelInfo:
         """Upload a local checkpoint file to the model store.
 
         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.
+            metadata: Metadata to attach to the model. Can be a dictionary.
         """
         if not path:
             raise ValueError("No path provided to upload")
@@ -281,13 +293,18 @@ class Teamspace:
                 f"The listed files are: {file_paths}\nThe relative paths are: {relative_paths}"
             )
 
-        cloud_account = (
-            self._teamspace_api._determine_cloud_account(self.id) if cloud_account is None else cloud_account
-        )
+        if cloud_account is None:
+            cloud_account = self._teamspace_api._determine_cloud_account(self.id)
+        if not metadata:
+            metadata = {}
+        if not isinstance(metadata, dict):
+            raise TypeError(f"Metadata must be a dictionary, but provided {type(metadata)}")
+        metadata.update({"lightning-sdk": lightning_sdk.__version__})
 
         model = self._teamspace_api.create_model(
             name=name,
-            metadata={"filenames": ",".join(relative_paths)},
+            version=version,
+            metadata=metadata,
             private=True,
             teamspace_id=self.id,
             cloud_account=cloud_account,

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.8.dist-info → lightning_sdk-0.2.10.dist-info}/METADATA

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