tccli 3.0.1393.1__py2.py3-none-any.whl → 3.0.1395.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1393.1'
+__version__ = '3.0.1395.1'

tccli/services/__init__.py

@@ -757,7 +757,8 @@ SERVICE_VERSIONS = {
         "2021-01-29"
     ],
     "wedata": [
-        "2021-08-20"
+        "2021-08-20",
+        "2025-08-06"
     ],
     "weilingwith": [
         "2023-04-27"

tccli/services/ai3d/v20250513/api.json

@@ -8,14 +8,14 @@
       "status": "online"
     },
     "QueryHunyuanTo3DProJob": {
-      "document": "混元生3D接口，基于混元大模型，根据输入的文本描述/图片智能生成3D。\n默认提供1个并发，代表最多能同时处理1个已提交的任务，上一个任务处理完毕后，才能开始处理下一个任务。",
+      "document": "混元生3D接口，基于混元大模型，根据输入的文本描述/图片智能生成3D。\n默认提供3个并发，代表最多能同时处理1个已提交的任务，上一个任务处理完毕后，才能开始处理下一个任务。",
       "input": "QueryHunyuanTo3DProJobRequest",
       "name": "查询混元生3D专业版任务",
       "output": "QueryHunyuanTo3DProJobResponse",
       "status": "online"
     },
     "QueryHunyuanTo3DRapidJob": {
-      "document": "混元生3D接口，基于混元大模型，根据输入的文本描述/图片智能生成3D。\n默认提供3个并发，代表最多能同时处理1个已提交的任务，上一个任务处理完毕后，才能开始处理下一个任务。",
+      "document": "混元生3D接口，基于混元大模型，根据输入的文本描述/图片智能生成3D。\n默认提供1个并发，代表最多能同时处理1个已提交的任务，上一个任务处理完毕后，才能开始处理下一个任务。",
       "input": "QueryHunyuanTo3DRapidJobRequest",
       "name": "查询混元生3D极速版任务",
       "output": "QueryHunyuanTo3DRapidJobResponse",
@@ -29,14 +29,14 @@
       "status": "online"
     },
     "SubmitHunyuanTo3DProJob": {
-      "document": "混元生3D接口，基于混元大模型，根据输入的文本描述/图片智能生成3D。\n默认提供1个并发，代表最多能同时处理1个已提交的任务，上一个任务处理完毕后，才能开始处理下一个任务。",
+      "document": "混元生3D接口，基于混元大模型，根据输入的文本描述/图片智能生成3D。\n默认提供3个并发，代表最多能同时处理1个已提交的任务，上一个任务处理完毕后，才能开始处理下一个任务。",
       "input": "SubmitHunyuanTo3DProJobRequest",
       "name": "提交混元生3D专业版任务",
       "output": "SubmitHunyuanTo3DProJobResponse",
       "status": "online"
     },
     "SubmitHunyuanTo3DRapidJob": {
-      "document": "混元生3D接口，基于混元大模型，根据输入的文本描述/图片智能生成3D。\n默认提供3个并发，代表最多能同时处理1个已提交的任务，上一个任务处理完毕后，才能开始处理下一个任务。",
+      "document": "混元生3D接口，基于混元大模型，根据输入的文本描述/图片智能生成3D。\n默认提供1个并发，代表最多能同时处理1个已提交的任务，上一个任务处理完毕后，才能开始处理下一个任务。",
       "input": "SubmitHunyuanTo3DRapidJobRequest",
       "name": "提交混元生3D极速版任务",
       "output": "SubmitHunyuanTo3DRapidJobResponse",

tccli/services/apm/apm_client.py

@@ -693,6 +693,58 @@ def doCreateApmInstance(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeApmServiceMetric(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.ApmClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeApmServiceMetricRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeApmServiceMetric(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 doDescribeServiceOverview(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -769,6 +821,7 @@ ACTION_MAP = {
     "DescribeMetricRecords": doDescribeMetricRecords,
     "TerminateApmInstance": doTerminateApmInstance,
     "CreateApmInstance": doCreateApmInstance,
+    "DescribeApmServiceMetric": doDescribeApmServiceMetric,
     "DescribeServiceOverview": doDescribeServiceOverview,
 
 }

tccli/services/apm/v20210622/api.json

@@ -28,6 +28,13 @@
       "output": "DescribeApmInstancesResponse",
       "status": "online"
     },
+    "DescribeApmServiceMetric": {
+      "document": "获取 APM 应用指标列表",
+      "input": "DescribeApmServiceMetricRequest",
+      "name": "获取 APM 应用指标",
+      "output": "DescribeApmServiceMetricResponse",
+      "status": "online"
+    },
     "DescribeGeneralApmApplicationConfig": {
       "document": "查询应用配置信息",
       "input": "DescribeGeneralApmApplicationConfigRequest",
@@ -1143,6 +1150,42 @@
       ],
       "usage": "out"
     },
+    "ApmServiceMetric": {
+      "document": "apm应用指标信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "filed数组\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "[]",
+          "member": "ApmField",
+          "name": "Fields",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "tag数组\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "[]",
+          "member": "ApmTag",
+          "name": "Tags",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "应用信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "{}",
+          "member": "ServiceDetail",
+          "name": "ServiceDetail",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "ApmTag": {
       "document": "维度（标签）对象",
       "members": [
@@ -1515,6 +1558,212 @@
       ],
       "type": "object"
     },
+    "DescribeApmServiceMetricRequest": {
+      "document": "DescribeApmServiceMetric请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "业务系统ID",
+          "example": "apm-CVfliqa8U",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "应用名",
+          "example": "apm_test",
+          "member": "string",
+          "name": "ServiceName",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "应用ID",
+          "example": "svc-JRNE5rvV8",
+          "member": "string",
+          "name": "ServiceID",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "开始时间",
+          "example": "1719317419",
+          "member": "int64",
+          "name": "StartTime",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "结束时间",
+          "example": "1720580629",
+          "member": "int64",
+          "name": "EndTime",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "排序",
+          "example": "无",
+          "member": "OrderBy",
+          "name": "OrderBy",
+          "required": false,
+          "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "是否demo模式",
+          "example": "false",
+          "member": "bool",
+          "name": "Demo",
+          "required": false,
+          "type": "bool"
+        },
+        {
+          "disabled": false,
+          "document": "应用状态筛选，可枚举的值为：health、warning、error。如果选中多个状态用逗号隔开，比如：\"warning,error\"",
+          "example": "health",
+          "member": "string",
+          "name": "ServiceStatus",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "标签列表",
+          "example": "无",
+          "member": "ApmTag",
+          "name": "Tags",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "页码",
+          "example": "1",
+          "member": "int64",
+          "name": "Page",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "页大小",
+          "example": "2",
+          "member": "int64",
+          "name": "PageSize",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "过滤条件",
+          "example": "无",
+          "member": "Filter",
+          "name": "Filters",
+          "required": false,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeApmServiceMetricResponse": {
+      "document": "DescribeApmServiceMetric返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "应用指标列表",
+          "example": "无",
+          "member": "ApmServiceMetric",
+          "name": "ServiceMetricList",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "符合筛选条件的应用数",
+          "example": "3",
+          "member": "int64",
+          "name": "TotalCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "警示异常应用数",
+          "example": "2",
+          "member": "int64",
+          "name": "WarningErrorCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "应用总数",
+          "example": "7",
+          "member": "int64",
+          "name": "ApplicationCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "页码",
+          "example": "1",
+          "member": "int64",
+          "name": "Page",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "页大小",
+          "example": "2",
+          "member": "int64",
+          "name": "PageSize",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "异常应用数",
+          "example": "1",
+          "member": "int64",
+          "name": "ErrorCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "警示应用数",
+          "example": "1",
+          "member": "int64",
+          "name": "WarningCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeGeneralApmApplicationConfigRequest": {
       "document": "DescribeGeneralApmApplicationConfig请求参数结构体",
       "members": [
@@ -2928,6 +3177,111 @@
       ],
       "usage": "in"
     },
+    "ServiceDetail": {
+      "document": "应用详细信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "应用ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "svc-test",
+          "member": "string",
+          "name": "ServiceID",
+          "output_required": true,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "业务系统ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "apm-test",
+          "member": "string",
+          "name": "InstanceKey",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "用户appid\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "123",
+          "member": "int64",
+          "name": "AppID",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "主账号uin\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "12",
+          "member": "string",
+          "name": "CreateUIN",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "应用名\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "demo",
+          "member": "string",
+          "name": "ServiceName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "应用描述\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "describe",
+          "member": "string",
+          "name": "ServiceDescription",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "地域\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "ap-guangzhou",
+          "member": "string",
+          "name": "Region",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "标签\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "ApmTag",
+          "name": "Tags",
+          "output_required": false,
+          "required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "业务系统名称",
+          "example": "travy-test",
+          "member": "string",
+          "name": "InstanceName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
     "Span": {
       "document": "Span 对象",
       "members": [

tccli/services/apm/v20210622/examples.json

@@ -32,6 +32,14 @@
         "title": "获取 APM 业务系统列表"
       }
     ],
+    "DescribeApmServiceMetric": [
+      {
+        "document": "获取APM应用指标",
+        "input": "POST / HTTP/1.1\nHost: apm.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeApmServiceMetric\n<公共请求参数>\n\n{\n    \"InstanceId\": \"apm-eDyXpD6CD\"\n}",
+        "output": "{\n    \"Response\": {\n        \"ApplicationCount\": 1,\n        \"ErrorCount\": 1,\n        \"Page\": 0,\n        \"PageSize\": 0,\n        \"RequestId\": \"84d35deb-232e-463e-b2ac-fe49338707a2\",\n        \"ServiceMetricList\": [\n            {\n                \"Fields\": [\n                    {\n                        \"CompareVal\": \"0.9%\",\n                        \"CompareVals\": null,\n                        \"Key\": \"duration_avg\",\n                        \"LastPeriodValue\": [\n                            {\n                                \"Key\": \"CompareByYesterday\",\n                                \"Value\": 681.7527368527665\n                            }\n                        ],\n                        \"NameCN\": \"平均响应时间\",\n                        \"NameEN\": \"Average Response Time\",\n                        \"Unit\": \"ms\",\n                        \"Value\": 688\n                    },\n                    {\n                        \"CompareVal\": \"-1.7%\",\n                        \"CompareVals\": null,\n                        \"Key\": \"qps\",\n                        \"LastPeriodValue\": [\n                            {\n                                \"Key\": \"CompareByYesterday\",\n                                \"Value\": 0.40692708333333333\n                            }\n                        ],\n                        \"NameCN\": \"平均请求量\",\n                        \"NameEN\": \"Average RPS\",\n                        \"Unit\": \"qps\",\n                        \"Value\": 0.4\n                    },\n                    {\n                        \"CompareVal\": \"-0.3%\",\n                        \"CompareVals\": null,\n                        \"Key\": \"request_count_sum\",\n                        \"LastPeriodValue\": [\n                            {\n                                \"Key\": \"CompareByYesterday\",\n                                \"Value\": 70317\n                            }\n                        ],\n                        \"NameCN\": \"总请求数\",\n                        \"NameEN\": \"Total Requests\",\n                        \"Unit\": \"\",\n                        \"Value\": 70129\n                    },\n                    {\n                        \"CompareVal\": \"0.0%\",\n                        \"CompareVals\": null,\n                        \"Key\": \"error_req_rate_avg\",\n                        \"LastPeriodValue\": [\n                            {\n                                \"Key\": \"CompareByYesterday\",\n                                \"Value\": 62.81837962370408\n                            }\n                        ],\n                        \"NameCN\": \"平均错误率\",\n                        \"NameEN\": \"Average Error Rate\",\n                        \"Unit\": \"%\",\n                        \"Value\": 62.8\n                    },\n                    {\n                        \"CompareVal\": \"-4.4%\",\n                        \"CompareVals\": null,\n                        \"Key\": \"adpdex\",\n                        \"LastPeriodValue\": [\n                            {\n                                \"Key\": \"CompareByYesterday\",\n                                \"Value\": 0.7325824480566577\n                            }\n                        ],\n                        \"NameCN\": \"平均 Apdex\",\n                        \"NameEN\": \"Average Apdex\",\n                        \"Unit\": \"\",\n                        \"Value\": 0.7\n                    },\n                    {\n                        \"CompareVal\": \"0\",\n                        \"CompareVals\": null,\n                        \"Key\": \"alarm_count\",\n                        \"LastPeriodValue\": [\n                            {\n                                \"Key\": \"CompareByYesterday\",\n                                \"Value\": 0\n                            }\n                        ],\n                        \"NameCN\": \"告警数\",\n                        \"NameEN\": \"Alarm Count\",\n                        \"Unit\": \"次\",\n                        \"Value\": 0\n                    },\n                    {\n                        \"CompareVal\": \"-0.4%\",\n                        \"CompareVals\": null,\n                        \"Key\": \"error_request_count\",\n                        \"LastPeriodValue\": [\n                            {\n                                \"Key\": \"CompareByYesterday\",\n                                \"Value\": 44172\n                            }\n                        ],\n                        \"NameCN\": \"异常数量\",\n                        \"NameEN\": \"Error Count\",\n                        \"Unit\": \"个\",\n                        \"Value\": 44008\n                    },\n                    {\n                        \"CompareVal\": \"\",\n                        \"CompareVals\": null,\n                        \"Key\": \"instance_count\",\n                        \"LastPeriodValue\": null,\n                        \"NameCN\": \"\",\n                        \"NameEN\": \"\",\n                        \"Unit\": \"\",\n                        \"Value\": 1\n                    },\n                    {\n                        \"CompareVal\": \"\",\n                        \"CompareVals\": null,\n                        \"Key\": \"critical_vulnerability_count\",\n                        \"LastPeriodValue\": null,\n                        \"NameCN\": \"\",\n                        \"NameEN\": \"\",\n                        \"Unit\": \"\",\n                        \"Value\": 0\n                    },\n                    {\n                        \"CompareVal\": \"\",\n                        \"CompareVals\": null,\n                        \"Key\": \"important_vulnerability_count\",\n                        \"LastPeriodValue\": null,\n                        \"NameCN\": \"\",\n                        \"NameEN\": \"\",\n                        \"Unit\": \"\",\n                        \"Value\": 0\n                    },\n                    {\n                        \"CompareVal\": \"\",\n                        \"CompareVals\": null,\n                        \"Key\": \"vulnerability_count\",\n                        \"LastPeriodValue\": null,\n                        \"NameCN\": \"\",\n                        \"NameEN\": \"\",\n                        \"Unit\": \"\",\n                        \"Value\": 0\n                    }\n                ],\n                \"ServiceDetail\": {\n                    \"AppID\": 250015922,\n                    \"CreateUIN\": \"1511340626\",\n                    \"InstanceKey\": \"apm-eDyXpD6CD\",\n                    \"InstanceName\": \"\",\n                    \"Region\": \"ap-guangzhou\",\n                    \"ServiceDescription\": \"\",\n                    \"ServiceID\": \"svc-ELHkoErzzc\",\n                    \"ServiceName\": \"java-order-service\",\n                    \"Tags\": []\n                },\n                \"Tags\": [\n                    {\n                        \"Key\": \"service.name\",\n                        \"Value\": \"java-order-service\"\n                    },\n                    {\n                        \"Key\": \"color\",\n                        \"Value\": \"red\"\n                    }\n                ]\n            }\n        ],\n        \"TotalCount\": 1,\n        \"WarningCount\": 0,\n        \"WarningErrorCount\": 1\n    }\n}",
+        "title": "成功获取APM应用指标"
+      }
+    ],
     "DescribeGeneralApmApplicationConfig": [
       {
         "document": "查询指定业务系统下应用的配置信息",