Fix minor bugs - dependency error

bdc_collection_builder/collections/landsat/tasks.py

@@ -5,7 +5,6 @@
 
 # 3rdparty
 from glob import glob as resource_glob
-from psycopg2 import InternalError
 from requests import get as resource_get
 from sqlalchemy.exc import InvalidRequestError
 
@@ -17,6 +16,7 @@
 from bdc_collection_builder.collections.landsat.download import download_landsat_images
 from bdc_collection_builder.collections.landsat.publish import publish
 from bdc_collection_builder.collections.utils import get_task_activity
+from bdc_collection_builder.db import db_aws
 
 
 class LandsatTask(RadcorTask):
@@ -78,8 +78,17 @@ def publish(self, scene):
 
         try:
             assets = publish(self.get_collection_item(activity_history.activity), activity_history.activity)
+        except InvalidRequestError as e:
+            # Error related with Transacion on AWS
+            # TODO: Is it occurs on local instance?
+            logging.error("Transaction Error on activity - {}".format(activity_history.activity_id), exc_info=True)
+
+            db_aws.session.rollback()
+
+            raise e
+
         except BaseException as e:
-            logging.error('An error occurred during task execution', e)
+            logging.error("An error occurred during task execution - {}".format(activity_history.activity_id), exc_info=True)
 
             raise e
 
@@ -171,7 +180,7 @@ def atm_correction_landsat(scene):
     return atm_correction_landsat.correction(scene)
 
 
-@celery_app.task(base=LandsatTask, queue='publish', max_retries=3, autoretry_for=(InternalError, InvalidRequestError,), default_retry_delay=Config.TASK_RETRY_DELAY)
+@celery_app.task(base=LandsatTask, queue='publish', max_retries=3, autoretry_for=(InvalidRequestError,), default_retry_delay=Config.TASK_RETRY_DELAY)
 def publish_landsat(scene):
     return publish_landsat.publish(scene)
 

bdc_collection_builder/collections/sentinel/tasks.py

@@ -10,7 +10,6 @@
 from zipfile import ZipFile
 
 # 3rdparty
-from psycopg2 import InternalError
 from requests.exceptions import ConnectionError, HTTPError
 from sqlalchemy.exc import InvalidRequestError
 
@@ -27,6 +26,7 @@
 from bdc_collection_builder.collections.sentinel.download import download_sentinel_images, download_sentinel_from_creodias
 from bdc_collection_builder.collections.sentinel.publish import publish
 from bdc_collection_builder.collections.sentinel.correction import correction_sen2cor255, correction_sen2cor280
+from bdc_collection_builder.db import db_aws
 
 
 lock = lock_handler.lock('sentinel_download_lock_4')
@@ -226,8 +226,16 @@ def publish(self, scene):
 
         try:
             assets = publish(self.get_collection_item(activity_history.activity), activity_history.activity)
+        except InvalidRequestError as e:
+            # Error related with Transacion on AWS
+            # TODO: Is it occurs on local instance?
+            logging.error("Transaction Error on activity - {}".format(activity_history.activity_id), exc_info=True)
+
+            db_aws.session.rollback()
+
+            raise e
         except BaseException as e:
-            logging.error('An error occurred during task execution', e)
+            logging.error('An error occurred during task execution - {}'.format(activity_history.activity_id), exc_info=True)
             raise e
 
         # Create new activity 'uploadS2' to continue task chain
@@ -291,7 +299,7 @@ def atm_correction(scene):
     return atm_correction.correction(scene)
 
 
-@celery_app.task(base=SentinelTask, queue='publish', max_retries=3, autoretry_for=(InternalError, InvalidRequestError,), default_retry_delay=Config.TASK_RETRY_DELAY)
+@celery_app.task(base=SentinelTask, queue='publish', max_retries=3, autoretry_for=(InvalidRequestError,), default_retry_delay=Config.TASK_RETRY_DELAY)
 def publish_sentinel(scene):
     """
     Represents a celery task definition for handling Sentinel

bdc_collection_builder/version.py

@@ -1 +1 @@
-__version__  = '0.1.0'
+__version__  = '0.2.0'

setup.py

@@ -42,6 +42,8 @@
     'bdc-db @ git+git://github.com/brazil-data-cube/bdc-db.git#egg=bdc-db',
     'stac @ git+git://github.com/brazil-data-cube/stac.py.git#egg=stac',
     'celery[librabbitmq]>=4.3.0',
+    # TODO: Remove werkzeug dependency when https://github.com/noirbizarre/flask-restplus/issues/777 is fixed
+    'Werkzeug>=0.16,<1.0'
 ]
 
 g = {}