tccli 3.0.1028.1__py2.py3-none-any.whl → 3.0.1030.1__py2.py3-none-any.whl

tccli/services/trp/trp_client.py

@@ -225,7 +225,7 @@ def doAuthorizedTransfer(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyProduct(args, parsed_globals):
+def doDescribeCustomRuleById(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -254,11 +254,11 @@ def doModifyProduct(args, parsed_globals):
     client = mod.TrpClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyProductRequest()
+    model = models.DescribeCustomRuleByIdRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ModifyProduct(model)
+        rsp = client.DescribeCustomRuleById(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -953,7 +953,7 @@ def doDescribeCodeBatches(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeCustomRuleById(args, parsed_globals):
+def doModifyProduct(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -982,11 +982,11 @@ def doDescribeCustomRuleById(args, parsed_globals):
     client = mod.TrpClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeCustomRuleByIdRequest()
+    model = models.ModifyProductRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeCustomRuleById(model)
+        rsp = client.ModifyProduct(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1265,7 +1265,7 @@ def doDeleteProduct(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateCodeBatch(args, parsed_globals):
+def doCreateTraceChain(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1294,11 +1294,11 @@ def doCreateCodeBatch(args, parsed_globals):
     client = mod.TrpClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateCodeBatchRequest()
+    model = models.CreateTraceChainRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateCodeBatch(model)
+        rsp = client.CreateTraceChain(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1889,7 +1889,7 @@ def doModifyMerchant(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateTraceChain(args, parsed_globals):
+def doDescribePlanQRCodeScanRecords(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1918,11 +1918,11 @@ def doCreateTraceChain(args, parsed_globals):
     client = mod.TrpClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateTraceChainRequest()
+    model = models.DescribePlanQRCodeScanRecordsRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateTraceChain(model)
+        rsp = client.DescribePlanQRCodeScanRecords(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2565,6 +2565,58 @@ def doModifyCodeBatch(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateCodeBatch(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_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.TrpClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreateCodeBatchRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateCodeBatch(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 doDescribeMerchants(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2736,7 +2788,7 @@ ACTION_MAP = {
     "DescribeCustomRules": doDescribeCustomRules,
     "DescribeTraceCodes": doDescribeTraceCodes,
     "AuthorizedTransfer": doAuthorizedTransfer,
-    "ModifyProduct": doModifyProduct,
+    "DescribeCustomRuleById": doDescribeCustomRuleById,
     "CreateTraceCodesAsync": doCreateTraceCodesAsync,
     "DescribeCodeBatchById": doDescribeCodeBatchById,
     "ModifyTraceDataRanks": doModifyTraceDataRanks,
@@ -2750,13 +2802,13 @@ ACTION_MAP = {
     "ModifyCustomRule": doModifyCustomRule,
     "ModifyTraceData": doModifyTraceData,
     "DescribeCodeBatches": doDescribeCodeBatches,
-    "DescribeCustomRuleById": doDescribeCustomRuleById,
+    "ModifyProduct": doModifyProduct,
     "ModifyCustomRuleStatus": doModifyCustomRuleStatus,
     "DescribeProductById": doDescribeProductById,
     "DescribeTmpToken": doDescribeTmpToken,
     "DescribeAgentCorps": doDescribeAgentCorps,
     "DeleteProduct": doDeleteProduct,
-    "CreateCodeBatch": doCreateCodeBatch,
+    "CreateTraceChain": doCreateTraceChain,
     "CreateCustomPack": doCreateCustomPack,
     "DescribeTraceDataById": doDescribeTraceDataById,
     "CreateCorporationOrder": doCreateCorporationOrder,
@@ -2768,7 +2820,7 @@ ACTION_MAP = {
     "CreateMerchant": doCreateMerchant,
     "DeleteCodeBatch": doDeleteCodeBatch,
     "ModifyMerchant": doModifyMerchant,
-    "CreateTraceChain": doCreateTraceChain,
+    "DescribePlanQRCodeScanRecords": doDescribePlanQRCodeScanRecords,
     "EffectFeedback": doEffectFeedback,
     "DescribeCodePackUrl": doDescribeCodePackUrl,
     "CreateTraceCodes": doCreateTraceCodes,
@@ -2781,6 +2833,7 @@ ACTION_MAP = {
     "DescribeCodePacks": doDescribeCodePacks,
     "DescribeScanLogs": doDescribeScanLogs,
     "ModifyCodeBatch": doModifyCodeBatch,
+    "CreateCodeBatch": doCreateCodeBatch,
     "DescribeMerchants": doDescribeMerchants,
     "DescribeRawScanLogs": doDescribeRawScanLogs,
     "DescribeJobFileUrl": doDescribeJobFileUrl,

tccli/services/trp/v20210515/api.json

@@ -210,6 +210,13 @@
       "output": "DescribeMerchantsResponse",
       "status": "online"
     },
+    "DescribePlanQRCodeScanRecords": {
+      "document": "查询安心计划二维码扫码记录",
+      "input": "DescribePlanQRCodeScanRecordsRequest",
+      "name": "查询安心计划二维码扫码记录",
+      "output": "DescribePlanQRCodeScanRecordsResponse",
+      "status": "online"
+    },
     "DescribePlanQRCodes": {
       "document": "查询安心计划二维码列表",
       "input": "DescribePlanQRCodesRequest",
@@ -539,7 +546,7 @@
           "example": "20121212000001",
           "member": "string",
           "name": "BatchId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -549,7 +556,7 @@
           "example": "1000",
           "member": "int64",
           "name": "CorpId",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -559,7 +566,7 @@
           "example": "20121212000001",
           "member": "string",
           "name": "BatchCode",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -569,7 +576,7 @@
           "example": "10",
           "member": "int64",
           "name": "CodeCnt",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -579,7 +586,7 @@
           "example": "eqdmnz7020bmtvi9",
           "member": "string",
           "name": "MerchantId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -589,7 +596,7 @@
           "example": "85tfp1sn78r9m1568i",
           "member": "string",
           "name": "ProductId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -599,7 +606,7 @@
           "example": "0",
           "member": "int64",
           "name": "BatchType",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -609,7 +616,7 @@
           "example": "备注",
           "member": "string",
           "name": "Remark",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -619,7 +626,7 @@
           "example": "微信模板",
           "member": "string",
           "name": "MpTpl",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -629,7 +636,7 @@
           "example": "0",
           "member": "int64",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -639,7 +646,7 @@
           "example": "2021-12-01T06:48:45.000Z",
           "member": "string",
           "name": "CreateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -649,7 +656,7 @@
           "example": "2021-12-01T06:48:45.000Z",
           "member": "string",
           "name": "UpdateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -659,7 +666,7 @@
           "example": "所属商户名称",
           "member": "string",
           "name": "MerchantName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -669,17 +676,17 @@
           "example": "产品名称",
           "member": "string",
           "name": "ProductName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
         {
-          "disabled": false,
+          "disabled": true,
           "document": "未使用\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "扩展字段",
           "member": "Ext",
           "name": "Ext",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -689,7 +696,7 @@
           "example": "模板名称",
           "member": "string",
           "name": "TplName",
-          "required": false,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -699,7 +706,7 @@
           "example": "无",
           "member": "Job",
           "name": "Job",
-          "required": false,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -709,7 +716,7 @@
           "example": "2022-05-12",
           "member": "string",
           "name": "ProductionDate",
-          "required": false,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -719,7 +726,7 @@
           "example": "2022",
           "member": "string",
           "name": "ValidDate",
-          "required": false,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -729,7 +736,7 @@
           "example": "无",
           "member": "AttrItem",
           "name": "Attrs",
-          "required": false,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         }
@@ -3404,6 +3411,90 @@
       ],
       "type": "object"
     },
+    "DescribePlanQRCodeScanRecordsRequest": {
+      "document": "DescribePlanQRCodeScanRecords请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "开始时间",
+          "example": "无",
+          "member": "string",
+          "name": "StartTime",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "结束时间",
+          "example": "无",
+          "member": "string",
+          "name": "EndTime",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "页码",
+          "example": "无",
+          "member": "int64",
+          "name": "PageNo",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "页大小",
+          "example": "无",
+          "member": "int64",
+          "name": "PageSize",
+          "required": true,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribePlanQRCodeScanRecordsResponse": {
+      "document": "DescribePlanQRCodeScanRecords返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "返回码",
+          "example": "无",
+          "member": "int64",
+          "name": "Ret",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "总数",
+          "example": "无",
+          "member": "int64",
+          "name": "Total",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "数据",
+          "example": "无",
+          "member": "PlanQRCodeRecord",
+          "name": "Data",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribePlanQRCodesRequest": {
       "document": "DescribePlanQRCodes请求参数结构体",
       "members": [
@@ -4246,7 +4337,18 @@
     },
     "Ext": {
       "document": "预留字段",
-      "members": [],
+      "members": [
+        {
+          "disabled": true,
+          "document": "字符串\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "Value",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
       "usage": "out"
     },
     "InputEncryptData": {
@@ -5396,6 +5498,89 @@
       ],
       "usage": "both"
     },
+    "PlanQRCodeRecord": {
+      "document": "安心计划二维码扫码记录",
+      "members": [
+        {
+          "disabled": false,
+          "document": "二维码\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "Url",
+          "output_required": false,
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "OpenID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "OpenId",
+          "output_required": false,
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "扫码时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "ScanTime",
+          "output_required": false,
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "IP 地址\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "Ip",
+          "output_required": false,
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "国家\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "Country",
+          "output_required": false,
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "省份\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "Province",
+          "output_required": false,
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "城市\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "City",
+          "output_required": false,
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "both"
+    },
     "Product": {
       "document": "商品信息",
       "members": [

tccli/services/trp/v20210515/examples.json

@@ -240,6 +240,14 @@
         "title": "查询商户列表"
       }
     ],
+    "DescribePlanQRCodeScanRecords": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: trp.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribePlanQRCodeScanRecords\n<公共请求参数>\n\n{\n    \"StartTime\": \"2023-10-10 00:00:00\",\n    \"EndTime\": \"2023-10-10 23:59:59\",\n    \"PageNo\": 1,\n    \"PageSize\": 10\n}",
+        "output": "{\n    \"Response\": {\n        \"Ret\": 0,\n        \"Total\": 1,\n        \"Data\": [\n            {\n                \"Url\": \"xxx\",\n                \"OpenId\": \"\",\n                \"ScanTime\": \"2023-10-10 00:00:00\",\n                \"Ip\": \"\",\n                \"Country\": \"\",\n                \"Province\": \"\",\n                \"City\": \"\"\n            }\n        ],\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "查询安心计划二维码扫码记录"
+      }
+    ],
     "DescribePlanQRCodes": [
       {
         "document": "",