lightning-sdk 0.2.19__py3-none-any.whl → 0.2.20__py3-none-any.whl

lightning_sdk/__init__.py

@@ -31,6 +31,6 @@ __all__ = [
     "User",
 ]
 
-__version__ = "0.2.19"
+__version__ = "0.2.20"
 _check_version_and_prompt_upgrade(__version__)
 _set_tqdm_envvars_noninteractive()

lightning_sdk/api/license_api.py

@@ -1,11 +1,35 @@
+import os
 from typing import Optional
+from urllib.parse import urlencode
 
+from lightning_sdk.lightning_cloud import env
 from lightning_sdk.lightning_cloud.rest_client import LightningClient
 
+LICENSE_CODE = os.environ.get("LICENSE_CODE", "we843fiji89")
+# https://lightning.ai/home?settings=licenses
+LICENSE_SIGNING_URL = f"{env.LIGHTNING_CLOUD_URL}/ai-hub?settings=licenses"
+
+
+def generate_url_user_settings(redirect_to: str = LICENSE_SIGNING_URL) -> str:
+    params = urlencode({"redirectTo": redirect_to, "mode": "licenses", "okbhrt": LICENSE_CODE})
+    return f"{env.LIGHTNING_CLOUD_URL}/sign-in?{params}"
+
 
 class LicenseApi:
-    def __init__(self) -> None:
-        self._client = LightningClient(retry=False, max_tries=0)
+    _client_authenticated: LightningClient = None
+    _client_public: LightningClient = None
+
+    @property
+    def client_public(self) -> LightningClient:
+        if not self._client_public:
+            self._client_public = LightningClient(retry=False, max_tries=0, with_auth=False)
+        return self._client_public
+
+    @property
+    def client_authenticated(self) -> LightningClient:
+        if not self._client_authenticated:
+            self._client_authenticated = LightningClient(retry=True, max_tries=3, with_auth=True)
+        return self._client_authenticated
 
     def valid_license(
         self,
@@ -25,14 +49,12 @@ class LicenseApi:
         Returns:
             True if the license key is valid, False otherwise.
         """
-        response, code, _ = self._client.product_license_service_validate_product_license_with_http_info(
+        response = self.client_public.product_license_service_validate_product_license(
             license_key=license_key,
             product_name=product_name,
             product_version=product_version,
             product_type=product_type,
         )
-        if code != 200:
-            raise ConnectionError(f"Failed to validate license key: {code} - {response}")
         return response.valid
 
     def list_user_licenses(self, user_id: str) -> list:
@@ -44,5 +66,5 @@ class LicenseApi:
         Returns:
             A list of licenses for the user.
         """
-        response = self._client.product_license_service_list_user_licenses(user_id=user_id)
+        response = self.client_authenticated.product_license_service_list_user_licenses(user_id=user_id)
         return response.licenses

lightning_sdk/cli/deploy/_auth.py

@@ -2,8 +2,7 @@ import os
 import time
 from datetime import datetime
 from enum import Enum
-from typing import Any, List, Optional, TypedDict
-from urllib.parse import urlencode
+from typing import List, Optional, TypedDict
 
 from rich.console import Console
 from rich.prompt import Confirm
@@ -11,7 +10,6 @@ from rich.prompt import Confirm
 from lightning_sdk import Teamspace
 from lightning_sdk.api import UserApi
 from lightning_sdk.cli.teamspace_menu import _TeamspacesMenu
-from lightning_sdk.lightning_cloud import env
 from lightning_sdk.lightning_cloud.login import Auth, AuthServer
 from lightning_sdk.lightning_cloud.openapi import V1CloudSpace
 from lightning_sdk.lightning_cloud.rest_client import LightningClient
@@ -26,18 +24,7 @@ class _AuthMode(Enum):
     DEPLOY = "deploy"
 
 
-class _AuthServer(AuthServer):
-    def __init__(self, mode: _AuthMode, *args: Any, **kwargs: Any) -> None:
-        self._mode = mode
-        super().__init__(*args, **kwargs)
-
-    def get_auth_url(self, port: int) -> str:
-        redirect_uri = f"http://localhost:{port}/login-complete"
-        params = urlencode({"redirectTo": redirect_uri, "mode": self._mode.value, "okbhrt": LITSERVE_CODE})
-        return f"{env.LIGHTNING_CLOUD_URL}/sign-in?{params}"
-
-
-class _Auth(Auth):
+class _AuthLitServe(Auth):
     def __init__(self, mode: _AuthMode, shall_confirm: bool = False) -> None:
         super().__init__()
         self._mode = mode
@@ -51,15 +38,20 @@ class _Auth(Auth):
             if not proceed:
                 raise RuntimeError(
                     "Login cancelled. Please login to Lightning AI to deploy the API. Run `lightning login` to login."
-                ) from None
+                )
         print("Opening browser for authentication...")
         print("Please come back to the terminal after logging in.")
         time.sleep(3)
-        _AuthServer(self._mode).login_with_browser(self)
+        AuthServer({"mode": self._mode, "okbhrt": LITSERVE_CODE}).login_with_browser(self)
 
 
 def authenticate(mode: _AuthMode, shall_confirm: bool = True) -> None:
-    auth = _Auth(mode, shall_confirm)
+    """Authenticate with Lightning AI.
+
+    This will open a browser window for authentication.
+    If `shall_confirm` is True, it will ask for confirmation before proceeding.
+    """
+    auth = _AuthLitServe(mode, shall_confirm)
     auth.authenticate()
 
 
@@ -87,7 +79,7 @@ def poll_verified_status(timeout: int = _POLL_TIMEOUT) -> _UserStatus:
     user_api = UserApi()
     user = _get_authed_user()
     start_time = datetime.now()
-    result = {"onboarded": False, "verified": False}
+    result = _UserStatus(onboarded=False, verified=False)
     while True:
         user_resp = user_api.get_user(name=user.name)
         result["onboarded"] = user_resp.status.completed_project_onboarding

lightning_sdk/cli/entrypoint.py

@@ -1,10 +1,12 @@
 import sys
+import traceback
 from types import TracebackType
 from typing import Type
 
 import click
 from rich.console import Console
 from rich.panel import Panel
+from rich.text import Text
 
 from lightning_sdk import __version__
 from lightning_sdk.api.studio_api import _cloud_url
@@ -26,13 +28,29 @@ from lightning_sdk.cli.start import start
 from lightning_sdk.cli.stop import stop
 from lightning_sdk.cli.switch import switch
 from lightning_sdk.cli.upload import upload
+from lightning_sdk.constants import _LIGHTNING_DEBUG
 from lightning_sdk.lightning_cloud.login import Auth
 
 
-def _notify_exception(exception_type: Type[BaseException], value: BaseException, tb: TracebackType) -> None:  # No
+def _notify_exception(exception_type: Type[BaseException], value: BaseException, tb: TracebackType) -> None:
     """CLI won't show tracebacks, just print the exception message."""
+    # if debug mode, print the traceback using rich
     console = Console()
-    console.print(Panel(value))
+    if value.args:
+        message = str(value.args[0]) if value.args[0] else str(value)
+    else:
+        message = str(value) or "An unknown error occurred"
+
+    error_content = Text()
+    error_content.append(f"{exception_type.__name__}: ", style="bold red")
+    error_content.append(message, style="white")
+
+    if _LIGHTNING_DEBUG:
+        error_content.append("\n\nFull traceback:\n", style="bold yellow")
+        tb_lines = traceback.format_exception(exception_type, value, tb)
+        error_content.append("".join(tb_lines), style="dim white")
+
+    console.print(Panel(error_content, title="⚡ Lightning CLI Error", border_style="red"))
 
 
 @click.group(name="lightning", help="Command line interface (CLI) to interact with/manage Lightning AI Studios.")

lightning_sdk/lightning_cloud/login.py

@@ -43,8 +43,8 @@ class Auth:
         for key in Keys:
             setattr(self, key.suffix, os.environ.get(key.value, None))
 
-        self._with_env_var = bool(
-            self.user_id and self.api_key)  # used by authenticate method
+        # used by authenticate method
+        self._with_env_var = bool(self.user_id and self.api_key)
         if self.api_key and not self.user_id:
             raise ValueError(
                 f"{Keys.USER_ID.value} is missing from env variables. "

lightning_sdk/lightning_cloud/openapi/__init__.py

@@ -69,6 +69,7 @@ from lightning_sdk.lightning_cloud.openapi.configuration import Configuration
 from lightning_sdk.lightning_cloud.openapi.models.affiliatelinks_id_body import AffiliatelinksIdBody
 from lightning_sdk.lightning_cloud.openapi.models.agentmanagedendpoints_id_body import AgentmanagedendpointsIdBody
 from lightning_sdk.lightning_cloud.openapi.models.agents_id_body import AgentsIdBody
+from lightning_sdk.lightning_cloud.openapi.models.alertingevents_id_body import AlertingeventsIdBody
 from lightning_sdk.lightning_cloud.openapi.models.alerts_config_billing import AlertsConfigBilling
 from lightning_sdk.lightning_cloud.openapi.models.alerts_config_studios import AlertsConfigStudios
 from lightning_sdk.lightning_cloud.openapi.models.app_id_works_body import AppIdWorksBody
@@ -256,6 +257,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_assistant import V1Assistan
 from lightning_sdk.lightning_cloud.openapi.models.v1_assistant_knowledge_item_status import V1AssistantKnowledgeItemStatus
 from lightning_sdk.lightning_cloud.openapi.models.v1_assistant_knowledge_status import V1AssistantKnowledgeStatus
 from lightning_sdk.lightning_cloud.openapi.models.v1_assistant_model_status import V1AssistantModelStatus
+from lightning_sdk.lightning_cloud.openapi.models.v1_author import V1Author
 from lightning_sdk.lightning_cloud.openapi.models.v1_auto_join_domain_validation import V1AutoJoinDomainValidation
 from lightning_sdk.lightning_cloud.openapi.models.v1_auto_join_org_response import V1AutoJoinOrgResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_autoscaling_spec import V1AutoscalingSpec
@@ -485,7 +487,6 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_drive_status import V1Drive
 from lightning_sdk.lightning_cloud.openapi.models.v1_drive_type import V1DriveType
 from lightning_sdk.lightning_cloud.openapi.models.v1_drive_type_spec import V1DriveTypeSpec
 from lightning_sdk.lightning_cloud.openapi.models.v1_drive_type_status import V1DriveTypeStatus
-from lightning_sdk.lightning_cloud.openapi.models.v1_ebs import V1Ebs
 from lightning_sdk.lightning_cloud.openapi.models.v1_efs_config import V1EfsConfig
 from lightning_sdk.lightning_cloud.openapi.models.v1_endpoint import V1Endpoint
 from lightning_sdk.lightning_cloud.openapi.models.v1_endpoint_auth import V1EndpointAuth
@@ -831,7 +832,6 @@ 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/jobs_service_api.py

@@ -4639,6 +4639,127 @@ class JobsServiceApi(object):
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def jobs_service_update_deployment_alerting_event(self, body: 'AlertingeventsIdBody', project_id: 'str', deployment_id: 'str', id: 'str', **kwargs) -> 'V1DeploymentAlertingEvent':  # noqa: E501
+        """UpdateDeploymentAlertingEvent lists the deployment alert events  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.jobs_service_update_deployment_alerting_event(body, project_id, deployment_id, id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param AlertingeventsIdBody body: (required)
+        :param str project_id: (required)
+        :param str deployment_id: (required)
+        :param str id: (required)
+        :return: V1DeploymentAlertingEvent
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.jobs_service_update_deployment_alerting_event_with_http_info(body, project_id, deployment_id, id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.jobs_service_update_deployment_alerting_event_with_http_info(body, project_id, deployment_id, id, **kwargs)  # noqa: E501
+            return data
+
+    def jobs_service_update_deployment_alerting_event_with_http_info(self, body: 'AlertingeventsIdBody', project_id: 'str', deployment_id: 'str', id: 'str', **kwargs) -> 'V1DeploymentAlertingEvent':  # noqa: E501
+        """UpdateDeploymentAlertingEvent lists the deployment alert events  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.jobs_service_update_deployment_alerting_event_with_http_info(body, project_id, deployment_id, id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param AlertingeventsIdBody body: (required)
+        :param str project_id: (required)
+        :param str deployment_id: (required)
+        :param str id: (required)
+        :return: V1DeploymentAlertingEvent
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body', 'project_id', 'deployment_id', '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 jobs_service_update_deployment_alerting_event" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'body' is set
+        if ('body' not in params or
+                params['body'] is None):
+            raise ValueError("Missing the required parameter `body` when calling `jobs_service_update_deployment_alerting_event`")  # noqa: E501
+        # verify the required parameter 'project_id' is set
+        if ('project_id' not in params or
+                params['project_id'] is None):
+            raise ValueError("Missing the required parameter `project_id` when calling `jobs_service_update_deployment_alerting_event`")  # noqa: E501
+        # verify the required parameter 'deployment_id' is set
+        if ('deployment_id' not in params or
+                params['deployment_id'] is None):
+            raise ValueError("Missing the required parameter `deployment_id` when calling `jobs_service_update_deployment_alerting_event`")  # noqa: E501
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `jobs_service_update_deployment_alerting_event`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'project_id' in params:
+            path_params['projectId'] = params['project_id']  # noqa: E501
+        if 'deployment_id' in params:
+            path_params['deploymentId'] = params['deployment_id']  # noqa: E501
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/v1/projects/{projectId}/deployments/{deploymentId}/alerting-events/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='V1DeploymentAlertingEvent',  # 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 jobs_service_update_deployment_alerting_policy(self, body: 'DeploymentIdAlertingpoliciesBody', project_id: 'str', deployment_id: 'str', **kwargs) -> 'V1DeploymentAlertingPolicy':  # noqa: E501
         """jobs_service_update_deployment_alerting_policy  # noqa: E501
 

lightning_sdk/lightning_cloud/openapi/models/__init__.py

@@ -24,6 +24,7 @@ from __future__ import absolute_import
 from lightning_sdk.lightning_cloud.openapi.models.affiliatelinks_id_body import AffiliatelinksIdBody
 from lightning_sdk.lightning_cloud.openapi.models.agentmanagedendpoints_id_body import AgentmanagedendpointsIdBody
 from lightning_sdk.lightning_cloud.openapi.models.agents_id_body import AgentsIdBody
+from lightning_sdk.lightning_cloud.openapi.models.alertingevents_id_body import AlertingeventsIdBody
 from lightning_sdk.lightning_cloud.openapi.models.alerts_config_billing import AlertsConfigBilling
 from lightning_sdk.lightning_cloud.openapi.models.alerts_config_studios import AlertsConfigStudios
 from lightning_sdk.lightning_cloud.openapi.models.app_id_works_body import AppIdWorksBody
@@ -211,6 +212,7 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_assistant import V1Assistan
 from lightning_sdk.lightning_cloud.openapi.models.v1_assistant_knowledge_item_status import V1AssistantKnowledgeItemStatus
 from lightning_sdk.lightning_cloud.openapi.models.v1_assistant_knowledge_status import V1AssistantKnowledgeStatus
 from lightning_sdk.lightning_cloud.openapi.models.v1_assistant_model_status import V1AssistantModelStatus
+from lightning_sdk.lightning_cloud.openapi.models.v1_author import V1Author
 from lightning_sdk.lightning_cloud.openapi.models.v1_auto_join_domain_validation import V1AutoJoinDomainValidation
 from lightning_sdk.lightning_cloud.openapi.models.v1_auto_join_org_response import V1AutoJoinOrgResponse
 from lightning_sdk.lightning_cloud.openapi.models.v1_autoscaling_spec import V1AutoscalingSpec
@@ -440,7 +442,6 @@ from lightning_sdk.lightning_cloud.openapi.models.v1_drive_status import V1Drive
 from lightning_sdk.lightning_cloud.openapi.models.v1_drive_type import V1DriveType
 from lightning_sdk.lightning_cloud.openapi.models.v1_drive_type_spec import V1DriveTypeSpec
 from lightning_sdk.lightning_cloud.openapi.models.v1_drive_type_status import V1DriveTypeStatus
-from lightning_sdk.lightning_cloud.openapi.models.v1_ebs import V1Ebs
 from lightning_sdk.lightning_cloud.openapi.models.v1_efs_config import V1EfsConfig
 from lightning_sdk.lightning_cloud.openapi.models.v1_endpoint import V1Endpoint
 from lightning_sdk.lightning_cloud.openapi.models.v1_endpoint_auth import V1EndpointAuth
@@ -786,7 +787,6 @@ 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