tccli 3.0.1328.1__py2.py3-none-any.whl → 3.0.1329.1__py2.py3-none-any.whl

tccli/services/ioa/ioa_client.py

@@ -329,6 +329,58 @@ def doDescribeSoftCensusListByDevice(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeDeviceHardwareInfoList(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.IoaClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeDeviceHardwareInfoListRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeDeviceHardwareInfoList(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 doDescribeRootAccountGroup(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -502,6 +554,7 @@ ACTION_MAP = {
     "DescribeDevices": doDescribeDevices,
     "CreateDLPFileDetectionTask": doCreateDLPFileDetectionTask,
     "DescribeSoftCensusListByDevice": doDescribeSoftCensusListByDevice,
+    "DescribeDeviceHardwareInfoList": doDescribeDeviceHardwareInfoList,
     "DescribeRootAccountGroup": doDescribeRootAccountGroup,
     "DescribeDLPFileDetectResult": doDescribeDLPFileDetectResult,
     "DescribeAccountGroups": doDescribeAccountGroups,

tccli/services/ioa/v20220601/api.json

@@ -35,6 +35,13 @@
       "output": "DescribeDLPFileDetectResultResponse",
       "status": "online"
     },
+    "DescribeDeviceHardwareInfoList": {
+      "document": "查询满足条件的查询终端硬件信息列表，私有化调用path为：/capi/Assets/Device/DescribeDeviceHardwareInfoList",
+      "input": "DescribeDeviceHardwareInfoListRequest",
+      "name": "查询终端硬件信息列表",
+      "output": "DescribeDeviceHardwareInfoListResponse",
+      "status": "online"
+    },
     "DescribeDevices": {
       "document": "查询满足条件的终端数据详情，私有化调用path为：/capi/Assets/Device/DescribeDevices",
       "input": "DescribeDevicesRequest",
@@ -810,6 +817,262 @@
       ],
       "type": "object"
     },
+    "DescribeDeviceHardwareInfoItem": {
+      "document": "终端硬件信息列表Item数据",
+      "members": [
+        {
+          "disabled": false,
+          "document": "设备ID",
+          "example": "1",
+          "member": "int64",
+          "name": "Id",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "设备唯一标识符",
+          "example": "10527BB0BE025F40B5E8A7D00B5E13E268243DBB",
+          "member": "string",
+          "name": "Mid",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "OS平台 0 Windows 1 Linux 2 macOS 4 Android 5 iOS",
+          "example": "0",
+          "member": "int64",
+          "name": "OsType",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "终端名",
+          "example": "MAGICTONG-PC4",
+          "member": "string",
+          "name": "Name",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "终端用户名",
+          "example": "magic",
+          "member": "string",
+          "name": "UserName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "授权状态（ 4未授权 5已授权）",
+          "example": "5",
+          "member": "int64",
+          "name": "Status",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "设备所属分组ID",
+          "example": "1578",
+          "member": "int64",
+          "name": "GroupId",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "设备所属分组名",
+          "example": "未分组终端",
+          "member": "string",
+          "name": "GroupName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "设备所属分组路径",
+          "example": "全网终端.未分组终端",
+          "member": "string",
+          "name": "GroupNamePath",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "最近登录账户的姓名",
+          "example": "张三",
+          "member": "string",
+          "name": "AccountName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "出口IP",
+          "example": "113.108.77.50",
+          "member": "string",
+          "name": "Ip",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "MAC地址",
+          "example": "00:0C:29:DD:00:06",
+          "member": "string",
+          "name": "MacAddr",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "CPU品牌型号",
+          "example": "Intel(R) Core(TM) i7-10700 CPU @ 2.90GH",
+          "member": "string",
+          "name": "Cpu",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "内存信息",
+          "example": "4 GB",
+          "member": "string",
+          "name": "Memory",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "硬盘信息",
+          "example": "VMware, VMware Virtual S SCSI Disk Device 1 GB",
+          "member": "string",
+          "name": "HardDiskSize",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "显示器品牌型号",
+          "example": "Parallels Vu",
+          "member": "string",
+          "name": "Monitor",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
+    "DescribeDeviceHardwareInfoListRequest": {
+      "document": "DescribeDeviceHardwareInfoList请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "【必填】设备分组id（需要和OsType匹配），下面是私有化场景下默认id：id-名称-操作系统1\t全网终端\tWin2\t未分组终端\tWin30000000\t服务器\tWin40000101\t全网终端\tLinux40000102\t未分组终端\tLinux40000103\t服务器\tLinux40000201\t全网终端\tmacOS40000202\t未分组终端\tmacOS40000203\t服务器\tmacOS40000401\t全网终端\tAndroid40000402\t未分组终端\tAndroid40000501\t全网终端\tiOS40000502\t未分组终端\tiOSSaaS需要调用分组接口DescribeDeviceChildGroups获取对应分组id",
+          "example": "93",
+          "member": "int64",
+          "name": "GroupId",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "【必填】操作系统类型（0: win，1：linux，2: mac，4：android，5：ios   默认值0），需要和GroupId或者GroupIds匹配",
+          "example": "0",
+          "member": "int64",
+          "name": "OsType",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "管理域实例ID，用于CAM管理域权限分配。若企业未进行管理域的划分，可直接传入根域\"1\"，此时表示针对当前企业的全部设备和账号进行接口CRUD，具体CRUD的影响范围限制于相应接口的入参。",
+          "example": "1",
+          "member": "string",
+          "name": "DomainInstanceId",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "过滤条件参数（字段含义请参考接口返回值） - Name, 类型String，支持操作：【eq，like，ilike】，支持排序 - UserName, 类型String，支持操作：【eq，like，ilike】，支持排序 - IoaUserName，类型String，支持操作：【eq，like，ilike】，支持排序 - MacAddr, 类型String，支持操作：【eq，like，ilike】，支持排序 - Ip, 类型String，支持操作：【eq，like，ilike】，支持排序 ，支持排序分页参数- PageNum 从1开始，小于等于0时使用默认参数- PageSize 最大值5000，最好不超过100",
+          "example": "\"Condition\":{\"Filters\":[],\"Sort\":{\"Field\":\"Id\",\"Order\":\"desc\"},\"PageSize\":10,\"PageNum\":1}",
+          "member": "Condition",
+          "name": "Condition",
+          "required": false,
+          "type": "object"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeDeviceHardwareInfoListResponse": {
+      "document": "DescribeDeviceHardwareInfoList返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "分页的data数据",
+          "example": "无",
+          "member": "DescribeDeviceHardwareInfoListRspData",
+          "name": "Data",
+          "output_required": true,
+          "type": "object",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeDeviceHardwareInfoListRspData": {
+      "document": "终端硬件信息列表响应详情",
+      "members": [
+        {
+          "disabled": false,
+          "document": "分页数据",
+          "example": "无",
+          "member": "Paging",
+          "name": "Page",
+          "output_required": true,
+          "type": "object",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "终端硬件信息数据数组",
+          "example": "无",
+          "member": "DescribeDeviceHardwareInfoItem",
+          "name": "Items",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "DescribeDevicesPageRsp": {
       "document": "分页的data数据",
       "members": [

tccli/services/ioa/v20220601/examples.json

@@ -58,6 +58,14 @@
         "title": "检测成功示例"
       }
     ],
+    "DescribeDeviceHardwareInfoList": [
+      {
+        "document": "查询终端硬件信息列表",
+        "input": "POST / HTTP/1.1\nHost: ioa.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeDeviceHardwareInfoList\n<公共请求参数>\n\n{\n    \"GroupId\": 11668614,\n    \"OsType\": 0,\n    \"DomainInstanceId\": \"1\"\n}",
+        "output": "{\n    \"Response\": {\n        \"Data\": {\n            \"Items\": [\n                {\n                    \"AccountName\": \"\",\n                    \"Cpu\": \"12th Gen Intel(R) Core(TM) i7-12700H\",\n                    \"GroupId\": 11668615,\n                    \"GroupName\": \"未分组终端\",\n                    \"GroupNamePath\": \"全网终端.未分组终端\",\n                    \"HardDiskSize\": \"VMware Virtual NVMe Disk 44 GB\",\n                    \"Id\": 288665,\n                    \"Ip\": \"113.108.77.52\",\n                    \"MacAddr\": \"00:0C:29:96:E6:DE\",\n                    \"Memory\": \"4 GB\",\n                    \"Mid\": \"0A811A6ECD8D6F4CA516AB56B1C2ECFC68104148\",\n                    \"Monitor\": \"\",\n                    \"Name\": \"PC-20240705KXXE\",\n                    \"OsType\": 0,\n                    \"Status\": 5,\n                    \"UserName\": \"Administrator\"\n                },\n                {\n                    \"AccountName\": \"\",\n                    \"Cpu\": \"Intel Pentium III Xeon 处理器\",\n                    \"GroupId\": 11668634,\n                    \"GroupName\": \"dddd\",\n                    \"GroupNamePath\": \"全网终端.dddd\",\n                    \"HardDiskSize\": \"VMware, VMware Virtual S SCSI Disk Device 14 GB\",\n                    \"Id\": 288664,\n                    \"Ip\": \"113.108.77.52\",\n                    \"MacAddr\": \"B0:DC:EF:E7:37:EE\",\n                    \"Memory\": \"1024 MB\",\n                    \"Mid\": \"489C698CAECC13B1B7C44E59443F5CBB676B7F33\",\n                    \"Monitor\": \"\",\n                    \"Name\": \"cs-207addad83ae\",\n                    \"OsType\": 0,\n                    \"Status\": 5,\n                    \"UserName\": \"Administrator\"\n                },\n                {\n                    \"AccountName\": \"\",\n                    \"Cpu\": \"12th Gen Intel(R) Core(TM) i7-12700H\",\n                    \"GroupId\": 11668637,\n                    \"GroupName\": \"本地ip\",\n                    \"GroupNamePath\": \"全网终端.本地ip\",\n                    \"HardDiskSize\": \"SAMSUNG MZVL41T0HBLB-00BL7 953 GB\",\n                    \"Id\": 288663,\n                    \"Ip\": \"119.147.10.192\",\n                    \"MacAddr\": \"B0:DC:EF:E7:37:EA\",\n                    \"Memory\": \"32 GB\",\n                    \"Mid\": \"8314BF3FD3FD738410C4FBB0DDDA48786800AB00\",\n                    \"Monitor\": \"\",\n                    \"Name\": \"STEVENSSHE-NBIR\",\n                    \"OsType\": 0,\n                    \"Status\": 5,\n                    \"UserName\": \"Administrator\"\n                },\n                {\n                    \"AccountName\": \"\",\n                    \"Cpu\": \"\",\n                    \"GroupId\": 11668634,\n                    \"GroupName\": \"dddd\",\n                    \"GroupNamePath\": \"全网终端.dddd\",\n                    \"HardDiskSize\": \"\",\n                    \"Id\": 288662,\n                    \"Ip\": \"119.147.10.202\",\n                    \"MacAddr\": \"\",\n                    \"Memory\": \"\",\n                    \"Mid\": \"7EBWA5184BEC838B96B29CE8105EC66167F8D1B2\",\n                    \"Monitor\": \"\",\n                    \"Name\": \"lucal_win-PC7\",\n                    \"OsType\": 0,\n                    \"Status\": 5,\n                    \"UserName\": \"lucal_win\"\n                },\n                {\n                    \"AccountName\": \"\",\n                    \"Cpu\": \"\",\n                    \"GroupId\": 11668634,\n                    \"GroupName\": \"dddd\",\n                    \"GroupNamePath\": \"全网终端.dddd\",\n                    \"HardDiskSize\": \"\",\n                    \"Id\": 288661,\n                    \"Ip\": \"119.147.10.202\",\n                    \"MacAddr\": \"\",\n                    \"Memory\": \"\",\n                    \"Mid\": \"1EBWA5184BEC838B96B29CE8105EC66167F8CFBD\",\n                    \"Monitor\": \"\",\n                    \"Name\": \"lucal_win-PC\",\n                    \"OsType\": 0,\n                    \"Status\": 5,\n                    \"UserName\": \"lucal_win\"\n                }\n            ],\n            \"Page\": {\n                \"PageCount\": 1,\n                \"PageNum\": 1,\n                \"PageSize\": 20,\n                \"Total\": 5\n            }\n        },\n        \"RequestId\": \"e00b7ba5-f534-4067-9fda-83012521919d\"\n    }\n}",
+        "title": "查询终端硬件信息列表"
+      }
+    ],
     "DescribeDevices": [
       {
         "document": "获取租户满足条件：最近登录账号包含\\'cc\\'（不区分大小写）的设备列表详情",

tccli/services/iotexplorer/v20190423/api.json

@@ -9516,6 +9516,48 @@
       ],
       "usage": "in"
     },
+    "DiarySHLConfig": {
+      "document": "Diary Simple Highlight 配置",
+      "members": [
+        {
+          "disabled": false,
+          "document": "每个视频偏移时长，单位秒",
+          "example": "2",
+          "member": "uint64",
+          "name": "StartOffset",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "视频浓缩倍数，支持1,2,4之间",
+          "example": "1",
+          "member": "uint64",
+          "name": "PlaySpeed",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "单个视频最小提取时长，单位秒",
+          "example": "2",
+          "member": "uint64",
+          "name": "MiniExtract",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "每天最终输出视频时长，单位秒\n注：免费版固定10s",
+          "example": "10",
+          "member": "uint64",
+          "name": "OutDuration",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "usage": "in"
+    },
     "DirectBindDeviceInFamilyRequest": {
       "document": "DirectBindDeviceInFamily请求参数结构体",
       "members": [
@@ -13283,7 +13325,7 @@
         },
         {
           "disabled": false,
-          "document": "云存 AI 服务类型。可选值：\n- `RealtimeObjectDetect`：目标检测\n- `Highlight`：视频浓缩",
+          "document": "云存 AI 服务类型。可选值：\n- `RealtimeObjectDetect`：目标检测\n- `Highlight`：视频浓缩\n- `SimpleHighlight`：TrueX SimpleHighlight",
           "example": "Highlight",
           "member": "string",
           "name": "ServiceType",
@@ -13316,6 +13358,15 @@
           "name": "Config",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "SimpleHighlight 算法配置参数",
+          "example": "无",
+          "member": "DiarySHLConfig",
+          "name": "SHLConfig",
+          "required": false,
+          "type": "object"
         }
       ],
       "type": "object"

tccli/services/lighthouse/v20200324/api.json

@@ -1160,7 +1160,7 @@
         },
         {
           "disabled": false,
-          "document": "镜像状态，镜镜像状态，NORMAL（正常）、SYNCING（同步中）、OFFLINE（下线）、ISOLATED（已隔离）、CREATEFAILED（创建失败）、SYNCING_FAILED（目的地域同步失败）、ISOLATING（隔离中）、ISOLATED（已隔离）、DELETING（删除中）、DESTROYING（销毁中）。",
+          "document": "镜像状态。\n可选值：\nNORMAL（正常）、SYNCING（同步中）、OFFLINE（下线）、ISOLATED（已隔离）、CREATEFAILED（创建失败）、SYNCING_FAILED（目的地域同步失败）、ISOLATING（隔离中）、ISOLATED（已隔离）、DELETING（删除中）、DESTROYING（销毁中）。",
           "example": "NORMAL",
           "member": "string",
           "name": "BlueprintState",