tccli 3.0.1351.1__py2.py3-none-any.whl → 3.0.1352.1__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- tccli/__init__.py +1 -1
- tccli/services/ai3d/v20250513/api.json +1 -1
- tccli/services/ai3d/v20250513/examples.json +1 -1
- tccli/services/ccc/v20200210/api.json +1 -1
- tccli/services/cdb/v20170320/api.json +2 -2
- tccli/services/ctem/ctem_client.py +212 -0
- tccli/services/ctem/v20231128/api.json +1609 -633
- tccli/services/ctem/v20231128/examples.json +32 -0
- tccli/services/cwp/v20180228/api.json +11 -1
- tccli/services/cynosdb/v20190107/api.json +28 -0
- tccli/services/cynosdb/v20190107/examples.json +4 -4
- tccli/services/ess/ess_client.py +114 -8
- tccli/services/ess/v20201111/api.json +212 -0
- tccli/services/ess/v20201111/examples.json +16 -0
- tccli/services/iss/v20230517/api.json +9 -9
- tccli/services/live/v20180801/api.json +299 -3
- tccli/services/live/v20180801/examples.json +6 -6
- tccli/services/lkeap/v20240522/api.json +94 -17
- tccli/services/lkeap/v20240522/examples.json +2 -2
- tccli/services/mongodb/v20190725/api.json +2 -2
- tccli/services/mongodb/v20190725/examples.json +1 -1
- tccli/services/monitor/v20180724/api.json +38 -24
- tccli/services/mps/mps_client.py +53 -0
- tccli/services/mps/v20190612/api.json +580 -279
- tccli/services/mps/v20190612/examples.json +18 -4
- tccli/services/ocr/v20181119/api.json +24 -4
- tccli/services/ocr/v20181119/examples.json +1 -1
- tccli/services/omics/v20221128/api.json +9 -0
- tccli/services/pts/v20210728/api.json +1 -1
- tccli/services/teo/teo_client.py +777 -35
- tccli/services/teo/v20220901/api.json +1026 -3
- tccli/services/teo/v20220901/examples.json +154 -0
- tccli/services/tione/v20211111/api.json +9 -0
- tccli/services/vod/v20180717/api.json +60 -60
- tccli/services/vod/v20180717/examples.json +20 -20
- {tccli-3.0.1351.1.dist-info → tccli-3.0.1352.1.dist-info}/METADATA +2 -2
- {tccli-3.0.1351.1.dist-info → tccli-3.0.1352.1.dist-info}/RECORD +40 -40
- {tccli-3.0.1351.1.dist-info → tccli-3.0.1352.1.dist-info}/WHEEL +0 -0
- {tccli-3.0.1351.1.dist-info → tccli-3.0.1352.1.dist-info}/entry_points.txt +0 -0
- {tccli-3.0.1351.1.dist-info → tccli-3.0.1352.1.dist-info}/license_files/LICENSE +0 -0
tccli/__init__.py
CHANGED
@@ -1 +1 @@
|
|
1
|
-
__version__ = '3.0.
|
1
|
+
__version__ = '3.0.1352.1'
|
@@ -133,7 +133,7 @@
|
|
133
133
|
"members": [
|
134
134
|
{
|
135
135
|
"disabled": false,
|
136
|
-
"document": "文生3D,3D内容的描述,中文正向提示词。\n最多支持
|
136
|
+
"document": "文生3D,3D内容的描述,中文正向提示词。\n最多支持1024个 utf-8 字符。\n文生3D, image、image_url和 prompt必填其一,且prompt和image/image_url不能同时存在。",
|
137
137
|
"example": "一只小猫",
|
138
138
|
"member": "string",
|
139
139
|
"name": "Prompt",
|
@@ -4,7 +4,7 @@
|
|
4
4
|
{
|
5
5
|
"document": "",
|
6
6
|
"input": "POST / HTTP/1.1\nHost: ai3d.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: QueryHunyuanTo3DJob\n<公共请求参数>\n\n{\n \"JobId\": \"1315932989749215232\"\n}",
|
7
|
-
"output": "{\n \"Response\": {\n \"ErrorCode\": \"\",\n \"ErrorMessage\": \"\",\n \"RequestId\": \"cfbcde8e-dc35-47ec-adda-0fa6d5db1dd2\",\n \"ResultFile3Ds\": [\n {\n \"Type\": \"STL\",\n \"Url\": \"https://xxx.cos.ap-guangzhou.tencentcos.cn/xxx.stl\"\n }\n ],\n \"Status\": \"DONE\"\n }\n}",
|
7
|
+
"output": "{\n \"Response\": {\n \"ErrorCode\": \"\",\n \"ErrorMessage\": \"\",\n \"RequestId\": \"cfbcde8e-dc35-47ec-adda-0fa6d5db1dd2\",\n \"ResultFile3Ds\": [\n {\n \"Type\": \"STL\",\n \"Url\": \"https://xxx.cos.ap-guangzhou.tencentcos.cn/xxx.stl\",\n \"PreviewImageUrl\": \"https://xxx.cos.ap-guangzhou.tencentcos.cn/xxx.png\"\n }\n ],\n \"Status\": \"DONE\"\n }\n}",
|
8
8
|
"title": "调用请求示例"
|
9
9
|
}
|
10
10
|
],
|
@@ -8491,7 +8491,7 @@
|
|
8491
8491
|
},
|
8492
8492
|
{
|
8493
8493
|
"disabled": false,
|
8494
|
-
"document": "ServerPushText消息的优先级,0表示可被打断,1
|
8494
|
+
"document": "ServerPushText消息的优先级,0表示可被打断,1表示不会被打断。\n注意:在接收到Priority=1的消息后,后续其他任何消息都会被忽略(包括Priority=1的消息),直到Priority=1的消息处理结束。该字段可与Interrupt、DropMode字段配合使用。\n例子:\n- Priority=1、Interrupt=true,会打断现有交互,立刻播报,播报过程中不会被打断\n- Priority=1、Interrupt=false、DropMode=1,会等待当前交互结束,再进行播报,播报过程中不会被打断\n",
|
8495
8495
|
"example": "0",
|
8496
8496
|
"member": "uint64",
|
8497
8497
|
"name": "Priority",
|
@@ -2940,7 +2940,7 @@
|
|
2940
2940
|
},
|
2941
2941
|
{
|
2942
2942
|
"disabled": false,
|
2943
|
-
"document": "弹性扩容观测周期(秒级),可取值为:
|
2943
|
+
"document": "弹性扩容观测周期(秒级),可取值为:15,30,45,60,180,300,600,900,1800。",
|
2944
2944
|
"example": "300",
|
2945
2945
|
"member": "int64",
|
2946
2946
|
"name": "ExpandSecondPeriod",
|
@@ -2951,7 +2951,7 @@
|
|
2951
2951
|
},
|
2952
2952
|
{
|
2953
2953
|
"disabled": false,
|
2954
|
-
"document": "缩容观测周期(秒级),可取值为:300。",
|
2954
|
+
"document": "缩容观测周期(秒级),可取值为:300、600、900、1800。",
|
2955
2955
|
"example": "300",
|
2956
2956
|
"member": "int64",
|
2957
2957
|
"name": "ShrinkSecondPeriod",
|
@@ -433,6 +433,58 @@ def doDescribeWechatApplets(args, parsed_globals):
|
|
433
433
|
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
|
434
434
|
|
435
435
|
|
436
|
+
def doDescribeFakeWebsites(args, parsed_globals):
|
437
|
+
g_param = parse_global_arg(parsed_globals)
|
438
|
+
|
439
|
+
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
|
440
|
+
cred = credential.CVMRoleCredential()
|
441
|
+
elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
|
442
|
+
cred = credential.STSAssumeRoleCredential(
|
443
|
+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
|
444
|
+
g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
|
445
|
+
)
|
446
|
+
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):
|
447
|
+
cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
|
448
|
+
else:
|
449
|
+
cred = credential.Credential(
|
450
|
+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
|
451
|
+
)
|
452
|
+
http_profile = HttpProfile(
|
453
|
+
reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
|
454
|
+
reqMethod="POST",
|
455
|
+
endpoint=g_param[OptionsDefine.Endpoint],
|
456
|
+
proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
|
457
|
+
)
|
458
|
+
profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
|
459
|
+
if g_param[OptionsDefine.Language]:
|
460
|
+
profile.language = g_param[OptionsDefine.Language]
|
461
|
+
mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
|
462
|
+
client = mod.CtemClient(cred, g_param[OptionsDefine.Region], profile)
|
463
|
+
client._sdkVersion += ("_CLI_" + __version__)
|
464
|
+
models = MODELS_MAP[g_param[OptionsDefine.Version]]
|
465
|
+
model = models.DescribeFakeWebsitesRequest()
|
466
|
+
model.from_json_string(json.dumps(args))
|
467
|
+
start_time = time.time()
|
468
|
+
while True:
|
469
|
+
rsp = client.DescribeFakeWebsites(model)
|
470
|
+
result = rsp.to_json_string()
|
471
|
+
try:
|
472
|
+
json_obj = json.loads(result)
|
473
|
+
except TypeError as e:
|
474
|
+
json_obj = json.loads(result.decode('utf-8')) # python3.3
|
475
|
+
if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
|
476
|
+
break
|
477
|
+
cur_time = time.time()
|
478
|
+
if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
|
479
|
+
raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
|
480
|
+
(g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
|
481
|
+
search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
|
482
|
+
else:
|
483
|
+
print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
|
484
|
+
time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
|
485
|
+
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
|
486
|
+
|
487
|
+
|
436
488
|
def doDescribeSensitiveInfos(args, parsed_globals):
|
437
489
|
g_param = parse_global_arg(parsed_globals)
|
438
490
|
|
@@ -485,6 +537,58 @@ def doDescribeSensitiveInfos(args, parsed_globals):
|
|
485
537
|
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
|
486
538
|
|
487
539
|
|
540
|
+
def doDescribeFakeMiniPrograms(args, parsed_globals):
|
541
|
+
g_param = parse_global_arg(parsed_globals)
|
542
|
+
|
543
|
+
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
|
544
|
+
cred = credential.CVMRoleCredential()
|
545
|
+
elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
|
546
|
+
cred = credential.STSAssumeRoleCredential(
|
547
|
+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
|
548
|
+
g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
|
549
|
+
)
|
550
|
+
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):
|
551
|
+
cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
|
552
|
+
else:
|
553
|
+
cred = credential.Credential(
|
554
|
+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
|
555
|
+
)
|
556
|
+
http_profile = HttpProfile(
|
557
|
+
reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
|
558
|
+
reqMethod="POST",
|
559
|
+
endpoint=g_param[OptionsDefine.Endpoint],
|
560
|
+
proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
|
561
|
+
)
|
562
|
+
profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
|
563
|
+
if g_param[OptionsDefine.Language]:
|
564
|
+
profile.language = g_param[OptionsDefine.Language]
|
565
|
+
mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
|
566
|
+
client = mod.CtemClient(cred, g_param[OptionsDefine.Region], profile)
|
567
|
+
client._sdkVersion += ("_CLI_" + __version__)
|
568
|
+
models = MODELS_MAP[g_param[OptionsDefine.Version]]
|
569
|
+
model = models.DescribeFakeMiniProgramsRequest()
|
570
|
+
model.from_json_string(json.dumps(args))
|
571
|
+
start_time = time.time()
|
572
|
+
while True:
|
573
|
+
rsp = client.DescribeFakeMiniPrograms(model)
|
574
|
+
result = rsp.to_json_string()
|
575
|
+
try:
|
576
|
+
json_obj = json.loads(result)
|
577
|
+
except TypeError as e:
|
578
|
+
json_obj = json.loads(result.decode('utf-8')) # python3.3
|
579
|
+
if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
|
580
|
+
break
|
581
|
+
cur_time = time.time()
|
582
|
+
if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
|
583
|
+
raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
|
584
|
+
(g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
|
585
|
+
search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
|
586
|
+
else:
|
587
|
+
print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
|
588
|
+
time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
|
589
|
+
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
|
590
|
+
|
591
|
+
|
488
592
|
def doDescribeSubDomains(args, parsed_globals):
|
489
593
|
g_param = parse_global_arg(parsed_globals)
|
490
594
|
|
@@ -641,6 +745,58 @@ def doDescribeLeakageEmails(args, parsed_globals):
|
|
641
745
|
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
|
642
746
|
|
643
747
|
|
748
|
+
def doDescribeFakeApps(args, parsed_globals):
|
749
|
+
g_param = parse_global_arg(parsed_globals)
|
750
|
+
|
751
|
+
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
|
752
|
+
cred = credential.CVMRoleCredential()
|
753
|
+
elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
|
754
|
+
cred = credential.STSAssumeRoleCredential(
|
755
|
+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
|
756
|
+
g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
|
757
|
+
)
|
758
|
+
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):
|
759
|
+
cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
|
760
|
+
else:
|
761
|
+
cred = credential.Credential(
|
762
|
+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
|
763
|
+
)
|
764
|
+
http_profile = HttpProfile(
|
765
|
+
reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
|
766
|
+
reqMethod="POST",
|
767
|
+
endpoint=g_param[OptionsDefine.Endpoint],
|
768
|
+
proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
|
769
|
+
)
|
770
|
+
profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
|
771
|
+
if g_param[OptionsDefine.Language]:
|
772
|
+
profile.language = g_param[OptionsDefine.Language]
|
773
|
+
mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
|
774
|
+
client = mod.CtemClient(cred, g_param[OptionsDefine.Region], profile)
|
775
|
+
client._sdkVersion += ("_CLI_" + __version__)
|
776
|
+
models = MODELS_MAP[g_param[OptionsDefine.Version]]
|
777
|
+
model = models.DescribeFakeAppsRequest()
|
778
|
+
model.from_json_string(json.dumps(args))
|
779
|
+
start_time = time.time()
|
780
|
+
while True:
|
781
|
+
rsp = client.DescribeFakeApps(model)
|
782
|
+
result = rsp.to_json_string()
|
783
|
+
try:
|
784
|
+
json_obj = json.loads(result)
|
785
|
+
except TypeError as e:
|
786
|
+
json_obj = json.loads(result.decode('utf-8')) # python3.3
|
787
|
+
if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
|
788
|
+
break
|
789
|
+
cur_time = time.time()
|
790
|
+
if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
|
791
|
+
raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
|
792
|
+
(g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
|
793
|
+
search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
|
794
|
+
else:
|
795
|
+
print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
|
796
|
+
time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
|
797
|
+
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
|
798
|
+
|
799
|
+
|
644
800
|
def doDescribeApps(args, parsed_globals):
|
645
801
|
g_param = parse_global_arg(parsed_globals)
|
646
802
|
|
@@ -693,6 +849,58 @@ def doDescribeApps(args, parsed_globals):
|
|
693
849
|
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
|
694
850
|
|
695
851
|
|
852
|
+
def doDescribeFakeWechatOfficials(args, parsed_globals):
|
853
|
+
g_param = parse_global_arg(parsed_globals)
|
854
|
+
|
855
|
+
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
|
856
|
+
cred = credential.CVMRoleCredential()
|
857
|
+
elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
|
858
|
+
cred = credential.STSAssumeRoleCredential(
|
859
|
+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
|
860
|
+
g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
|
861
|
+
)
|
862
|
+
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):
|
863
|
+
cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
|
864
|
+
else:
|
865
|
+
cred = credential.Credential(
|
866
|
+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
|
867
|
+
)
|
868
|
+
http_profile = HttpProfile(
|
869
|
+
reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
|
870
|
+
reqMethod="POST",
|
871
|
+
endpoint=g_param[OptionsDefine.Endpoint],
|
872
|
+
proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
|
873
|
+
)
|
874
|
+
profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
|
875
|
+
if g_param[OptionsDefine.Language]:
|
876
|
+
profile.language = g_param[OptionsDefine.Language]
|
877
|
+
mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
|
878
|
+
client = mod.CtemClient(cred, g_param[OptionsDefine.Region], profile)
|
879
|
+
client._sdkVersion += ("_CLI_" + __version__)
|
880
|
+
models = MODELS_MAP[g_param[OptionsDefine.Version]]
|
881
|
+
model = models.DescribeFakeWechatOfficialsRequest()
|
882
|
+
model.from_json_string(json.dumps(args))
|
883
|
+
start_time = time.time()
|
884
|
+
while True:
|
885
|
+
rsp = client.DescribeFakeWechatOfficials(model)
|
886
|
+
result = rsp.to_json_string()
|
887
|
+
try:
|
888
|
+
json_obj = json.loads(result)
|
889
|
+
except TypeError as e:
|
890
|
+
json_obj = json.loads(result.decode('utf-8')) # python3.3
|
891
|
+
if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
|
892
|
+
break
|
893
|
+
cur_time = time.time()
|
894
|
+
if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
|
895
|
+
raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
|
896
|
+
(g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
|
897
|
+
search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
|
898
|
+
else:
|
899
|
+
print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
|
900
|
+
time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
|
901
|
+
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
|
902
|
+
|
903
|
+
|
696
904
|
def doDescribeJobRecordDetails(args, parsed_globals):
|
697
905
|
g_param = parse_global_arg(parsed_globals)
|
698
906
|
|
@@ -1492,11 +1700,15 @@ ACTION_MAP = {
|
|
1492
1700
|
"DescribeVuls": doDescribeVuls,
|
1493
1701
|
"DescribeConfigs": doDescribeConfigs,
|
1494
1702
|
"DescribeWechatApplets": doDescribeWechatApplets,
|
1703
|
+
"DescribeFakeWebsites": doDescribeFakeWebsites,
|
1495
1704
|
"DescribeSensitiveInfos": doDescribeSensitiveInfos,
|
1705
|
+
"DescribeFakeMiniPrograms": doDescribeFakeMiniPrograms,
|
1496
1706
|
"DescribeSubDomains": doDescribeSubDomains,
|
1497
1707
|
"DescribeCustomers": doDescribeCustomers,
|
1498
1708
|
"DescribeLeakageEmails": doDescribeLeakageEmails,
|
1709
|
+
"DescribeFakeApps": doDescribeFakeApps,
|
1499
1710
|
"DescribeApps": doDescribeApps,
|
1711
|
+
"DescribeFakeWechatOfficials": doDescribeFakeWechatOfficials,
|
1500
1712
|
"DescribeJobRecordDetails": doDescribeJobRecordDetails,
|
1501
1713
|
"DescribeSuspiciousAssets": doDescribeSuspiciousAssets,
|
1502
1714
|
"DescribeGithubs": doDescribeGithubs,
|