Merge pull request #1185 from resource-watch/foo_053

add retries for requests

foo_053_alerts_price_spikes/Dockerfile

@@ -1,12 +1,12 @@
-FROM python:3.7
+FROM python:3.9
 MAINTAINER Weiqi Zhou <weiqi.zhou@wri.org>
 #Note this script was originally developed by Nathan Suberi <nathan.suberi@wri.org> and Amelia Snyder <amelia.snyder@wri.org>
 
 # install core libraries
 RUN apt-get update
 # install application libraries
 RUN pip install --upgrade pip
-RUN pip install requests==2.22.0
+RUN pip install requests
 RUN pip install -e git+https://github.com/resource-watch/cartosql.py.git#egg=cartosql
 RUN pip install shapely
 RUN pip install numpy==1.18.1

foo_053_alerts_price_spikes/contents/src/SamplePythonDataBridgesCall.py

@@ -64,7 +64,7 @@ def _refresh_token(self, scopes):
             raise TokenScopeError(f'Could not acquire requested scopes: {scopes}')
         self.tokens_by_scopes[scopes] = resp_data['access_token']
 
-    @backoff.on_exception(backoff.expo, (ApiServerError, ApiNotAuthorizedError), max_tries=5)
+    @backoff.on_exception(backoff.expo, (ApiServerError, ApiNotAuthorizedError), max_tries=8, base=10)
     def _invoke(self, endpoint_name, params=None, body=None):
         if endpoint_name not in API_ENDPOINTS:
             raise ValueError('Invalid endpoint invoked. Check the system configuration')
@@ -88,13 +88,13 @@ def _invoke(self, endpoint_name, params=None, body=None):
                 print('unauthorized. Retrying...')
                 raise ApiNotAuthorizedError()
             if resp.status_code >= httpx.codes.INTERNAL_SERVER_ERROR:
-                print('Internal server error. Retrying...')
+                print('Internal server issue. Retrying...')
                 raise ApiServerError()
             if resp.status_code == httpx.codes.NOT_FOUND:
                 raise NotFoundError()
             if httpx.codes.BAD_REQUEST <= resp.status_code < httpx.codes.INTERNAL_SERVER_ERROR:
-                print('Http client error! Not retrying (as it would be useless)')
-                raise HTTPError(f'HTTP Client error ({resp.status_code})')
+                print('Http client issue! Not retrying (as it would be useless)')
+                raise HTTPError(f'HTTP Client issue ({resp.status_code})')
 
         return resp.json()