tccli 3.0.1133.1__py2.py3-none-any.whl → 3.0.1134.1__py2.py3-none-any.whl

tccli/services/dlc/dlc_client.py

@@ -2565,6 +2565,58 @@ def doReportHeartbeatMetaData(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeSparkSessionBatchSQLCost(args, parsed_globals):
+    g_param = parse_global_arg(parsed_globals)
+
+    if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+        cred = credential.CVMRoleCredential()
+    elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+        cred = credential.STSAssumeRoleCredential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+            g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE)             and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+        cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+    else:
+        cred = credential.Credential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+        )
+    http_profile = HttpProfile(
+        reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+        reqMethod="POST",
+        endpoint=g_param[OptionsDefine.Endpoint],
+        proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.DlcClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeSparkSessionBatchSQLCostRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeSparkSessionBatchSQLCost(model)
+        result = rsp.to_json_string()
+        try:
+            json_obj = json.loads(result)
+        except TypeError as e:
+            json_obj = json.loads(result.decode('utf-8'))  # python3.3
+        if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+            break
+        cur_time = time.time()
+        if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+            raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+            (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+            search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+        else:
+            print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+        time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+    FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
 def doDescribeUpdatableDataEngines(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7305,6 +7357,7 @@ ACTION_MAP = {
     "DescribeTablesName": doDescribeTablesName,
     "DeleteCHDFSBindingProduct": doDeleteCHDFSBindingProduct,
     "ReportHeartbeatMetaData": doReportHeartbeatMetaData,
+    "DescribeSparkSessionBatchSQLCost": doDescribeSparkSessionBatchSQLCost,
     "DescribeUpdatableDataEngines": doDescribeUpdatableDataEngines,
     "CreateInternalTable": doCreateInternalTable,
     "GenerateCreateMangedTableSql": doGenerateCreateMangedTableSql,

tccli/services/dlc/v20210125/api.json

@@ -567,6 +567,13 @@
       "output": "DescribeSparkSessionBatchSQLResponse",
       "status": "online"
     },
+    "DescribeSparkSessionBatchSQLCost": {
+      "document": "本接口（DescribeSparkSessionBatchSQLCost）用于查询Spark SQL批任务消耗",
+      "input": "DescribeSparkSessionBatchSQLCostRequest",
+      "name": "获取Spark SQL批任务消耗",
+      "output": "DescribeSparkSessionBatchSQLCostResponse",
+      "status": "online"
+    },
     "DescribeSparkSessionBatchSqlLog": {
       "document": "本接口（DescribeSparkSessionBatchSqlLog）用于查询Spark SQL批任务日志",
       "input": "DescribeSparkSessionBatchSqlLogRequest",
@@ -1641,6 +1648,72 @@
       ],
       "type": "object"
     },
+    "BatchSQLCostInfo": {
+      "document": "spark session batch SQL的消耗信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "任务id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "8925a6ba-0b33-4499-8b41-1f5a213689f0",
+          "member": "string",
+          "name": "BatchId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "引擎名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "testengine",
+          "member": "string",
+          "name": "DataEngineName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "引擎id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "DataEngine-xxx",
+          "member": "string",
+          "name": "DataEngineId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "本次消耗，单位cu\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1.231412",
+          "member": "float",
+          "name": "Cost",
+          "output_required": false,
+          "type": "float",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "时间开销，秒\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "12",
+          "member": "int64",
+          "name": "TimeCost",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "操作者\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1238741213",
+          "member": "string",
+          "name": "Operator",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "BatchSqlTask": {
       "document": "SparkSQL批任务信息",
       "members": [
@@ -9563,6 +9636,43 @@
       ],
       "type": "object"
     },
+    "DescribeSparkSessionBatchSQLCostRequest": {
+      "document": "DescribeSparkSessionBatchSQLCost请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "SparkSQL唯一标识",
+          "example": "[\"d3018ad4-9a7e-4f64-a3f4-f38507c69742\"]",
+          "member": "string",
+          "name": "BatchIds",
+          "required": false,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeSparkSessionBatchSQLCostResponse": {
+      "document": "DescribeSparkSessionBatchSQLCost返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "任务消耗\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "[{\"BatchId\":\"8925sdfxv-3-4499-8b41-1f5a213689f0\",\"DataEngineName\":\"spark_jar\",\"DataEngineId\":\"DataEngine-xxxx\",\"Cost\":0.7466666666666667,\"TimeCost\":193,\"Operator\":\"100001244200\"}]",
+          "member": "BatchSQLCostInfo",
+          "name": "CostInfo",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeSparkSessionBatchSQLRequest": {
       "document": "DescribeSparkSessionBatchSQL请求参数结构体",
       "members": [
@@ -10356,7 +10466,44 @@
     },
     "DescribeTasksOverviewRequest": {
       "document": "DescribeTasksOverview请求参数结构体",
-      "members": [],
+      "members": [
+        {
+          "disabled": false,
+          "document": "开始时间",
+          "example": "2022-08-30 00:00:00",
+          "member": "string",
+          "name": "StartTime",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "结束时间",
+          "example": "2022-08-30 00:00:002022-08-30 00:00:00",
+          "member": "string",
+          "name": "EndTime",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "筛选条件",
+          "example": "无",
+          "member": "Filter",
+          "name": "Filters",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "引擎名",
+          "example": "dataengine-xx",
+          "member": "string",
+          "name": "DataEngineName",
+          "required": false,
+          "type": "string"
+        }
+      ],
       "type": "object"
     },
     "DescribeTasksOverviewResponse": {
@@ -10368,7 +10515,7 @@
           "example": "无",
           "member": "TasksOverview",
           "name": "TasksOverview",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },

tccli/services/dlc/v20210125/examples.json

@@ -654,6 +654,14 @@
         "title": "获取SparkSQL批任务运行状态"
       }
     ],
+    "DescribeSparkSessionBatchSQLCost": [
+      {
+        "document": "获取SparkSQL批任务消耗",
+        "input": "POST / HTTP/1.1\nHost: dlc.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeSparkSessionBatchSQLCost\n<公共请求参数>\n\n{\n    \"BatchIds\": [\n        \"d3018ad4-9a7e-4f64-a3f4-fsjr37c69742\"\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"CostInfo\": [\n            {\n                \"BatchId\": \"892499-8b41-1f5a213689f0\",\n                \"DataEngineName\": \"engine_jar\",\n                \"DataEngineId\": \"DataEngine-xxxx\",\n                \"Cost\": 0.7466666666666667,\n                \"TimeCost\": 193,\n                \"Operator\": \"1000fsdf0\"\n            }\n        ],\n        \"RequestId\": \"2ae4707a-9f72-sdfsd-sdf-cac3c2bc\"\n    }\n}",
+        "title": "获取SparkSQL批任务消耗"
+      }
+    ],
     "DescribeSparkSessionBatchSqlLog": [
       {
         "document": "查询Spark SQL批任务日志",
@@ -737,7 +745,7 @@
     "DescribeTasksOverview": [
       {
         "document": "",
-        "input": "POST / HTTP/1.1\nHost: dlc.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeTasksOverview\n<公共请求参数>\n\n{}",
+        "input": "POST / HTTP/1.1\nHost: dlc.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeTasksOverview\n<公共请求参数>\n\n{\n    \"StartTime\": \"2022-08-23 00:00:00\",\n    \"EndTime\": \"2022-08-30 00:00:00\"\n}",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"923423423445\",\n        \"TasksOverview\": {\n            \"TaskQueuedCount\": 0,\n            \"TaskInitCount\": 0,\n            \"TaskRunningCount\": 0,\n            \"TotalTaskCount\": 0\n        }\n    }\n}",
         "title": "查询任务概览情况"
       }

tccli/services/dsgc/v20190723/api.json

@@ -3684,7 +3684,7 @@
         {
           "disabled": true,
           "document": "本次更新的ID号，用来标记一次完整的更新过程。",
-          "example": "无",
+          "example": "10",
           "member": "string",
           "name": "UpdateId",
           "required": false,
@@ -3693,7 +3693,7 @@
         {
           "disabled": true,
           "document": "云上资源列表。",
-          "example": "无",
+          "example": "[item]",
           "member": "DspaCloudResourceMeta",
           "name": "Items",
           "required": false,
@@ -3702,7 +3702,7 @@
         {
           "disabled": false,
           "document": "必填，云数据库资源列表。",
-          "example": "无",
+          "example": "[cloudResourceItem]",
           "member": "CloudResourceItem",
           "name": "CloudResourceItems",
           "required": false,
@@ -3717,7 +3717,7 @@
         {
           "disabled": true,
           "document": "本次更新的ID号，用来标记一次完整的更新过程。",
-          "example": "无",
+          "example": "10",
           "member": "string",
           "name": "UpdateId",
           "output_required": true,
@@ -3727,7 +3727,7 @@
         {
           "disabled": false,
           "document": "资源类型，支持：cdb（云数据库 MySQL）、dcdb（TDSQL MySQL版）、mariadb（云数据库 MariaDB）、postgres（云数据库 PostgreSQL）、cynosdbpg（TDSQL-C PostgreSQL版）、cynosdbmysql（TDSQL-C MySQL版）",
-          "example": "无",
+          "example": "cdb",
           "member": "string",
           "name": "MetaType",
           "output_required": true,
@@ -3737,7 +3737,7 @@
         {
           "disabled": false,
           "document": "DSPA实例ID。",
-          "example": "无",
+          "example": "dspa-a1b2",
           "member": "string",
           "name": "DspaId",
           "output_required": true,
@@ -3747,7 +3747,7 @@
         {
           "disabled": true,
           "document": "资源所处地域。",
-          "example": "无",
+          "example": "ap-guangzhou",
           "member": "string",
           "name": "ResourceRegion",
           "output_required": true,
@@ -5063,7 +5063,7 @@
         {
           "disabled": false,
           "document": "资源所处地域。",
-          "example": "无",
+          "example": "ap-guangzhou",
           "member": "string",
           "name": "ResourceRegion",
           "required": true,
@@ -5072,7 +5072,7 @@
         {
           "disabled": false,
           "document": "资源实例ID。",
-          "example": "无",
+          "example": "[\"res-abcd\",\"res-1234\"]",
           "member": "string",
           "name": "ResourceIds",
           "required": false,
@@ -5087,20 +5087,20 @@
         {
           "disabled": false,
           "document": "结果集合。\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "[item]",
           "member": "DspaTaskResult",
           "name": "Results",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
         {
           "disabled": false,
           "document": "DSPA实例ID。",
-          "example": "无",
+          "example": "dspa-dabad",
           "member": "string",
           "name": "DspaId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -5308,7 +5308,7 @@
         {
           "disabled": false,
           "document": "DSPA实例ID。",
-          "example": "无",
+          "example": "dspa-a1b2",
           "member": "string",
           "name": "DspaId",
           "required": true,
@@ -5317,7 +5317,7 @@
         {
           "disabled": false,
           "document": "用户云资源ID。",
-          "example": "无",
+          "example": "[9781,3213]",
           "member": "string",
           "name": "ResourceIDs",
           "required": true,
@@ -5332,20 +5332,20 @@
         {
           "disabled": false,
           "document": "DSPA实例ID。",
-          "example": "无",
+          "example": "dspa-a1b2c3",
           "member": "string",
           "name": "DspaId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "删除结果。",
-          "example": "无",
+          "example": "[success]",
           "member": "DspaTaskResult",
           "name": "Results",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -14331,7 +14331,7 @@
         {
           "disabled": false,
           "document": "DSPA实例ID。",
-          "example": "无",
+          "example": "dspa-a1b2",
           "member": "string",
           "name": "DspaId",
           "required": true,
@@ -14492,7 +14492,7 @@
         {
           "disabled": false,
           "document": "DSPA实例ID。",
-          "example": "无",
+          "example": "dspa-abcaa",
           "member": "string",
           "name": "DspaId",
           "required": true,
@@ -14501,7 +14501,7 @@
         {
           "disabled": false,
           "document": "资源类型。",
-          "example": "无",
+          "example": "cdb",
           "member": "string",
           "name": "MetaType",
           "required": true,
@@ -14510,7 +14510,7 @@
         {
           "disabled": false,
           "document": "资源所处地域。",
-          "example": "无",
+          "example": "ap-guangzhou",
           "member": "string",
           "name": "ResourceRegion",
           "required": true,
@@ -14519,7 +14519,7 @@
         {
           "disabled": false,
           "document": "资源列表中展示的资源ID。",
-          "example": "无",
+          "example": "cdb-a1b2",
           "member": "string",
           "name": "ResourceId",
           "required": true,
@@ -14537,17 +14537,17 @@
           "example": "success",
           "member": "string",
           "name": "ConnectionStatus",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "连接状态的描述信息。\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "connection-success",
           "member": "string",
           "name": "ConnectionDesc",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -14566,7 +14566,7 @@
         {
           "disabled": false,
           "document": "DSPA实例ID。",
-          "example": "无",
+          "example": "dspa-a1b2c3",
           "member": "string",
           "name": "DspaId",
           "required": true,
@@ -14581,18 +14581,20 @@
         {
           "disabled": false,
           "document": "体验版本名称。",
-          "example": "无",
+          "example": "version",
           "member": "string",
           "name": "TrialVersion",
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "版本体验结束时间戳。",
-          "example": "无",
+          "example": "123042123",
           "member": "uint64",
           "name": "TrialEndAt",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -14970,7 +14972,7 @@
         {
           "disabled": false,
           "document": "实例Id",
-          "example": "dspa-xxxxxxxx",
+          "example": "dspa-12311",
           "member": "string",
           "name": "DspaId",
           "required": true,
@@ -14979,7 +14981,7 @@
         {
           "disabled": false,
           "document": "过滤数组。支持的Name：\nBucket - 桶名，支持模糊匹配\n\nResoureRegion - 资源所处地域，需要填写完整地域名称，不支持模糊匹配。\n\nValid -- 资源是否有效，\"1\" 表示有效，\"0\"表示无效。",
-          "example": "无",
+          "example": "[filter]",
           "member": "DspaDataSourceMngFilter",
           "name": "Filters",
           "required": false,
@@ -15024,24 +15026,27 @@
           "example": "1",
           "member": "int64",
           "name": "TotalCount",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "COS元数据信息\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "[item]",
           "member": "DSPACosMetaDataInfo",
           "name": "Items",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
         {
           "disabled": false,
           "document": "DSPA实例ID\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "dspa-a1b2c3",
           "member": "string",
           "name": "DspaId",
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -15760,7 +15765,7 @@
         {
           "disabled": false,
           "document": "DSPA实例ID。",
-          "example": "无",
+          "example": "dspa-a1b2",
           "member": "string",
           "name": "DspaId",
           "required": true,
@@ -18312,7 +18317,7 @@
         {
           "disabled": false,
           "document": "DSPA实例ID。",
-          "example": "无",
+          "example": "dspa-a1b2",
           "member": "string",
           "name": "DspaId",
           "required": true,
@@ -18321,7 +18326,7 @@
         {
           "disabled": false,
           "document": "云资源名称，如果是通过CVM访问则填写CVM的资源ID，如果是通过LB访问则填写LB的资源ID。",
-          "example": "无",
+          "example": "c231",
           "member": "string",
           "name": "ResourceId",
           "required": true,
@@ -18330,7 +18335,7 @@
         {
           "disabled": false,
           "document": "资源绑定的端口，为0则表示不更新。",
-          "example": "无",
+          "example": "2204",
           "member": "uint64",
           "name": "ResourceVPort",
           "required": true,
@@ -18339,7 +18344,7 @@
         {
           "disabled": false,
           "document": "账户名，为空则表示不更新。\nUserName和Password必须同时填写或同时为空。",
-          "example": "无",
+          "example": "admin",
           "member": "string",
           "name": "UserName",
           "required": true,
@@ -18348,7 +18353,7 @@
         {
           "disabled": false,
           "document": "账户密码，为空则表示不更新。\nUserName和Password必须同时填写或同时为空。",
-          "example": "无",
+          "example": "pass",
           "member": "string",
           "name": "Password",
           "required": true,