aliyun-log-python-sdk 0.9.10__tar.gz → 0.9.12__tar.gz

{aliyun-log-python-sdk-0.9.10/aliyun_log_python_sdk.egg-info → aliyun-log-python-sdk-0.9.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.10
+Version: 0.9.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.9.10 → aliyun-log-python-sdk-0.9.12}/aliyun/log/logclient.py

@@ -855,7 +855,7 @@ class LogClient(object):
         :raise: LogException
         """
         if not is_stats_query(sql):
-            raise LogException("parameter sql invalid, please follow 'Search|Analysis' syntax, refer to "
+            raise LogException("InvalidParameter", "parameter sql invalid, please follow 'Search|Analysis' syntax, refer to "
                                "https://help.aliyun.com/document_detail/43772.html")
         return self.get_log(project, logstore, from_time, to_time, topic=None,
                             query=sql, reverse=False, offset=0, size=100, power_sql=power_sql)
@@ -2529,7 +2529,7 @@ class LogClient(object):
         (resp, header) = self._send("PUT", project, None, resource, params, headers)
         return ModifyScheduledSqlJobStateResponse(header, resp)
 
-    def create_project(self, project_name, project_des, resource_group_id=''):
+    def create_project(self, project_name, project_des, resource_group_id='', data_redundancy_type=None):
         """ Create a project
         Unsuccessful operation will cause an LogException.
 
@@ -2539,9 +2539,12 @@ class LogClient(object):
         :type project_des: string
         :param project_des: the description of a project
 
-        type resource_group_id: string
+        :type resource_group_id: string
         :param resource_group_id: the resource group id, the project created will put in the resource group
 
+        :type data_redundancy_type: string
+        :param data_redundancy_type: the data redundancy type, LRS or ZRS
+
         :return: CreateProjectResponse
 
         :raise: LogException
@@ -2549,13 +2552,39 @@ class LogClient(object):
 
         params = {}
         body = {"projectName": project_name, "description": project_des, "resourceGroupId": resource_group_id}
-
+        if data_redundancy_type is not None:
+            body["dataRedundancyType"] = data_redundancy_type
         body = six.b(json.dumps(body))
         headers = {'Content-Type': 'application/json', 'x-log-bodyrawsize': str(len(body))}
         resource = "/"
 
         (resp, header) = self._send("POST", project_name, body, resource, params, headers)
         return CreateProjectResponse(header, resp)
+    
+    def update_project(self, project_name, project_des):
+        """ Update a project
+        Unsuccessful operation will cause an LogException.
+
+        :type project_name: string
+        :param project_name: the Project name
+
+        :type project_des: string
+        :param project_des: the description of a project
+
+        :return: UpdateProjectResponse
+
+        :raise: LogException
+        """
+
+        params = {}
+        body = {"description": project_des}
+
+        body = six.b(json.dumps(body))
+        headers = {'Content-Type': 'application/json', 'x-log-bodyrawsize': str(len(body))}
+        resource = "/"
+
+        (resp, header) = self._send("PUT", project_name, body, resource, params, headers)
+        return UpdateProjectResponse(header, resp)
 
     def get_project(self, project_name):
         """ get project

{aliyun-log-python-sdk-0.9.10 → aliyun-log-python-sdk-0.9.12}/aliyun/log/logitem.py

@@ -12,7 +12,7 @@ class LogItem(object):
     """ LogItem used to present a log, it contains log time and multiple
     key/value pairs to present the log contents.
 
-    :type timestamp: int
+    :type timestamp: int with seconds as unit
     :param timestamp: time of the log item, the default time is the now time.
 
     :type contents: tuple(key-value) list
@@ -20,9 +20,12 @@ class LogItem(object):
     """
 
     def __init__(self, timestamp=None, time_nano_part=None, contents=None):
-        nano_time = int(time.time()* 10**9)
+        nano_time = int(time.time() * 10**9)
         self.timestamp = int(timestamp) if timestamp else int(nano_time / 1000000000)
-        self.time_nano_part= int(time_nano_part) if time_nano_part else int(nano_time%1000000000)
+        # milliseconds
+        if self.timestamp > 1e10:
+            self.timestamp = int(self.timestamp / 1000.0)
+        self.time_nano_part = int(time_nano_part) if time_nano_part else int(nano_time % 1000000000)
         self.contents = copy.deepcopy(contents) if contents else []
 
     def push_back(self, key, value):
@@ -70,6 +73,9 @@ class LogItem(object):
         :type timestamp: int
         :param timestamp: log time
         """
+        # milliseconds
+        if timestamp > 1e10:
+            timestamp = timestamp / 1000.0
         self.timestamp = int(timestamp)
 
     def set_time_nano_part(self, time_nano_part):

{aliyun-log-python-sdk-0.9.10 → aliyun-log-python-sdk-0.9.12}/aliyun/log/project_response.py

@@ -9,7 +9,7 @@ from .logresponse import LogResponse
 from .util import Util
 
 __all__ = [
-    'CreateProjectResponse', 'DeleteProjectResponse',
+    'CreateProjectResponse', 'UpdateProjectResponse', 'DeleteProjectResponse',
     'GetProjectResponse', 'ListProjectResponse',
     'GetProjectTagsResponse',
 ]
@@ -26,6 +26,17 @@ class CreateProjectResponse(LogResponse):
         print('CreateProjectResponse:')
         print('headers:', self.get_all_headers())
 
+class UpdateProjectResponse(LogResponse):
+    """
+    Response of update_project
+    """
+    def __init__(self, header, resp=''):
+        LogResponse.__init__(self, header, resp)
+
+    def log_print(self):
+        print('UpdateProjectResponse:')
+        print('headers:', self.get_all_headers())
+
 
 class DeleteProjectResponse(LogResponse):
     def __init__(self, header, resp=''):
@@ -48,6 +59,7 @@ class GetProjectResponse(LogResponse):
         self.lastModifyTime = resp['lastModifyTime']
         # resourceGroupId is optional for some old backend releases
         self.resourceGroupId = resp.get('resourceGroupId', '')
+        self.dataRedundancyType = resp.get('dataRedundancyType')
 
     def get_owner(self):
         return self.owner
@@ -72,6 +84,9 @@ class GetProjectResponse(LogResponse):
 
     def get_resource_group_id(self):
         return self.resourceGroupId
+    
+    def get_data_redundancy_type(self):
+        return self.dataRedundancyType
 
     def log_print(self):
         print('GetProjectResponse:')
@@ -84,6 +99,7 @@ class GetProjectResponse(LogResponse):
         print('create_time:' + self.get_create_time())
         print('last_modify_time:' + self.get_last_modify_time())
         print('resource_group_id:' + self.get_resource_group_id())
+        print('dataRedundancyType:' + self.get_data_redundancy_type())
 
 class ListProjectResponse(LogResponse):
     def __init__(self, resp, header):