updates

- request headers
- method get_push()
- method metrics()
- method purge()
- add unit support

Author: VladaPetrovic

databox/__init__.py

@@ -3,12 +3,12 @@
 from os import getenv
 from json import dumps as json_dumps
 
-__version__ = "0.1.6"
+__version__ = "2.0.0"
 
 
 class Client(object):
     push_token = None
-    push_host = 'https://push2new.databox.com'
+    push_host = 'https://push.databox.com'
     last_push_content = None
 
     class MissingToken(Exception):
@@ -25,8 +25,6 @@ def __init__(self, token=None):
         if self.push_token is None:
             raise self.MissingToken('Push token is missing!')
 
-        self.push_host = getenv('DATABOX_PUSH_HOST', self.push_host)
-
     def process_kpi(self, **args):
         key = args.get('key', None)
         if key is None:
@@ -42,6 +40,10 @@ def process_kpi(self, **args):
         if date is not None:
             item['date'] = date
 
+        unit = args.get('unit', None)
+        if unit is not None:
+            item['unit'] = unit
+
         attributes = args.get('attributes', None)
         if attributes is not None:
             item = dict(item.items() + attributes.items())
@@ -57,7 +59,8 @@ def _push_json(self, data=None, path="/"):
                 auth=HTTPBasicAuth(self.push_token, ''),
                 headers={
                     'Content-Type': 'application/json',
-                    'User-Agent': "Databox/" + __version__ + " (Python)"
+                    'User-Agent': 'databox-python/' + __version__,
+                    'Accept': 'application/vnd.databox.v' + __version__.split('.')[0] + '+json'
                 },
                 data=data
         )
@@ -70,37 +73,61 @@ def _get_json(self, path):
                 auth=HTTPBasicAuth(self.push_token, ''),
                 headers={
                     'Content-Type': 'application/json',
-                    'User-Agent': "Databox/" + __version__ + " (Python)"
+                    'User-Agent': 'databox-python/' + __version__,
+                    'Accept': 'application/vnd.databox.v' + __version__.split('.')[0] + '+json'
+                }
+        )
+
+        return response.json()
+
+    def _delete_json(self, path):
+        response = requests.delete(
+                self.push_host + path,
+                auth=HTTPBasicAuth(self.push_token, ''),
+                headers={
+                    'Content-Type': 'application/json',
+                    'User-Agent': 'databox-python/' + __version__,
+                    'Accept': 'application/vnd.databox.v' + __version__.split('.')[0] + '+json'
                 }
         )
 
         return response.json()
 
-    def push(self, key, value, date=None, attributes=None):
+    def push(self, key, value, date=None, attributes=None, unit=None):
         self.last_push_content = self._push_json({
             'data': [self.process_kpi(
                     key=key,
                     value=value,
                     date=date,
+                    unit=unit,
                     attributes=attributes
             )]
         })
 
-        return self.last_push_content['status'] == 'ok'
+        return 'id' in self.last_push_content
 
     def insert_all(self, rows):
         self.last_push_content = self._push_json({
             'data': [self.process_kpi(**row) for row in rows]
         })
 
-        return self.last_push_content['status'] == 'ok'
+        return 'id' in self.last_push_content
 
     def last_push(self, number=1):
-        return self._get_json(path='/lastpushes/{n}'.format(**{'n': number}))
+        return self._get_json(path='/lastpushes?limit={n}'.format(**{'n': number}))
+
+    def get_push(self, sha):
+        return self._get_json(path='/lastpushes?id=' + sha)
+
+    def metrics(self):
+        return self._get_json(path='/metrickeys')
+
+    def purge(self):
+        return self._delete_json(path='/data')
 
 
-def push(key, value, date=None, token=None):
-    return Client(token).push(key, value, date)
+def push(key, value, date=None, attributes=None, unit=None, token=None):
+    return Client(token).push(key, value, date, attributes, unit)
 
 
 def insert_all(rows=[], token=None):