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

tccli/services/wedata/v20210820/api.json

@@ -1553,6 +1553,13 @@
       "name": "开发空间-保存任务信息",
       "output": "UploadContentResponse",
       "status": "online"
+    },
+    "UploadResource": {
+      "document": "资源管理-上传资源",
+      "input": "UploadResourceRequest",
+      "name": "【资源管理】上传资源",
+      "output": "UploadResourceResponse",
+      "status": "online"
     }
   },
   "metadata": {
@@ -40211,6 +40218,376 @@
       ],
       "type": "object"
     },
+    "UploadResourceRequest": {
+      "document": "UploadResource请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "资源上传请求信息",
+          "example": "无",
+          "member": "UploadResourceRequestInfo",
+          "name": "UploadResourceRequestInfo",
+          "required": false,
+          "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "项目id",
+          "example": "无",
+          "member": "string",
+          "name": "ProjectId",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "UploadResourceRequestInfo": {
+      "document": "资管管理-上传资源请求",
+      "members": [
+        {
+          "disabled": false,
+          "document": "项目id",
+          "example": "无",
+          "member": "string",
+          "name": "ProjectId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "资源路径",
+          "example": "无",
+          "member": "string",
+          "name": "FilePath",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "桶名称",
+          "example": "无",
+          "member": "string",
+          "name": "BucketName",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "所属地区",
+          "example": "无",
+          "member": "string",
+          "name": "Region",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "是否为新资源",
+          "example": "无",
+          "member": "bool",
+          "name": "NewFile",
+          "required": true,
+          "type": "bool"
+        },
+        {
+          "disabled": false,
+          "document": "资源列表",
+          "example": "无",
+          "member": "string",
+          "name": "FileList",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "资源大小列表",
+          "example": "无",
+          "member": "string",
+          "name": "FileSizeList",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "File Md5（适配私有化，公有云可以不传）",
+          "example": "无",
+          "member": "string",
+          "name": "FileMd5",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "usage": "in"
+    },
+    "UploadResourceResponse": {
+      "document": "UploadResource返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "资源文件信息列表",
+          "example": "无",
+          "member": "UserFileDTONew",
+          "name": "Data",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "UserFileDTONew": {
+      "document": "用户文件信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "资源ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "111111",
+          "member": "string",
+          "name": "ResourceId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件名\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1111",
+          "member": "string",
+          "name": "FileName",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件类型，如 jar zip 等\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "jar",
+          "member": "string",
+          "name": "FileExtensionType",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件上传类型，资源管理为 resource\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "resouce",
+          "member": "string",
+          "name": "Type",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件MD5值\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "aaaaa",
+          "member": "string",
+          "name": "Md5Value",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "创建时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2023-02-27 00:00:00",
+          "member": "string",
+          "name": "CreateTime",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "更新时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2023-02-27 00:00:00",
+          "member": "string",
+          "name": "UpdateTime",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件大小，单位为字节\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "123123",
+          "member": "uint64",
+          "name": "Size",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "本地路径\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "/datastudio/resource/jaydenjhu/xxxx/wedata-spark-1.0-SNAPSHOT.ja",
+          "member": "string",
+          "name": "LocalPath",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "本地临时路径\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "/tmp/datastudio/resource/1171938931991703552/jaydenjhu/xxxx/wed",
+          "member": "string",
+          "name": "LocalTempPath",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "远程路径\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "/datastudio/resource/1171938931991703552/jaydenjhu/xxxx/wedata-s",
+          "member": "string",
+          "name": "RemotePath",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件拥有者名字\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "fe",
+          "member": "string",
+          "name": "OwnerName",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件拥有者uin\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "100022256608",
+          "member": "string",
+          "name": "Owner",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件深度\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "string",
+          "name": "PathDepth",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "项目ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1111",
+          "member": "string",
+          "name": "ProjectId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "附加信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "xxxx",
+          "member": "string",
+          "name": "ExtraInfo",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "本地临时压缩文件绝对路径\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "xxx",
+          "member": "string",
+          "name": "ZipPath",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件所属存储桶\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "agent-test-1257305158",
+          "member": "string",
+          "name": "Bucket",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件所属存储桶的地域\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "ap-guangzhou",
+          "member": "string",
+          "name": "Region",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "删除用户名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "DeleteName",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "删除用户id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "DeleteOwner",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "操作者id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "Operator",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "操作者名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "OperatorName",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "全路径\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "FullPath",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "UserFileInfo": {
       "document": "开发空间-获取数据开发脚本信息响应体",
       "members": [

tccli/services/wedata/v20210820/examples.json

@@ -1895,6 +1895,14 @@
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"b24bf87c-c391-42cc-a41e-077f946bdff1\",\n        \"ScriptInfo\": {\n            \"Bucket\": \"wedata-agent-sh-1257305432\",\n            \"CreateTime\": \"2024-04-10 10:38:15\",\n            \"ExtraInfo\": \"{\\\"taskId\\\":\\\"ap-shanghai|wedata-agent-sh-1257305432|/datastudio/personal/shell1234.sh\\\"}\",\n            \"FileExtensionType\": \"sh\",\n            \"FileName\": \"shell1234.sh\",\n            \"LocalPath\": \"/datastudio/personal/shell1234.sh\",\n            \"LocalTempPath\": null,\n            \"Md5Value\": null,\n            \"Owner\": \"100028649733\",\n            \"OwnerName\": \"demo\",\n            \"PathDepth\": null,\n            \"ProjectId\": \"100028649733\",\n            \"Region\": \"ap-shanghai\",\n            \"RemotePath\": \"/datastudio/personal/100028649733/shell1234.sh\",\n            \"ResourceId\": \"3342446a-d046-4a97-9fe6-3c5dd9866ba4\",\n            \"Size\": null,\n            \"Type\": \"personal\",\n            \"UpdateTime\": \"2024-04-10 10:38:15\",\n            \"ZipPath\": null\n        }\n    }\n}",
         "title": "UploadContent 示例"
       }
+    ],
+    "UploadResource": [
+      {
+        "document": "资源上传",
+        "input": "POST / HTTP/1.1\nHost: wedata.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: UploadResource\n<公共请求参数>\n\n{\n    \"UploadResourceRequestInfo\": {\n        \"ProjectId\": \"abc\",\n        \"FileList\": [\n            \"abc\"\n        ],\n        \"FilePath\": \"abc\",\n        \"BucketName\": \"abc\",\n        \"Region\": \"abc\",\n        \"NewFile\": true,\n        \"FileSizeList\": [\n            \"abc\"\n        ]\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"Data\": [\n            {\n                \"ResourceId\": \"abc\",\n                \"FileName\": \"abc\",\n                \"FileExtensionType\": \"abc\",\n                \"Type\": \"abc\",\n                \"Md5Value\": \"abc\",\n                \"CreateTime\": \"abc\",\n                \"UpdateTime\": \"abc\",\n                \"Size\": 1,\n                \"LocalPath\": \"abc\",\n                \"LocalTempPath\": \"abc\",\n                \"RemotePath\": \"abc\",\n                \"OwnerName\": \"abc\",\n                \"Owner\": \"abc\",\n                \"PathDepth\": \"abc\",\n                \"ProjectId\": \"abc\",\n                \"ExtraInfo\": \"abc\",\n                \"ZipPath\": \"abc\",\n                \"Bucket\": \"abc\",\n                \"Region\": \"abc\",\n                \"DeleteName\": \"abc\",\n                \"DeleteOwner\": \"abc\",\n                \"Operator\": \"abc\",\n                \"OperatorName\": \"abc\"\n            }\n        ],\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "资源上传接口示例"
+      }
     ]
   },
   "version": "1.0"

tccli/services/wedata/wedata_client.py

@@ -6985,7 +6985,7 @@ def doCheckIntegrationTaskNameExists(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeRulesByPage(args, parsed_globals):
+def doUploadResource(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -7014,11 +7014,11 @@ def doDescribeRulesByPage(args, parsed_globals):
     client = mod.WedataClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeRulesByPageRequest()
+    model = models.UploadResourceRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeRulesByPage(model)
+        rsp = client.UploadResource(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -7245,7 +7245,7 @@ def doBatchMakeUpIntegrationTasks(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doUploadContent(args, parsed_globals):
+def doDescribeRulesByPage(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -7274,11 +7274,11 @@ def doUploadContent(args, parsed_globals):
     client = mod.WedataClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.UploadContentRequest()
+    model = models.DescribeRulesByPageRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.UploadContent(model)
+        rsp = client.DescribeRulesByPage(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -9481,6 +9481,58 @@ def doDescribeIntegrationVersionNodesInfo(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doUploadContent(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.WedataClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.UploadContentRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.UploadContent(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 doModifyTaskAlarmRegular(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -11706,12 +11758,12 @@ ACTION_MAP = {
     "DeleteRule": doDeleteRule,
     "CheckAlarmRegularNameExist": doCheckAlarmRegularNameExist,
     "CheckIntegrationTaskNameExists": doCheckIntegrationTaskNameExists,
-    "DescribeRulesByPage": doDescribeRulesByPage,
+    "UploadResource": doUploadResource,
     "ModifyMonitorStatus": doModifyMonitorStatus,
     "DeleteProjectUsers": doDeleteProjectUsers,
     "DeleteFile": doDeleteFile,
     "BatchMakeUpIntegrationTasks": doBatchMakeUpIntegrationTasks,
-    "UploadContent": doUploadContent,
+    "DescribeRulesByPage": doDescribeRulesByPage,
     "DescribeRuleTemplate": doDescribeRuleTemplate,
     "DescribeRule": doDescribeRule,
     "ModifyWorkflowInfo": doModifyWorkflowInfo,
@@ -11754,6 +11806,7 @@ ACTION_MAP = {
     "ModifyDataSource": doModifyDataSource,
     "DescribeTaskAlarmRegulations": doDescribeTaskAlarmRegulations,
     "DescribeIntegrationVersionNodesInfo": doDescribeIntegrationVersionNodesInfo,
+    "UploadContent": doUploadContent,
     "ModifyTaskAlarmRegular": doModifyTaskAlarmRegular,
     "DescribeTableMeta": doDescribeTableMeta,
     "DeleteCustomFunction": doDeleteCustomFunction,

{tccli-3.0.1136.1.dist-info → tccli-3.0.1137.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tccli
-Version: 3.0.1136.1
+Version: 3.0.1137.1
 Summary: Universal Command Line Environment for Tencent Cloud
 Project-URL: Bug Tracker, https://github.com/TencentCloud/tencentcloud-cli/issues
 Project-URL: Homepage, https://github.com/TencentCloud/tencentcloud-cli
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: jmespath==0.10.0
 Requires-Dist: six==1.16.0
-Requires-Dist: tencentcloud-sdk-python>=3.0.1136
+Requires-Dist: tencentcloud-sdk-python>=3.0.1137
 Description-Content-Type: text/markdown
 
 # 命令行工具简介