tccli 3.0.833.1__py2.py3-none-any.whl → 3.0.834.1__py2.py3-none-any.whl

tccli/services/gaap/v20180529/examples.json

@@ -118,14 +118,14 @@
     ],
     "CreateGlobalDomain": [
       {
-        "document": "",
-        "input": "POST / HTTP/1.1\nHost: gaap.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateGlobalDomain\n<公共请求参数>\n\n{\n    \"ProjectId\": \"0\",\n    \"DefaultValue\": \"1.1.1.1\",\n    \"Alias\": \"test\"\n}",
+        "document": "创建域名",
+        "input": "POST / HTTP/1.1\nHost: gaap.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateGlobalDomain\n<公共请求参数>\n\n{\n    \"ProjectId\": 0,\n    \"DefaultValue\": \"1.1.1.1\",\n    \"Alias\": \"test\"\n}",
         "output": "{\n    \"Response\": {\n        \"DomainId\": \"dm-pcp5xac5\",\n        \"RequestId\": \"0266e1f0-10a4-46ce-a118-29e360c90a1b\"\n    }\n}",
         "title": "创建域名"
       },
       {
-        "document": "",
-        "input": "POST / HTTP/1.1\nHost: gaap.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateGlobalDomain\n<公共请求参数>\n\n{\n    \"ProjectId\": \"0\",\n    \"DefaultValue\": \"127.0.0.1\",\n    \"Alias\": \"www.baidu.com\"\n}",
+        "document": "创建域名示例",
+        "input": "POST / HTTP/1.1\nHost: gaap.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateGlobalDomain\n<公共请求参数>\n\n{\n    \"ProjectId\": 0,\n    \"DefaultValue\": \"127.0.0.1\",\n    \"Alias\": \"www.baidu.com\"\n}",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"b4195a4c-7595-46db-b46d-7fcdafddee2c\",\n        \"DomainId\": \"dm-bihtw7x3\"\n    }\n}",
         "title": "创建域名示例"
       }

tccli/services/mps/mps_client.py

@@ -3813,6 +3813,58 @@ def doDescribeImageSpriteTemplates(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doWithdrawsWatermark(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('-', '_')]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_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.MpsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.WithdrawsWatermarkRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.WithdrawsWatermark(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 doDeleteContentReviewTemplate(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4417,6 +4469,7 @@ ACTION_MAP = {
     "ModifyWordSample": doModifyWordSample,
     "ModifyAdaptiveDynamicStreamingTemplate": doModifyAdaptiveDynamicStreamingTemplate,
     "DescribeImageSpriteTemplates": doDescribeImageSpriteTemplates,
+    "WithdrawsWatermark": doWithdrawsWatermark,
     "DeleteContentReviewTemplate": doDeleteContentReviewTemplate,
     "CreatePersonSample": doCreatePersonSample,
     "ProcessLiveStream": doProcessLiveStream,

tccli/services/mps/v20190612/api.json

@@ -580,6 +580,13 @@
       "name": "停止媒体传输流",
       "output": "StopStreamLinkFlowResponse",
       "status": "online"
+    },
+    "WithdrawsWatermark": {
+      "document": "提取视频中的盲水印。",
+      "input": "WithdrawsWatermarkRequest",
+      "name": "提取盲水印",
+      "output": "WithdrawsWatermarkResponse",
+      "status": "online"
     }
   },
   "metadata": {
@@ -4834,6 +4841,117 @@
       ],
       "usage": "in"
     },
+    "AwsS3FileUploadTrigger": {
+      "document": "AWS S3 文件是上传触发器。",
+      "members": [
+        {
+          "document": "工作流绑定的 AWS S3 存储桶。",
+          "example": "test",
+          "member": "string",
+          "name": "S3Bucket",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "工作流绑定的桶所在 AWS 区域。",
+          "example": "无",
+          "member": "string",
+          "name": "S3Region",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "工作流绑定的输入路径目录，必须为绝对路径，即以 `/` 开头和结尾。如`/movie/201907/`，不填代表根目录`/`。\t",
+          "example": "无",
+          "member": "string",
+          "name": "Dir",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "工作流允许触发的文件格式列表，如 [\"mp4\", \"flv\", \"mov\"]。不填代表所有格式的文件都可以触发工作流。\t",
+          "example": "无",
+          "member": "string",
+          "name": "Formats",
+          "required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "工作流绑定的 AWS S3 存储桶的秘钥ID。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "S3SecretId",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "document": "工作流绑定的 AWS S3 存储桶的秘钥Key。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "S3SecretKey",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "document": "工作流绑定的 AWS S3 存储桶对应的 SQS事件队列。\n注意：队列和桶需要在同一区域。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "AwsSQS",
+          "name": "AwsSQS",
+          "required": false,
+          "type": "object",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "both"
+    },
+    "AwsSQS": {
+      "document": "Aws SQS 队列信息",
+      "members": [
+        {
+          "document": "SQS 队列区域。",
+          "example": "ap-southeast-1",
+          "member": "string",
+          "name": "SQSRegion",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "SQS 队列名称。",
+          "example": "test",
+          "member": "string",
+          "name": "SQSQueueName",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "读写SQS的秘钥id。",
+          "example": "xx",
+          "member": "string",
+          "name": "S3SecretId",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "读写SQS的秘钥key。",
+          "example": "xxx",
+          "member": "string",
+          "name": "S3SecretKey",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "in"
+    },
     "ClassificationConfigureInfo": {
       "document": "智能分类任务控制参数",
       "members": [
@@ -13732,8 +13850,7 @@
       "document": "媒体处理的输入对象信息。",
       "members": [
         {
-          "default": "",
-          "document": "输入来源对象的类型，支持 COS、URL 两种。",
+          "document": "输入来源对象的类型，支持：\n<li> COS：COS源</li>\n<li> URL：URL源</li>\n<li> AWS-S3：AWS 源，目前只支持转码任务 </li>",
           "example": "NULL",
           "member": "string",
           "name": "Type",
@@ -13742,7 +13859,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "当 Type 为 COS 时有效，则该项为必填，表示媒体处理 COS 对象信息。",
           "example": "NULL",
           "member": "CosInputInfo",
@@ -13752,7 +13868,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "当 Type 为 URL 时有效，则该项为必填，表示媒体处理 URL 对象信息。\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "NULL",
           "member": "UrlInputInfo",
@@ -13760,6 +13875,15 @@
           "required": false,
           "type": "object",
           "value_allowed_null": true
+        },
+        {
+          "document": "当 Type 为 AWS-S3 时有效，则该项为必填，表示媒体处理 AWS S3 对象信息。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "NULL",
+          "member": "S3InputInfo",
+          "name": "S3InputInfo",
+          "required": false,
+          "type": "object",
+          "value_allowed_null": true
         }
       ],
       "usage": "both"
@@ -18124,6 +18248,99 @@
       ],
       "usage": "both"
     },
+    "S3InputInfo": {
+      "document": "AWS S3存储输入",
+      "members": [
+        {
+          "document": "S3 bucket。",
+          "example": "test",
+          "member": "string",
+          "name": "S3Bucket",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "S3 bucket 对应的区域。",
+          "example": "ap-southeast-1",
+          "member": "string",
+          "name": "S3Region",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "S3 bucket 中的媒体资源路径。",
+          "example": "/test.mp4",
+          "member": "string",
+          "name": "S3Object",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "AWS 内网访问 媒体资源的秘钥id。",
+          "example": "\"\"",
+          "member": "string",
+          "name": "S3SecretId",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "AWS 内网访问 媒体资源的秘钥key。",
+          "example": "\"\"",
+          "member": "string",
+          "name": "S3SecretKey",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "in"
+    },
+    "S3OutputStorage": {
+      "document": "AWS S3 输出位置",
+      "members": [
+        {
+          "document": "S3 bucket。",
+          "example": "test",
+          "member": "string",
+          "name": "S3Bucket",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "S3 bucket 对应的区域。",
+          "example": "ap-southeast-1",
+          "member": "string",
+          "name": "S3Region",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "AWS 内网上传 媒体资源的秘钥id。",
+          "example": "\"\"",
+          "member": "string",
+          "name": "S3SecretId",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "AWS 内网上传 媒体资源的秘钥key。",
+          "example": "\"\"",
+          "member": "string",
+          "name": "S3SecretKey",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "in"
+    },
     "SRTAddressDestination": {
       "document": "转推的目标地址信息。",
       "members": [
@@ -19158,7 +19375,6 @@
       "document": "任务的事件通知配置。",
       "members": [
         {
-          "default": "",
           "document": "CMQ或TDMQ-CMQ 的模型，有 Queue 和 Topic 两种。",
           "example": "Queue ",
           "member": "string",
@@ -19168,7 +19384,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "CMQ或TDMQ-CMQ 的园区，如 sh，bj 等。",
           "example": "sh",
           "member": "string",
@@ -19178,7 +19393,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "当模型为 Topic 时有效，表示接收事件通知的 CMQ 或 TDMQ-CMQ 的主题名。",
           "example": "test",
           "member": "string",
@@ -19188,7 +19402,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "当模型为 Queue 时有效，表示接收事件通知的 CMQ 或 TDMQ-CMQ 的队列名。",
           "example": "\"\"",
           "member": "string",
@@ -19198,7 +19411,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "工作流通知的模式，可取值有 Finish 和 Change，不填代表 Finish。",
           "example": "Finish ",
           "member": "string",
@@ -19208,8 +19420,7 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
-          "document": "通知类型，可选值：\n<li>CMQ：已下线，建议切换到TDMQ-CMQ</li>\n<li>TDMQ-CMQ：消息队列</li>\n<li>URL：指定URL时HTTP回调推送到 NotifyUrl 指定的地址，回调协议http+json，包体内容同解析事件通知接口的输出参数 </li>\n<li>SCF：不推荐使用，需要在控制台额外配置SCF</li>\n<font color=\"red\"> 注：不填或为空时默认 CMQ，如需采用其他类型需填写对应类型值。 </font>",
+          "document": "通知类型，可选值：\n<li>CMQ：已下线，建议切换到TDMQ-CMQ</li>\n<li>TDMQ-CMQ：消息队列</li>\n<li>URL：指定URL时HTTP回调推送到 NotifyUrl 指定的地址，回调协议http+json，包体内容同解析事件通知接口的输出参数 </li>\n<li>SCF：不推荐使用，需要在控制台额外配置SCF</li>\n<li>AWS-SQS：AWS 队列，只适用于 AWS 任务，且要求同区域</li>\n<font color=\"red\"> 注：不填或为空时默认 CMQ，如需采用其他类型需填写对应类型值。 </font>",
           "example": "URL",
           "member": "string",
           "name": "NotifyType",
@@ -19218,7 +19429,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "HTTP回调地址，NotifyType为URL时必填。",
           "example": "http://www.qq.com/callback",
           "member": "string",
@@ -19226,6 +19436,15 @@
           "required": false,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "document": "AWS SQS 回调，NotifyType为 AWS-SQS 时必填。\n\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "NULL",
+          "member": "AwsSQS",
+          "name": "AwsSQS",
+          "required": false,
+          "type": "object",
+          "value_allowed_null": true
         }
       ],
       "usage": "both"
@@ -19234,8 +19453,7 @@
       "document": "媒体处理输出对象信息。",
       "members": [
         {
-          "default": "",
-          "document": "媒体处理输出对象存储位置的类型，现在仅支持 COS。",
+          "document": "媒体处理输出对象存储位置的类型，支持：\n<li>COS：COS存储</li>\n<li>AWS-S3：AWS 存储，只适用于AWS任务，且要求同区域</li>",
           "example": "NULL",
           "member": "string",
           "name": "Type",
@@ -19244,7 +19462,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "当 Type 为 COS 时有效，则该项为必填，表示媒体处理 COS 输出位置。\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "NULL",
           "member": "CosOutputStorage",
@@ -19252,6 +19469,15 @@
           "required": false,
           "type": "object",
           "value_allowed_null": true
+        },
+        {
+          "document": "当 Type 为 AWS-S3 时有效，则该项为必填，表示媒体处理 AWS S3 输出位置。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "NULL",
+          "member": "S3OutputStorage",
+          "name": "S3OutputStorage",
+          "required": false,
+          "type": "object",
+          "value_allowed_null": true
         }
       ],
       "usage": "both"
@@ -20752,6 +20978,60 @@
       ],
       "usage": "out"
     },
+    "WithdrawsWatermarkRequest": {
+      "document": "WithdrawsWatermark请求参数结构体",
+      "members": [
+        {
+          "default": "",
+          "document": "输入媒体文件存储信息。",
+          "example": "无",
+          "member": "MediaInputInfo",
+          "name": "InputInfo",
+          "required": true,
+          "type": "object"
+        },
+        {
+          "default": "",
+          "document": "任务的事件通知信息，不填代表不获取事件通知。",
+          "example": "无",
+          "member": "TaskNotifyConfig",
+          "name": "TaskNotifyConfig",
+          "required": false,
+          "type": "object"
+        },
+        {
+          "default": "",
+          "document": "来源上下文，用于透传用户请求信息，任务流状态变更回调将返回该字段值，最长 1000 个字符。",
+          "example": "xxx",
+          "member": "string",
+          "name": "SessionContext",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "WithdrawsWatermarkResponse": {
+      "document": "WithdrawsWatermark返回参数结构体",
+      "members": [
+        {
+          "document": "任务 ID，可以通过该 ID 查询任务状态和结果。",
+          "example": "125xxx65-WithdrawsWatermark-bffb15f07530b57bc1aabb01fac74bca",
+          "member": "string",
+          "name": "TaskId",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "WorkflowInfo": {
       "document": "工作流信息详情。",
       "members": [
@@ -21008,8 +21288,8 @@
       "document": "输入规则，当上传视频命中该规则时，即触发工作流。",
       "members": [
         {
-          "default": "",
-          "document": "触发器的类型，目前仅支持 CosFileUpload。",
+          "document": "触发器的类型，可选值：\n<li>CosFileUpload：COS触发</li>\n<li>AwsS3FileUpload：AWS触发，目前只支持转码任务。只有编排支持，工作流不支持。  </li>\n\n",
+          "example": "无",
           "member": "string",
           "name": "Type",
           "required": true,
@@ -21017,13 +21297,22 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "当 Type 为 CosFileUpload 时必填且有效，为 COS 触发规则。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
           "member": "CosFileUploadTrigger",
           "name": "CosFileUploadTrigger",
           "required": false,
           "type": "object",
           "value_allowed_null": true
+        },
+        {
+          "document": "当 Type 为 AwsS3FileUpload 时必填且有效，为 AWS S3 触发规则。\n\n注意：目前AWS的S3、对应触发队列SQS、回调队列SQS的秘钥需要一致。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "AwsS3FileUploadTrigger",
+          "name": "AwsS3FileUploadTrigger",
+          "required": false,
+          "type": "object",
+          "value_allowed_null": true
         }
       ],
       "usage": "both"

tccli/services/mps/v20190612/examples.json

@@ -795,6 +795,14 @@
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"aaaaa\"\n    }\n}",
         "title": "请求示例"
       }
+    ],
+    "WithdrawsWatermark": [
+      {
+        "document": "提取视频中的暗水印。",
+        "input": "POST / HTTP/1.1\nHost: mps.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: WithdrawsWatermark\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        \"TaskId\": \"125xxx65-WithdrawsWatermark-bffb15f07530b57bc1aabb01fac74bca\",\n        \"RequestId\": \"6ca31e3a-6b8e-4b4e-9256-fdc700064ef3\"\n    }\n}",
+        "title": "发起提取水印任务"
+      }
     ]
   },
   "version": "1.0"