lightning-sdk 0.1.19__py3-none-any.whl → 0.1.21__py3-none-any.whl

lightning_sdk/__init__.py

@@ -25,5 +25,5 @@ __all__ = [
     "Agent",
 ]
 
-__version__ = "0.1.19"
+__version__ = "0.1.21"
 _check_version_and_prompt_upgrade(__version__)

lightning_sdk/api/org_api.py

@@ -8,8 +8,6 @@ class OrgApi:
     """Internal API client for org requests (mainly http requests)."""
 
     def __init__(self) -> None:
-        super().__init__()
-
         self._client = LightningClient(max_tries=7)
 
     def get_org(self, name: str) -> V1Organization:

lightning_sdk/api/studio_api.py

@@ -59,8 +59,6 @@ class StudioApi:
     """Internal API client for Studio requests (mainly http requests)."""
 
     def __init__(self) -> None:
-        super().__init__()
-
         self._cloud_url = _cloud_url()
         self._client = LightningClient(max_tries=7)
         self._keep_alive_threads: Mapping[str, Thread] = {}
@@ -317,15 +315,14 @@ class StudioApi:
                 teamspace_id=teamspace_id,
                 session_id=response_submit.session_name,
             ):
-                if resp.exit_code != -1:
-                    if exit_code is None:
-                        exit_code = resp.exit_code
-                    elif exit_code != resp.exit_code:
-                        raise RuntimeError("Cannot determine exit code")
-
-                    output += resp.output
-                else:
+                if resp.exit_code == -1:
                     break
+                if exit_code is None:
+                    exit_code = resp.exit_code
+                elif exit_code != resp.exit_code:
+                    raise RuntimeError("Cannot determine exit code")
+
+                output += resp.output
 
             if exit_code is not None:
                 return output, exit_code

lightning_sdk/api/teamspace_api.py

@@ -33,7 +33,7 @@ class TeamspaceApi:
         """Get the current teamspace from the owner."""
         teamspaces = self.list_teamspaces(name=name, owner_id=owner_id)
 
-        if len(teamspaces) == 0:
+        if not teamspaces:
             raise ValueError(f"Teamspace {name} does not exist")
 
         if len(teamspaces) > 1:
@@ -44,7 +44,7 @@ class TeamspaceApi:
     def _get_teamspace_by_id(self, teamspace_id: str) -> V1Project:
         return self._client.projects_service_get_project(teamspace_id)
 
-    def list_teamspaces(self, owner_id: str, name: Optional[str]) -> Optional[V1Project]:
+    def list_teamspaces(self, owner_id: str, name: Optional[str] = None) -> Optional[V1Project]:
         """Lists teamspaces from owner.
 
         If name is passed only teamspaces matching that name will be returned
@@ -54,15 +54,14 @@ class TeamspaceApi:
         # -> list projects authed users are members of + filter later on
         res = self._client.projects_service_list_memberships(filter_by_user_id=True)
 
-        return [
-            self._get_teamspace_by_id(m.project_id)
-            for m in filter(
-                # only return teamspaces actually owned by the id
-                lambda x: x.owner_id == owner_id,
-                # if name is provided, filter for teamspaces matching that name
-                filter(lambda x: name is None or x.name == name or x.display_name == name, res.memberships),
-            )
-        ]
+        teamspaces = []
+        for teamspace in res.memberships:
+            # if name is provided, filter for teamspaces matching that name
+            match_name = name is None or teamspace.name == name or teamspace.display_name == name
+            # and only return teamspaces actually owned by the id
+            if match_name and teamspace.owner_id == owner_id:
+                teamspaces.append(self._get_teamspace_by_id(teamspace.project_id))
+        return teamspaces
 
     def list_studios(self, teamspace_id: str, cluster_id: str = "") -> List[V1CloudSpace]:
         """List studios in teamspace."""
@@ -90,24 +89,25 @@ class TeamspaceApi:
         return self._client.projects_service_list_project_cluster_bindings(project_id=teamspace_id).clusters
 
     def _get_authed_user_id(self) -> str:
-        """Gets the currently logged in user."""
+        """Gets the currently logged-in user."""
         auth = Auth()
         auth.authenticate()
         return auth.user_id
 
-    def _try_get_cluster_id(self, teamspace_id: str) -> str:
+    def _determine_cluster_id(self, teamspace_id: str) -> str:
         """Attempts to determine the cluster id of the teamspace.
 
         Raises an error if it's ambiguous.
 
         """
+        # when you run  from studio, the cluster is with env. vars
         cluster_id = os.getenv("LIGHTNING_CLUSTER_ID")
         if cluster_id:
             return cluster_id
         cluster_ids = [c.cluster_id for c in self.list_clusters(teamspace_id=teamspace_id)]
         if len(cluster_ids) == 1:
             return cluster_ids[0]
-        raise ValueError(
+        raise RuntimeError(
             "Could not determine the current cluster id. Please provide it manually as input."
             f" Choices are: {', '.join(cluster_ids)}"
         )

lightning_sdk/api/user_api.py

@@ -15,8 +15,6 @@ class UserApi:
     """Internal API Client for user requests (mainly http requests)."""
 
     def __init__(self) -> None:
-        super().__init__()
-
         self._client = LightningClient(max_tries=7)
 
     def get_user(self, name: str) -> V1SearchUser:
@@ -24,13 +22,15 @@ class UserApi:
         response = self._client.user_service_search_users(query=name)
 
         users = [u for u in response.users if u.username == name]
-        if not len(users):
+        if not users:
             raise ValueError(f"User {name} does not exist.")
         return users[0]
 
     def _get_user_by_id(self, user_id: str) -> V1SearchUser:
         response = self._client.user_service_search_users(query=user_id)
         users = [u for u in response.users if u.id == user_id]
+        if not users:
+            raise ValueError(f"User {user_id} does not exist.")
         return users[0]
 
     def _get_organizations_for_authed_user(
@@ -45,11 +45,13 @@ class UserApi:
         )
         return resp.cloudspaces
 
-    def _get_all_teamspace_memberships(self, user_id: str) -> List[V1Membership]:
+    def _get_all_teamspace_memberships(
+        self, user_id: str  # todo: this is unused, but still required
+    ) -> List[V1Membership]:
         return self._client.projects_service_list_memberships(filter_by_user_id=True).memberships
 
     def _get_authed_user_name(self) -> str:
-        """Gets the currently logged in user."""
+        """Gets the currently logged-in user."""
         auth = Auth()
         auth.authenticate()
         user = self._get_user_by_id(auth.user_id)

lightning_sdk/lightning_cloud/login.py

@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
 
 
 class Keys(Enum):
-    USERNAME = "LIGHTNING_USERNAME"
+    # USERNAME = "LIGHTNING_USERNAME"
     USER_ID = "LIGHTNING_USER_ID"
     API_KEY = "LIGHTNING_API_KEY"
 
@@ -33,7 +33,7 @@ class Keys(Enum):
 
 @dataclass
 class Auth:
-    username: Optional[str] = None
+    # username: Optional[str] = None
     user_id: Optional[str] = None
     api_key: Optional[str] = None
 
@@ -72,20 +72,21 @@ class Auth:
              token: str = "",
              user_id: str = "",
              api_key: str = "",
-             username: str = "") -> None:
+             # username: str = "",
+        ) -> None:
         """save credentials to disk."""
         self.secrets_file.parent.mkdir(exist_ok=True, parents=True)
         with self.secrets_file.open("w") as f:
             json.dump(
                 {
-                    f"{Keys.USERNAME.suffix}": username,
+                    # f"{Keys.USERNAME.suffix}": username,
                     f"{Keys.USER_ID.suffix}": user_id,
                     f"{Keys.API_KEY.suffix}": api_key,
                 },
                 f,
             )
 
-        self.username = username
+        # self.username = username
         self.user_id = user_id
         self.api_key = api_key
         logger.debug("credentials saved successfully")
@@ -173,7 +174,7 @@ class AuthServer:
                              user_id: str = Query("", alias="userID")):
             if token:
                 auth.save(token=token,
-                          username=user_id,
+                          # username=user_id,
                           user_id=user_id,
                           api_key=key)
                 logger.info("Authentication Successful")

lightning_sdk/lightning_cloud/openapi/__init__.py

@@ -86,6 +86,7 @@ from lightning_sdk.lightning_cloud.openapi.models.create_deployment_request_defi
 from lightning_sdk.lightning_cloud.openapi.models.data_connection_mount_data_connection_mount_copy_status import DataConnectionMountDataConnectionMountCopyStatus
 from lightning_sdk.lightning_cloud.openapi.models.datasets_id_body import DatasetsIdBody
 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.experiment_name_variant_name_body import ExperimentNameVariantNameBody
 from lightning_sdk.lightning_cloud.openapi.models.externalv1_cloud_space_instance_status import Externalv1CloudSpaceInstanceStatus
@@ -231,7 +232,6 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_cloud_space_publication_typ
 from lightning_sdk.lightning_cloud.openapi.models.v1_cloud_space_seed_file import V1CloudSpaceSeedFile
 from lightning_sdk.lightning_cloud.openapi.models.v1_cloud_space_session import V1CloudSpaceSession
 from lightning_sdk.lightning_cloud.openapi.models.v1_cloud_space_state import V1CloudSpaceState
-from lightning_sdk.lightning_cloud.openapi.models.v1_cloud_space_tag import V1CloudSpaceTag
 from lightning_sdk.lightning_cloud.openapi.models.v1_cloud_space_version import V1CloudSpaceVersion
 from lightning_sdk.lightning_cloud.openapi.models.v1_cloud_space_version_publication import V1CloudSpaceVersionPublication
 from lightning_sdk.lightning_cloud.openapi.models.v1_cluster_accelerator import V1ClusterAccelerator
@@ -240,7 +240,6 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_cluster_capacity_reservatio
 from lightning_sdk.lightning_cloud.openapi.models.v1_cluster_deletion_options import V1ClusterDeletionOptions
 from lightning_sdk.lightning_cloud.openapi.models.v1_cluster_encryption_key import V1ClusterEncryptionKey
 from lightning_sdk.lightning_cloud.openapi.models.v1_cluster_names import V1ClusterNames
-from lightning_sdk.lightning_cloud.openapi.models.v1_cluster_performance_profile import V1ClusterPerformanceProfile
 from lightning_sdk.lightning_cloud.openapi.models.v1_cluster_resource_tag import V1ClusterResourceTag
 from lightning_sdk.lightning_cloud.openapi.models.v1_cluster_security_options import V1ClusterSecurityOptions
 from lightning_sdk.lightning_cloud.openapi.models.v1_cluster_spec import V1ClusterSpec
@@ -348,6 +347,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_deployment_state import V1D
 from lightning_sdk.lightning_cloud.openapi.models.v1_deployment_status import V1DeploymentStatus
 from lightning_sdk.lightning_cloud.openapi.models.v1_deployment_strategy import V1DeploymentStrategy
 from lightning_sdk.lightning_cloud.openapi.models.v1_deployment_template import V1DeploymentTemplate
+from lightning_sdk.lightning_cloud.openapi.models.v1_deployment_template_gallery_response import V1DeploymentTemplateGalleryResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_deployment_template_parameter import V1DeploymentTemplateParameter
 from lightning_sdk.lightning_cloud.openapi.models.v1_deployment_template_summary import V1DeploymentTemplateSummary
 from lightning_sdk.lightning_cloud.openapi.models.v1_deployment_template_type import V1DeploymentTemplateType
@@ -389,6 +389,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_get_artifacts_page_response
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_cloud_space_instance_status_response import V1GetCloudSpaceInstanceStatusResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_cloud_space_size_response import V1GetCloudSpaceSizeResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_cluster_credentials_response import V1GetClusterCredentialsResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_get_deployment_routing_telemetry_aggregated_response import V1GetDeploymentRoutingTelemetryAggregatedResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_deployment_routing_telemetry_response import V1GetDeploymentRoutingTelemetryResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_folder_index_response import V1GetFolderIndexResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_get_job_system_metrics_response import V1GetJobSystemMetricsResponse
@@ -467,6 +468,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_list_cloud_space_version_pu
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_cloud_space_versions_response import V1ListCloudSpaceVersionsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_cloud_spaces_response import V1ListCloudSpacesResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_cluster_accelerators_response import V1ListClusterAcceleratorsResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_list_cluster_availabilities_response import V1ListClusterAvailabilitiesResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_cluster_capacity_reservations_response import V1ListClusterCapacityReservationsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_clusters_response import V1ListClustersResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_conversations_response import V1ListConversationsResponse
@@ -476,6 +478,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_list_datasets_response impo
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_default_cluster_accelerators_response import V1ListDefaultClusterAcceleratorsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_deployment_events_response import V1ListDeploymentEventsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_deployment_releases_response import V1ListDeploymentReleasesResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_list_deployment_tags_response import V1ListDeploymentTagsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_deployment_templates_response import V1ListDeploymentTemplatesResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_deployments_response import V1ListDeploymentsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_endpoints_response import V1ListEndpointsResponse
@@ -517,6 +520,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_list_project_membership_rol
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_project_memberships_response import V1ListProjectMembershipsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_project_roles_response import V1ListProjectRolesResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_published_cloud_spaces_response import V1ListPublishedCloudSpacesResponse
+from lightning_sdk.lightning_cloud.openapi.models.v1_list_published_deployment_templates_response import V1ListPublishedDeploymentTemplatesResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_quests_response import V1ListQuestsResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_ssh_public_keys_response import V1ListSSHPublicKeysResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_list_secrets_response import V1ListSecretsResponse
@@ -599,9 +603,11 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_refresh_path_response impor
 from lightning_sdk.lightning_cloud.openapi.models.v1_refresh_request import V1RefreshRequest
 from lightning_sdk.lightning_cloud.openapi.models.v1_refresh_response import V1RefreshResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_region_state import V1RegionState
+from lightning_sdk.lightning_cloud.openapi.models.v1_regional_load_balancer import V1RegionalLoadBalancer
 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_resource_tag import V1ResourceTag
 from lightning_sdk.lightning_cloud.openapi.models.v1_resources import V1Resources
 from lightning_sdk.lightning_cloud.openapi.models.v1_response_choice import V1ResponseChoice
 from lightning_sdk.lightning_cloud.openapi.models.v1_response_choice_delta import V1ResponseChoiceDelta

lightning_sdk/lightning_cloud/openapi/api/cluster_service_api.py

@@ -1590,6 +1590,95 @@ class ClusterServiceApi(object):
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def cluster_service_list_cluster_availabilities(self, **kwargs) -> 'V1ListClusterAvailabilitiesResponse':  # noqa: E501
+        """cluster_service_list_cluster_availabilities  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.cluster_service_list_cluster_availabilities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str org_id:
+        :return: V1ListClusterAvailabilitiesResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.cluster_service_list_cluster_availabilities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.cluster_service_list_cluster_availabilities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def cluster_service_list_cluster_availabilities_with_http_info(self, **kwargs) -> 'V1ListClusterAvailabilitiesResponse':  # noqa: E501
+        """cluster_service_list_cluster_availabilities  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.cluster_service_list_cluster_availabilities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str org_id:
+        :return: V1ListClusterAvailabilitiesResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['org_id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method cluster_service_list_cluster_availabilities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'org_id' in params:
+            query_params.append(('orgId', params['org_id']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/v1/core/cluster-availabilities', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='V1ListClusterAvailabilitiesResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def cluster_service_list_cluster_capacity_reservations(self, project_id: 'str', cluster_id: 'str', **kwargs) -> 'V1ListClusterCapacityReservationsResponse':  # noqa: E501
         """cluster_service_list_cluster_capacity_reservations  # noqa: E501