aliyun-log-python-sdk 0.9.19__tar.gz → 0.9.22__tar.gz

{aliyun_log_python_sdk-0.9.19/aliyun_log_python_sdk.egg-info → aliyun_log_python_sdk-0.9.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.19
+Version: 0.9.22
 Summary: Aliyun log service Python client SDK
 Home-page: https://github.com/aliyun/aliyun-log-python-sdk
 Author: Aliyun

{aliyun_log_python_sdk-0.9.19 → aliyun_log_python_sdk-0.9.22}/aliyun/log/compress.py

@@ -6,26 +6,46 @@ from .util import Util
 import six
 import lz4.block
 
+try:
+    import zstd
+    zstd_available = True
+except ImportError:
+    zstd_available = False
 
 def lz_decompress(raw_size, data):
     return lz4.block.decompress(data, uncompressed_size=raw_size)
 
-
 def lz_compresss(data):
     return lz4.block.compress(data)[4:]
 
+def zstd_compress(data):
+    if not zstd_available:
+        raise LogException('UnsupportedompressType',
+                           'Unsupported compress type zstd, zstd not installed')
+    return zstd.compress(data, 1)
 
 class CompressType(Enum):
     UNCOMPRESSED = 1
     LZ4 = 2
+    ZSTD = 3
 
     @staticmethod
     def default_compress_type():
         return CompressType.LZ4
+    
+    @staticmethod
+    def from_nullable_str(compress_type):
+        if compress_type == 'lz4':
+            return CompressType.LZ4
+        if compress_type == 'zstd':
+            return CompressType.ZSTD
+        return CompressType.default_compress_type()
 
     def __str__(self):
         if self == CompressType.LZ4:
             return 'lz4'
+        if self == CompressType.ZSTD:
+            return 'zstd'
         return ''
 
 
@@ -35,6 +55,9 @@ class Compressor():
         # type: (bytes, CompressType) -> bytes
         if compress_type == CompressType.LZ4:
             return lz_compresss(data)
+        
+        if compress_type == CompressType.ZSTD:
+            return zstd_compress(data)
 
         if compress_type == CompressType.UNCOMPRESSED:
             return data

{aliyun_log_python_sdk-0.9.19 → aliyun_log_python_sdk-0.9.22}/aliyun/log/logclient.py

@@ -166,6 +166,8 @@ class LogClient(object):
             self._auth = make_auth(StaticCredentialsProvider(accessKeyId, accessKey, securityToken),
                                    auth_version, region)
         self._get_logs_v2_enabled = True
+        self._session = requests.Session()
+        self._enable_keep_alive = True
 
     def _replace_credentials(self):
         delta = time.time() - self._last_refresh
@@ -248,10 +250,16 @@ class LogClient(object):
                                'Bad json format:\n"%s"' % resp_body + '\n' + repr(ex),
                                requestId, resp_status, resp_header, resp_body)
 
+    def _get_http_sender(self, method):
+        if self._enable_keep_alive:
+            return getattr(self._session, method.lower())
+        return getattr(requests, method.lower())
+        
     def _getHttpResponse(self, method, url, params, body, headers):  # ensure method, url, body is str
         try:
             headers['User-Agent'] = self._user_agent
-            r = getattr(requests, method.lower())(url, params=params, data=body, headers=headers, timeout=self._timeout)
+            http_sender = self._get_http_sender(method)
+            r = http_sender(url, params=params, data=body, headers=headers, timeout=self._timeout)
             return r.status_code, r.content, r.headers
         except Exception as ex:
             raise LogException('LogRequestError', str(ex))
@@ -274,6 +282,10 @@ class LogClient(object):
 
         exJson = self._loadJson(resp_status, resp_header, resp_body, requestId)
         exJson = Util.convert_unicode_to_str(exJson)
+        if exJson is None:
+            raise LogException('LogRequestError',
+                               'Request is failed, got None response while status code is ' + str(resp_status) + '.',
+                               requestId, resp_status, resp_header, resp_body)
 
         if 'errorCode' in exJson and 'errorMessage' in exJson:
             raise LogException(exJson['errorCode'], exJson['errorMessage'], requestId,
@@ -444,7 +456,7 @@ class LogClient(object):
         
         need_compress = request.get_compress() is None or request.get_compress()
         if need_compress:
-            compress_type = CompressType.default_compress_type()
+            compress_type = CompressType.from_nullable_str(request.get_compress_type())
             headers['x-log-compresstype'] = str(compress_type)
             body = Compressor.compress(body, compress_type)
 

{aliyun_log_python_sdk-0.9.19 → aliyun_log_python_sdk-0.9.22}/aliyun/log/putlogsrequest.py

@@ -33,11 +33,14 @@ class PutLogsRequest(LogRequest):
 
     :type logtags: list
     :param logtags: list of key:value tag pair , [(tag_key_1,tag_value_1) , (tag_key_2,tag_value_2)]
+    
+    :type compress_type: String
+    :param compress_type: compress_type, eg lz4, zstd, default is lz4. To use zstd, pip install zstd.
 
     """
 
     def __init__(self, project=None, logstore=None, topic=None, source=None, logitems=None, hashKey=None,
-                 compress=True, logtags=None):
+                 compress=True, logtags=None, compress_type=None):
         LogRequest.__init__(self, project)
         self.logstore = logstore
         self.topic = topic
@@ -46,6 +49,13 @@ class PutLogsRequest(LogRequest):
         self.hashkey = hashKey
         self.compress = compress
         self.logtags = logtags
+        self.compress_type = compress_type
+
+    def get_compress_type(self):
+        return self.compress_type
+    
+    def set_compress_type(self, compress_type):
+        self.compress_type = compress_type
 
     def get_compress(self):
         return self.compress

{aliyun_log_python_sdk-0.9.19 → aliyun_log_python_sdk-0.9.22}/aliyun/log/version.py

@@ -1,5 +1,4 @@
-__version__ = '0.9.19'
-
+__version__ = '0.9.22'
 
 import sys
 OS_VERSION = str(sys.platform)

{aliyun_log_python_sdk-0.9.19 → aliyun_log_python_sdk-0.9.22/aliyun_log_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.19
+Version: 0.9.22
 Summary: Aliyun log service Python client SDK
 Home-page: https://github.com/aliyun/aliyun-log-python-sdk
 Author: Aliyun