Pull request #7: Added tracking to requests

Merge in SDK/python_telesign from feature/EOA2032 to developer

* commit '5da1c2fe62574564333d98e0f2da679e98012b87':
  Added tracking to requests

Author: jmartinez-telesign

RELEASE

@@ -1,3 +1,15 @@
+2.2.7
+- Added tracking to requests
+
+2.2.6
+- Add setters for URL
+
+2.2.5
+- Fixing auth issue that was causing requests to fail
+
+2.2.4
+- Resolved an issue causing PhoneID requests to fail
+
 2.2.3
 - Added support for Intelligence(basic auth) API
 

setup.py

@@ -11,7 +11,7 @@
 
 here = path.abspath(path.dirname(__file__))
 
-version = "2.2.6"
+version = "2.2.7"
 
 with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
     long_description = f.read()

telesign/rest.py

@@ -24,10 +24,6 @@ class RestClient(requests.models.RequestEncodingMixin):
 
     See https://developer.telesign.com for detailed API documentation.
     """
-    user_agent = "TeleSignSDK/python-{sdk_version} Python/{python_version} Requests/{requests_version}".format(
-        sdk_version=telesign.__version__,
-        python_version=python_version(),
-        requests_version=requests.__version__)
 
     class Response(object):
         """
@@ -51,6 +47,9 @@ def __init__(self,
                  customer_id,
                  api_key,
                  rest_endpoint='https://rest-api.telesign.com',
+                 source="python_telesign",
+                 sdk_version_origin=None,
+                 sdk_version_dependency=None,
                  proxies=None,
                  timeout=10,
                  auth_method=None):
@@ -77,6 +76,17 @@ def __init__(self,
 
         self.auth_method = auth_method
 
+        current_version_sdk = telesign.__version__ if source == "python_telesign" else sdk_version_origin
+
+        self.user_agent = "TeleSignSDK/python Python/{python_version} Requests/{requests_version} OriginatingSDK/{source} SDKVersion/{sdk_version}".format(
+        python_version=python_version(),
+        requests_version=requests.__version__,
+        source=source,
+        sdk_version=current_version_sdk)
+
+        if source != "python_telesign":
+            self.user_agent = self.user_agent + " DependencySDKVersion/{sdk_version_dependency}".format(sdk_version_dependency=sdk_version_dependency)
+
     @staticmethod
     def generate_telesign_headers(customer_id,
                                   api_key,

tests/test_rest.py

@@ -18,6 +18,7 @@ class TestRest(TestCase):
     def setUp(self):
         self.customer_id = "FFFFFFFF-EEEE-DDDD-1234-AB1234567890"
         self.api_key = "EXAMPLE----TE8sTgg45yusumoN6BYsBVkh+yRJ5czgsnCehZaOYldPJdmFh6NeX8kunZ2zU1YWaUw/0wV6xfw=="
+        self.rest_endpoint = "https://rest-api.telesign.com"
 
     def test_rest_client_constructor_basic(self):
 
@@ -43,6 +44,19 @@ def test_rest_client_response_constructor_basic(self):
         self.assertEqual(response.ok, requests_response.ok)
         self.assertEqual(response.json, requests_response.json())
 
+    def test_rest_client_response_constructor_from_full_service(self):
+
+        client = RestClient(self.customer_id,
+                            self.api_key,
+                            self.rest_endpoint,
+                            "python_telesign_enterprise",
+                            "1.0.0",
+                            "2.0.0")
+
+        self.assertIn("OriginatingSDK/python_telesign_enterprise", client.user_agent)
+        self.assertIn("SDKVersion/1.0.0", client.user_agent)
+        self.assertIn("DependencySDKVersion/2.0.0", client.user_agent)
+
     def test_generate_telesign_headers_with_post(self):
         method_name = 'POST'
         date_rfc2616 = 'Wed, 14 Dec 2016 18:20:12 GMT'