Merge branch 'master' into s3

Author: dt3310321

.gitignore

@@ -0,0 +1 @@
+*.pyc

.travis.yml

@@ -10,6 +10,11 @@ install:
 - pip install nose
 - pip install pycodestyle
 - pip install dicttoxml
+notifications:
+  email:
+    recipients:
+      - wjielai@tencent.com
+      - fysntian@tencent.com
 script:
 - pycodestyle --max-line-length=200 qcloud_cos/.
 - nosetests -s -v ut/

qcloud_cos/cos_client.py

@@ -256,6 +256,8 @@ def send_request(self, method, url, bucket, timeout=30, **kwargs):
                     res = self._session.head(url, timeout=timeout, proxies=self._conf._proxies, **kwargs)
                 if res.status_code < 400:  # 2xx和3xx都认为是成功的
                     return res
+                elif res.status_code < 500:  # 4xx 不重试
+                    break
             except Exception as e:  # 捕获requests抛出的如timeout等客户端错误,转化为客户端错误
                 logger.exception('url:%s, retry_time:%d exception:%s' % (url, j, str(e)))
                 if j < self._retry:
@@ -381,6 +383,78 @@ def get_object(self, Bucket, Key, **kwargs):
 
         return response
 
+    def get_object_sensitive_content_recognition(self, Bucket, Key, DetectType, **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 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上的文件到本地
+            response = client.get_object_sensitive_content_recognition(
+                Bucket='bucket',
+                DetectType=CiDetectType.PORN | CiDetectType.POLITICS,
+                Key='test.png'
+            )
+            print response
+        """
+        headers = mapped(kwargs)
+        final_headers = {}
+        params = {}
+        for key in headers:
+            if key.startswith("response"):
+                params[key] = headers[key]
+            else:
+                final_headers[key] = headers[key]
+        headers = final_headers
+
+        if 'versionId' in headers:
+            params['versionId'] = headers['versionId']
+            del headers['versionId']
+        params['ci-process'] = 'sensitive-content-recognition'
+        detect_type = ''
+        if DetectType & CiDetectType.PORN > 0:
+            detect_type += 'porn'
+        if DetectType & CiDetectType.TERRORIST > 0:
+            if len(detect_type) > 0:
+                detect_type += ','
+            detect_type += 'terrorist'
+        if DetectType & CiDetectType.POLITICS > 0:
+            if len(detect_type) > 0:
+                detect_type += ','
+            detect_type += 'politics'
+        if DetectType & CiDetectType.ADS > 0:
+            if len(detect_type) > 0:
+                detect_type += ','
+            detect_type += 'ads'
+
+        params['detect-type'] = detect_type
+        params = format_values(params)
+
+        url = self._conf.uri(bucket=Bucket, path=Key)
+        logger.info("get object sensitive content recognition, url=:{url} ,headers=:{headers}, params=:{params}".format(
+            url=url,
+            headers=headers,
+            params=params))
+        rt = self.send_request(
+                method='GET',
+                url=url,
+                bucket=Bucket,
+                stream=True,
+                auth=CosS3Auth(self._conf, Key, params=params),
+                params=params,
+                headers=headers)
+
+        data = xml_to_dict(rt.content)
+
+        return data
+
     def get_presigned_url(self, Bucket, Key, Method, Expired=300, Params={}, Headers={}):
         """生成预签名的url
 
@@ -732,8 +806,7 @@ def upload_part(self, Bucket, Key, Body, PartNumber, UploadId, EnableMD5=False,
                 params=params,
                 auth=CosS3Auth(self._conf, Key, params=params),
                 data=Body)
-        response = dict()
-        response['ETag'] = rt.headers['ETag']
+        response = dict(**rt.headers)
         return response
 
     def complete_multipart_upload(self, Bucket, Key, UploadId, MultipartUpload={}, **kwargs):

qcloud_cos/cos_comm.py

@@ -412,3 +412,11 @@ def get_date(yy, mm, dd):
     date_str = datetime(yy, mm, dd).isoformat()
     final_date_str = date_str+'+08:00'
     return final_date_str
+
+
+class CiDetectType():
+    """ci内容设备的类型设置,可与操作设多个"""
+    PORN = 1
+    TERRORIST = 2
+    POLITICS = 4
+    ADS = 8

ut/test.py

@@ -10,6 +10,7 @@
 from qcloud_cos import CosConfig
 from qcloud_cos import CosServiceError
 from qcloud_cos import get_date
+from qcloud_cos.cos_comm import CiDetectType
 
 SECRET_ID = os.environ["SECRET_ID"]
 SECRET_KEY = os.environ["SECRET_KEY"]
@@ -1152,6 +1153,18 @@ def test_select_object():
         print(event)
 
 
+def _test_get_object_sensitive_content_recognition():
+    """测试ci文件内容识别的接口"""
+    print(CiDetectType)
+    response = client.get_object_sensitive_content_recognition(
+        Bucket=test_bucket,
+        Key=test_object,
+        DetectType=(CiDetectType.PORN | CiDetectType.TERRORIST | CiDetectType.POLITICS | CiDetectType.ADS)
+    )
+    print(response)
+    assert response
+
+
 if __name__ == "__main__":
     setUp()
     """
@@ -1175,6 +1188,8 @@ def test_select_object():
     test_put_get_delete_bucket_inventory()
     test_put_get_traffic_limit()
     test_put_get_delete_bucket_domain()
-    """
     test_select_object()
+    _test_get_object_sensitive_content_recognition()
+    """
+
     tearDown()