tccli 3.0.1207.1__py2.py3-none-any.whl → 3.0.1209.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1207.1'
+__version__ = '3.0.1209.1'

tccli/services/__init__.py

@@ -367,6 +367,9 @@ SERVICE_VERSIONS = {
     "gse": [
         "2019-11-12"
     ],
+    "gwlb": [
+        "2024-09-06"
+    ],
     "habo": [
         "2018-12-03"
     ],

tccli/services/advisor/v20200721/api.json

@@ -17,7 +17,7 @@
   },
   "metadata": {
     "apiVersion": "2020-07-21",
-    "api_brief": null,
+    "api_brief": "1",
     "serviceNameCN": "云顾问",
     "serviceShortName": "advisor"
   },

tccli/services/batch/v20170312/api.json

@@ -5391,6 +5391,7 @@
           "example": "无",
           "member": "Application",
           "name": "Application",
+          "output_required": true,
           "required": true,
           "type": "object",
           "value_allowed_null": false
@@ -5401,16 +5402,18 @@
           "example": "test-task",
           "member": "string",
           "name": "TaskName",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "任务实例运行个数",
+          "document": "任务实例运行个数，默认为1",
           "example": "1",
           "member": "uint64",
           "name": "TaskInstanceNum",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": false
@@ -5421,6 +5424,7 @@
           "example": "无",
           "member": "AnonymousComputeEnv",
           "name": "ComputeEnv",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": false
@@ -5431,6 +5435,7 @@
           "example": "env_238swek2",
           "member": "string",
           "name": "EnvId",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": false
@@ -5441,6 +5446,7 @@
           "example": "无",
           "member": "RedirectInfo",
           "name": "RedirectInfo",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": false
@@ -5451,6 +5457,7 @@
           "example": "无",
           "member": "RedirectLocalInfo",
           "name": "RedirectLocalInfo",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": false
@@ -5461,6 +5468,7 @@
           "example": "无",
           "member": "InputMapping",
           "name": "InputMappings",
+          "output_required": true,
           "required": false,
           "type": "list",
           "value_allowed_null": false
@@ -5471,6 +5479,7 @@
           "example": "无",
           "member": "OutputMapping",
           "name": "OutputMappings",
+          "output_required": true,
           "required": false,
           "type": "list",
           "value_allowed_null": false
@@ -5481,6 +5490,7 @@
           "example": "无",
           "member": "OutputMappingConfig",
           "name": "OutputMappingConfigs",
+          "output_required": true,
           "required": false,
           "type": "list",
           "value_allowed_null": false
@@ -5491,6 +5501,7 @@
           "example": "无",
           "member": "EnvVar",
           "name": "EnvVars",
+          "output_required": true,
           "required": false,
           "type": "list",
           "value_allowed_null": false
@@ -5501,6 +5512,7 @@
           "example": "无",
           "member": "Authentication",
           "name": "Authentications",
+          "output_required": true,
           "required": false,
           "type": "list",
           "value_allowed_null": false
@@ -5511,6 +5523,7 @@
           "example": "TERMINATE",
           "member": "string",
           "name": "FailedAction",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": false
@@ -5521,6 +5534,7 @@
           "example": "0",
           "member": "uint64",
           "name": "MaxRetryCount",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": false
@@ -5531,6 +5545,7 @@
           "example": "86400",
           "member": "uint64",
           "name": "Timeout",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": false
@@ -5541,6 +5556,7 @@
           "example": "100",
           "member": "uint64",
           "name": "MaxConcurrentNum",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": false
@@ -5551,16 +5567,18 @@
           "example": "false",
           "member": "bool",
           "name": "RestartComputeNode",
+          "output_required": true,
           "required": false,
           "type": "bool",
           "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "启动任务过程中，创建计算资源如CVM失败后的最大重试次数，默认为0。最大值100。",
+          "document": "启动任务过程中，创建计算资源如CVM失败后的最大重试次数，默认为0。最大值100。\n计算资源创建重试的等待时间间隔策略设置如下：\n[1, 3]: 等待600 s发起重试；\n[4, 10]: 等待900 s发起重试；\n[11, 50]: 等待1800 s发起重试；\n[51, 100]: 等待3600 s发起重试；\n[a, b]表示重试次数区间，每次重试的等待时间随着重试次数的增加而递增。\n例如，计算资源创建重试8次的耗时为：3*600 + 5*900 = 6300 s",
           "example": "1",
           "member": "uint64",
           "name": "ResourceMaxRetryCount",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": false

tccli/services/bma/v20221115/examples.json

@@ -51,7 +51,7 @@
     "DeleteBPWhiteList": [
       {
         "document": "删除白名单",
-        "input": "{\n  \"WhiteListId\": 123\n}",
+        "input": "POST / HTTP/1.1\nHost: bma.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DeleteBPWhiteList\n<公共请求参数>\n\n{\n    \"WhiteListId\": 123\n}",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"xxx\"\n    }\n}",
         "title": "删除白名单"
       }

tccli/services/ccc/v20200210/api.json

@@ -1516,7 +1516,7 @@
           "example": "ZhiMei",
           "member": "string",
           "name": "VoiceType",
-          "required": true,
+          "required": false,
           "type": "string"
         },
         {
@@ -1599,6 +1599,33 @@
           "name": "EndFunctionDesc",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "用户多久没说话提示时长,最小10秒,默认10秒",
+          "example": "10000",
+          "member": "int64",
+          "name": "NotifyDuration",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "用户NotifyDuration没说话，ai提示的语句，默认是\"抱歉，我没听清。您可以重复下吗？\"",
+          "example": "抱歉，我没听清。您可以重复下吗？",
+          "member": "string",
+          "name": "NotifyMessage",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "和voiceType字段需要选填一个，这里是使用自己自定义的TTS，voiceType是系统内置的一些音色\n\ntencent TTS:\n{ \n       \"TTSType\": \"tencent\", // String TTS类型, 目前支持\"tencent\" 和 “minixmax”， 其他的厂商支持中\n       \"AppId\": \"您的应用ID\", // String 必填\n       \"SecretId\": \"您的密钥ID\", // String 必填\n       \"SecretKey\":  \"您的密钥Key\", // String 必填\n       \"VoiceType\": 101001, // Integer  必填，音色 ID，包括标准音色与精品音色，精品音色拟真度更高，价格不同于标准音色，请参见语音合成计费概述。完整的音色 ID 列表请参见语音合成音色列表。\n       \"Speed\": 1.25, // Integer 非必填，语速，范围：[-2，6]，分别对应不同语速： -2: 代表0.6倍 -1: 代表0.8倍 0: 代表1.0倍（默认） 1: 代表1.2倍 2: 代表1.5倍  6: 代表2.5倍  如果需要更细化的语速，可以保留小数点后 2 位，例如0.5/1.25/2.81等。 参数值与实际语速转换，可参考 语速转换\n       \"Volume\": 5, // Integer 非必填，音量大小，范围：[0，10]，分别对应11个等级的音量，默认值为0，代表正常音量。\n       \"PrimaryLanguage\": 1, // Integer 可选 主要语言 1-中文（默认） 2-英文 3-日文\n       \"FastVoiceType\": \"xxxx\"   //  可选参数， 快速声音复刻的参数 \n  }\n\n参考：https://cloud.tencent.com/document/product/1073/92668#55924b56-1a73-4663-a7a1-a8dd82d6e823 \n\nminimax TTS\n{\n        \"TTSType\": \"minimax\",  // String TTS类型, \n        \"Model\": \"speech-01-turbo\",\n        \"APIUrl\": \"https://api.minimax.chat/v1/t2a_v2\",\n        \"APIKey\": \"eyxxxx\",\n        \"GroupId\": \"181000000000000\",\n        \"VoiceType\":\"female-tianmei-jingpin\",\n        \"Speed\": 1.2\n}\n\n参考：https://platform.minimaxi.com/document/T2A%20V2?key=66719005a427f0c8a5701643 \n限频参考：https://platform.minimaxi.com/document/Rate%20limits?key=66b19417290299a26b234572   可能会导致回答卡顿\n\n\n\nvolcengine TTS\n{\n    \"TTSType\": \"volcengine\",  // 必填：String TTS类型\n    \"AppId\" : \"xxxxxxxx\",   // 必填：String 火山引擎分配的Appid\n    \"Token\" : \"TY9d4sQXHxxxxxxx\", // 必填： String类型 火山引擎的访问token\n    \"Speed\" : 1.0,            // 可选参数 语速，默认为1.0\n    \"Volume\": 1.0,            // 可选参数， 音量大小， 默认为1.0\n    \"Cluster\" : \"volcano_tts\", // 可选参数，业务集群, 默认是 volcano_tts\n    \"VoiceType\" : \"zh_male_aojiaobazong_moon_bigtts\"   // 音色类型， 默认为大模型语音合成的音色。 如果使用普通语音合成，则需要填写对应的音色类型。 音色类型填写错误会导致没有声音。\n}\n\n\n\n火山引擎音色类型参考：\nhttps://www.volcengine.com/docs/6561/162929 \n语音合成音色列表--语音技术-火山引擎\n大模型语音合成音色列表--语音技术-火山引擎\n\n\nAzure TTS\n{\n    \"TTSType\": \"azure\", // 必填：String TTS类型\n    \"SubscriptionKey\": \"xxxxxxxx\", // 必填：String 订阅的Key\n    \"Region\": \"chinanorth3\",  // 必填：String 订阅的地区\n    \"VoiceName\": \"zh-CN-XiaoxiaoNeural\", // 必填：String 音色名必填\n    \"Language\": \"zh-CN\", // 必填：String 合成的语言  \n    \"Rate\": 1 // 选填：float 语速  0.5～2 默认为 1\n}\n\n参考：\nhttps://docs.azure.cn/zh-cn/ai-services/speech-service/speech-synthesis-markup-voice \n\n\n自定义 TTS \n{\n  \"TTSType\": \"custom\", // String 必填\n  \"APIKey\": \"ApiKey\", // String 必填 用来鉴权\n  \"APIUrl\": \"http://0.0.0.0:8080/stream-audio\" // String，必填，TTS API URL\n  \"AudioFormat\": \"wav\", // String, 非必填，期望输出的音频格式，如mp3， ogg_opus，pcm，wav，默认为 wav，目前只支持pcm和wav，\n  \"SampleRate\": 16000,  // Integer，非必填，音频采样率，默认为16000(16k)，推荐值为16000\n  \"AudioChannel\": 1,    // Integer，非必填，音频通道数，取值：1 或 2  默认为1  \n}\n\n\n具体协议规范： \nhttps://doc.weixin.qq.com/doc/w3_ANQAiAbdAFwHILbJBmtSqSbV1WZ3L?scode=AJEAIQdfAAo5a1xajYANQAiAbdAFw \n\n\n",
+          "example": "{ \t\"TTSType\": \"azure\", \t\"SubscriptionKey\": \"xxxxxxxx\", \t\"Region\": \"chinanorth3\", \t\"VoiceName\": \"zh-CN-XiaoxiaoNeural\", \t\"Language\": \"zh-CN\", \t\"Rate\": 1 }",
+          "member": "string",
+          "name": "CustomTTSConfig",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"

tccli/services/cls/cls_client.py

@@ -1525,7 +1525,7 @@ def doCreateShipper(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyConsumer(args, parsed_globals):
+def doCreateNoticeContent(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1554,11 +1554,11 @@ def doModifyConsumer(args, parsed_globals):
     client = mod.ClsClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyConsumerRequest()
+    model = models.CreateNoticeContentRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ModifyConsumer(model)
+        rsp = client.CreateNoticeContent(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2981,6 +2981,58 @@ def doDescribeShipperTasks(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyNoticeContent(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.ClsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ModifyNoticeContentRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyNoticeContent(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 doSearchCosRechargeInfo(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3293,6 +3345,58 @@ def doAddMachineGroupInfo(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDeleteNoticeContent(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.ClsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DeleteNoticeContentRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DeleteNoticeContent(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 doDeleteConsoleSharing(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4860,6 +4964,58 @@ def doModifyLogset(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyConsumer(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.ClsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ModifyConsumerRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyConsumer(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 doModifyDataTransform(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -5068,6 +5224,58 @@ def doDescribeConsumer(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeNoticeContents(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.ClsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeNoticeContentsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeNoticeContents(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 doDescribeMachines(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -5316,7 +5524,7 @@ ACTION_MAP = {
     "DescribeIndex": doDescribeIndex,
     "CreateAlarmShield": doCreateAlarmShield,
     "CreateShipper": doCreateShipper,
-    "ModifyConsumer": doModifyConsumer,
+    "CreateNoticeContent": doCreateNoticeContent,
     "DeleteConsumer": doDeleteConsumer,
     "DeleteMachineGroup": doDeleteMachineGroup,
     "DescribeKafkaRecharges": doDescribeKafkaRecharges,
@@ -5344,12 +5552,14 @@ ACTION_MAP = {
     "CreateConsoleSharing": doCreateConsoleSharing,
     "DescribeMachineGroupConfigs": doDescribeMachineGroupConfigs,
     "DescribeShipperTasks": doDescribeShipperTasks,
+    "ModifyNoticeContent": doModifyNoticeContent,
     "SearchCosRechargeInfo": doSearchCosRechargeInfo,
     "ModifyKafkaRecharge": doModifyKafkaRecharge,
     "DescribeKafkaConsumer": doDescribeKafkaConsumer,
     "DeleteDashboardSubscribe": doDeleteDashboardSubscribe,
     "CreateDataTransform": doCreateDataTransform,
     "AddMachineGroupInfo": doAddMachineGroupInfo,
+    "DeleteNoticeContent": doDeleteNoticeContent,
     "DeleteConsoleSharing": doDeleteConsoleSharing,
     "DescribeAlarmNotices": doDescribeAlarmNotices,
     "DescribePartitions": doDescribePartitions,
@@ -5380,10 +5590,12 @@ ACTION_MAP = {
     "UploadLog": doUploadLog,
     "DeleteTopic": doDeleteTopic,
     "ModifyLogset": doModifyLogset,
+    "ModifyConsumer": doModifyConsumer,
     "ModifyDataTransform": doModifyDataTransform,
     "SearchLog": doSearchLog,
     "DescribeLogContext": doDescribeLogContext,
     "DescribeConsumer": doDescribeConsumer,
+    "DescribeNoticeContents": doDescribeNoticeContents,
     "DescribeMachines": doDescribeMachines,
     "RetryShipperTask": doRetryShipperTask,
     "CreateAlarm": doCreateAlarm,