From ce8504380b3250580c7f4ed9074d565c23bade48 Mon Sep 17 00:00:00 2001 From: Hugo Maingonnat Date: Wed, 25 Sep 2019 11:55:03 +0200 Subject: [PATCH 1/3] remove support for user_agent_suffix --- deepomatic/api/client.py | 3 --- deepomatic/api/http_helper.py | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/deepomatic/api/client.py b/deepomatic/api/client.py index f41a20b..61a072b 100644 --- a/deepomatic/api/client.py +++ b/deepomatic/api/client.py @@ -54,10 +54,7 @@ def __init__(self, *args, **kwargs): :param version (optional): API version. :type version: string :param user_agent_prefix (optional): Prefix the HTTP User-Agent. - It is recommended to declare your client via this parameter. Example: 'my-app/1.0.0'. :type user_agent_prefix: string - :param user_agent_suffix (optional): Suffix the HTTP User-Agent. - :type user_agent_suffix: string :param pool_maxsize (optional): Set `requests.adapters.HTTPAdapter.pool_maxsize` for concurrent calls. Defaults to 20. :type pool_maxsize: int diff --git a/deepomatic/api/http_helper.py b/deepomatic/api/http_helper.py index 3dadbd9..63c8cdc 100644 --- a/deepomatic/api/http_helper.py +++ b/deepomatic/api/http_helper.py @@ -50,7 +50,7 @@ class RequestsTimeout(object): class HTTPHelper(object): def __init__(self, app_id=None, api_key=None, verify_ssl=None, host=None, version=API_VERSION, check_query_parameters=True, - user_agent_prefix='', user_agent_suffix='', pool_maxsize=20, + user_agent_prefix='', pool_maxsize=20, requests_timeout=RequestsTimeout.FAST, **kwargs): """ Init the HTTP helper with API key and secret. @@ -103,9 +103,6 @@ def __init__(self, app_id=None, api_key=None, verify_ssl=None, self.user_agent += '{package_title}-python-client/{package_version} requests/{requests_version} python/{python_version} platform/{platform}\ '.format(**user_agent_params) - if user_agent_suffix: - self.user_agent += ' ' + user_agent_suffix - self.api_key = str(api_key) self.app_id = str(app_id) self.verify = verify From 55c4582bbd335cd5ef3fe2ed4d62c41d675c22ef Mon Sep 17 00:00:00 2001 From: Hugo Maingonnat Date: Wed, 25 Sep 2019 11:58:00 +0200 Subject: [PATCH 2/3] remove support for user_agent_suffix --- deepomatic/api/client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deepomatic/api/client.py b/deepomatic/api/client.py index 61a072b..a9e699d 100644 --- a/deepomatic/api/client.py +++ b/deepomatic/api/client.py @@ -54,6 +54,7 @@ def __init__(self, *args, **kwargs): :param version (optional): API version. :type version: string :param user_agent_prefix (optional): Prefix the HTTP User-Agent. + It is recommended to declare your client via this parameter. Example: 'my-app/1.0.0'. :type user_agent_prefix: string :param pool_maxsize (optional): Set `requests.adapters.HTTPAdapter.pool_maxsize` for concurrent calls. Defaults to 20. From 7d60bd280071053034a30389fa9319b4a2aedd4f Mon Sep 17 00:00:00 2001 From: Hugo Maingonnat Date: Wed, 25 Sep 2019 12:16:56 +0200 Subject: [PATCH 3/3] Build user agent prefix using list --- deepomatic/api/http_helper.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/deepomatic/api/http_helper.py b/deepomatic/api/http_helper.py index 63c8cdc..02dd1b8 100644 --- a/deepomatic/api/http_helper.py +++ b/deepomatic/api/http_helper.py @@ -95,13 +95,18 @@ def __init__(self, app_id=None, api_key=None, verify_ssl=None, 'platform': platform.platform() } + user_agent_list = [] + if user_agent_prefix: - self.user_agent = user_agent_prefix + ' ' - else: - self.user_agent = '' + user_agent_list.append(user_agent_prefix) + + user_agent_list += [ + '{package_title}-python-client/{package_version}', + 'requests/{requests_version}', + 'python/{python_version} platform/{platform}', + ] - self.user_agent += '{package_title}-python-client/{package_version} requests/{requests_version} python/{python_version} platform/{platform}\ - '.format(**user_agent_params) + self.user_agent = ' '.join(user_agent_list).format(**user_agent_params) self.api_key = str(api_key) self.app_id = str(app_id)