tccli 3.0.1195.1__py2.py3-none-any.whl → 3.0.1196.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1195.1'
+__version__ = '3.0.1196.1'

tccli/services/asr/asr_client.py

@@ -17,6 +17,58 @@ from tencentcloud.asr.v20190614 import models as models_v20190614
 from jmespath import search
 import time
 
+def doGetUsageByDate(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.AsrClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.GetUsageByDateRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.GetUsageByDate(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 doCreateAsrKeyWordLib(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -329,7 +381,7 @@ def doVoicePrintCount(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doVoicePrintVerify(args, parsed_globals):
+def doGetAsrVocabList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -358,11 +410,11 @@ def doVoicePrintVerify(args, parsed_globals):
     client = mod.AsrClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.VoicePrintVerifyRequest()
+    model = models.GetAsrVocabListRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.VoicePrintVerify(model)
+        rsp = client.GetAsrVocabList(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -849,7 +901,7 @@ def doUpdateAsrKeyWordLib(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doVoicePrintUpdate(args, parsed_globals):
+def doCreateRecTask(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -878,11 +930,11 @@ def doVoicePrintUpdate(args, parsed_globals):
     client = mod.AsrClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.VoicePrintUpdateRequest()
+    model = models.CreateRecTaskRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.VoicePrintUpdate(model)
+        rsp = client.CreateRecTask(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -901,7 +953,7 @@ def doVoicePrintUpdate(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateRecTask(args, parsed_globals):
+def doDescribeTaskStatus(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -930,11 +982,11 @@ def doCreateRecTask(args, parsed_globals):
     client = mod.AsrClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateRecTaskRequest()
+    model = models.DescribeTaskStatusRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateRecTask(model)
+        rsp = client.DescribeTaskStatus(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -953,7 +1005,7 @@ def doCreateRecTask(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeTaskStatus(args, parsed_globals):
+def doVoicePrintEnroll(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -982,11 +1034,11 @@ def doDescribeTaskStatus(args, parsed_globals):
     client = mod.AsrClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeTaskStatusRequest()
+    model = models.VoicePrintEnrollRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeTaskStatus(model)
+        rsp = client.VoicePrintEnroll(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1005,7 +1057,7 @@ def doDescribeTaskStatus(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doVoicePrintEnroll(args, parsed_globals):
+def doVoicePrintVerify(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1034,11 +1086,11 @@ def doVoicePrintEnroll(args, parsed_globals):
     client = mod.AsrClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.VoicePrintEnrollRequest()
+    model = models.VoicePrintVerifyRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.VoicePrintEnroll(model)
+        rsp = client.VoicePrintVerify(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1161,7 +1213,7 @@ def doVoicePrintDelete(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doGetAsrVocabList(args, parsed_globals):
+def doVoicePrintUpdate(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1190,11 +1242,11 @@ def doGetAsrVocabList(args, parsed_globals):
     client = mod.AsrClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.GetAsrVocabListRequest()
+    model = models.VoicePrintUpdateRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.GetAsrVocabList(model)
+        rsp = client.VoicePrintUpdate(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1640,13 +1692,14 @@ MODELS_MAP = {
 }
 
 ACTION_MAP = {
+    "GetUsageByDate": doGetUsageByDate,
     "CreateAsrKeyWordLib": doCreateAsrKeyWordLib,
     "VoicePrintCompare": doVoicePrintCompare,
     "UpdateAsrVocab": doUpdateAsrVocab,
     "CreateAsyncRecognitionTask": doCreateAsyncRecognitionTask,
     "GetCustomizationList": doGetCustomizationList,
     "VoicePrintCount": doVoicePrintCount,
-    "VoicePrintVerify": doVoicePrintVerify,
+    "GetAsrVocabList": doGetAsrVocabList,
     "GetAsrVocab": doGetAsrVocab,
     "SetVocabState": doSetVocabState,
     "DownloadAsrVocab": doDownloadAsrVocab,
@@ -1656,13 +1709,13 @@ ACTION_MAP = {
     "GetAsrKeyWordLibList": doGetAsrKeyWordLibList,
     "SentenceRecognition": doSentenceRecognition,
     "UpdateAsrKeyWordLib": doUpdateAsrKeyWordLib,
-    "VoicePrintUpdate": doVoicePrintUpdate,
     "CreateRecTask": doCreateRecTask,
     "DescribeTaskStatus": doDescribeTaskStatus,
     "VoicePrintEnroll": doVoicePrintEnroll,
+    "VoicePrintVerify": doVoicePrintVerify,
     "DescribeAsyncRecognitionTasks": doDescribeAsyncRecognitionTasks,
     "VoicePrintDelete": doVoicePrintDelete,
-    "GetAsrVocabList": doGetAsrVocabList,
+    "VoicePrintUpdate": doVoicePrintUpdate,
     "ModifyCustomization": doModifyCustomization,
     "CloseAsyncRecognitionTask": doCloseAsyncRecognitionTask,
     "GetModelInfo": doGetModelInfo,

tccli/services/asr/v20190614/api.json

@@ -126,6 +126,13 @@
       "output": "GetModelInfoResponse",
       "status": "online"
     },
+    "GetUsageByDate": {
+      "document": "查询用户用量",
+      "input": "GetUsageByDateRequest",
+      "name": "通过日期查询用量",
+      "output": "GetUsageByDateResponse",
+      "status": "online"
+    },
     "ModifyCustomization": {
       "document": "用户通过该接口可以更新自学习模型，如模型名称、模型类型、模型语料。",
       "input": "ModifyCustomizationRequest",
@@ -1386,6 +1393,61 @@
       ],
       "type": "object"
     },
+    "GetUsageByDateRequest": {
+      "document": "GetUsageByDate请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "需要查询的业务类型名字列表\n- asr_rt 实时识别\n- asr_rec 录音文件识别",
+          "example": "[\"asr_rec\"]",
+          "member": "string",
+          "name": "BizNameList",
+          "required": true,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "查询开始时间\n开始时间包含当天，支持 YYYY-MM-DD 日期以国内时区为准\n开始时间到结束时间需要在3个月以内",
+          "example": "2024-09-01",
+          "member": "string",
+          "name": "StartDate",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "查询结束时间\n结束时间包含当天，，支持 YYYY-MM-DD 日期以国内时区为准\n开始时间到结束时间需要在3个月以内",
+          "example": "2024-09-06",
+          "member": "string",
+          "name": "EndDate",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "GetUsageByDateResponse": {
+      "document": "GetUsageByDate返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "用量次数",
+          "example": "无",
+          "member": "UsageByDateInfoData",
+          "name": "Data",
+          "output_required": true,
+          "type": "object",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "HotWord": {
       "document": "[热词的词和权重](https://cloud.tencent.com/document/product/1093/41111#2.-.E8.BE.93.E5.85.A5.E5.8F.82.E6.95.B0)",
       "members": [
@@ -2443,6 +2505,62 @@
       ],
       "type": "object"
     },
+    "UsageByDateInfo": {
+      "document": "用户用量信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "业务类型名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "string",
+          "name": "BizName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "识别次数\n单位：次\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "uint64",
+          "name": "Count",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "识别时长\n单位：秒\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "uint64",
+          "name": "Duration",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "both"
+    },
+    "UsageByDateInfoData": {
+      "document": "用户用量信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "用量信息列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "UsageByDateInfo",
+          "name": "UsageByDateInfoList",
+          "output_required": false,
+          "required": false,
+          "type": "list",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "both"
+    },
     "VerifyTop": {
       "document": "声纹组对比结果top数据",
       "members": [

tccli/services/asr/v20190614/examples.json

@@ -168,6 +168,14 @@
         "title": "通过模型id获取模型信息"
       }
     ],
+    "GetUsageByDate": [
+      {
+        "document": "需要查询8月份录音识别和实时识别的用量",
+        "input": "POST / HTTP/1.1\nHost: asr.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: GetUsageByDate\n<公共请求参数>\n\n{\n    \"BizNameList\": [\n        \"asr_rt\",\n        \"asr_rec\"\n    ],\n    \"StartDate\": \"2024-08-01\",\n    \"EndDate\": \"2024-08-31\"\n}",
+        "output": "{\n    \"Response\": {\n        \"Data\": {\n            \"UsageByDateInfoList\": [\n                {\n                    \"BizName\": \"asr_rt\",\n                    \"Count\": 0,\n                    \"Duration\": 0\n                },\n                {\n                    \"BizName\": \"asr_rec\",\n                    \"Count\": 47,\n                    \"Duration\": 351\n                }\n            ]\n        },\n        \"RequestId\": \"877e8723-792b-4b4e-a8c0-57bece96b7f0\"\n    }\n}",
+        "title": "用量查询输入示例"
+      }
+    ],
     "ModifyCustomization": [
       {
         "document": "修改",

tccli/services/autoscaling/v20180419/api.json

@@ -6992,6 +6992,7 @@
           "example": "False",
           "member": "bool",
           "name": "ReplaceMonitorUnhealthy",
+          "output_required": true,
           "required": false,
           "type": "bool",
           "value_allowed_null": false
@@ -7002,6 +7003,7 @@
           "example": "CLASSIC_SCALING",
           "member": "string",
           "name": "ScalingMode",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": false
@@ -7012,9 +7014,21 @@
           "example": "False",
           "member": "bool",
           "name": "ReplaceLoadBalancerUnhealthy",
+          "output_required": true,
           "required": false,
           "type": "bool",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "不健康替换服务的替换模式。取值范围：\nRECREATE：重建实例替代原有不健康实例；\nRESET：对原有不健康实例进行重装系统操作，可保持数据盘、内网IP、实例id等信息不发生变化，实例登录设置、主机名、增强服务和 UserData 与当前启动配置保持一致。\n默认取值：RECREATE\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "RECREATE",
+          "member": "string",
+          "name": "ReplaceMode",
+          "output_required": true,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "both"

tccli/services/cfg/v20210820/api.json

@@ -1544,6 +1544,15 @@
           "name": "Issue",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "演练记录",
+          "example": "演练记录",
+          "member": "string",
+          "name": "Record",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"