aliyun-log-python-sdk 0.9.38__tar.gz → 0.9.40__tar.gz

{aliyun_log_python_sdk-0.9.38/aliyun_log_python_sdk.egg-info → aliyun_log_python_sdk-0.9.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.38
+Version: 0.9.40
 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.38 → aliyun_log_python_sdk-0.9.40}/aliyun/log/__init__.py

@@ -48,6 +48,8 @@ from .logger_hanlder import SimpleLogHandler, QueuedLogHandler, LogFields, Uwsgi
 from .metering_mode_response import GetLogStoreMeteringModeResponse, \
     GetMetricStoreMeteringModeResponse, \
     UpdateLogStoreMeteringModeResponse, UpdateMetricStoreMeteringModeResponse
+from .multimodal_config_response import GetLogStoreMultimodalConfigurationResponse, \
+    PutLogStoreMultimodalConfigurationResponse
 from .object_response import PutObjectResponse, GetObjectResponse
 
 from .store_view import StoreView, StoreViewStore

{aliyun_log_python_sdk-0.9.38 → aliyun_log_python_sdk-0.9.40}/aliyun/log/auth.py

@@ -68,13 +68,17 @@ class AuthV1(AuthBase):
         headers['x-log-signaturemethod'] = 'hmac-sha1'
         headers['Date'] = self._getGMT()
 
+        content_md5 = None
+        # we don't need content-md5 in signature if compute_content_hash is False
         if body and compute_content_hash:
-            headers['Content-MD5'] = Util.cal_md5(body)
+            content_md5 = Util.cal_md5(body)
+            headers['Content-MD5'] = content_md5
+
         if not credentials.get_access_key_secret():
             return six.b('')
         content = method + '\n'
-        if 'Content-MD5' in headers:
-            content += headers['Content-MD5']
+        if content_md5 is not None:
+            content += content_md5
         content += '\n'
         if 'Content-Type' in headers:
             content += headers['Content-Type']
@@ -87,6 +91,8 @@ class AuthV1(AuthBase):
         headers['x-log-date'] = headers['Date']  # bypass some proxy doesn't allow "Date" in header issue.
 
 
+_EMPTY_CONTENT_SHA256 = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+
 class AuthV4(AuthBase):
     def __init__(self, credentials_provider, region):
         AuthBase.__init__(self, credentials_provider)
@@ -94,16 +100,18 @@ class AuthV4(AuthBase):
 
     def sign_request(self, method, resource, params, headers, body, compute_content_hash=True):
         current_time = datetime.utcnow().strftime("%Y%m%dT%H%M%SZ")
-        headers['Authorization'] = self._do_sign_request(method, resource, params, headers, body, current_time)
+        headers['Authorization'] = self._do_sign_request(method, resource, params, headers, body, current_time, compute_content_hash=compute_content_hash)
 
-    def _do_sign_request(self, method, resource, params, headers, body, current_time):
+    def _do_sign_request(self, method, resource, params, headers, body, current_time, compute_content_hash=True):
         credentials = self.credentials_provider.get_credentials()
 
         if credentials.get_security_token():
             headers['x-acs-security-token'] = credentials.get_security_token()
 
-        content_sha256 = sha256(body).hexdigest() \
-            if body else 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+        content_sha256 = _EMPTY_CONTENT_SHA256
+        if compute_content_hash and body: 
+            content_sha256 = sha256(body).hexdigest()
+
         headers['x-log-content-sha256'] = content_sha256
         headers['x-log-date'] = current_time
         current_date = current_time[:8]
@@ -111,7 +119,11 @@ class AuthV4(AuthBase):
         signed_headers = ''
         for original_key, value in headers.items():
             key = original_key.lower()
-            if key == 'content-type' or key == 'host' or key.startswith('x-log-') or key.startswith('x-acs-'):
+            if (
+                key == "content-type"
+                or key == "host"
+                or Util._is_extra_sign_header(key)
+            ):
                 canonical_headers[key] = value
         headers_to_string = ''
         for key, value in sorted(canonical_headers.items()):

{aliyun_log_python_sdk-0.9.38 → aliyun_log_python_sdk-0.9.40}/aliyun/log/logclient.py

@@ -76,6 +76,8 @@ from .compress import CompressType, Compressor
 from .metering_mode_response import GetLogStoreMeteringModeResponse, \
     GetMetricStoreMeteringModeResponse, UpdateLogStoreMeteringModeResponse, \
         UpdateMetricStoreMeteringModeResponse
+from .multimodal_config_response import GetLogStoreMultimodalConfigurationResponse, \
+    PutLogStoreMultimodalConfigurationResponse
 from .object_response import PutObjectResponse, GetObjectResponse
 from .util import require_python3, object_name_encode
 
@@ -1833,6 +1835,61 @@ class LogClient(object):
         (resp, header) = self._send("PUT", project_name, body_str, resource, params, headers)
         return UpdateLogStoreMeteringModeResponse(header, resp)
     
+    def get_logstore_multimodal_configuration(self, project_name, logstore_name):
+        """ Get the multimodal configuration of the logstore
+        Unsuccessful operation will cause an LogException.
+
+        :type project_name: string
+        :param project_name: the Project name
+
+        :type logstore_name: string
+        :param logstore_name: the logstore name
+
+        :return: GetLogStoreMultimodalConfigurationResponse
+
+        :raise: LogException
+        """
+        params = {}
+        resource = "/logstores/" + logstore_name + "/multimodalconfiguration"
+        headers = {}
+
+        (resp, header) = self._send("GET", project_name, None, resource, params, headers)
+        return GetLogStoreMultimodalConfigurationResponse(resp, header)
+    
+    def put_logstore_multimodal_configuration(self, project_name, logstore_name, status, anonymous_write=None):
+        """ Put the multimodal configuration of the logstore
+        Unsuccessful operation will cause an LogException.
+
+        :type project_name: string
+        :param project_name: the Project name
+
+        :type logstore_name: string
+        :param logstore_name: the logstore name
+        
+        :type status: string
+        :param status: the status of multimodal configuration, required (e.g., "Enabled" or "Disabled")
+        
+        :type anonymous_write: string
+        :param anonymous_write: the anonymous write setting, optional (e.g., "Enabled" or "Disabled")
+
+        :return: PutLogStoreMultimodalConfigurationResponse
+
+        :raise: LogException
+        """
+        params = {}
+        resource = "/logstores/" + logstore_name + "/multimodalconfiguration"
+        headers = {"x-log-bodyrawsize": '0', "Content-Type": "application/json"}
+        body = {
+            "status": status
+        }
+        if anonymous_write is not None:
+            body["anonymousWrite"] = anonymous_write
+        
+        body_str = six.b(json.dumps(body))
+
+        (resp, header) = self._send("PUT", project_name, body_str, resource, params, headers)
+        return PutLogStoreMultimodalConfigurationResponse(header, resp)
+    
     def get_metric_store_metering_mode(self, project_name, metric_store_name):
         """ Get the metering mode of the metric store
         Unsuccessful operation will cause an LogException.

aliyun_log_python_sdk-0.9.40/aliyun/log/multimodal_config_response.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+# Copyright (C) Alibaba Cloud Computing
+# All rights reserved.
+
+from .util import Util
+from .logresponse import LogResponse
+
+
+class GetLogStoreMultimodalConfigurationResponse(LogResponse):
+    """ The response of the get_logstore_multimodal_configuration API from log.
+
+    :type header: dict
+    :param header: GetLogStoreMultimodalConfigurationResponse HTTP response header
+
+    :type resp: dict
+    :param resp: the HTTP response body
+    """
+
+    def __init__(self, resp, header):
+        LogResponse.__init__(self, header, resp)
+        self.status = Util.convert_unicode_to_str(resp["status"])
+        self.anonymous_write = None
+        if "anonymousWrite" in resp:
+            self.anonymous_write = Util.convert_unicode_to_str(resp["anonymousWrite"])
+
+    def get_status(self):
+        """
+        :return: string, the status of the multimodal configuration
+        """
+        return self.status
+
+    def get_anonymous_write(self):
+        """
+        :return: string, the anonymous write setting, or None if not set
+        """
+        return self.anonymous_write
+
+    def log_print(self):
+        print('GetLogStoreMultimodalConfigurationResponse')
+        print('headers:', self.get_all_headers())
+        print('status:', self.status)
+        if self.anonymous_write is not None:
+            print('anonymousWrite:', self.anonymous_write)
+
+
+class PutLogStoreMultimodalConfigurationResponse(LogResponse):
+    """ The response of the put_logstore_multimodal_configuration API from log.
+
+    :type header: dict
+    :param header: PutLogStoreMultimodalConfigurationResponse HTTP response header
+    """
+
+    def __init__(self, header, resp=''):
+        LogResponse.__init__(self, header, resp)
+
+    def log_print(self):
+        print('PutLogStoreMultimodalConfigurationResponse:')
+        print('headers:', self.get_all_headers())
+

{aliyun_log_python_sdk-0.9.38 → aliyun_log_python_sdk-0.9.40}/aliyun/log/object_response.py

@@ -55,13 +55,6 @@ class GetObjectResponse(LogResponse):
         """
         return Util.h_v_td(self.headers, 'ETag', None)
 
-    def get_last_modified(self):
-        """ Get the last modified time of the object.
-
-        :return: string, last modified time, may be None if not set
-        """
-        return Util.h_v_td(self.headers, 'Last-Modified', None)
-
     def get_content_type(self):
         """ Get the content type of the object.
 

{aliyun_log_python_sdk-0.9.38 → aliyun_log_python_sdk-0.9.40}/aliyun/log/util.py

@@ -40,6 +40,7 @@ def base64_decodestring(s):
             s = s.encode('utf8')
         return base64.decodebytes(s).decode('utf8')
 
+_EXCLUDE_SIGN_HEADER_PREFIX = 'x-log-meta-'
 
 class Util(object):
     @staticmethod
@@ -90,10 +91,18 @@ class Util(object):
     def canonicalized_log_headers(headers):
         content = ''
         for key in sorted(six.iterkeys(headers)):
-            if key[:6].lower() in ('x-log-', 'x-acs-'):  # x-log- header
+            if Util._is_extra_sign_header(key):
                 content += key + ':' + str(headers[key]) + "\n"
         return content
 
+    @staticmethod
+    def _is_extra_sign_header(key):
+        lower_key = key.lower()
+        return lower_key.startswith("x-acs-") or (
+            lower_key.startswith("x-log-")
+            and not lower_key.startswith(_EXCLUDE_SIGN_HEADER_PREFIX)
+        )
+
     @staticmethod
     def url_encode(params):
         for key, value in params.items():  # urllib.urlencode accept 8-bit str

{aliyun_log_python_sdk-0.9.38 → aliyun_log_python_sdk-0.9.40}/aliyun/log/version.py

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

{aliyun_log_python_sdk-0.9.38 → aliyun_log_python_sdk-0.9.40/aliyun_log_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.38
+Version: 0.9.40
 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.38 → aliyun_log_python_sdk-0.9.40}/aliyun_log_python_sdk.egg-info/SOURCES.txt

@@ -59,6 +59,7 @@ aliyun/log/logtail_pipeline_config_response.py
 aliyun/log/machine_group_detail.py
 aliyun/log/machinegroup_response.py
 aliyun/log/metering_mode_response.py
+aliyun/log/multimodal_config_response.py
 aliyun/log/object_response.py
 aliyun/log/odps_sink.py
 aliyun/log/oss_sink.py