aliyun-log-python-sdk 0.8.10__tar.gz → 0.8.12__tar.gz

{aliyun-log-python-sdk-0.8.10 → aliyun-log-python-sdk-0.8.12}/PKG-INFO

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

{aliyun-log-python-sdk-0.8.10 → aliyun-log-python-sdk-0.8.12}/aliyun/log/gethistogramsrequest.py

@@ -28,14 +28,14 @@ class GetHistogramsRequest(LogRequest):
     :type query: string
     :param query: user defined query
 
-    :type from_nano: int
-    :param from_nano: nano part of query begin time
+    :type from_time_nano_part: int
+    :param from_time_nano_part: nano part of query begin time
 
-    :type to_nano: int
-    :param to_nano: nano part of query end time
+    :type to_time_nano_part: int
+    :param to_time_nano_part: nano part of query end time
     """
 
-    def __init__(self, project=None, logstore=None, fromTime=None, toTime=None, topic=None, query=None, accurate_query=False, from_nano=0 ,to_nano=0):
+    def __init__(self, project=None, logstore=None, fromTime=None, toTime=None, topic=None, query=None, accurate_query=False, from_time_nano_part=0 ,to_time_nano_part=0):
         LogRequest.__init__(self, project)
         self.logstore = logstore
         self.fromTime = parse_timestamp(fromTime)
@@ -43,8 +43,8 @@ class GetHistogramsRequest(LogRequest):
         self.topic = topic
         self.query = query
         self.accurate_query = accurate_query
-        self.from_nano = from_nano
-        self.to_nano = to_nano
+        self.from_time_nano_part = from_time_nano_part
+        self.to_time_nano_part = to_time_nano_part
 
     def get_logstore(self):
         """ Get logstore name
@@ -134,32 +134,32 @@ class GetHistogramsRequest(LogRequest):
         """
         self.accurate_query = accurate_query
 
-    def get_from_nano(self):
-        """ Get request from_nano
+    def get_from_time_nano_part(self):
+        """ Get request from_time_nano_part
 
-        :return: int, from_nano
+        :return: int, from_time_nano_part
         """
-        return self.from_nano
+        return self.from_time_nano_part
 
-    def set_from_nano(self, from_nano):
-        """ Set request from_nano
+    def set_from_time_nano_part(self, from_time_nano_part):
+        """ Set request from_time_nano_part
 
-        :type from_nano: int
-        :param from_nano: from_nano part of query begin time
+        :type from_time_nano_part: int
+        :param from_time_nano_part: from_time_nano_part part of query begin time
         """
-        self.from_nano = from_nano
+        self.from_time_nano_part = from_time_nano_part
 
-    def get_to_nano(self):
-        """ Get request to_nano
+    def get_to_time_nano_part(self):
+        """ Get request to_time_nano_part
 
-        :return: int, to_nano
+        :return: int, to_time_nano_part
         """
-        return self.to_nano
+        return self.to_time_nano_part
 
-    def set_to_nano(self, to_nano):
-        """ Set request to_nano
+    def set_to_time_nano_part(self, to_time_nano_part):
+        """ Set request to_time_nano_part
 
-        :type to_nano: int
-        :param to_nano: to_nano part of query end time
+        :type to_time_nano_part: int
+        :param to_time_nano_part: to_time_nano_part part of query end time
         """
-        self.to_nano = to_nano
+        self.to_time_nano_part = to_time_nano_part

{aliyun-log-python-sdk-0.8.10 → aliyun-log-python-sdk-0.8.12}/aliyun/log/getlogsrequest.py

@@ -49,15 +49,15 @@ class GetLogsRequest(LogRequest):
     :type accurate_query: bool
     :param accurate_query: if accurate_query is set to true, the query will run global ordered time mode
 
-    :type from_nano: int
-    :param from_nano: nano part of query begin time
+    :type from_time_nano_part: int
+    :param from_time_nano_part: nano part of query begin time
 
-    :type to_nano: int
-    :param to_nano: nano part of query end time
+    :type to_time_nano_part: int
+    :param to_time_nano_part: nano part of query end time
     """
 
     def __init__(self, project=None, logstore=None, fromTime=None, toTime=None, topic=None,
-                 query=None, line=100, offset=0, reverse=False, power_sql=False, scan=False, forward=True, accurate_query=False, from_nano=0, to_nano=0):
+                 query=None, line=100, offset=0, reverse=False, power_sql=False, scan=False, forward=True, accurate_query=False, from_time_nano_part=0, to_time_nano_part=0):
         LogRequest.__init__(self, project)
         self.logstore = logstore
         self.fromTime = fromTime
@@ -71,8 +71,8 @@ class GetLogsRequest(LogRequest):
         self.scan = scan
         self.forward = forward
         self.accurate_query = accurate_query
-        self.from_nano = from_nano
-        self.to_nano = to_nano
+        self.from_time_nano_part = from_time_nano_part
+        self.to_time_nano_part = to_time_nano_part
 
     def get_logstore(self):
         """ Get logstore name
@@ -254,35 +254,35 @@ class GetLogsRequest(LogRequest):
         """
         self.accurate_query = accurate_query
 
-    def get_from_nano(self):
-        """ Get request from_nano
+    def get_from_time_nano_part(self):
+        """ Get request from_time_nano_part
 
-        :return: int, from_nano
+        :return: int, from_time_nano_part
         """
-        return self.from_nano
+        return self.from_time_nano_part
 
-    def set_from_nano(self, from_nano):
-        """ Set request from_nano
+    def set_from_time_nano_part(self, from_time_nano_part):
+        """ Set request from_time_nano_part
 
-        :type from_nano: int
-        :param from_nano: from_nano part of query begin time
+        :type from_time_nano_part: int
+        :param from_time_nano_part: from_time_nano_part part of query begin time
         """
-        self.from_nano = from_nano
+        self.from_time_nano_part = from_time_nano_part
 
-    def get_to_nano(self):
-        """ Get request to_nano
+    def get_to_time_nano_part(self):
+        """ Get request to_time_nano_part
 
-        :return: int, to_nano
+        :return: int, to_time_nano_part
         """
-        return self.to_nano
+        return self.to_time_nano_part
 
-    def set_to_nano(self, to_nano):
-        """ Set request to_nano
+    def set_to_time_nano_part(self, to_time_nano_part):
+        """ Set request to_time_nano_part
 
-        :type to_nano: int
-        :param to_nano: to_nano part of query end time
+        :type to_time_nano_part: int
+        :param to_time_nano_part: to_time_nano_part part of query end time
         """
-        self.to_nano = to_nano
+        self.to_time_nano_part = to_time_nano_part
 
 class GetProjectLogsRequest(LogRequest):
     """ The request used to get logs by a query from log cross multiple logstores.

{aliyun-log-python-sdk-0.8.10 → aliyun-log-python-sdk-0.8.12}/aliyun/log/job.py

@@ -78,7 +78,7 @@ class ExportConfiguration(object):
     def getSink(self):
         return self.__sink
 
-    def setSink(self, sink: DataSink):
+    def setSink(self, sink):
         self.__sink = sink
 
     def getParameters(self):
@@ -88,7 +88,7 @@ class ExportConfiguration(object):
         self.__parameters = parameters
 
 
-class AbstractJob(metaclass=abc.ABCMeta):
+class AbstractJob(object):
 
     def getName(self):
         return self.__name

{aliyun-log-python-sdk-0.8.10 → aliyun-log-python-sdk-0.8.12}/aliyun/log/logclient.py

@@ -251,7 +251,7 @@ class LogClient(object):
             return json.loads(resp_body)
         except Exception as ex:
             raise LogException('BadResponse',
-                               'Bad json format:\n"%s"' % b64e(resp_body) + '\n' + repr(ex),
+                               'Bad json format:\n"%s"' % resp_body + '\n' + repr(ex),
                                requestId, resp_status, resp_header, resp_body)
 
     def _getHttpResponse(self, method, url, params, body, headers):  # ensure method, url, body is str
@@ -542,8 +542,8 @@ class LogClient(object):
             params['query'] = request.get_query()
 
         params['accurate'] = request.get_accurate_query()
-        params['fromNs'] = request.get_from_nano()
-        params['toNs'] = request.get_to_nano()
+        params['fromNs'] = request.get_from_time_nano_part()
+        params['toNs'] = request.get_to_time_nano_part()
         params['type'] = 'histogram'
         logstore = request.get_logstore()
         project = request.get_project()
@@ -552,7 +552,7 @@ class LogClient(object):
         return GetHistogramsResponse(resp, header)
 
     def get_log(self, project, logstore, from_time, to_time, topic=None,
-                query=None, reverse=False, offset=0, size=100, power_sql=False, scan=False, forward=True, accurate_query=False, from_nano=0, to_nano=0):
+                query=None, reverse=False, offset=0, size=100, power_sql=False, scan=False, forward=True, accurate_query=False, from_time_nano_part=0, to_time_nano_part=0):
         """ Get logs from log service.
         will retry DEFAULT_QUERY_RETRY_COUNT when incomplete.
         Unsuccessful operation will cause an LogException.
@@ -597,11 +597,11 @@ class LogClient(object):
         :type accurate_query: bool
         :param accurate_query: if accurate_query is set to true, the query will global ordered time second mode
 
-        :type from_nano: int
-        :param from_nano: nano part of query begin time
+        :type from_time_nano_part: int
+        :param from_time_nano_part: nano part of query begin time
 
-        :type to_nano: int
-        :param to_nano: nano part of query end time
+        :type to_time_nano_part: int
+        :param to_time_nano_part: nano part of query end time
 
         :return: GetLogsResponse
 
@@ -624,8 +624,8 @@ class LogClient(object):
                 query=query,
                 reverse=reverse,
                 accurate_query=accurate_query,
-                from_nano=from_nano,
-                to_nano=to_nano
+                from_time_nano_part=from_time_nano_part,
+                to_time_nano_part=to_time_nano_part
             )
 
         ret = None
@@ -639,8 +639,8 @@ class LogClient(object):
                       'reverse': 'true' if reverse else 'false',
                       'powerSql': power_sql,
                       'accurate': accurate_query,
-                      'fromNs': from_nano,
-                      'toNs': to_nano
+                      'fromNs': from_time_nano_part,
+                      'toNs': to_time_nano_part
                       }
 
             if topic:
@@ -687,11 +687,11 @@ class LogClient(object):
         scan = request.get_scan()
         forward = request.get_forward()
         accurate_query = request.get_accurate_query()
-        from_nano = request.get_from_nano()
-        to_nano = request.get_to_nano()
+        from_time_nano_part = request.get_from_time_nano_part()
+        to_time_nano_part = request.get_to_time_nano_part()
 
         return self.get_log(project, logstore, from_time, to_time, topic,
-                            query, reverse, offset, size, power_sql, scan, forward, accurate_query, from_nano, to_nano)
+                            query, reverse, offset, size, power_sql, scan, forward, accurate_query, from_time_nano_part, to_time_nano_part)
 
     def get_log_all(self, project, logstore, from_time, to_time, topic=None,
                     query=None, reverse=False, offset=0, power_sql=False, accurate_query=False):
@@ -1294,6 +1294,9 @@ class LogClient(object):
         :type mode: string
         :param mode: type of logstore, can be choose between lite and standard, default value standard
 
+        :type hot_ttl: int
+        :param hot_ttl: the life cycle of hot storage,[0-hot_ttl]is hot storage, (hot_ttl-ttl] is warm storage, if hot_ttl=-1, it means [0-ttl]is all hot storage
+        
         :return: CreateLogStoreResponse
         
         :raise: LogException

{aliyun-log-python-sdk-0.8.10 → aliyun-log-python-sdk-0.8.12}/aliyun/log/version.py

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

{aliyun-log-python-sdk-0.8.10 → aliyun-log-python-sdk-0.8.12}/aliyun_log_python_sdk.egg-info/PKG-INFO

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

{aliyun-log-python-sdk-0.8.10 → aliyun-log-python-sdk-0.8.12}/aliyun_log_python_sdk.egg-info/requires.txt

@@ -4,4 +4,4 @@ python-dateutil
 elasticsearch
 jmespath
 dateparser
-protobuf<4.0.0,>=3.4.0
+protobuf<4.0.0,>3.4.0

{aliyun-log-python-sdk-0.8.10 → aliyun-log-python-sdk-0.8.12}/setup.py

@@ -32,7 +32,7 @@ requirements_py3 = [
     'elasticsearch',
     'jmespath',
     'dateparser',
-    'protobuf>=3.4.0,<4.0.0',
+    'protobuf>3.4.0,<4.0.0',
 ]
 requirements_py2 = [
     'six==1.14.0',
@@ -42,7 +42,7 @@ requirements_py2 = [
     'jmespath==0.9.5',
     'enum34==1.1.10',
     'futures==3.3.0',
-    'protobuf<=3.4.0',
+    'protobuf>3.4.0,<4.0.0',
     'regex==2021.3.17',
     'tzlocal==2.0.0',
     'lz4a==0.7.0',