aliyun-log-python-sdk 0.9.7__tar.gz → 0.9.8__tar.gz

{aliyun-log-python-sdk-0.9.7/aliyun_log_python_sdk.egg-info → aliyun_log_python_sdk-0.9.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.7
+Version: 0.9.8
 Summary: Aliyun log service Python client SDK
 Home-page: https://github.com/aliyun/aliyun-log-python-sdk
 Author: Aliyun
@@ -16,6 +16,18 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 License-File: LICENSE
+Requires-Dist: six
+Requires-Dist: requests
+Requires-Dist: python-dateutil
+Requires-Dist: elasticsearch
+Requires-Dist: jmespath
+Requires-Dist: dateparser
+Requires-Dist: protobuf<6.0.0,>3.20.3
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: lz4; extra == "test"
+Requires-Dist: virtualenv; extra == "test"
+Requires-Dist: zstandard; extra == "test"
 
 
 Python SDK for Alicloud Log Service

{aliyun-log-python-sdk-0.9.7 → aliyun_log_python_sdk-0.9.8}/aliyun/log/__init__.py

@@ -33,7 +33,7 @@ from .shard_response import *
 from .shipper_response import *
 from .common_response import *
 from .external_store_config_response import *
-from .log_logs_raw_pb2 import LogGroupRaw as LogGroup
+from .proto import LogGroupRaw as LogGroup
 
 # logging handler
 from .logger_hanlder import SimpleLogHandler, QueuedLogHandler, LogFields, UwsgiQueuedLogHandler

aliyun_log_python_sdk-0.9.8/aliyun/log/_proto_py2/__init__.py

@@ -0,0 +1,9 @@
+import sys
+
+MAX_PYTHON_VERSION = (3, 0)
+
+if sys.version_info >= MAX_PYTHON_VERSION:
+    raise RuntimeError("This module works only on Python 2, "
+                       "You are using Python {}.{}.{}".format(sys.version_info.major,
+                                                              sys.version_info.minor,
+                                                              sys.version_info.micro))

aliyun_log_python_sdk-0.9.8/aliyun/log/_proto_py2/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)

aliyun_log_python_sdk-0.9.8/aliyun/log/_proto_py2/log_logs_raw_pb2.py

@@ -0,0 +1,297 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: log_logs_raw.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_raw.proto',
+  package='',
+  syntax='proto2',
+  serialized_options=None,
+  create_key=_descriptor._internal_create_key,
+  serialized_pb=b'\n\x12log_logs_raw.proto\"q\n\x06LogRaw\x12\x0c\n\x04Time\x18\x01 \x02(\r\x12!\n\x08\x43ontents\x18\x02 \x03(\x0b\x32\x0f.LogRaw.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(\x0c\"\'\n\tLogTagRaw\x12\x0b\n\x03Key\x18\x01 \x02(\t\x12\r\n\x05Value\x18\x02 \x02(\t\"\x87\x01\n\x0bLogGroupRaw\x12\x15\n\x04Logs\x18\x01 \x03(\x0b\x32\x07.LogRaw\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\x1b\n\x07LogTags\x18\x06 \x03(\x0b\x32\n.LogTagRaw\"2\n\x0fLogGroupListRaw\x12\x1f\n\tLogGroups\x18\x01 \x03(\x0b\x32\x0c.LogGroupRaw'
+)
+
+
+
+
+_LOGRAW_CONTENT = _descriptor.Descriptor(
+  name='Content',
+  full_name='LogRaw.Content',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='Key', full_name='LogRaw.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='LogRaw.Content.Value', index=1,
+      number=2, type=12, cpp_type=9, label=2,
+      has_default_value=False, default_value=b"",
+      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=98,
+  serialized_end=135,
+)
+
+_LOGRAW = _descriptor.Descriptor(
+  name='LogRaw',
+  full_name='LogRaw',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='Time', full_name='LogRaw.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='LogRaw.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='LogRaw.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=[_LOGRAW_CONTENT, ],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto2',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=22,
+  serialized_end=135,
+)
+
+
+_LOGTAGRAW = _descriptor.Descriptor(
+  name='LogTagRaw',
+  full_name='LogTagRaw',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='Key', full_name='LogTagRaw.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='LogTagRaw.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=137,
+  serialized_end=176,
+)
+
+
+_LOGGROUPRAW = _descriptor.Descriptor(
+  name='LogGroupRaw',
+  full_name='LogGroupRaw',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='Logs', full_name='LogGroupRaw.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='LogGroupRaw.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='LogGroupRaw.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='LogGroupRaw.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='LogGroupRaw.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='LogGroupRaw.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=179,
+  serialized_end=314,
+)
+
+
+_LOGGROUPLISTRAW = _descriptor.Descriptor(
+  name='LogGroupListRaw',
+  full_name='LogGroupListRaw',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='LogGroups', full_name='LogGroupListRaw.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=316,
+  serialized_end=366,
+)
+
+_LOGRAW_CONTENT.containing_type = _LOGRAW
+_LOGRAW.fields_by_name['Contents'].message_type = _LOGRAW_CONTENT
+_LOGGROUPRAW.fields_by_name['Logs'].message_type = _LOGRAW
+_LOGGROUPRAW.fields_by_name['LogTags'].message_type = _LOGTAGRAW
+_LOGGROUPLISTRAW.fields_by_name['LogGroups'].message_type = _LOGGROUPRAW
+DESCRIPTOR.message_types_by_name['LogRaw'] = _LOGRAW
+DESCRIPTOR.message_types_by_name['LogTagRaw'] = _LOGTAGRAW
+DESCRIPTOR.message_types_by_name['LogGroupRaw'] = _LOGGROUPRAW
+DESCRIPTOR.message_types_by_name['LogGroupListRaw'] = _LOGGROUPLISTRAW
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+LogRaw = _reflection.GeneratedProtocolMessageType('LogRaw', (_message.Message,), {
+
+  'Content' : _reflection.GeneratedProtocolMessageType('Content', (_message.Message,), {
+    'DESCRIPTOR' : _LOGRAW_CONTENT,
+    '__module__' : 'log_logs_raw_pb2'
+    # @@protoc_insertion_point(class_scope:LogRaw.Content)
+    })
+  ,
+  'DESCRIPTOR' : _LOGRAW,
+  '__module__' : 'log_logs_raw_pb2'
+  # @@protoc_insertion_point(class_scope:LogRaw)
+  })
+_sym_db.RegisterMessage(LogRaw)
+_sym_db.RegisterMessage(LogRaw.Content)
+
+LogTagRaw = _reflection.GeneratedProtocolMessageType('LogTagRaw', (_message.Message,), {
+  'DESCRIPTOR' : _LOGTAGRAW,
+  '__module__' : 'log_logs_raw_pb2'
+  # @@protoc_insertion_point(class_scope:LogTagRaw)
+  })
+_sym_db.RegisterMessage(LogTagRaw)
+
+LogGroupRaw = _reflection.GeneratedProtocolMessageType('LogGroupRaw', (_message.Message,), {
+  'DESCRIPTOR' : _LOGGROUPRAW,
+  '__module__' : 'log_logs_raw_pb2'
+  # @@protoc_insertion_point(class_scope:LogGroupRaw)
+  })
+_sym_db.RegisterMessage(LogGroupRaw)
+
+LogGroupListRaw = _reflection.GeneratedProtocolMessageType('LogGroupListRaw', (_message.Message,), {
+  'DESCRIPTOR' : _LOGGROUPLISTRAW,
+  '__module__' : 'log_logs_raw_pb2'
+  # @@protoc_insertion_point(class_scope:LogGroupListRaw)
+  })
+_sym_db.RegisterMessage(LogGroupListRaw)
+
+
+# @@protoc_insertion_point(module_scope)

{aliyun-log-python-sdk-0.9.7 → aliyun_log_python_sdk-0.9.8}/aliyun/log/es_migration/migration_task.py

@@ -192,7 +192,7 @@ class MigrationTask(object):
                         scroll=self._es_scroll,
                     )
                 except NotFoundError:
-                    msg = f"cache is expired, which is with duration {self._es_scroll}"
+                    msg = "cache is expired, which is with duration {}".format(self._es_scroll)
                     self._logger.error(msg, exc_info=True)
                     raise Exception(msg)
 

{aliyun-log-python-sdk-0.9.7 → aliyun_log_python_sdk-0.9.8}/aliyun/log/logclient.py

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 """
 LogClient class is the main class in the SDK. It can be used to communicate with
 log service server to put/get data.
@@ -50,7 +51,7 @@ from .util import base64_encodestring as b64e
 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
+from .proto import LogGroupRaw as LogGroup
 from .external_store_config_response import *
 import struct
 from .logresponse import LogResponse

{aliyun-log-python-sdk-0.9.7 → aliyun_log_python_sdk-0.9.8}/aliyun/log/odps_sink.py

@@ -72,7 +72,7 @@ class AliyunMaxComputeSink(DataSink):
     def getPartitionColumn(self):
         return self.__params["partitionColumn"]
 
-    def setPartitionColumn(self, partitionColumn: list):
+    def setPartitionColumn(self, partitionColumn):
         self.__params["partitionColumn"] = partitionColumn
 
     def getParams(self):