alibabacloud-emr-serverless-spark20230808 1.7.0__tar.gz → 1.8.1__tar.gz

{alibabacloud_emr-serverless-spark20230808-1.7.0 → alibabacloud_emr-serverless-spark20230808-1.8.1}/ChangeLog.md

@@ -1,3 +1,13 @@
+2024-11-27 Version: 1.8.0
+- Support API GetTemplate.
+
+
+2024-11-25 Version: 1.7.0
+- Support API GetSessionCluster.
+- Update API GetJobRun: update response param.
+- Update API ListSessionClusters: update response param.
+
+
 2024-11-06 Version: 1.6.0
 - Support API ListLogContents.
 

{alibabacloud_emr-serverless-spark20230808-1.7.0 → alibabacloud_emr-serverless-spark20230808-1.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibabacloud_emr-serverless-spark20230808
-Version: 1.7.0
+Version: 1.8.1
 Summary: Alibaba Cloud emr-serverless-spark (20230808) SDK Library for Python
 Home-page: https://github.com/aliyun/alibabacloud-python-sdk
 Author: Alibaba Cloud SDK

alibabacloud_emr-serverless-spark20230808-1.8.1/alibabacloud_emr_serverless_spark20230808/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.8.1'

{alibabacloud_emr-serverless-spark20230808-1.7.0 → alibabacloud_emr-serverless-spark20230808-1.8.1}/alibabacloud_emr_serverless_spark20230808/client.py

@@ -737,6 +737,118 @@ class Client(OpenApiClient):
         headers = {}
         return await self.get_sql_statement_with_options_async(workspace_id, statement_id, request, headers, runtime)
 
+    def get_template_with_options(
+        self,
+        workspace_biz_id: str,
+        request: emr_serverless_spark_20230808_models.GetTemplateRequest,
+        headers: Dict[str, str],
+        runtime: util_models.RuntimeOptions,
+    ) -> emr_serverless_spark_20230808_models.GetTemplateResponse:
+        """
+        @summary 获取任务模板
+        
+        @param request: GetTemplateRequest
+        @param headers: map
+        @param runtime: runtime options for this request RuntimeOptions
+        @return: GetTemplateResponse
+        """
+        UtilClient.validate_model(request)
+        query = {}
+        if not UtilClient.is_unset(request.region_id):
+            query['regionId'] = request.region_id
+        if not UtilClient.is_unset(request.template_type):
+            query['templateType'] = request.template_type
+        req = open_api_models.OpenApiRequest(
+            headers=headers,
+            query=OpenApiUtilClient.query(query)
+        )
+        params = open_api_models.Params(
+            action='GetTemplate',
+            version='2023-08-08',
+            protocol='HTTPS',
+            pathname=f'/api/interactive/v1/workspace/{OpenApiUtilClient.get_encode_param(workspace_biz_id)}/template',
+            method='GET',
+            auth_type='AK',
+            style='ROA',
+            req_body_type='json',
+            body_type='json'
+        )
+        return TeaCore.from_map(
+            emr_serverless_spark_20230808_models.GetTemplateResponse(),
+            self.call_api(params, req, runtime)
+        )
+
+    async def get_template_with_options_async(
+        self,
+        workspace_biz_id: str,
+        request: emr_serverless_spark_20230808_models.GetTemplateRequest,
+        headers: Dict[str, str],
+        runtime: util_models.RuntimeOptions,
+    ) -> emr_serverless_spark_20230808_models.GetTemplateResponse:
+        """
+        @summary 获取任务模板
+        
+        @param request: GetTemplateRequest
+        @param headers: map
+        @param runtime: runtime options for this request RuntimeOptions
+        @return: GetTemplateResponse
+        """
+        UtilClient.validate_model(request)
+        query = {}
+        if not UtilClient.is_unset(request.region_id):
+            query['regionId'] = request.region_id
+        if not UtilClient.is_unset(request.template_type):
+            query['templateType'] = request.template_type
+        req = open_api_models.OpenApiRequest(
+            headers=headers,
+            query=OpenApiUtilClient.query(query)
+        )
+        params = open_api_models.Params(
+            action='GetTemplate',
+            version='2023-08-08',
+            protocol='HTTPS',
+            pathname=f'/api/interactive/v1/workspace/{OpenApiUtilClient.get_encode_param(workspace_biz_id)}/template',
+            method='GET',
+            auth_type='AK',
+            style='ROA',
+            req_body_type='json',
+            body_type='json'
+        )
+        return TeaCore.from_map(
+            emr_serverless_spark_20230808_models.GetTemplateResponse(),
+            await self.call_api_async(params, req, runtime)
+        )
+
+    def get_template(
+        self,
+        workspace_biz_id: str,
+        request: emr_serverless_spark_20230808_models.GetTemplateRequest,
+    ) -> emr_serverless_spark_20230808_models.GetTemplateResponse:
+        """
+        @summary 获取任务模板
+        
+        @param request: GetTemplateRequest
+        @return: GetTemplateResponse
+        """
+        runtime = util_models.RuntimeOptions()
+        headers = {}
+        return self.get_template_with_options(workspace_biz_id, request, headers, runtime)
+
+    async def get_template_async(
+        self,
+        workspace_biz_id: str,
+        request: emr_serverless_spark_20230808_models.GetTemplateRequest,
+    ) -> emr_serverless_spark_20230808_models.GetTemplateResponse:
+        """
+        @summary 获取任务模板
+        
+        @param request: GetTemplateRequest
+        @return: GetTemplateResponse
+        """
+        runtime = util_models.RuntimeOptions()
+        headers = {}
+        return await self.get_template_with_options_async(workspace_biz_id, request, headers, runtime)
+
     def grant_role_to_users_with_options(
         self,
         request: emr_serverless_spark_20230808_models.GrantRoleToUsersRequest,

{alibabacloud_emr-serverless-spark20230808-1.7.0 → alibabacloud_emr-serverless-spark20230808-1.8.1}/alibabacloud_emr_serverless_spark20230808/models.py

@@ -421,6 +421,87 @@ class JobDriver(TeaModel):
         return self
 
 
+class KerberosConf(TeaModel):
+    def __init__(
+        self,
+        creator: str = None,
+        enabled: bool = None,
+        gmt_created: str = None,
+        gmt_modified: str = None,
+        kerberos_conf_id: str = None,
+        keytabs: List[str] = None,
+        krb_5conf: str = None,
+        name: str = None,
+        network_service_id: str = None,
+        workspace_id: str = None,
+    ):
+        self.creator = creator
+        self.enabled = enabled
+        self.gmt_created = gmt_created
+        self.gmt_modified = gmt_modified
+        self.kerberos_conf_id = kerberos_conf_id
+        self.keytabs = keytabs
+        self.krb_5conf = krb_5conf
+        self.name = name
+        self.network_service_id = network_service_id
+        self.workspace_id = workspace_id
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.creator is not None:
+            result['creator'] = self.creator
+        if self.enabled is not None:
+            result['enabled'] = self.enabled
+        if self.gmt_created is not None:
+            result['gmtCreated'] = self.gmt_created
+        if self.gmt_modified is not None:
+            result['gmtModified'] = self.gmt_modified
+        if self.kerberos_conf_id is not None:
+            result['kerberosConfId'] = self.kerberos_conf_id
+        if self.keytabs is not None:
+            result['keytabs'] = self.keytabs
+        if self.krb_5conf is not None:
+            result['krb5Conf'] = self.krb_5conf
+        if self.name is not None:
+            result['name'] = self.name
+        if self.network_service_id is not None:
+            result['networkServiceId'] = self.network_service_id
+        if self.workspace_id is not None:
+            result['workspaceId'] = self.workspace_id
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('creator') is not None:
+            self.creator = m.get('creator')
+        if m.get('enabled') is not None:
+            self.enabled = m.get('enabled')
+        if m.get('gmtCreated') is not None:
+            self.gmt_created = m.get('gmtCreated')
+        if m.get('gmtModified') is not None:
+            self.gmt_modified = m.get('gmtModified')
+        if m.get('kerberosConfId') is not None:
+            self.kerberos_conf_id = m.get('kerberosConfId')
+        if m.get('keytabs') is not None:
+            self.keytabs = m.get('keytabs')
+        if m.get('krb5Conf') is not None:
+            self.krb_5conf = m.get('krb5Conf')
+        if m.get('name') is not None:
+            self.name = m.get('name')
+        if m.get('networkServiceId') is not None:
+            self.network_service_id = m.get('networkServiceId')
+        if m.get('workspaceId') is not None:
+            self.workspace_id = m.get('workspaceId')
+        return self
+
+
 class PrincipalAction(TeaModel):
     def __init__(
         self,
@@ -2792,6 +2873,140 @@ class GetSqlStatementResponse(TeaModel):
         return self
 
 
+class GetTemplateRequest(TeaModel):
+    def __init__(
+        self,
+        region_id: str = None,
+        template_type: str = None,
+    ):
+        self.region_id = region_id
+        self.template_type = template_type
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.region_id is not None:
+            result['regionId'] = self.region_id
+        if self.template_type is not None:
+            result['templateType'] = self.template_type
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('regionId') is not None:
+            self.region_id = m.get('regionId')
+        if m.get('templateType') is not None:
+            self.template_type = m.get('templateType')
+        return self
+
+
+class GetTemplateResponseBody(TeaModel):
+    def __init__(
+        self,
+        data: Template = None,
+        error_code: str = None,
+        error_message: str = None,
+        http_status_code: str = None,
+        request_id: str = None,
+        success: bool = None,
+    ):
+        self.data = data
+        self.error_code = error_code
+        self.error_message = error_message
+        # Id of the request
+        self.http_status_code = http_status_code
+        self.request_id = request_id
+        self.success = success
+
+    def validate(self):
+        if self.data:
+            self.data.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.data is not None:
+            result['data'] = self.data.to_map()
+        if self.error_code is not None:
+            result['errorCode'] = self.error_code
+        if self.error_message is not None:
+            result['errorMessage'] = self.error_message
+        if self.http_status_code is not None:
+            result['httpStatusCode'] = self.http_status_code
+        if self.request_id is not None:
+            result['requestId'] = self.request_id
+        if self.success is not None:
+            result['success'] = self.success
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('data') is not None:
+            temp_model = Template()
+            self.data = temp_model.from_map(m['data'])
+        if m.get('errorCode') is not None:
+            self.error_code = m.get('errorCode')
+        if m.get('errorMessage') is not None:
+            self.error_message = m.get('errorMessage')
+        if m.get('httpStatusCode') is not None:
+            self.http_status_code = m.get('httpStatusCode')
+        if m.get('requestId') is not None:
+            self.request_id = m.get('requestId')
+        if m.get('success') is not None:
+            self.success = m.get('success')
+        return self
+
+
+class GetTemplateResponse(TeaModel):
+    def __init__(
+        self,
+        headers: Dict[str, str] = None,
+        status_code: int = None,
+        body: GetTemplateResponseBody = None,
+    ):
+        self.headers = headers
+        self.status_code = status_code
+        self.body = body
+
+    def validate(self):
+        if self.body:
+            self.body.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.headers is not None:
+            result['headers'] = self.headers
+        if self.status_code is not None:
+            result['statusCode'] = self.status_code
+        if self.body is not None:
+            result['body'] = self.body.to_map()
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('headers') is not None:
+            self.headers = m.get('headers')
+        if m.get('statusCode') is not None:
+            self.status_code = m.get('statusCode')
+        if m.get('body') is not None:
+            temp_model = GetTemplateResponseBody()
+            self.body = temp_model.from_map(m['body'])
+        return self
+
+
 class GrantRoleToUsersRequest(TeaModel):
     def __init__(
         self,
@@ -3307,6 +3522,7 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
         code_type: str = None,
         configuration_overrides: ListJobRunsResponseBodyJobRunsConfigurationOverrides = None,
         creator: str = None,
+        cu_hours: int = None,
         display_release_version: str = None,
         end_time: int = None,
         execution_timeout_seconds: int = None,
@@ -3314,12 +3530,14 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
         job_driver: JobDriver = None,
         job_run_id: str = None,
         log: RunLog = None,
+        mb_seconds: int = None,
         name: str = None,
         release_version: str = None,
         state: str = None,
         state_change_reason: ListJobRunsResponseBodyJobRunsStateChangeReason = None,
         submit_time: int = None,
         tags: List[Tag] = None,
+        vcore_seconds: int = None,
         web_ui: str = None,
         workspace_id: str = None,
     ):
@@ -3335,6 +3553,7 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
         self.configuration_overrides = configuration_overrides
         # The ID of the user who created the job.
         self.creator = creator
+        self.cu_hours = cu_hours
         self.display_release_version = display_release_version
         # The end time of the job.
         self.end_time = end_time
@@ -3347,6 +3566,7 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
         self.job_run_id = job_run_id
         # The path where the operational logs are stored.
         self.log = log
+        self.mb_seconds = mb_seconds
         # The job name.
         self.name = name
         # The version of Spark on which the jobs run.
@@ -3359,6 +3579,7 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
         self.submit_time = submit_time
         # The tags of the job.
         self.tags = tags
+        self.vcore_seconds = vcore_seconds
         # The web UI of the job.
         self.web_ui = web_ui
         # The workspace ID.
@@ -3390,6 +3611,8 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
             result['configurationOverrides'] = self.configuration_overrides.to_map()
         if self.creator is not None:
             result['creator'] = self.creator
+        if self.cu_hours is not None:
+            result['cuHours'] = self.cu_hours
         if self.display_release_version is not None:
             result['displayReleaseVersion'] = self.display_release_version
         if self.end_time is not None:
@@ -3404,6 +3627,8 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
             result['jobRunId'] = self.job_run_id
         if self.log is not None:
             result['log'] = self.log.to_map()
+        if self.mb_seconds is not None:
+            result['mbSeconds'] = self.mb_seconds
         if self.name is not None:
             result['name'] = self.name
         if self.release_version is not None:
@@ -3418,6 +3643,8 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
         if self.tags is not None:
             for k in self.tags:
                 result['tags'].append(k.to_map() if k else None)
+        if self.vcore_seconds is not None:
+            result['vcoreSeconds'] = self.vcore_seconds
         if self.web_ui is not None:
             result['webUI'] = self.web_ui
         if self.workspace_id is not None:
@@ -3433,6 +3660,8 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
             self.configuration_overrides = temp_model.from_map(m['configurationOverrides'])
         if m.get('creator') is not None:
             self.creator = m.get('creator')
+        if m.get('cuHours') is not None:
+            self.cu_hours = m.get('cuHours')
         if m.get('displayReleaseVersion') is not None:
             self.display_release_version = m.get('displayReleaseVersion')
         if m.get('endTime') is not None:
@@ -3449,6 +3678,8 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
         if m.get('log') is not None:
             temp_model = RunLog()
             self.log = temp_model.from_map(m['log'])
+        if m.get('mbSeconds') is not None:
+            self.mb_seconds = m.get('mbSeconds')
         if m.get('name') is not None:
             self.name = m.get('name')
         if m.get('releaseVersion') is not None:
@@ -3465,6 +3696,8 @@ class ListJobRunsResponseBodyJobRuns(TeaModel):
             for k in m.get('tags'):
                 temp_model = Tag()
                 self.tags.append(temp_model.from_map(k))
+        if m.get('vcoreSeconds') is not None:
+            self.vcore_seconds = m.get('vcoreSeconds')
         if m.get('webUI') is not None:
             self.web_ui = m.get('webUI')
         if m.get('workspaceId') is not None:

{alibabacloud_emr-serverless-spark20230808-1.7.0 → alibabacloud_emr-serverless-spark20230808-1.8.1}/alibabacloud_emr_serverless_spark20230808.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibabacloud-emr-serverless-spark20230808
-Version: 1.7.0
+Version: 1.8.1
 Summary: Alibaba Cloud emr-serverless-spark (20230808) SDK Library for Python
 Home-page: https://github.com/aliyun/alibabacloud-python-sdk
 Author: Alibaba Cloud SDK

{alibabacloud_emr-serverless-spark20230808-1.7.0 → alibabacloud_emr-serverless-spark20230808-1.8.1}/setup.py

@@ -24,7 +24,7 @@ from setuptools import setup, find_packages
 """
 setup module for alibabacloud_emr-serverless-spark20230808.
 
-Created on 25/11/2024
+Created on 10/12/2024
 
 @author: Alibaba Cloud SDK
 """

alibabacloud_emr-serverless-spark20230808-1.7.0/alibabacloud_emr_serverless_spark20230808/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.7.0'