Bumped v0.5.1

vishr · vishr · commit c1b216bbf166 · 2017-07-31T08:38:07.000-07:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/labstack/log.py b/labstack/log.py
@@ -39,22 +39,22 @@ async def _dispatch(self):
     finally:
       self.entries.clear()
 
-  def debug(self, fields):
-    self._log(Level.DEBUG, fields)
+  def debug(self, **kwargs):
+    self._log(Level.DEBUG, **kwargs)
 
-  def info(self, fields):
-    self._log(Level.INFO, fields)
+  def info(self, **kwargs):
+    self._log(Level.INFO, **kwargs)
     
-  def warn(self, fields):
-    self._log(Level.WARN, fields)
+  def warn(self, **kwargs):
+    self._log(Level.WARN, **kwargs)
   
-  def error(self, fields):
-    self._log(Level.ERROR, fields)
+  def error(self, **kwargs):
+    self._log(Level.ERROR, **kwargs)
     
-  def fatal(self, fields):
-    self._log(Level.FATAL, fields)
+  def fatal(self, **kwargs):
+    self._log(Level.FATAL, **kwargs)
 
-  def _log(self, level, fields):
+  def _log(self, level, **kwargs):
     if level < self.level:
       return
 
@@ -64,11 +64,11 @@ def _log(self, level, fields):
       self._loop.create_task(self._schedule())
       threading.Thread(target=self._loop.run_forever).start()
     
-    fields['time'] = arrow.now().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    kwargs['time'] = arrow.now().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
     for k, v in self.fields.items():
-      fields[k]  = v
-    fields['level'] = level.name
-    self.entries.append(fields)
+      kwargs[k]  = v
+    kwargs['level'] = level.name
+    self.entries.append(kwargs)
 
     if len(self.entries) >= self.batch_size:
       try:
diff --git a/labstack/store.py b/labstack/store.py
@@ -22,8 +22,21 @@ def get(self, collection, id):
       raise StoreError(data['code'], data['message'])
     return data
 
-  def search(self, collection, **kwargs):
-    r = requests.post('{}{}/{}/search'.format(API_URL, self.path, collection), auth=self.interceptor, json=kwargs)
+  def search(self,
+             collection,
+             query=None,
+             query_string='*',
+             sort=None,
+             size=None,
+             from_=None):
+    params = {
+      'query': query,
+      'query_string': query_string,
+      'sort': sort,
+      'size': size,
+      'from': from_ 
+    }
+    r = requests.post('{}{}/{}/search'.format(API_URL, self.path, collection), auth=self.interceptor, json=params)
     data = r.json()
     if not 200 <= r.status_code < 300:
       raise StoreError(data['code'], data['message'])
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
   name='labstack',
-  version='0.5.0',
+  version='0.5.1',
   description='Official Python client library for the LabStack REST API',
   long_description='`<https://github.com/labstack/labstack-python>`_',
   keywords='labstack cube email log mqtt store',
