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

{aliyun-log-python-sdk-0.8.8 → 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.8
+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.8 → aliyun-log-python-sdk-0.8.12}/aliyun/log/gethistogramsrequest.py

@@ -27,15 +27,24 @@ class GetHistogramsRequest(LogRequest):
     
     :type query: string
     :param query: user defined query
+
+    :type from_time_nano_part: int
+    :param from_time_nano_part: nano part of query begin 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):
+    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)
         self.toTime = parse_timestamp(toTime)
         self.topic = topic
         self.query = query
+        self.accurate_query = accurate_query
+        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
@@ -111,3 +120,46 @@ class GetHistogramsRequest(LogRequest):
         :param query: user defined query
         """
         self.query = query
+
+    def get_accurate_query(self):
+        """ Get user defined accurate_query
+        :return: string, user defined accurate_query
+        """
+        return self.accurate_query
+
+    def set_accurate_query(self, accurate_query):
+        """ Set user defined accurate_query
+        :type accurate_query: string
+        :param accurate_query: user defined accurate_query
+        """
+        self.accurate_query = accurate_query
+
+    def get_from_time_nano_part(self):
+        """ Get request from_time_nano_part
+
+        :return: int, from_time_nano_part
+        """
+        return self.from_time_nano_part
+
+    def set_from_time_nano_part(self, from_time_nano_part):
+        """ Set request from_time_nano_part
+
+        :type from_time_nano_part: int
+        :param from_time_nano_part: from_time_nano_part part of query begin time
+        """
+        self.from_time_nano_part = from_time_nano_part
+
+    def get_to_time_nano_part(self):
+        """ Get request to_time_nano_part
+
+        :return: int, to_time_nano_part
+        """
+        return self.to_time_nano_part
+
+    def set_to_time_nano_part(self, to_time_nano_part):
+        """ Set request to_time_nano_part
+
+        :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

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

@@ -45,10 +45,19 @@ class GetLogsRequest(LogRequest):
 
     :type forward: bool
     :param forward: only for scan query, if forward is set to true, the query will get next page, otherwise previous page
+
+    :type accurate_query: bool
+    :param accurate_query: if accurate_query is set to true, the query will run global ordered time mode
+
+    :type from_time_nano_part: int
+    :param from_time_nano_part: nano part of query begin 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):
+                 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
@@ -61,6 +70,9 @@ class GetLogsRequest(LogRequest):
         self.power_sql = power_sql
         self.scan = scan
         self.forward = forward
+        self.accurate_query = accurate_query
+        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
@@ -227,6 +239,51 @@ class GetLogsRequest(LogRequest):
         """
         self.forward = forward
 
+    def get_accurate_query(self):
+        """ Get request accurate_query flag
+
+        :return: bool, accurate_query flag
+        """
+        return self.accurate_query
+
+    def set_accurate_query(self, accurate_query):
+        """ Set request accurate_query flag
+
+        :type accurate_query: bool
+        :param accurate_query: accurate_query flag
+        """
+        self.accurate_query = accurate_query
+
+    def get_from_time_nano_part(self):
+        """ Get request from_time_nano_part
+
+        :return: int, from_time_nano_part
+        """
+        return self.from_time_nano_part
+
+    def set_from_time_nano_part(self, from_time_nano_part):
+        """ Set request from_time_nano_part
+
+        :type from_time_nano_part: int
+        :param from_time_nano_part: from_time_nano_part part of query begin time
+        """
+        self.from_time_nano_part = from_time_nano_part
+
+    def get_to_time_nano_part(self):
+        """ Get request to_time_nano_part
+
+        :return: int, to_time_nano_part
+        """
+        return self.to_time_nano_part
+
+    def set_to_time_nano_part(self, to_time_nano_part):
+        """ Set request to_time_nano_part
+
+        :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
+
 class GetProjectLogsRequest(LogRequest):
     """ The request used to get logs by a query from log cross multiple logstores.
 

{aliyun-log-python-sdk-0.8.8 → aliyun-log-python-sdk-0.8.12}/aliyun/log/getlogsresponse.py

@@ -185,6 +185,11 @@ class GetLogsResponse(LogResponse):
             log.log_print()
             print('\n')
 
+    def get_log_list(self):
+        print('count:', self.get_count())
+        print('progress:', self.progress)
+        return self.logs
+
     def merge(self, response):
         if not isinstance(response, GetLogsResponse):
             raise ValueError("passed response is not a GetLogsResponse: " + str(type(response)))

{aliyun-log-python-sdk-0.8.8 → 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
@@ -134,6 +134,32 @@ class AbstractJob(metaclass=abc.ABCMeta):
 
 
 class JobSchedule(object):
+    def __init__(self):
+        self.__id = None
+        self.__displayName = None
+        self.__jobName = None
+        self.__type = None
+        self.__interval = None
+        self.__cronExpression = None
+        self.__delay = None
+        self.__dayOfWeek = None
+        self.__hour = None
+        self.__timeZone = None
+
+    def jobScheduleToDict(self):
+        config = {
+            'id': self.getId(),
+            'displayName': self.getDisplayName(),
+            'jobName': self.getJobName(),
+            'type': self.getType(),
+            'interval': self.getInterval(),
+            'cronExpression': self.getCronExpression(),
+            'delay': self.getDelay(),
+            'dayOfWeek': self.getDayOfWeek(),
+            'hour': self.getHour(),
+            'timeZone': self.getTimeZone()
+        }
+        return config
 
     def getId(self):
         return self.__id
@@ -151,7 +177,7 @@ class JobSchedule(object):
         return self.__jobName
 
     def setJobName(self, jobName):
-        self.jobName = jobName
+        self.__jobName = jobName
 
     def getType(self):
         return self.__type
@@ -251,6 +277,9 @@ class JobSchedule(object):
 
 
 class ScheduledJob(AbstractJob):
+    def __init__(self):
+        self.__status = None
+        self.__schedule = JobSchedule()
 
     def getStatus(self):
         return self.__status
@@ -267,6 +296,7 @@ class ScheduledJob(AbstractJob):
 
 class Export(ScheduledJob):
     def __init__(self):
+        self.configuration = None
         self.setType(JobType.EXPORT)
         schedule = JobSchedule()
         schedule.setType(JobScheduleType.RESIDENT)

aliyun-log-python-sdk-0.8.12/aliyun/log/log_logs_pb2.py

@@ -0,0 +1,297 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: log_logs.proto
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='log_logs.proto',
+  package='',
+  syntax='proto2',
+  serialized_options=None,
+  create_key=_descriptor._internal_create_key,
+  serialized_pb=b'\n\x0elog_logs.proto\"k\n\x03Log\x12\x0c\n\x04Time\x18\x01 \x02(\r\x12\x1e\n\x08\x43ontents\x18\x02 \x03(\x0b\x32\x0c.Log.Content\x12\x0f\n\x07Time_ns\x18\x04 \x01(\x07\x1a%\n\x07\x43ontent\x12\x0b\n\x03Key\x18\x01 \x02(\t\x12\r\n\x05Value\x18\x02 \x02(\t\"$\n\x06LogTag\x12\x0b\n\x03Key\x18\x01 \x02(\t\x12\r\n\x05Value\x18\x02 \x02(\t\"~\n\x08LogGroup\x12\x12\n\x04Logs\x18\x01 \x03(\x0b\x32\x04.Log\x12\x10\n\x08Reserved\x18\x02 \x01(\t\x12\r\n\x05Topic\x18\x03 \x01(\t\x12\x0e\n\x06Source\x18\x04 \x01(\t\x12\x13\n\x0bMachineUUID\x18\x05 \x01(\t\x12\x18\n\x07LogTags\x18\x06 \x03(\x0b\x32\x07.LogTag\",\n\x0cLogGroupList\x12\x1c\n\tLogGroups\x18\x01 \x03(\x0b\x32\t.LogGroup'
+)
+
+
+
+
+_LOG_CONTENT = _descriptor.Descriptor(
+  name='Content',
+  full_name='Log.Content',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='Key', full_name='Log.Content.Key', index=0,
+      number=1, type=9, cpp_type=9, label=2,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='Value', full_name='Log.Content.Value', index=1,
+      number=2, type=9, cpp_type=9, label=2,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=88,
+  serialized_end=125,
+)
+
+_LOG = _descriptor.Descriptor(
+  name='Log',
+  full_name='Log',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='Time', full_name='Log.Time', index=0,
+      number=1, type=13, cpp_type=3, label=2,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='Contents', full_name='Log.Contents', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='Time_ns', full_name='Log.Time_ns', index=2,
+      number=4, type=7, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[_LOG_CONTENT, ],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=18,
+  serialized_end=125,
+)
+
+
+_LOGTAG = _descriptor.Descriptor(
+  name='LogTag',
+  full_name='LogTag',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='Key', full_name='LogTag.Key', index=0,
+      number=1, type=9, cpp_type=9, label=2,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='Value', full_name='LogTag.Value', index=1,
+      number=2, type=9, cpp_type=9, label=2,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=127,
+  serialized_end=163,
+)
+
+
+_LOGGROUP = _descriptor.Descriptor(
+  name='LogGroup',
+  full_name='LogGroup',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='Logs', full_name='LogGroup.Logs', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='Reserved', full_name='LogGroup.Reserved', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='Topic', full_name='LogGroup.Topic', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='Source', full_name='LogGroup.Source', index=3,
+      number=4, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='MachineUUID', full_name='LogGroup.MachineUUID', index=4,
+      number=5, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='LogTags', full_name='LogGroup.LogTags', index=5,
+      number=6, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=165,
+  serialized_end=291,
+)
+
+
+_LOGGROUPLIST = _descriptor.Descriptor(
+  name='LogGroupList',
+  full_name='LogGroupList',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='LogGroups', full_name='LogGroupList.LogGroups', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=293,
+  serialized_end=337,
+)
+
+_LOG_CONTENT.containing_type = _LOG
+_LOG.fields_by_name['Contents'].message_type = _LOG_CONTENT
+_LOGGROUP.fields_by_name['Logs'].message_type = _LOG
+_LOGGROUP.fields_by_name['LogTags'].message_type = _LOGTAG
+_LOGGROUPLIST.fields_by_name['LogGroups'].message_type = _LOGGROUP
+DESCRIPTOR.message_types_by_name['Log'] = _LOG
+DESCRIPTOR.message_types_by_name['LogTag'] = _LOGTAG
+DESCRIPTOR.message_types_by_name['LogGroup'] = _LOGGROUP
+DESCRIPTOR.message_types_by_name['LogGroupList'] = _LOGGROUPLIST
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+Log = _reflection.GeneratedProtocolMessageType('Log', (_message.Message,), {
+
+  'Content' : _reflection.GeneratedProtocolMessageType('Content', (_message.Message,), {
+    'DESCRIPTOR' : _LOG_CONTENT,
+    '__module__' : 'log_logs_pb2'
+    # @@protoc_insertion_point(class_scope:Log.Content)
+    })
+  ,
+  'DESCRIPTOR' : _LOG,
+  '__module__' : 'log_logs_pb2'
+  # @@protoc_insertion_point(class_scope:Log)
+  })
+_sym_db.RegisterMessage(Log)
+_sym_db.RegisterMessage(Log.Content)
+
+LogTag = _reflection.GeneratedProtocolMessageType('LogTag', (_message.Message,), {
+  'DESCRIPTOR' : _LOGTAG,
+  '__module__' : 'log_logs_pb2'
+  # @@protoc_insertion_point(class_scope:LogTag)
+  })
+_sym_db.RegisterMessage(LogTag)
+
+LogGroup = _reflection.GeneratedProtocolMessageType('LogGroup', (_message.Message,), {
+  'DESCRIPTOR' : _LOGGROUP,
+  '__module__' : 'log_logs_pb2'
+  # @@protoc_insertion_point(class_scope:LogGroup)
+  })
+_sym_db.RegisterMessage(LogGroup)
+
+LogGroupList = _reflection.GeneratedProtocolMessageType('LogGroupList', (_message.Message,), {
+  'DESCRIPTOR' : _LOGGROUPLIST,
+  '__module__' : 'log_logs_pb2'
+  # @@protoc_insertion_point(class_scope:LogGroupList)
+  })
+_sym_db.RegisterMessage(LogGroupList)
+
+
+# @@protoc_insertion_point(module_scope)