tccli 3.0.1137.1__py2.py3-none-any.whl → 3.0.1139.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1137.1'
+__version__ = '3.0.1139.1'

tccli/command.py

@@ -157,7 +157,7 @@ class ServiceCommand(BaseCommand):
             raise Exception("Version: %s is invalid in service: %s, available versions: %s. \n"
                             "Please check your command or configure file to find out "
                             "if version setting is correct."
-                            % (service_name, version, " ".join(available_version_list)))
+                            % (version, service_name, " ".join(available_version_list)))
         self._version = version
         self._command_map = None
         self._service_model = None

tccli/help_command.py

@@ -29,7 +29,7 @@ class BaseHelpCommand(object):
                 raise Exception("Version: %s is invalid in service: %s, available versions: %s. \n"
                                 "Please check your command or configure file to find out "
                                 "if version setting is correct."
-                                % (service_name, version, " ".join(available_version_list)))
+                                % (version, service_name, " ".join(available_version_list)))
             self._version = version
 
     def __call__(self, args, parsed_globals):

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/asr/v20190614/api.json

@@ -712,6 +712,15 @@
           "name": "Extra",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "临时热词表：该参数用于提升识别准确率。\n\n- 单个热词限制：\"热词|权重\"，单个热词不超过30个字符（最多10个汉字），权重[1-11]或者100，如：“腾讯云|5” 或“ASR|11”；\n\n- 临时热词表限制：多个热词用英文逗号分割，最多支持128个热词，如：“腾讯云|10,语音识别|5,ASR|11”；\n\n- 参数 hotword_id（热词表） 与 hotword_list（临时热词表） 区别：\n\n    - hotword_id：热词表。需要先在控制台或接口创建热词表，获得对应hotword_id传入参数来使用热词功能；\n\n    - hotword_list：临时热词表。每次请求时直接传入临时热词表来使用热词功能，云端不保留临时热词表。适用于有极大量热词需求的用户；\n\n注意：\n\n- 如果同时传入了 hotword_id 和 hotword_list，会优先使用 hotword_list；\n\n- 热词权重设置为11时，当前热词将升级为超级热词，建议仅将重要且必须生效的热词设置到11，设置过多权重为11的热词将影响整体字准率。\n\n- 热词权重设置为100时，当前热词开启热词增强同音替换功能（仅支持8k_zh,16k_zh），举例：热词配置“蜜制|100”时，与“蜜制”同拼音（mizhi）的“秘制”的识别结果会被强制替换成“蜜制”。因此建议客户根据自己的实际情况开启该功能。建议仅将重要且必须生效的热词设置到100，设置过多权重为100的热词将影响整体字准率。",
+          "example": "无",
+          "member": "string",
+          "name": "HotwordList",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"

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/cdwch/v20200915/api.json

@@ -193,7 +193,7 @@
   "metadata": {
     "apiVersion": "2020-09-15",
     "api_brief": "云数据仓库 ClickHouse（CDWCH）是腾讯云提供的云上 ClickHouse 托管服务，为用户提供便捷的 ClickHouse 集群部署、软件安装、配置修改、监控告警、弹性伸缩等功能，为企业及用户提供安全稳定的大数据处理解决方案。",
-    "serviceNameCN": "云数据仓库 ClickHouse",
+    "serviceNameCN": "腾讯云数据仓库TCHouse-C",
     "serviceShortName": "cdwch"
   },
   "objects": {

tccli/services/ckafka/v20190819/api.json

@@ -85,9 +85,9 @@
       "status": "online"
     },
     "CreateDatahubTopic": {
-      "document": "创建Datahub主题",
+      "document": "创建DIP主题",
       "input": "CreateDatahubTopicRequest",
-      "name": "创建Datahub主题",
+      "name": "创建DIP主题",
       "output": "CreateDatahubTopicResponse",
       "status": "online"
     },
@@ -183,9 +183,9 @@
       "status": "online"
     },
     "DeleteDatahubTask": {
-      "document": "删除Datahub任务",
+      "document": "删除Dip任务",
       "input": "DeleteDatahubTaskRequest",
-      "name": "删除Datahub任务",
+      "name": "删除Dip任务",
       "output": "DeleteDatahubTaskResponse",
       "status": "online"
     },
@@ -323,9 +323,9 @@
       "status": "online"
     },
     "DescribeDatahubTopic": {
-      "document": "获取Datahub主题属性",
+      "document": "获取DIP主题属性",
       "input": "DescribeDatahubTopicRequest",
-      "name": "获取Datahub主题属性",
+      "name": "获取DIP主题属性",
       "output": "DescribeDatahubTopicResponse",
       "status": "online"
     },
@@ -526,9 +526,9 @@
       "status": "online"
     },
     "ModifyDatahubTopic": {
-      "document": "修改Datahub主题属性",
+      "document": "修改DIP主题属性",
       "input": "ModifyDatahubTopicRequest",
-      "name": "修改Datahub主题属性",
+      "name": "修改DIP主题属性",
       "output": "ModifyDatahubTopicResponse",
       "status": "online"
     },
@@ -1025,7 +1025,7 @@
           "example": "0",
           "member": "int64",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -2831,7 +2831,7 @@
           "example": "1",
           "member": "int64",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -3311,7 +3311,7 @@
       "members": [
         {
           "disabled": false,
-          "document": "名称，是一个不超过 128 个字符的字符串，必须以字母为首字符，剩余部分可以包含字母、数字和横划线(-)",
+          "document": "名称，是一个不超过 128 个字符的字符串，必须以“AppId-”为首字符，剩余部分可以包含字母、数字和横划线(-)",
           "example": "xxx",
           "member": "string",
           "name": "Name",
@@ -3366,7 +3366,7 @@
           "example": "无",
           "member": "DatahubTopicResp",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -4247,7 +4247,7 @@
           "example": "data",
           "member": "PrometheusResult",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -4274,7 +4274,7 @@
         },
         {
           "disabled": false,
-          "document": "路由网络类型(3:vpc路由;4:标准版支撑路由;7:专业版支撑路由)",
+          "document": "路由网络类型(3:vpc路由;7:内部支撑路由)",
           "example": "1",
           "member": "int64",
           "name": "VipType",
@@ -4402,7 +4402,7 @@
           "example": "904b75130b4b4102bdeb071a7f48523a",
           "member": "string",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -5515,7 +5515,7 @@
           "example": "无",
           "member": "int64",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -5552,7 +5552,7 @@
           "example": "xxx",
           "member": "ConnectResourceResourceIdResp",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -5589,7 +5589,7 @@
           "example": "xxx",
           "member": "DatahubTaskIdRes",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -6736,7 +6736,7 @@
           "example": "xxx",
           "member": "DescribeConnectResourceResp",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -6981,7 +6981,7 @@
           "example": "无",
           "member": "GroupOffsetResponse",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -7174,7 +7174,7 @@
           "example": "xxx",
           "member": "DescribeDatahubTaskRes",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -7434,7 +7434,7 @@
           "example": "无",
           "member": "DescribeDatahubTopicResp",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -9938,7 +9938,7 @@
           "example": "无",
           "member": "ConsumerRecord",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -12974,7 +12974,7 @@
           "example": "xxx",
           "member": "DatahubTaskIdRes",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -13038,7 +13038,7 @@
           "example": "无",
           "member": "JgwOperateResponse",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },