tccli 3.0.1138.1__py2.py3-none-any.whl → 3.0.1140.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1138.1'
+__version__ = '3.0.1140.1'

tccli/services/__init__.py

@@ -749,6 +749,9 @@ SERVICE_VERSIONS = {
     "vcg": [
         "2024-04-04"
     ],
+    "vclm": [
+        "2024-05-23"
+    ],
     "vdb": [
         "2023-06-16"
     ],

tccli/services/aiart/aiart_client.py

@@ -173,6 +173,58 @@ def doQueryTextToImageProJob(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doGenerateAvatar(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.AiartClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.GenerateAvatarRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.GenerateAvatar(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 doQueryTrainPortraitModelJob(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -499,6 +551,7 @@ ACTION_MAP = {
     "SubmitTextToImageProJob": doSubmitTextToImageProJob,
     "SubmitTrainPortraitModelJob": doSubmitTrainPortraitModelJob,
     "QueryTextToImageProJob": doQueryTextToImageProJob,
+    "GenerateAvatar": doGenerateAvatar,
     "QueryTrainPortraitModelJob": doQueryTrainPortraitModelJob,
     "UploadTrainPortraitImages": doUploadTrainPortraitImages,
     "QueryDrawPortraitJob": doQueryDrawPortraitJob,

tccli/services/aiart/v20221229/api.json

@@ -1,5 +1,12 @@
 {
   "actions": {
+    "GenerateAvatar": {
+      "document": "百变头像接口将根据输入的人像照片，生成风格百变的头像。\n百变头像默认提供1个并发任务数，代表最多能同时处理1个已提交的任务，上一个任务处理完毕后才能开始处理下一个任务。",
+      "input": "GenerateAvatarRequest",
+      "name": "百变头像",
+      "output": "GenerateAvatarResponse",
+      "status": "online"
+    },
     "ImageToImage": {
       "document": "图像风格化（图生图）接口提供生成式的图生图风格转化能力，将根据输入的图像及文本描述，智能生成风格转化后的图像。建议避免输入人像过小、姿势复杂、人数较多的人像图片。\n图像风格化（图生图）默认提供3个并发任务数，代表最多能同时处理3个已提交的任务，上一个任务处理完毕后才能开始处理下一个任务。",
       "input": "ImageToImageRequest",
@@ -104,6 +111,97 @@
       ],
       "usage": "in"
     },
+    "GenerateAvatarRequest": {
+      "document": "GenerateAvatar请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "头像风格。\n请在  [百变头像风格列表](https://cloud.tencent.com/document/product/1668/107741) 中选择期望的风格，必须传入风格编号。",
+          "example": "无",
+          "member": "string",
+          "name": "Style",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "输入图 Base64 数据。\n算法将根据输入的图片，结合文本描述智能生成与之相关的图像。\nBase64 和 Url 必须提供一个，如果都提供以 Base64 为准。\n图片限制：单边分辨率小于5000，转成 Base64 字符串后小于 6MB，格式支持 jpg、jpeg、png、bmp、tiff、webp。",
+          "example": "无",
+          "member": "string",
+          "name": "InputImage",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "输入图 Url。\n算法将根据输入的图片，结合文本描述智能生成与之相关的图像。\nBase64 和 Url 必须提供一个，如果都提供以 Base64 为准。\n图片限制：单边分辨率小于5000，转成 Base64 字符串后小于 6MB，格式支持 jpg、jpeg、png、bmp、tiff、webp。",
+          "example": "无",
+          "member": "string",
+          "name": "InputUrl",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "输入图像质量检测开关，默认开启。\n1：开启\n0：关闭\n建议开启检测，可提升生成效果，关闭检测可能因输入图像质量较差导致生成效果受损。\n开启后，将增强对输入图像的质量要求，如果输入图像单边分辨率<500、图像中人脸占比较小、存在多人、没有检测到人脸、人脸不完整、人脸遮挡等，将被拦截。\n关闭后，将降低对输入图像的质量要求，如果图像中没有检测到人脸或人脸占比过小等，将被拦截。",
+          "example": "无",
+          "member": "int64",
+          "name": "Filter",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "为生成结果图添加标识的开关，默认为1。\n1：添加标识。\n0：不添加标识。\n其他数值：默认按1处理。\n建议您使用显著标识来提示结果图是 AI 生成的图片。",
+          "example": "无",
+          "member": "int64",
+          "name": "LogoAdd",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "标识内容设置。\n默认在生成结果图右下角添加“图片由 AI 生成”字样，您可根据自身需要替换为其他的标识图片。",
+          "example": "无",
+          "member": "LogoParam",
+          "name": "LogoParam",
+          "required": false,
+          "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "返回图像方式（base64 或 url) ，二选一，默认为 base64。url 有效期为1小时。",
+          "example": "base64",
+          "member": "string",
+          "name": "RspImgType",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "GenerateAvatarResponse": {
+      "document": "GenerateAvatar返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "根据入参 RspImgType 填入不同，返回不同的内容。\n如果传入 base64 则返回生成图 Base64 编码。\n如果传入 url 则返回的生成图 URL , 有效期1小时，请及时保存。",
+          "example": "无",
+          "member": "string",
+          "name": "ResultImage",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ImageToImageRequest": {
       "document": "ImageToImage请求参数结构体",
       "members": [

tccli/services/aiart/v20221229/examples.json

@@ -1,5 +1,13 @@
 {
   "actions": {
+    "GenerateAvatar": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: aiart.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: GenerateAvatar\n<公共请求参数>\n\n{\n    \"InputUrl\": \"http://url\",\n    \"Style\": \"water\"\n}",
+        "output": "{\n    \"Response\": {\n        \"ResultImage\": \"url or base64\",\n        \"RequestId\": \"301bfc25-61ca-4ece-b03e-f6aefb547969\"\n    }\n}",
+        "title": "调用成功示例"
+      }
+    ],
     "ImageToImage": [
       {
         "document": "调用成功示例",

tccli/services/cbs/v20170312/api.json

@@ -531,8 +531,7 @@
           "member": "string",
           "name": "InstanceId",
           "required": true,
-          "type": "list",
-          "value_allowed_null": false
+          "type": "list"
         },
         {
           "disabled": false,
@@ -540,9 +539,8 @@
           "example": "[\"/mnt/datadisk0\"]",
           "member": "string",
           "name": "MountPoint",
-          "required": true,
-          "type": "list",
-          "value_allowed_null": false
+          "required": false,
+          "type": "list"
         },
         {
           "disabled": false,
@@ -550,9 +548,8 @@
           "example": "ext4",
           "member": "string",
           "name": "FileSystemType",
-          "required": true,
-          "type": "string",
-          "value_allowed_null": false
+          "required": false,
+          "type": "string"
         }
       ],
       "usage": "in"

tccli/services/cls/v20201016/api.json

@@ -1350,6 +1350,26 @@
           "output_required": true,
           "type": "int",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "检索语法规则，默认值为0。\n0：Lucene语法，1：CQL语法。\n详细说明参见<a href=\"https://cloud.tencent.com/document/product/614/47044#RetrievesConditionalRules\" target=\"_blank\">检索条件语法规则</a>\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "0",
+          "member": "uint64",
+          "name": "SyntaxRule",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "主题类型。\n0: 日志主题，1: 指标主题\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "0",
+          "member": "uint64",
+          "name": "BizType",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"

tccli/services/cwp/cwp_client.py

@@ -14837,58 +14837,6 @@ def doSetLocalStorageExpire(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doExportAttackLogs(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.CwpClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ExportAttackLogsRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.ExportAttackLogs(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 doDescribeUsualLoginPlaces(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -17749,7 +17697,7 @@ def doDescribeBaselineStrategyList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyBaselineRuleIgnore(args, parsed_globals):
+def doDescribeScanMalwareSchedule(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -17778,11 +17726,11 @@ def doModifyBaselineRuleIgnore(args, parsed_globals):
     client = mod.CwpClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyBaselineRuleIgnoreRequest()
+    model = models.DescribeScanMalwareScheduleRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ModifyBaselineRuleIgnore(model)
+        rsp = client.DescribeScanMalwareSchedule(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -20089,6 +20037,58 @@ def doDescribeRansomDefenseEventsList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doExportLicenseDetail(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.CwpClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ExportLicenseDetailRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ExportLicenseDetail(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 doExportAssetProcessInfoList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -22429,58 +22429,6 @@ def doDeleteBaselineWeakPassword(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeScanMalwareSchedule(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.CwpClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeScanMalwareScheduleRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DescribeScanMalwareSchedule(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 doDeleteNonlocalLoginPlaces(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -23729,7 +23677,7 @@ def doExportRiskDnsEventList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doExportLicenseDetail(args, parsed_globals):
+def doModifyBaselineRuleIgnore(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -23758,11 +23706,11 @@ def doExportLicenseDetail(args, parsed_globals):
     client = mod.CwpClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ExportLicenseDetailRequest()
+    model = models.ModifyBaselineRuleIgnoreRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ExportLicenseDetail(model)
+        rsp = client.ModifyBaselineRuleIgnore(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -27145,7 +27093,6 @@ ACTION_MAP = {
     "DescribeBaselineTop": doDescribeBaselineTop,
     "DescribeFastAnalysis": doDescribeFastAnalysis,
     "SetLocalStorageExpire": doSetLocalStorageExpire,
-    "ExportAttackLogs": doExportAttackLogs,
     "DescribeUsualLoginPlaces": doDescribeUsualLoginPlaces,
     "ExportFileTamperEvents": doExportFileTamperEvents,
     "AddLoginWhiteLists": doAddLoginWhiteLists,
@@ -27201,7 +27148,7 @@ ACTION_MAP = {
     "DescribeBashRules": doDescribeBashRules,
     "DescribeAttackStatistics": doDescribeAttackStatistics,
     "DescribeBaselineStrategyList": doDescribeBaselineStrategyList,
-    "ModifyBaselineRuleIgnore": doModifyBaselineRuleIgnore,
+    "DescribeScanMalwareSchedule": doDescribeScanMalwareSchedule,
     "ModifyMalwareWhiteList": doModifyMalwareWhiteList,
     "DescribeWebHookRule": doDescribeWebHookRule,
     "RetryVulFix": doRetryVulFix,
@@ -27246,6 +27193,7 @@ ACTION_MAP = {
     "GetLocalStorageItem": doGetLocalStorageItem,
     "ExportRansomDefenseMachineList": doExportRansomDefenseMachineList,
     "DescribeRansomDefenseEventsList": doDescribeRansomDefenseEventsList,
+    "ExportLicenseDetail": doExportLicenseDetail,
     "ExportAssetProcessInfoList": doExportAssetProcessInfoList,
     "DescribeMachinesSimple": doDescribeMachinesSimple,
     "DescribeBashEvents": doDescribeBashEvents,
@@ -27291,7 +27239,6 @@ ACTION_MAP = {
     "DescribeAssetTotalCount": doDescribeAssetTotalCount,
     "DescribeHotVulTop": doDescribeHotVulTop,
     "DeleteBaselineWeakPassword": doDeleteBaselineWeakPassword,
-    "DescribeScanMalwareSchedule": doDescribeScanMalwareSchedule,
     "DeleteNonlocalLoginPlaces": doDeleteNonlocalLoginPlaces,
     "ExportAssetSystemPackageList": doExportAssetSystemPackageList,
     "EditReverseShellRules": doEditReverseShellRules,
@@ -27316,7 +27263,7 @@ ACTION_MAP = {
     "ExportWebPageEventList": doExportWebPageEventList,
     "DescribeBaselineHostRiskTop": doDescribeBaselineHostRiskTop,
     "ExportRiskDnsEventList": doExportRiskDnsEventList,
-    "ExportLicenseDetail": doExportLicenseDetail,
+    "ModifyBaselineRuleIgnore": doModifyBaselineRuleIgnore,
     "DescribeEmergencyResponseList": doDescribeEmergencyResponseList,
     "DescribeAttackTrends": doDescribeAttackTrends,
     "DescribeScreenDefenseTrends": doDescribeScreenDefenseTrends,

tccli/services/cwp/v20180228/api.json

@@ -2681,13 +2681,6 @@
       "output": "ExportAttackEventsResponse",
       "status": "online"
     },
-    "ExportAttackLogs": {
-      "document": "ExportAttackEvents接口替代\n\n导出网络攻击日志",
-      "input": "ExportAttackLogsRequest",
-      "name": "导出网络攻击日志",
-      "output": "ExportAttackLogsResponse",
-      "status": "deprecated"
-    },
     "ExportBaselineEffectHostList": {
       "document": "导出基线影响主机列表",
       "input": "ExportBaselineEffectHostListRequest",
@@ -38792,69 +38785,6 @@
       ],
       "type": "object"
     },
-    "ExportAttackLogsRequest": {
-      "document": "ExportAttackLogs请求参数结构体",
-      "members": [
-        {
-          "disabled": false,
-          "document": "过滤条件。\n<li>HttpMethod - String - 是否必填：否 - 攻击方法(POST|GET)</li>\n<li>DateRange - String - 是否必填：否 - 时间范围(存储最近3个月的数据)，如最近一个月[\"2019-11-17\", \"2019-12-17\"]</li>\n<li>VulType - String 威胁类型 - 是否必填: 否</li>\n<li>SrcIp - String 攻击源IP - 是否必填: 否</li>\n<li>DstIp - String 攻击目标IP - 是否必填: 否</li>\n<li>SrcPort - String 攻击源端口 - 是否必填: 否</li>\n<li>DstPort - String 攻击目标端口 - 是否必填: 否</li>",
-          "example": "[]",
-          "member": "Filters",
-          "name": "Filters",
-          "required": false,
-          "type": "list"
-        },
-        {
-          "disabled": false,
-          "document": "主机安全客户端ID",
-          "example": "uuid",
-          "member": "string",
-          "name": "Uuid",
-          "required": false,
-          "type": "string"
-        },
-        {
-          "disabled": false,
-          "document": "云主机机器ID",
-          "example": "quuid",
-          "member": "string",
-          "name": "Quuid",
-          "required": false,
-          "type": "string"
-        }
-      ],
-      "type": "object"
-    },
-    "ExportAttackLogsResponse": {
-      "document": "ExportAttackLogs返回参数结构体",
-      "members": [
-        {
-          "disabled": false,
-          "document": "已废弃",
-          "example": "xxx",
-          "member": "string",
-          "name": "DownloadUrl",
-          "type": "string",
-          "value_allowed_null": false
-        },
-        {
-          "disabled": false,
-          "document": "任务ID,需要到接口“异步导出任务”ExportTasks获取DownloadUrl下载地址",
-          "example": "123456",
-          "member": "string",
-          "name": "TaskId",
-          "type": "string",
-          "value_allowed_null": false
-        },
-        {
-          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
-          "member": "string",
-          "name": "RequestId",
-          "type": "string"
-        }
-      ],
-      "type": "object"
-    },
     "ExportBaselineEffectHostListRequest": {
       "document": "ExportBaselineEffectHostList请求参数结构体",
       "members": [

tccli/services/cwp/v20180228/examples.json

@@ -3100,14 +3100,6 @@
         "title": "导出网络攻击事件"
       }
     ],
-    "ExportAttackLogs": [
-      {
-        "document": "导出网络攻击日志",
-        "input": "https://cwp.tencentcloudapi.com/?Action=ExportAttackLogs\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"354f4ac3-8546-4516-8c8a-69e3ab73aa8a\",\n        \"DownloadUrl\": \"http://download.url/xxx.csv\",\n        \"TaskId\": \"1596595610\"\n    }\n}",
-        "title": "导出网络攻击日志"
-      }
-    ],
     "ExportBaselineEffectHostList": [
       {
         "document": "导出漏洞影响主机列表数据",