Merge pull request #6 from allthingstalk/feature/user-agent

Adds support for User-Agent string

.gitignore

@@ -80,6 +80,7 @@ celerybeat-schedule
 
 # virtualenv
 venv/
+.venv/
 ENV/
 
 # Spyder project settings
@@ -90,3 +91,6 @@ ENV/
 
 scratchpad.py
 *~
+
+# Tools
+.vscode/

allthingstalk/clients.py

@@ -19,6 +19,7 @@
 # limitations under the License.
 
 import logging
+import pkg_resources
 
 import paho.mqtt.client as paho_mqtt
 import requests
@@ -95,6 +96,7 @@ def prefix_http(url):
             self.mqtt = None
 
         self._devices = {}
+        self._version = self._get_version()
 
     def _make_mqtt_client(self, host, port, token):
         def on_mqtt_connect(client, userdata, rc):
@@ -139,8 +141,7 @@ def get_assets(self, device_id):
         :rtype: list of Asset
         """
 
-        r = requests.get('%s/device/%s/assets' % (self.http, device_id),
-                         headers={'Authorization': 'Bearer %s' % self.token})
+        r = requests.get('%s/device/%s/assets' % (self.http, device_id), headers=self._get_headers())
         if r.status_code == 403:
             raise AccessForbiddenException('Could not use token "%s" to access device "%s" on "%s".'
                                            % (self.token, device_id, self.http))
@@ -163,7 +164,7 @@ def create_asset(self, device_id, asset):
             'Profile': asset.profile
         }
         asset_dict = requests.post('%s/device/%s/assets' % (self.http, device_id),
-                                   headers={'Authorization': 'Bearer %s' % self.token},
+                                   headers=self._get_headers(),
                                    json=attalk_asset).json()
         return Asset.from_dict(asset_dict)
 
@@ -177,8 +178,8 @@ def get_asset_state(self, device_id, asset_name):
         :rtype: AssetState
         """
 
-        r = requests.get('%s/device/%s/asset/%s/state' % (self.http, device_id, asset_name),
-                         headers={'Authorization': 'Bearer %s' % self.token})
+        r = requests.get('%s/device/%s/asset/%s/state' %
+                         (self.http, device_id, asset_name), headers=self._get_headers())
         if r.status_code != 200:
             raise AssetStateRetrievalException()
         response_json = r.json()
@@ -200,9 +201,18 @@ def publish_asset_state(self, device_id, asset_name, state):
         else:
             json_state = {'value': state}
         requests.put('%s/device/%s/asset/%s/state' % (self.http, device_id, asset_name),
-                     headers={'Authorization': 'Bearer %s' % self.token},
+                     headers=self._get_headers(),
                      json=json_state)
 
+    def _get_headers(self):
+        return {
+            'Authorization': 'Bearer %s' % self.token,
+            'User-Agent': 'ATTalk-PythonSDK/%s' % self._get_version()
+        }
+
+    def _get_version(self):
+        return pkg_resources.require('allthingstalk')[0].version
+
     def __del__(self):
         try:
             self.mqtt.loop_stop(force=True)

setup.py

@@ -2,10 +2,10 @@
 
 setup(
     name='allthingstalk',
-    version='0.2.4',
+    version='0.2.5',
     description='AllThingsTalk Python SDK',
     url='https://github.com/allthingstalk/python-sdk',
-    download_url='https://github.com/allthingstalk/python-sdk/archive/0.2.4.tar.gz',
+    download_url='https://github.com/allthingstalk/python-sdk/archive/0.2.5.tar.gz',
     author='Danilo Vidovic',
     author_email='[email protected]',
     license='Apache 2.0',