aliyun-log-python-sdk 0.9.3__tar.gz → 0.9.4__tar.gz

{aliyun-log-python-sdk-0.9.3/aliyun_log_python_sdk.egg-info → aliyun-log-python-sdk-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.3
+Version: 0.9.4
 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.3 → aliyun-log-python-sdk-0.9.4}/aliyun/log/logclient.py

@@ -47,7 +47,7 @@ from .tag_response import GetResourceTagsResponse
 from .topostore_response import *
 from .topostore_params import *
 from .util import base64_encodestring as b64e
-from .util import base64_encodestring as e64, base64_decodestring as d64
+from .util import base64_encodestring as e64, base64_decodestring as d64, Util
 from .version import API_VERSION, USER_AGENT
 
 from .log_logs_raw_pb2 import LogGroupRaw as LogGroup
@@ -66,22 +66,9 @@ logger = logging.getLogger(__name__)
 if six.PY3:
     xrange = range
 
-
-try:
-    import lz4
-
-    if not hasattr(lz4, 'loads') or not hasattr(lz4, 'dumps'):
-        lz4 = None
-    else:
-        def lz_decompress(raw_size, data):
-            return lz4.loads(struct.pack('<I', raw_size) + data)
-
-        def lz_compresss(data):
-            return lz4.dumps(data)[4:]
-
-except ImportError:
-    lz4 = None
-
+lz4_available = Util.is_lz4_available()
+if lz4_available:
+    from .util import lz_decompress, lz_compresss
 
 CONNECTION_TIME_OUT = 120
 MAX_LIST_PAGING_SIZE = 500
@@ -395,7 +382,7 @@ class LogClient(object):
         headers = {'x-log-bodyrawsize': str(raw_body_size), 'Content-Type': 'application/x-protobuf'}
 
         if compress is None or compress:
-            if lz4:
+            if lz4_available:
                 headers['x-log-compresstype'] = 'lz4'
                 body = lz_compresss(body)
             else:
@@ -459,7 +446,7 @@ class LogClient(object):
 
         compress_data = None
         if is_compress:
-            if lz4:
+            if lz4_available:
                 headers['x-log-compresstype'] = 'lz4'
                 compress_data = lz_compresss(body)
             else:
@@ -664,7 +651,7 @@ class LogClient(object):
                 params['forward'] = forward
                 body_str = six.b(json.dumps(params))
                 headers["x-log-bodyrawsize"] = str(len(body_str))
-                accept_encoding = "lz4" if Util.is_lz4_available() else "deflate"
+                accept_encoding = "lz4" if lz4_available else "deflate"
                 headers['Accept-Encoding'] = accept_encoding
 
                 (resp, header) = self._send("POST", project, body_str, resource, None, headers, respons_body_type=accept_encoding)
@@ -1139,7 +1126,7 @@ class LogClient(object):
 
         headers = {}
         if compress is None or compress:
-            if lz4:
+            if lz4_available:
                 headers['Accept-Encoding'] = 'lz4'
             else:
                 headers['Accept-Encoding'] = 'gzip'
@@ -1162,11 +1149,10 @@ class LogClient(object):
         if end_cursor:
             params['end_cursor'] = end_cursor
         (resp, header) = self._send("GET", project_name, None, resource, params, headers, "binary")
-
         compress_type = Util.h_v_td(header, 'x-log-compresstype', '').lower()
         if compress_type == 'lz4':
             raw_size = int(Util.h_v_t(header, 'x-log-bodyrawsize'))
-            if lz4:
+            if lz4_available:
                 raw_data = lz_decompress(raw_size, resp)
                 return PullLogResponse(raw_data, header)
             else:

{aliyun-log-python-sdk-0.9.3 → aliyun-log-python-sdk-0.9.4}/aliyun/log/util.py

@@ -34,9 +34,10 @@ try:
             return lz4.block.decompress(data, uncompressed_size=raw_size)
 
         def lz_compresss(data):
-            return lz4.block.compress(data)
+            return lz4.block.compress(data)[4:]
+    lz4_available = True
 except ImportError:
-    lz4 = None
+    lz4_available = False
       
 logger = logging.getLogger(__name__)
 
@@ -165,7 +166,7 @@ class Util(object):
 
     @staticmethod
     def is_lz4_available():
-        return lz4 is not None
+        return lz4_available
         
     @staticmethod
     def h_v_t(header, key):
@@ -216,7 +217,7 @@ class Util(object):
         compress_type = Util.h_v_td(header, 'x-log-compresstype', '').lower()
         if compress_type == 'lz4':
             raw_size = int(Util.h_v_t(header, 'x-log-bodyrawsize'))
-            if lz4:
+            if Util.is_lz4_available():
                 return lz_decompress(raw_size, response)
             else:
                 raise LogException("ClientHasNoLz4", "There's no Lz4 lib available to decompress the response", resp_header=header, resp_body=response)

{aliyun-log-python-sdk-0.9.3 → aliyun-log-python-sdk-0.9.4}/aliyun/log/version.py

@@ -1,4 +1,4 @@
-__version__ = '0.9.3'
+__version__ = '0.9.4'
 
 import sys
 OS_VERSION = str(sys.platform)

{aliyun-log-python-sdk-0.9.3 → aliyun-log-python-sdk-0.9.4/aliyun_log_python_sdk.egg-info}/PKG-INFO

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