Merge pull request #729 from oda-hub/dedicated-exception-product-proc…

…essing

Dedicated exception product processing

cdci_data_analysis/analysis/exceptions.py

@@ -43,6 +43,12 @@ class RequestNotUnderstood(BadRequest):
     """
 
 
+class ProductProcessingError(RuntimeError):
+    """
+    For an error in the post-processing, caused by the user's request.
+    """
+
+
 class RequestNotAuthorized(BadRequest):
     def __init__(self, message, debug_message=''):
         self.debug_message = debug_message

cdci_data_analysis/analysis/instrument.py

@@ -41,7 +41,7 @@
 from .queries import ProductQuery, SourceQuery, InstrumentQuery
 from .io_helper import upload_file, upload_files_request
 
-from .exceptions import RequestNotUnderstood, RequestNotAuthorized, InternalError
+from .exceptions import RequestNotUnderstood, RequestNotAuthorized, InternalError, ProductProcessingError
 from ..flask_app.sentry import sentry
 
 from oda_api.api import DispatcherAPI, RemoteException, Unauthorized, DispatcherException, DispatcherNotAvailable, UnexpectedDispatcherStatusCode, RequestNotUnderstood as RequestNotUnderstoodOdaApi
@@ -480,6 +480,10 @@ def run_query(self, product_type,
                 except RequestNotUnderstood as e:
                     logger.warning("bad request from user, passing through: %s", e)
                     raise
+                except ProductProcessingError as e:
+                    logger.warning("error in the post processing of the products to fail, passing through: %s", e)
+                    query_out.set_status(1, message="Error during the products post processing",
+                                         error_message=str(e))
                 except InternalError as e:
                     if hasattr(e, 'message') and e.message is not None:
                         message = e.message

cdci_data_analysis/analysis/queries.py

@@ -46,7 +46,7 @@
                          )
 from .products import SpectralFitProduct, QueryOutput, QueryProductList, ImageProduct
 from .io_helper import FilePath
-from .exceptions import RequestNotUnderstood, InternalError
+from .exceptions import RequestNotUnderstood, InternalError, ProductProcessingError
 
 logger = logging.getLogger(__name__)
 
@@ -614,6 +614,10 @@ def get_query_products(self,
             logger.error("passing request issue: %s", e)
             raise
 
+        except ProductProcessingError as e:
+            logger.error("product processing error: %s", e)
+            raise
+
         except Exception as e:
             logger.exception("failed to get query products")
             internal_error_message = "Error when getting query products"