aliyun-log-python-sdk 0.9.1__tar.gz → 0.9.2__tar.gz

{aliyun-log-python-sdk-0.9.1/aliyun_log_python_sdk.egg-info → aliyun-log-python-sdk-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.1
+Version: 0.9.2
 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.1 → aliyun-log-python-sdk-0.9.2}/aliyun/log/gethistogramsrequest.py

@@ -33,9 +33,12 @@ class GetHistogramsRequest(LogRequest):
 
     :type to_time_nano_part: int
     :param to_time_nano_part: nano part of query end time
+
+    :type shard_id: int
+    :param shard_id: specific shard id,-1 means all shard
     """
 
-    def __init__(self, project=None, logstore=None, fromTime=None, toTime=None, topic=None, query=None, accurate_query=True, from_time_nano_part=0 ,to_time_nano_part=0):
+    def __init__(self, project=None, logstore=None, fromTime=None, toTime=None, topic=None, query=None, accurate_query=True, from_time_nano_part=0, to_time_nano_part=0, shard_id=-1):
         LogRequest.__init__(self, project)
         self.logstore = logstore
         self.fromTime = parse_timestamp(fromTime)
@@ -45,6 +48,7 @@ class GetHistogramsRequest(LogRequest):
         self.accurate_query = accurate_query
         self.from_time_nano_part = from_time_nano_part
         self.to_time_nano_part = to_time_nano_part
+        self.shard_id = shard_id
 
     def get_logstore(self):
         """ Get logstore name
@@ -162,4 +166,19 @@ class GetHistogramsRequest(LogRequest):
         :type to_time_nano_part: int
         :param to_time_nano_part: to_time_nano_part part of query end time
         """
-        self.to_time_nano_part = to_time_nano_part
+        self.to_time_nano_part = to_time_nano_part
+
+    def set_shard_id(self, shard_id):
+        """ Set request shard_id
+
+        :type shard_id: int
+        :param shard_id: user defined shard_id
+        """
+        self.shard_id = shard_id
+
+    def get_shard_id(self):
+        """ Get request shard_id
+
+        :return: int, shard_id
+        """
+        return self.shard_id

{aliyun-log-python-sdk-0.9.1 → aliyun-log-python-sdk-0.9.2}/aliyun/log/getlogsresponse.py

@@ -267,15 +267,15 @@ class GetLogsResponse(LogResponse):
 
             :return: bool, true if this logs query is completed
             """
-            return self._progress == 'Complete'
+            return self.get_progress() == 'Complete'
 
         def merge(self, other):
             """ merge with other GetLogsResponseMeta
 
             """
-            self._progress = other.progress
-            self._count += other.count
-            self._processed_rows += other.processed_rows
+            self._progress = other.get_progress()
+            self._count += other.get_count()
+            self._processed_rows += other.get_processed_rows()
             return self
 
         def get_count(self):
@@ -288,23 +288,22 @@ class GetLogsResponse(LogResponse):
         def _to_dict(self):
             """ to Dict
             """
-            phrase_query_info = None
-            if self._phrase_query_info is not None:
-                phrase_query_info = self._phrase_query_info._to_dict()
+            phrase_query_info = self.get_phrase_query_info()
+            phrase_query_info_dict = phrase_query_info._to_dict() if phrase_query_info is not None else None
 
             return {
-                'count': self._count,
-                'progress': self._progress,
-                'processedRows': self._processed_rows,
-                'elapsedMillisecond': self._elapsed_millisecond,
-                'hasSQL': self._has_sql,
-                'whereQuery': self._where_query,
-                'aggQuery': self._agg_query,
-                'cpuSec': self._cpu_sec,
-                'cpuCores': self._cpu_cores,
-                'mode': self._mode,
-                'scanBytes': self._scan_bytes,
-                'phraseQueryInfo': phrase_query_info,
+                'count': self.get_count(),
+                'progress': self.get_progress(),
+                'processedRows': self.get_processed_rows(),
+                'elapsedMillisecond': self.get_elapsed_millisecond(),
+                'hasSQL': self.get_has_sql(),
+                'whereQuery': self.get_where_query(),
+                'aggQuery': self.get_agg_query(),
+                'cpuSec': self.get_cpu_sec(),
+                'cpuCores': self.get_cpu_cores(),
+                'mode': self.get_mode(),
+                'scanBytes': self.get_scan_bytes(),
+                'phraseQueryInfo': phrase_query_info_dict,
                 # 'limited': self._limited,
                 # 'processedBytes': self._processed_bytes,
                 # 'telementryType': self._telemetry_type,  # not typo
@@ -515,10 +514,10 @@ class GetLogsResponse(LogResponse):
             """ to Dict
             """
             return {
-                "beginOffset": self._begin_offset,
-                "endOffset": self._end_offset,
-                "scanAll": self._scan_all,
-                "endTime": self._end_time
+                "beginOffset": self.get_begin_offset(),
+                "endOffset": self.get_end_offset(),
+                "scanAll": self.get_scan_all(),
+                "endTime": self.get_end_time()
             }
 
         def log_print(self):

{aliyun-log-python-sdk-0.9.1 → aliyun-log-python-sdk-0.9.2}/aliyun/log/logclient.py

@@ -545,6 +545,8 @@ class LogClient(object):
         params['accurate'] = request.get_accurate_query()
         params['fromNs'] = request.get_from_time_nano_part()
         params['toNs'] = request.get_to_time_nano_part()
+        if request.get_shard_id() != -1:
+            params['shard'] = request.get_shard_id()
         params['type'] = 'histogram'
         logstore = request.get_logstore()
         project = request.get_project()

{aliyun-log-python-sdk-0.9.1 → aliyun-log-python-sdk-0.9.2}/aliyun/log/version.py

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

{aliyun-log-python-sdk-0.9.1 → aliyun-log-python-sdk-0.9.2/aliyun_log_python_sdk.egg-info}/PKG-INFO

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