Jobs saving to file: raise an exception when API is failing

Author: Dario Varotto

ravenpackapi/core.py

@@ -14,7 +14,7 @@
 from ravenpackapi.utils.constants import JSON_AVAILABLE_FIELDS
 
 _VALID_METHODS = ('get', 'post', 'put', 'delete')
-VERSION = '1.0.19'
+VERSION = '1.0.20'
 
 logger = logging.getLogger("ravenpack.core")
 
@@ -35,6 +35,7 @@ def __init__(self, api_key=None):
                 "or set your environment RP_API_KEY with your API KEY."
             )
         self.api_key = api_key
+        self.log_curl_commands = True
 
     @property
     def headers(self):
@@ -57,6 +58,8 @@ def request(self, endpoint, data=None, params=None, method='get'):
             data=json.dumps(data) if data else None,
             params=params,
         )
+        if self.log_curl_commands:
+            logger.info("API query to %s" % to_curl(response.request))
         if response.status_code != 200:
             logger.error("Error calling the API, we tried: %s" % to_curl(response.request))
             raise APIException(

ravenpackapi/models/job.py

@@ -6,6 +6,7 @@
 import requests
 
 from ravenpackapi.exceptions import api_method, APIException, DataFileTimeout
+from ravenpackapi.util import to_curl
 
 logger = logging.getLogger(__name__)
 
@@ -93,12 +94,17 @@ def save_to_file(self, filename):
 
             # this is a different request than the normal API
             # streaming the file in chunks
-            r = requests.get(job.url,
-                             headers=api.headers,
-                             stream=True,
-                             )
-
-            for chunk in r.iter_content(chunk_size=self._CHUNK_SIZE):
+            response = requests.get(job.url,
+                                    headers=api.headers,
+                                    stream=True,
+                                    )
+            if response.status_code != 200:
+                logger.error("Error calling the API, we tried: %s" % to_curl(response.request))
+                raise APIException(
+                    'Got an error {status}: body was \'{error_message}\''.format(
+                        status=response.status_code, error_message=response.text
+                    ), response=response)
+            for chunk in response.iter_content(chunk_size=self._CHUNK_SIZE):
                 if chunk:
                     output.write(chunk)
 

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '1.0.19'
+VERSION = '1.0.20'
 
 with open('README.rst') as readme_file:
     readme = readme_file.read()