pytolino 1.5__tar.gz → 1.7__tar.gz

{pytolino-1.5/src/pytolino.egg-info → pytolino-1.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytolino
-Version: 1.5
+Version: 1.7
 Summary: client for tolino cloud
 Author: Imam Usmani
 Project-URL: Source Code, https://github.com/ImamAzim/pytolino
@@ -23,6 +23,7 @@ Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: sphinx-rtd-theme; extra == "dev"
+Dynamic: license-file
 
 pytolino
 ===================

{pytolino-1.5 → pytolino-1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytolino"
-version = "1.5"
+version = "1.7"
 authors = [
     {name="Imam Usmani"},
 ]

{pytolino-1.5 → pytolino-1.7}/src/pytolino/tolino_cloud.py

@@ -6,11 +6,13 @@ import configparser
 import platform
 import logging
 from urllib.parse import urlparse, parse_qs
+from urllib3.util import Retry
 import json
 import time
 
 
 import requests
+from requests.adapters import HTTPAdapter
 import mechanize
 
 
@@ -27,6 +29,8 @@ servers_settings = configparser.ConfigParser()
 servers_settings.read(SERVERS_SETTINGS_FILE_PATH)
 
 PARTNERS = servers_settings.sections()
+TOTAL_RETRY = 5
+STATUS_FORCELIST = [404]
 
 
 def main():
@@ -38,23 +42,41 @@ class Client(object):
 
     """create a client to communicate with a tolino partner (login, etc..)"""
 
-    def _log_requests(self, host_response):
-        logging.info('-------------------- HTTP response --------------------')
-        logging.info(f'status code: {host_response.status_code}')
-        logging.info(f'cookies: {host_response.cookies}')
-        logging.info(f'headers: {host_response.headers}')
+    def _log_requests(self, host_response, error: True or None=None):
+        if host_response.status_code >= 400 or error is True:
+            logger = logging.error
+        else:
+            logger = logging.debug
+        logger('log request')
+        logger('---------------- HTTP response (requests)----------')
+        logger(f'status code: {host_response.status_code}')
+        logger(f'cookies: {host_response.cookies}')
+        logger(f'headers: {host_response.headers}')
         try:
             j = host_response.json()
-            logging.debug(f'json: {j}')
+            logger(f'json: {j}')
         except requests.JSONDecodeError:
-            logging.debug(f'text: {host_response.text}')
-        logging.info('-------------------------------------------------------')
+            logger(f'text: {host_response.text}')
+        logger('-------------------------------------------------------')
+
+        try:
+            host_response.raise_for_status()
+        except requests.exceptions.HTTPError as e:
+            raise PytolinoException
+        except requests.exceptions.RequestException as e:
+            raise PytolinoException
 
     def _log_mechanize(self, host_response):
-        logging.info('-------------------- HTTP response --------------------')
-        logging.info(f'status code: {host_response.code}')
-        logging.info(f'headers: {host_response.info()}')
-        logging.info('-------------------------------------------------------')
+        logging.debug('-------------- HTTP response (mechanize)--------------')
+        logging.debug(f'status code: {host_response.code}')
+        logging.debug(f'headers: {host_response.info()}')
+        logging.debug('-------------------------------------------------------')
+        if host_response.code >= 400:
+            logging.error('-------------- HTTP response (mechanize)----------')
+            logging.error(f'status code: {host_response.code}')
+            logging.error(f'headers: {host_response.info()}')
+            logging.error('--------------------------------------------------')
+            raise PytolinoException('http error')
 
     def _hardware_id():
 
@@ -124,7 +146,15 @@ class Client(object):
         self.token_expires = None
 
         self.server_settings = servers_settings[server_name]
-        self.session = requests.session()
+        self.session = requests.Session()
+        retry_strategy = Retry(
+                total=TOTAL_RETRY,
+                status_forcelist=STATUS_FORCELIST,
+                backoff_factor=2,
+                allowed_methods=frozenset(['GET', 'POST']))
+        adapter = HTTPAdapter(max_retries=retry_strategy)
+        self.session.mount('http://', adapter)
+        self.session.mount('https://', adapter)
         self.browser = mechanize.Browser()
         self.browser.set_handle_robots(False)
         self.server_name = server_name
@@ -147,7 +177,7 @@ class Client(object):
         for cookie in self.browser.cookiejar:
             self.session.cookies.set(cookie.name, cookie.value)
 
-        logging.info(self.server_settings['login_cookie'])
+        logging.debug(self.server_settings['login_cookie'])
         self._log_mechanize(host_response)
         if not self.server_settings['login_cookie'] in self.session.cookies:
             raise PytolinoException(f'login to {self.server_name} failed.')
@@ -179,7 +209,8 @@ class Client(object):
                 host_response.headers['Location']
                 ).query)
             auth_code = params['code'][0]
-        except ValueError:
+        except KeyError:
+            self._log_requests(host_response, error=True)
             raise PytolinoException('oauth code request failed.')
 
         # Fetch OAUTH access token
@@ -196,6 +227,7 @@ class Client(object):
                 allow_redirects=False,
                 )
         self._log_requests(host_response)
+
         try:
             j = host_response.json()
             self.access_token = j['access_token']
@@ -497,7 +529,8 @@ class Client(object):
 
         :book_id: id of the book on the serveer
         :filepath: path to the cover file
-        :file_ext: png, jpg or jpeg. only necessary if the filepath has no extension
+        :file_ext: png, jpg or jpeg. only necessary if the
+        filepath has no extension
 
         """
 
@@ -512,8 +545,8 @@ class Client(object):
 
         host_response = self.session.post(
                 self.server_settings['cover_url'],
-                files = [('file', ('1092560016', open(filepath, 'rb'), mime))],
-                data = {'deliverableId': book_id},
+                files=[('file', ('1092560016', open(filepath, 'rb'), mime))],
+                data={'deliverableId': book_id},
                 headers={
                     't_auth_token': self.access_token,
                     'hardware_id': self.hardware_id,

{pytolino-1.5 → pytolino-1.7/src/pytolino.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytolino
-Version: 1.5
+Version: 1.7
 Summary: client for tolino cloud
 Author: Imam Usmani
 Project-URL: Source Code, https://github.com/ImamAzim/pytolino
@@ -23,6 +23,7 @@ Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: sphinx-rtd-theme; extra == "dev"
+Dynamic: license-file
 
 pytolino
 ===================

{pytolino-1.5 → pytolino-1.7}/tests/test_tolino_cloud.py

@@ -68,13 +68,16 @@ def client_method_tests():
 
     username, password = get_credentials()
     client = Client()
-    client.login(username, password)
-
-    print(client.access_token)
-    print(client.refresh_token)
-    print(client.token_expires)
+    try:
+        client.login(username, password)
+    except PytolinoException as e:
+        print(e)
+    else:
+        print(client.access_token)
+        print(client.refresh_token)
+        print(client.token_expires)
 
-    client.logout()
+        client.logout()
 
 
 def register_test():
@@ -238,12 +241,12 @@ def add_cover_test():
 
 
 if __name__ == '__main__':
-    # logging.basicConfig(level=logging.INFO)
+    # logging.basicConfig(level=logging.DEBUG)
     # register_test()
     # unregister_test()
-    # client_method_tests()
+    client_method_tests()
     # upload_test()
     # delete_test()
     # add_cover_test()
     # metadata_test()
-    inventory_test()
+    # inventory_test()