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

lightning_sdk/lightning_cloud/openapi/models/v1_volume.py

@@ -41,50 +41,245 @@ class V1Volume(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'ebs': 'V1Ebs',
+        'attached_at': 'datetime',
+        'availability_zone': 'str',
+        'cluster_id': 'str',
+        'created_at': 'datetime',
+        'detached_at': 'datetime',
+        'encrypted': 'bool',
         'id': 'str',
-        'spec_id': 'str'
+        'iops': 'str',
+        'path': 'str',
+        'project_id': 'str',
+        'provider': 'str',
+        'provider_id': 'str',
+        'region': 'str',
+        'resource_id': 'str',
+        'resource_type': 'str',
+        'server_id': 'str',
+        'size_gb': 'str',
+        'throughput': 'str',
+        'type': 'str',
+        'updated_at': 'datetime',
+        'user_id': 'str'
     }
 
     attribute_map = {
-        'ebs': 'ebs',
+        'attached_at': 'attachedAt',
+        'availability_zone': 'availabilityZone',
+        'cluster_id': 'clusterId',
+        'created_at': 'createdAt',
+        'detached_at': 'detachedAt',
+        'encrypted': 'encrypted',
         'id': 'id',
-        'spec_id': 'specId'
+        'iops': 'iops',
+        'path': 'path',
+        'project_id': 'projectId',
+        'provider': 'provider',
+        'provider_id': 'providerId',
+        'region': 'region',
+        'resource_id': 'resourceId',
+        'resource_type': 'resourceType',
+        'server_id': 'serverId',
+        'size_gb': 'sizeGb',
+        'throughput': 'throughput',
+        'type': 'type',
+        'updated_at': 'updatedAt',
+        'user_id': 'userId'
     }
 
-    def __init__(self, ebs: 'V1Ebs' =None, id: 'str' =None, spec_id: 'str' =None):  # noqa: E501
+    def __init__(self, attached_at: 'datetime' =None, availability_zone: 'str' =None, cluster_id: 'str' =None, created_at: 'datetime' =None, detached_at: 'datetime' =None, encrypted: 'bool' =None, id: 'str' =None, iops: 'str' =None, path: 'str' =None, project_id: 'str' =None, provider: 'str' =None, provider_id: 'str' =None, region: 'str' =None, resource_id: 'str' =None, resource_type: 'str' =None, server_id: 'str' =None, size_gb: 'str' =None, throughput: 'str' =None, type: 'str' =None, updated_at: 'datetime' =None, user_id: 'str' =None):  # noqa: E501
         """V1Volume - a model defined in Swagger"""  # noqa: E501
-        self._ebs = None
+        self._attached_at = None
+        self._availability_zone = None
+        self._cluster_id = None
+        self._created_at = None
+        self._detached_at = None
+        self._encrypted = None
         self._id = None
-        self._spec_id = None
+        self._iops = None
+        self._path = None
+        self._project_id = None
+        self._provider = None
+        self._provider_id = None
+        self._region = None
+        self._resource_id = None
+        self._resource_type = None
+        self._server_id = None
+        self._size_gb = None
+        self._throughput = None
+        self._type = None
+        self._updated_at = None
+        self._user_id = None
         self.discriminator = None
-        if ebs is not None:
-            self.ebs = ebs
+        if attached_at is not None:
+            self.attached_at = attached_at
+        if availability_zone is not None:
+            self.availability_zone = availability_zone
+        if cluster_id is not None:
+            self.cluster_id = cluster_id
+        if created_at is not None:
+            self.created_at = created_at
+        if detached_at is not None:
+            self.detached_at = detached_at
+        if encrypted is not None:
+            self.encrypted = encrypted
         if id is not None:
             self.id = id
-        if spec_id is not None:
-            self.spec_id = spec_id
+        if iops is not None:
+            self.iops = iops
+        if path is not None:
+            self.path = path
+        if project_id is not None:
+            self.project_id = project_id
+        if provider is not None:
+            self.provider = provider
+        if provider_id is not None:
+            self.provider_id = provider_id
+        if region is not None:
+            self.region = region
+        if resource_id is not None:
+            self.resource_id = resource_id
+        if resource_type is not None:
+            self.resource_type = resource_type
+        if server_id is not None:
+            self.server_id = server_id
+        if size_gb is not None:
+            self.size_gb = size_gb
+        if throughput is not None:
+            self.throughput = throughput
+        if type is not None:
+            self.type = type
+        if updated_at is not None:
+            self.updated_at = updated_at
+        if user_id is not None:
+            self.user_id = user_id
 
     @property
-    def ebs(self) -> 'V1Ebs':
-        """Gets the ebs of this V1Volume.  # noqa: E501
+    def attached_at(self) -> 'datetime':
+        """Gets the attached_at of this V1Volume.  # noqa: E501
 
 
-        :return: The ebs of this V1Volume.  # noqa: E501
-        :rtype: V1Ebs
+        :return: The attached_at of this V1Volume.  # noqa: E501
+        :rtype: datetime
         """
-        return self._ebs
+        return self._attached_at
 
-    @ebs.setter
-    def ebs(self, ebs: 'V1Ebs'):
-        """Sets the ebs of this V1Volume.
+    @attached_at.setter
+    def attached_at(self, attached_at: 'datetime'):
+        """Sets the attached_at of this V1Volume.
 
 
-        :param ebs: The ebs of this V1Volume.  # noqa: E501
-        :type: V1Ebs
+        :param attached_at: The attached_at of this V1Volume.  # noqa: E501
+        :type: datetime
         """
 
-        self._ebs = ebs
+        self._attached_at = attached_at
+
+    @property
+    def availability_zone(self) -> 'str':
+        """Gets the availability_zone of this V1Volume.  # noqa: E501
+
+
+        :return: The availability_zone of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._availability_zone
+
+    @availability_zone.setter
+    def availability_zone(self, availability_zone: 'str'):
+        """Sets the availability_zone of this V1Volume.
+
+
+        :param availability_zone: The availability_zone of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._availability_zone = availability_zone
+
+    @property
+    def cluster_id(self) -> 'str':
+        """Gets the cluster_id of this V1Volume.  # noqa: E501
+
+
+        :return: The cluster_id of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._cluster_id
+
+    @cluster_id.setter
+    def cluster_id(self, cluster_id: 'str'):
+        """Sets the cluster_id of this V1Volume.
+
+
+        :param cluster_id: The cluster_id of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._cluster_id = cluster_id
+
+    @property
+    def created_at(self) -> 'datetime':
+        """Gets the created_at of this V1Volume.  # noqa: E501
+
+
+        :return: The created_at of this V1Volume.  # noqa: E501
+        :rtype: datetime
+        """
+        return self._created_at
+
+    @created_at.setter
+    def created_at(self, created_at: 'datetime'):
+        """Sets the created_at of this V1Volume.
+
+
+        :param created_at: The created_at of this V1Volume.  # noqa: E501
+        :type: datetime
+        """
+
+        self._created_at = created_at
+
+    @property
+    def detached_at(self) -> 'datetime':
+        """Gets the detached_at of this V1Volume.  # noqa: E501
+
+
+        :return: The detached_at of this V1Volume.  # noqa: E501
+        :rtype: datetime
+        """
+        return self._detached_at
+
+    @detached_at.setter
+    def detached_at(self, detached_at: 'datetime'):
+        """Sets the detached_at of this V1Volume.
+
+
+        :param detached_at: The detached_at of this V1Volume.  # noqa: E501
+        :type: datetime
+        """
+
+        self._detached_at = detached_at
+
+    @property
+    def encrypted(self) -> 'bool':
+        """Gets the encrypted of this V1Volume.  # noqa: E501
+
+
+        :return: The encrypted of this V1Volume.  # noqa: E501
+        :rtype: bool
+        """
+        return self._encrypted
+
+    @encrypted.setter
+    def encrypted(self, encrypted: 'bool'):
+        """Sets the encrypted of this V1Volume.
+
+
+        :param encrypted: The encrypted of this V1Volume.  # noqa: E501
+        :type: bool
+        """
+
+        self._encrypted = encrypted
 
     @property
     def id(self) -> 'str':
@@ -108,25 +303,298 @@ class V1Volume(object):
         self._id = id
 
     @property
-    def spec_id(self) -> 'str':
-        """Gets the spec_id of this V1Volume.  # noqa: E501
+    def iops(self) -> 'str':
+        """Gets the iops of this V1Volume.  # noqa: E501
+
+
+        :return: The iops of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._iops
+
+    @iops.setter
+    def iops(self, iops: 'str'):
+        """Sets the iops of this V1Volume.
+
+
+        :param iops: The iops of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._iops = iops
+
+    @property
+    def path(self) -> 'str':
+        """Gets the path of this V1Volume.  # noqa: E501
+
+
+        :return: The path of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._path
+
+    @path.setter
+    def path(self, path: 'str'):
+        """Sets the path of this V1Volume.
+
+
+        :param path: The path of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._path = path
+
+    @property
+    def project_id(self) -> 'str':
+        """Gets the project_id of this V1Volume.  # noqa: E501
+
+
+        :return: The project_id of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._project_id
+
+    @project_id.setter
+    def project_id(self, project_id: 'str'):
+        """Sets the project_id of this V1Volume.
+
+
+        :param project_id: The project_id of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._project_id = project_id
+
+    @property
+    def provider(self) -> 'str':
+        """Gets the provider of this V1Volume.  # noqa: E501
+
+
+        :return: The provider of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._provider
+
+    @provider.setter
+    def provider(self, provider: 'str'):
+        """Sets the provider of this V1Volume.
+
+
+        :param provider: The provider of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._provider = provider
+
+    @property
+    def provider_id(self) -> 'str':
+        """Gets the provider_id of this V1Volume.  # noqa: E501
+
+
+        :return: The provider_id of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._provider_id
+
+    @provider_id.setter
+    def provider_id(self, provider_id: 'str'):
+        """Sets the provider_id of this V1Volume.
+
+
+        :param provider_id: The provider_id of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._provider_id = provider_id
+
+    @property
+    def region(self) -> 'str':
+        """Gets the region of this V1Volume.  # noqa: E501
+
+
+        :return: The region of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._region
+
+    @region.setter
+    def region(self, region: 'str'):
+        """Sets the region of this V1Volume.
+
+
+        :param region: The region of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._region = region
+
+    @property
+    def resource_id(self) -> 'str':
+        """Gets the resource_id of this V1Volume.  # noqa: E501
+
+
+        :return: The resource_id of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._resource_id
+
+    @resource_id.setter
+    def resource_id(self, resource_id: 'str'):
+        """Sets the resource_id of this V1Volume.
+
+
+        :param resource_id: The resource_id of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._resource_id = resource_id
+
+    @property
+    def resource_type(self) -> 'str':
+        """Gets the resource_type of this V1Volume.  # noqa: E501
+
+
+        :return: The resource_type of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._resource_type
+
+    @resource_type.setter
+    def resource_type(self, resource_type: 'str'):
+        """Sets the resource_type of this V1Volume.
+
+
+        :param resource_type: The resource_type of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._resource_type = resource_type
+
+    @property
+    def server_id(self) -> 'str':
+        """Gets the server_id of this V1Volume.  # noqa: E501
+
+
+        :return: The server_id of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._server_id
+
+    @server_id.setter
+    def server_id(self, server_id: 'str'):
+        """Sets the server_id of this V1Volume.
+
+
+        :param server_id: The server_id of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._server_id = server_id
+
+    @property
+    def size_gb(self) -> 'str':
+        """Gets the size_gb of this V1Volume.  # noqa: E501
+
+
+        :return: The size_gb of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._size_gb
+
+    @size_gb.setter
+    def size_gb(self, size_gb: 'str'):
+        """Sets the size_gb of this V1Volume.
+
+
+        :param size_gb: The size_gb of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._size_gb = size_gb
+
+    @property
+    def throughput(self) -> 'str':
+        """Gets the throughput of this V1Volume.  # noqa: E501
+
+
+        :return: The throughput of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._throughput
+
+    @throughput.setter
+    def throughput(self, throughput: 'str'):
+        """Sets the throughput of this V1Volume.
+
+
+        :param throughput: The throughput of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._throughput = throughput
+
+    @property
+    def type(self) -> 'str':
+        """Gets the type of this V1Volume.  # noqa: E501
+
+
+        :return: The type of this V1Volume.  # noqa: E501
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type: 'str'):
+        """Sets the type of this V1Volume.
+
+
+        :param type: The type of this V1Volume.  # noqa: E501
+        :type: str
+        """
+
+        self._type = type
+
+    @property
+    def updated_at(self) -> 'datetime':
+        """Gets the updated_at of this V1Volume.  # noqa: E501
+
+
+        :return: The updated_at of this V1Volume.  # noqa: E501
+        :rtype: datetime
+        """
+        return self._updated_at
+
+    @updated_at.setter
+    def updated_at(self, updated_at: 'datetime'):
+        """Sets the updated_at of this V1Volume.
+
+
+        :param updated_at: The updated_at of this V1Volume.  # noqa: E501
+        :type: datetime
+        """
+
+        self._updated_at = updated_at
+
+    @property
+    def user_id(self) -> 'str':
+        """Gets the user_id of this V1Volume.  # noqa: E501
 
 
-        :return: The spec_id of this V1Volume.  # noqa: E501
+        :return: The user_id of this V1Volume.  # noqa: E501
         :rtype: str
         """
-        return self._spec_id
+        return self._user_id
 
-    @spec_id.setter
-    def spec_id(self, spec_id: 'str'):
-        """Sets the spec_id of this V1Volume.
+    @user_id.setter
+    def user_id(self, user_id: 'str'):
+        """Sets the user_id of this V1Volume.
 
 
-        :param spec_id: The spec_id of this V1Volume.  # noqa: E501
+        :param user_id: The user_id of this V1Volume.  # noqa: E501
         :type: str
         """
 
-        self._spec_id = spec_id
+        self._user_id = user_id
 
     def to_dict(self) -> dict:
         """Returns the model properties as a dict"""

lightning_sdk/lightning_cloud/rest_client.py

@@ -44,7 +44,7 @@ from lightning_sdk.lightning_cloud.source_code.logs_socket_api import LightningL
 logger = logging.getLogger(__name__)
 
 
-def create_swagger_client(check_context=True):
+def create_swagger_client(check_context: bool = True, with_auth: bool = True):
     """
     Create the swagger client to use the autogenerated code
 
@@ -53,6 +53,8 @@ def create_swagger_client(check_context=True):
     check_context: bool
         If true, check if the context is set. It's only false for APIs that
         doesn't need the context information i.e login
+    with_auth: bool
+        If true, it uses user's Authorization for the api client
     """
     if check_context and not env.CONTEXT:
         raise RuntimeError(
@@ -67,7 +69,8 @@ def create_swagger_client(check_context=True):
     # if present in /grid-cli/grid/cli/cli/artifacts.py
     configuration.ssl_ca_cert = env.SSL_CA_CERT
     api_client = ApiClient(configuration)
-    api_client.default_headers["Authorization"] = Auth().authenticate()
+    if with_auth:
+        api_client.default_headers["Authorization"] = Auth().authenticate()
     api_client.user_agent = f"Grid-CLI-{env.VERSION}"
     return api_client
 
@@ -103,8 +106,8 @@ class GridRestClient(
         CloudSpaceEnvironmentTemplateServiceApi
 ):
 
-    def __init__(self, api_client: Optional[ApiClient] = None):
-        api_client = api_client if api_client else create_swagger_client()
+    def __init__(self, api_client: Optional[ApiClient] = None, with_auth: bool = True):
+        api_client = api_client if api_client else create_swagger_client(with_auth=with_auth)
         api_client.request = request_auth_warning_wrapper(api_client.request)
         super().__init__(api_client)
 
@@ -179,24 +182,23 @@ class LightningClient(GridRestClient):
     Args:
         retry: Whether API calls should follow a retry mechanism with exponential backoff.
         max_tries: Maximum number of attempts (or -1 to retry forever).
+        with_auth: Whether to use user's Authorization for the api client.
 
     """
 
     def __init__(self,
                  retry: bool = True,
-                 max_tries: Optional[int] = None) -> None:
-        super().__init__(api_client=create_swagger_client())
+                 max_tries: Optional[int] = None,
+                 with_auth: bool = True) -> None:
+        super().__init__(api_client=create_swagger_client(with_auth=with_auth))
         if retry:
             for base_class in GridRestClient.__mro__:
                 for name, attribute in base_class.__dict__.items():
-                    if callable(
-                            attribute) and attribute.__name__ != "__init__":
+                    if callable(attribute) and attribute.__name__ != "__init__":
                         setattr(
                             self,
                             name,
-                            _retry_wrapper(self,
-                                           attribute,
-                                           max_tries=max_tries),
+                            _retry_wrapper(self, attribute, max_tries=max_tries),
                         )
 
 

lightning_sdk/lightning_cloud/source_code/logs_socket_api.py

@@ -11,11 +11,17 @@ class LightningLogsSocketAPI:
         if api_client is None:
             api_client = ApiClient()
         self.api_client = api_client
+        self._auth = None
+        self._auth_service = None
+
+    def _init_auth(self):
         self._auth = Auth()
         self._auth.authenticate()
-        self._auth_service = AuthServiceApi(api_client)
+        self._auth_service = AuthServiceApi(self.api_client)
 
     def _get_api_token(self):
+        if not self._auth_service:
+            self._init_auth()
         token_resp = self._auth_service.auth_service_login(body=V1LoginRequest(
             username=self._auth.user_id,
             api_key=self._auth.api_key,
@@ -83,13 +89,12 @@ class LightningLogsSocketAPI:
         -------
         WebSocketApp of the wanted socket
         """
-        _token = self._get_api_token()
         clean_ws_host = urlparse(self.api_client.configuration.host).netloc
         socket_url = self._socket_url(
             host=clean_ws_host,
             project_id=project_id,
             app_id=app_id,
-            token=_token,
+            token=self._get_api_token(),
             component=component,
         )