tccli 3.0.1358.1__py2.py3-none-any.whl → 3.0.1360.1__py2.py3-none-any.whl

tccli/services/mps/v20190612/examples.json

@@ -1206,6 +1206,18 @@
         "input": "POST / HTTP/1.1\nHost: mps.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ProcessMedia\n<公共请求参数>\n\n{\n    \"MediaProcessTask\": {\n        \"TranscodeTaskSet\": [\n            {\n                \"Definition\": \"30\"\n            },\n            {\n                \"Definition\": \"20\"\n            },\n            {\n                \"Definition\": \"40\"\n            }\n        ]\n    },\n    \"InputInfo\": {\n        \"Type\": \"COS\",\n        \"CosInputInfo\": {\n            \"Region\": \"ap-chongqing\",\n            \"Object\": \"/movie/201907/WildAnimal.mov\",\n            \"Bucket\": \"TopRankVideo-125xxx88\"\n        }\n    }\n}",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"6ca31e3a-6b8e-4b4e-9256-fdc700064ef3\",\n        \"TaskId\": \"125xxx65-procedurev2-bffb15f07530b57bc1aabb01fac74bca\"\n    }\n}",
         "title": "发起转码任务"
+      },
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: mps.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ProcessMedia\n<公共请求参数>\n\n{\n    \"InputInfo\": {\n        \"Type\": \"COS\",\n        \"CosInputInfo\": {\n            \"Bucket\": \"TopRankVideo-125xxx88\",\n            \"Region\": \"ap-shanghai\",\n            \"Object\": \"/image/lenna.jpeg\"\n        }\n    },\n    \"OutputStorage\": {\n        \"Type\": \"COS\",\n        \"CosOutputStorage\": {\n            \"Bucket\": \"TopRankVideo-125xxx88\",\n            \"Region\": \"ap-shanghai\"\n        }\n    },\n    \"OutputDir\": \"/data/share/\",\n    \"AiQualityControlTask\": {\n        \"Definition\": 30\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"4a72e698-ec27-4fc1-8e17-c1cbfce1a4a9\",\n        \"TaskId\": \"2600007696-WorkflowTask-67771a50b24d08baaf6165da23461e36tt7\"\n    }\n}",
+        "title": "发起媒体质检任务"
+      },
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: mps.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ProcessMedia\n<公共请求参数>\n\n{\n    \"InputInfo\": {\n        \"Type\": \"COS\",\n        \"CosInputInfo\": {\n            \"Bucket\": \"TopRankVideo-125xxx88\",\n            \"Region\": \"ap-shanghai\",\n            \"Object\": \"/video/lego-city-vehicles.mp4\"\n        }\n    },\n    \"OutputDir\": \"/share/output/\",\n    \"MediaProcessTask\": {\n        \"AdaptiveDynamicStreamingTaskSet\": [\n            {\n                \"Definition\": 10,\n                \"OutputObjectPath\": \"{inputName}_adaptiveDynamicStreaming.{format}\",\n                \"SubStreamObjectName\": \"{inputName}_adaptiveDynamicStreaming_{definition}_{subStreamNumber}.{format}\",\n                \"SegmentObjectName\": \"{inputName}_adaptiveDynamicStreaming_{definition}_{subStreamNumber}_{segmentNumber}.{format}\"\n            }\n        ]\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"be6954ba-1e0e-4b36-9da1-d79aaaaccb0d\",\n        \"TaskId\": \"2600007696-WorkflowTask-7bc4b70f5bda4b4fef4ad29d2d168bdftt7\"\n    }\n}",
+        "title": "发起自适应码流任务"
       }
     ],
     "RecognizeMediaForZhiXue": [

tccli/services/oceanus/v20190422/api.json

@@ -3996,7 +3996,7 @@
       "members": [
         {
           "disabled": false,
-          "document": "筛选条件字段",
+          "document": "筛选条件字段，使用了筛选字段后不支持分页，最多返回2000条记录",
           "example": "无",
           "member": "Filter",
           "name": "Filters",
@@ -4133,12 +4133,32 @@
         {
           "disabled": false,
           "document": "请求ID\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "xxx",
+          "example": "ocs-111",
           "member": "string",
           "name": "RequestId",
           "output_required": true,
           "type": "string",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "attach-000\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "attach-000",
+          "member": "string",
+          "name": "PageAttach",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "bool\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "false",
+          "member": "bool",
+          "name": "HasMore",
+          "output_required": false,
+          "type": "bool",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"

tccli/services/ocr/ocr_client.py

@@ -3709,6 +3709,58 @@ def doRecognizeMedicalInvoiceOCR(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doRecognizeTableMultiOCR(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.OcrClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.RecognizeTableMultiOCRRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.RecognizeTableMultiOCR(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 doGeneralFastOCR(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4623,6 +4675,7 @@ ACTION_MAP = {
     "QuestionSplitOCR": doQuestionSplitOCR,
     "MLIDCardOCR": doMLIDCardOCR,
     "RecognizeMedicalInvoiceOCR": doRecognizeMedicalInvoiceOCR,
+    "RecognizeTableMultiOCR": doRecognizeTableMultiOCR,
     "GeneralFastOCR": doGeneralFastOCR,
     "VatInvoiceOCR": doVatInvoiceOCR,
     "RecognizeForeignPermanentResidentIdCard": doRecognizeForeignPermanentResidentIdCard,

tccli/services/ocr/v20181119/api.json

@@ -448,6 +448,13 @@
       "output": "RecognizeTableAccurateOCRResponse",
       "status": "online"
     },
+    "RecognizeTableMultiOCR": {
+      "document": "基于MLLM(多模态大语言模型)的表格识别能力，针对复杂表格的算法识别效果更佳，适配财务报表识别场景，并可输出直接对接业务系统的Excel数据。\n\n默认接口请求频率限制：1次/秒。",
+      "input": "RecognizeTableMultiOCRRequest",
+      "name": "表格识别（多模态版）",
+      "output": "RecognizeTableMultiOCRResponse",
+      "status": "online"
+    },
     "RecognizeTableOCR": {
       "document": "本接口支持中英文图片/ PDF内常规表格、无线表格、多表格的检测和识别，支持日文有线表格识别，返回每个单元格的文字内容，支持旋转的表格图片识别，且支持将识别结果保存为 Excel 格式。\n\n默认接口请求频率限制：10次/秒。",
       "input": "RecognizeTableOCRRequest",
@@ -14820,6 +14827,79 @@
       ],
       "type": "object"
     },
+    "RecognizeTableMultiOCRRequest": {
+      "document": "RecognizeTableMultiOCR请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "图片/PDF的 Base64 值。 要求图片/PDF经Base64编码后不超过 10M，分辨率建议600*800以上，支持PNG、JPG、JPEG、BMP、PDF格式。 图片支持的像素范围：需介于20-10000px之间。 图片的 ImageUrl、ImageBase64 必须提供一个，如果都提供，只使用 ImageUrl。 ",
+          "example": "/9j/4AAQSkZJRg.....s97n//2Q==",
+          "member": "string",
+          "name": "ImageBase64",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "图片/PDF的 Url 地址。 要求图片/PDF经Base64编码后不超过 10M，分辨率建议600*800以上，支持PNG、JPG、JPEG、BMP、PDF格式。 图片支持的像素范围：需介于20-10000px之间。 图片存储于腾讯云的 Url 可保障更高的下载速度和稳定性，建议图片存储于腾讯云。非腾讯云存储的 Url 速度和稳定性可能受一定影响。 ",
+          "example": "https://ocr-demo-1254418846.cos.ap-guangzhou.myqcloud.com/***/fakeurl.jpg",
+          "member": "string",
+          "name": "ImageUrl",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "文档的起始页码。  当传入文件是PDF型时，用来指定识别的起始页码，识别的页码包含当前值。",
+          "example": "1",
+          "member": "int64",
+          "name": "PdfStartPageNumber",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "文档的结束页码。 当传入文件是PDF类型时，用来指定识别的结束页码，识别的页码包含当前值。单次调用最多支持识别3页内容，即PdfEndPageNumber-PdfStartPageNumber需要不大于3。",
+          "example": "3",
+          "member": "int64",
+          "name": "PdfEndPageNumber",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "配置选项，支持配置输出数据格式。\n\n* **Mdbase64** 返回 base64 编码的 markdown 格式文本。\n* **Excelbase64** 返回 base64 编码的 excel 文件。",
+          "example": "Excelbase64",
+          "member": "string",
+          "name": "DataFormat",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "RecognizeTableMultiOCRResponse": {
+      "document": "RecognizeTableMultiOCR返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "Base64 编码后的 Excel 数据或 Markdown 数据。  注意：此字段可能返回空，表示取不到有效值。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "/9j/4AAQSkZJRg.....s97n//2Q==",
+          "member": "string",
+          "name": "DataBase64",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "RecognizeTableOCRRequest": {
       "document": "RecognizeTableOCR请求参数结构体",
       "members": [

tccli/services/ocr/v20181119/examples.json

@@ -554,6 +554,14 @@
         "title": "RecognizeTableAccurateOCR调用"
       }
     ],
+    "RecognizeTableMultiOCR": [
+      {
+        "document": "调用成功示例",
+        "input": "POST / HTTP/1.1\nHost: ocr.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: RecognizeTableMultiOCR\n<公共请求参数>\n\n{\n    \"ImageUrl\": \"https://xxx.com/1.pdf\",\n    \"PdfStartPageNumber\": 1,\n    \"PdfEndPageNumber\": 2\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"43e5db77-ea0c-4b82-9f77-86387eb856e5\",\n        \"DataBase64\": \"fCDpobnnm64gfCAyMDI0IOW5tDkg5pyIMz...4LjQ0IHwK\"\n    }\n}",
+        "title": "调用成功示例"
+      }
+    ],
     "RecognizeTableOCR": [
       {
         "document": "表格识别示例代码",