tccli 3.0.1150.1__py2.py3-none-any.whl → 3.0.1151.1__py2.py3-none-any.whl

tccli/services/hunyuan/hunyuan_client.py

@@ -17,7 +17,7 @@ from tencentcloud.hunyuan.v20230901 import models as models_v20230901
 from jmespath import search
 import time
 
-def doChatCompletions(args, parsed_globals):
+def doSubmitHunyuanImageJob(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -46,11 +46,11 @@ def doChatCompletions(args, parsed_globals):
     client = mod.HunyuanClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ChatCompletionsRequest()
+    model = models.SubmitHunyuanImageJobRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ChatCompletions(model)
+        rsp = client.SubmitHunyuanImageJob(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -121,7 +121,7 @@ def doQueryHunyuanImageJob(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doGetEmbedding(args, parsed_globals):
+def doChatCompletions(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -150,11 +150,11 @@ def doGetEmbedding(args, parsed_globals):
     client = mod.HunyuanClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.GetEmbeddingRequest()
+    model = models.ChatCompletionsRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.GetEmbedding(model)
+        rsp = client.ChatCompletions(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -225,7 +225,7 @@ def doGetTokenCount(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doSubmitHunyuanImageJob(args, parsed_globals):
+def doTextToImageLite(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -254,11 +254,63 @@ def doSubmitHunyuanImageJob(args, parsed_globals):
     client = mod.HunyuanClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.SubmitHunyuanImageJobRequest()
+    model = models.TextToImageLiteRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.SubmitHunyuanImageJob(model)
+        rsp = client.TextToImageLite(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 doGetEmbedding(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.HunyuanClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.GetEmbeddingRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.GetEmbedding(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -288,11 +340,12 @@ MODELS_MAP = {
 }
 
 ACTION_MAP = {
-    "ChatCompletions": doChatCompletions,
+    "SubmitHunyuanImageJob": doSubmitHunyuanImageJob,
     "QueryHunyuanImageJob": doQueryHunyuanImageJob,
-    "GetEmbedding": doGetEmbedding,
+    "ChatCompletions": doChatCompletions,
     "GetTokenCount": doGetTokenCount,
-    "SubmitHunyuanImageJob": doSubmitHunyuanImageJob,
+    "TextToImageLite": doTextToImageLite,
+    "GetEmbedding": doGetEmbedding,
 
 }
 

tccli/services/hunyuan/v20230901/api.json

@@ -34,6 +34,13 @@
       "name": "提交混元生图任务",
       "output": "SubmitHunyuanImageJobResponse",
       "status": "online"
+    },
+    "TextToImageLite": {
+      "document": "文生图轻量版接口根据输入的文本描述，智能生成与之相关的结果图。\n文生图轻量版默认提供3个并发任务数，代表最多能同时处理3个已提交的任务，上一个任务处理完毕后才能开始处理下一个任务。",
+      "input": "TextToImageLiteRequest",
+      "name": "文生图轻量版",
+      "output": "TextToImageLiteResponse",
+      "status": "online"
     }
   },
   "metadata": {
@@ -762,6 +769,88 @@
       ],
       "type": "object"
     },
+    "TextToImageLiteRequest": {
+      "document": "TextToImageLite请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "文本描述。\n算法将根据输入的文本智能生成与之相关的图像。建议详细描述画面主体、细节、场景等，文本描述越丰富，生成效果越精美。\n不能为空，推荐使用中文。最多可传256个 utf-8 字符。",
+          "example": "雨中, 竹林,  小路",
+          "member": "string",
+          "name": "Prompt",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "反向文本描述。\n用于一定程度上从反面引导模型生成的走向，减少生成结果中出现描述内容的可能，但不能完全杜绝。\n推荐使用中文。最多可传256个 utf-8 字符。",
+          "example": "无",
+          "member": "string",
+          "name": "NegativePrompt",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "绘画风格。\n请在 [智能文生图风格列表](https://cloud.tencent.com/document/product/1668/86249) 中选择期望的风格，传入风格编号。\n推荐使用且只使用一种风格。不传默认使用201（日系动漫风格）。",
+          "example": "无",
+          "member": "string",
+          "name": "Style",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "生成图分辨率。\n支持生成以下分辨率的图片：768:768（1:1）、768:1024（3:4）、1024:768（4:3）、1024:1024（1:1）、720:1280（9:16）、1280:720（16:9）、768:1280（3:5）、1280:768（5:3）、1080:1920（9:16）、1920:1080（16:9），不传默认使用768:768。",
+          "example": "无",
+          "member": "string",
+          "name": "Resolution",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "为生成结果图添加标识的开关，默认为1。\n1：添加标识。\n0：不添加标识。\n其他数值：默认按0处理。\n建议您使用显著标识来提示结果图使用了 AI 绘画技术，是 AI 生成的图片。",
+          "example": "无",
+          "member": "int64",
+          "name": "LogoAdd",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "返回图像方式（base64 或 url) ，二选一，默认为 base64。url 有效期为1小时。",
+          "example": "base64",
+          "member": "string",
+          "name": "RspImgType",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "TextToImageLiteResponse": {
+      "document": "TextToImageLite返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "根据入参 RspImgType 填入不同，返回不同的内容。如果传入 base64 则返回生成图 Base64 编码。如果传入 url 则返回的生成图 URL , 有效期1小时，请及时保存。",
+          "example": "url",
+          "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"
+    },
     "Tool": {
       "document": "用户指定模型使用的工具",
       "members": [

tccli/services/hunyuan/v20230901/examples.json

@@ -87,6 +87,14 @@
         "output": "{\n    \"Response\": {\n        \"JobId\": \"test\",\n        \"RequestId\": \"d4e1f224-fa21-40bc-9ee7-4bb13abece6e\"\n    }\n}",
         "title": "调用成功"
       }
+    ],
+    "TextToImageLite": [
+      {
+        "document": "成功调用，并返回生图url",
+        "input": "POST / HTTP/1.1\nHost: hunyuan.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: TextToImageLite\n<公共请求参数>\n\n{\n    \"Prompt\": \"冰川，企鹅\",\n    \"RspImgType\": \"url\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"53549a10-0633-4ebe-bf39-466dc51aa2bb\",\n        \"ResultImage\": \"https://rspimg.jpg\"\n    }\n}",
+        "title": "成功调用"
+      }
     ]
   },
   "version": "1.0"

tccli/services/mps/v20190612/api.json

@@ -127,7 +127,7 @@
       "status": "online"
     },
     "CreateTranscodeTemplate": {
-      "document": "创建用户自定义转码模板，数量上限：1000。",
+      "document": "创建用户自定义转码模板，数量上限：1000",
       "input": "CreateTranscodeTemplateRequest",
       "name": "创建转码模板",
       "output": "CreateTranscodeTemplateResponse",
@@ -8137,7 +8137,7 @@
           "example": "1008",
           "member": "uint64",
           "name": "Definition",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -8228,7 +8228,7 @@
           "example": "30",
           "member": "int64",
           "name": "Definition",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -8355,7 +8355,7 @@
           "example": "1008",
           "member": "uint64",
           "name": "Definition",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -9042,6 +9042,7 @@
           "example": "",
           "member": "AiSamplePerson",
           "name": "Person",
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -9051,6 +9052,7 @@
           "example": "",
           "member": "AiSampleFailFaceInfo",
           "name": "FailFaceInfoSet",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -9214,7 +9216,7 @@
           "example": "1008",
           "member": "uint64",
           "name": "Definition",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -9978,6 +9980,7 @@
           "example": "157482",
           "member": "int64",
           "name": "WorkflowId",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -10437,7 +10440,7 @@
         {
           "disabled": false,
           "document": "关键词，数组长度限制：100 个词。",
-          "example": "",
+          "example": "“”",
           "member": "string",
           "name": "Keywords",
           "required": true,
@@ -13966,7 +13969,7 @@
         {
           "disabled": false,
           "document": "工作流 ID。",
-          "example": "",
+          "example": "12345",
           "member": "int64",
           "name": "WorkflowId",
           "required": true,
@@ -14435,7 +14438,7 @@
           "example": "XXX",
           "member": "string",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -20488,6 +20491,7 @@
           "example": "",
           "member": "AiSamplePerson",
           "name": "Person",
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -20497,6 +20501,7 @@
           "example": "",
           "member": "AiSampleFailFaceInfo",
           "name": "FailFaceInfoSet",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -21228,7 +21233,7 @@
           "example": "\"\"",
           "member": "string",
           "name": "ImageUrl",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -23565,6 +23570,7 @@
           "example": "",
           "member": "string",
           "name": "TaskId",
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -23599,7 +23605,7 @@
         {
           "disabled": false,
           "document": "工作流 ID。",
-          "example": "",
+          "example": "10",
           "member": "int64",
           "name": "WorkflowId",
           "required": true,
@@ -23608,7 +23614,7 @@
         {
           "disabled": false,
           "document": "工作流名称，最多128字符。同一个用户该名称唯一。",
-          "example": "",
+          "example": "“”",
           "member": "string",
           "name": "WorkflowName",
           "required": true,
@@ -23617,7 +23623,7 @@
         {
           "disabled": false,
           "document": "工作流绑定的触发规则，当上传视频命中该规则到该对象时即触发工作流。",
-          "example": "",
+          "example": "无",
           "member": "WorkflowTrigger",
           "name": "Trigger",
           "required": true,
@@ -23626,7 +23632,7 @@
         {
           "disabled": false,
           "document": "视频处理的文件输出配置。不填则继承 Trigger 中的存储位置。",
-          "example": "",
+          "example": "无",
           "member": "TaskOutputStorage",
           "name": "OutputStorage",
           "required": false,
@@ -23634,8 +23640,8 @@
         },
         {
           "disabled": false,
-          "document": "视频处理生成的文件输出的目标目录，如`/movie/201907/`。如果不填，表示与触发文件所在的目录一致，即`{inputDir}`。",
-          "example": "",
+          "document": "视频处理生成的文件输出的目标目录，必选以 / 开头和结尾，如`/movie/201907/`。\n如果不填，表示与触发文件所在的目录一致，即`{inputDir}`。",
+          "example": "无",
           "member": "string",
           "name": "OutputDir",
           "required": false,
@@ -23644,7 +23650,7 @@
         {
           "disabled": false,
           "document": "视频处理类型任务参数。",
-          "example": "",
+          "example": "无",
           "member": "MediaProcessTaskInput",
           "name": "MediaProcessTask",
           "required": false,
@@ -23653,7 +23659,7 @@
         {
           "disabled": false,
           "document": "视频内容审核类型任务参数。",
-          "example": "",
+          "example": "无",
           "member": "AiContentReviewTaskInput",
           "name": "AiContentReviewTask",
           "required": false,
@@ -23662,7 +23668,7 @@
         {
           "disabled": false,
           "document": "视频内容分析类型任务参数。",
-          "example": "",
+          "example": "无",
           "member": "AiAnalysisTaskInput",
           "name": "AiAnalysisTask",
           "required": false,
@@ -23671,7 +23677,7 @@
         {
           "disabled": false,
           "document": "视频内容识别类型任务参数。",
-          "example": "",
+          "example": "无",
           "member": "AiRecognitionTaskInput",
           "name": "AiRecognitionTask",
           "required": false,
@@ -23680,7 +23686,7 @@
         {
           "disabled": false,
           "document": "工作流的优先级，数值越大优先级越高，取值范围是 -10 到 10，不填代表 0。",
-          "example": "",
+          "example": "无",
           "member": "int64",
           "name": "TaskPriority",
           "required": false,
@@ -23689,7 +23695,7 @@
         {
           "disabled": false,
           "document": "任务的事件通知信息，不填代表不获取事件通知。",
-          "example": "",
+          "example": "无",
           "member": "TaskNotifyConfig",
           "name": "TaskNotifyConfig",
           "required": false,
@@ -26539,42 +26545,38 @@
         {
           "disabled": false,
           "document": "用户自定文本审核任务开关，可选值：\n<li>ON：开启自定义文本审核任务；</li>\n<li>OFF：关闭自定义文本审核任务。</li>",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "Switch",
           "required": false,
-          "type": "string",
-          "value_allowed_null": false
+          "type": "string"
         },
         {
           "disabled": false,
           "document": "用户自定义文本过滤标签，审核结果包含选择的标签则返回结果，如果过滤标签为空，则审核结果全部返回。如果要使用标签过滤功能，添加自定义文本关键词素材时需要添加对应标签。\n标签个数最多 10 个，每个标签长度最多 16 个字符。",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "LabelSet",
           "required": false,
-          "type": "string",
-          "value_allowed_null": false
+          "type": "string"
         },
         {
           "disabled": false,
           "document": "判定涉嫌违规的分数阈值，当智能审核达到该分数以上，认为涉嫌违规。取值范围：0~100。",
-          "example": "",
+          "example": "无",
           "member": "int64",
           "name": "BlockConfidence",
           "required": false,
-          "type": "int",
-          "value_allowed_null": false
+          "type": "int"
         },
         {
           "disabled": false,
           "document": "判定需人工复核是否违规的分数阈值，当智能审核达到该分数以上，认为需人工复核。取值范围：0~100。",
-          "example": "",
+          "example": "无",
           "member": "int64",
           "name": "ReviewConfidence",
           "required": false,
-          "type": "int",
-          "value_allowed_null": false
+          "type": "int"
         }
       ],
       "usage": "in"
@@ -26737,7 +26739,7 @@
         },
         {
           "disabled": false,
-          "document": "视频帧率，取值范围：[0, 120]，单位：Hz。 当取值为 0，表示帧率和原始视频保持一致。 注意：自适应码率时取值范围是 [0, 60]",
+          "document": "视频帧率，取值范围：[0, 120]，单位：Hz。 当取值为 0，表示帧率和原始视频保持一致。\n注意：自适应码率时取值范围是 [0, 60]",
           "example": "0",
           "member": "int64",
           "name": "Fps",
@@ -27232,7 +27234,7 @@
           "example": "125xxx65-WithdrawsWatermark-bffb15f07530b57bc1aabb01fac74bca",
           "member": "string",
           "name": "TaskId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },