add detect (#169)

Co-authored-by: tiedu <tiedu@tencent.com>

Author: dt3310321

qcloud_cos/cos_client.py

@@ -406,20 +406,23 @@ def get_object(self, Bucket, Key, **kwargs):
 
         return response
 
-    def get_object_sensitive_content_recognition(self, Bucket, Key, DetectType, **kwargs):
+    def get_object_sensitive_content_recognition(self, Bucket, Key, DetectType, Interval=None, MaxFrames=None, BizType=None, **kwargs):
         """文件内容识别接口 https://cloud.tencent.com/document/product/460/37318
 
         :param Bucket(string): 存储桶名称.
         :param Key(string): COS路径.
         :param DetectType(int): 内容识别标志,位计算 1:porn, 2:terrorist, 4:politics, 8:ads
+        :param Interval(int): 截帧频率，GIF图/长图检测专用，默认值为0，表示只会检测GIF图/长图的第一帧.
+        :param MaxFrames(int): 最大截帧数量，GIF图/长图检测专用，默认值为1，表示只取GIF的第1帧图片进行审核，或长图不做切分识别.
+        :param BizType(string): 审核策略的唯一标识，由后台自动生成，在控制台中对应为Biztype值.
         :param kwargs(dict): 设置下载的headers.
         :return(dict): 下载成功返回的结果,dict类型.
 
         .. code-block:: python
 
             config = CosConfig(Region=region, SecretId=secret_id, SecretKey=secret_key, Token=token)  # 获取配置对象
             client = CosS3Client(config)
-            # 下载cos上的文件到本地
+            # 识别cos上的图片
             response = client.get_object_sensitive_content_recognition(
                 Bucket='bucket',
                 DetectType=CiDetectType.PORN | CiDetectType.POLITICS,
@@ -458,6 +461,12 @@ def get_object_sensitive_content_recognition(self, Bucket, Key, DetectType, **kw
             detect_type += 'ads'
 
         params['detect-type'] = detect_type
+        if Interval:
+            params['interval'] = Interval
+        if MaxFrames:
+            params['max-frames'] = MaxFrames
+        if BizType:
+            params['biz-type'] = BizType
         params = format_values(params)
 
         url = self._conf.uri(bucket=Bucket, path=Key)

qcloud_cos/cos_threadpool.py

@@ -84,17 +84,14 @@ def get_result(self):
 
     pool = SimpleThreadPool(2)
 
-
     def task_sleep(x):
         from time import sleep
         sleep(x)
         return 'hello, sleep %d seconds' % x
 
-
     def raise_exception():
         raise ValueError("Pa! Exception!")
 
-
     for i in range(1000):
         pool.add_task(task_sleep, 0.001)
         print(i)

ut/test.py

@@ -96,7 +96,6 @@ def print_error_msg(e):
 
 def percentage(consumed_bytes, total_bytes):
     """进度条回调函数，计算当前完成的百分比
-    
     :param consumed_bytes: 已经上传/下载的数据量
     :param total_bytes: 总数据量
     """
@@ -1541,6 +1540,7 @@ def test_live_channel():
     response = client.delete_live_channel(Bucket=test_bucket, ChannelName=channel_name)
     assert (response)
 
+
 def test_get_object_url():
     """测试获取对象访问URL"""
     response = client.get_object_url(
@@ -1549,7 +1549,8 @@ def test_get_object_url():
     )
     print(response)
 
-def test_qrcode():
+
+def _test_qrcode():
     """二维码图片上传时识别"""
     file_name = 'test_object_sdk_qrcode.file'
     with open(file_name, 'rb') as fp: