Format backend error msg

cdci_data_analysis/analysis/instrument.py

@@ -470,7 +470,7 @@ def run_query(self, product_type,
                                      'please use "provide feedback" button below. We would greatly appreciate it!\n\n'
                                      'This additional information might help:\n\n'
                                )
-                    e_message = f'Instrument: {self.name}, product: {product_type} failed!\n'
+                    e_message = f'Instrument: {self.name}, product: {product_type}\n'
                     query_out.set_failed(product_type,
                                          message=message,
                                          e_message=e_message,

cdci_data_analysis/analysis/queries.py

@@ -18,19 +18,19 @@
 
 
 import logging
-import os
 import time as _time
 import json
 from collections import OrderedDict
 
 import sentry_sdk
 import decorator 
+import traceback
 import numpy as np
 
 
-from .parameters import (Parameter, 
-                         ParameterGroup, 
-                         ParameterRange, 
+from .parameters import (Parameter,
+                         ParameterGroup,
+                         ParameterRange,
                          ParameterTuple,
                          Name,
                          Angle,
@@ -40,15 +40,15 @@
                          DetectionThreshold,
                          Float,
                          TimeDelta,
-                         
+
                          # these are not used here but wildcard-imported from this module by integral plugin
                          SpectralBoundary,
                          Integer
                          )
 from .products import SpectralFitProduct, QueryOutput, QueryProductList, ImageProduct
 from .io_helper import FilePath
-from .exceptions import RequestNotUnderstood, UnfortunateRequestResults, BadRequest, InternalError
-import traceback
+from .exceptions import RequestNotUnderstood, InternalError
+from ..flask_app.sentry import sentry
 
 logger = logging.getLogger(__name__)
 
@@ -452,7 +452,6 @@
                                  debug_message=debug_message)
 
         except Exception as e:
-            sentry_sdk.capture_exception(e)
             raise InternalError(f"unexpected error while testing communication with {instrument}, {e!r}")
 
         status = query_out.get_status()
@@ -583,26 +582,25 @@
             raise
 
         except Exception as e:
-            # TODO: could we avoid these? they make error tracking hard
-            # TODO we could use the very same approach used when test_communication fails
             logger.exception("failed to get query products")
+            internal_error_message = "Error when getting query products"
+            # e_message = f"{internal_error_message} (instrument: {instrument.name}, product: {self.name}):\n{repr(e)}"
+            #
+            # if hasattr(e, 'debug_message') and e.debug_message is not None:
+            #     debug_message = e.debug_message
+            # else:
+            #     debug_message = 'no exception default debug message'
 
-            #status=1
             job.set_failed()
-            if os.environ.get('DISPATCHER_DEBUG', 'yes') == 'yes':
-                raise
-            exception_message = getattr(e, 'message', '')
-            e_message = f'Failed when getting query products for job {job.job_id}:\n{exception_message}'
-            messages['debug_message'] = repr(e) + ' : ' + getattr(e, 'debug_message', '')
-
-            query_out.set_failed('get_query_products found job failed',
-                                 logger=logger,
-                                 sentry_dsn=sentry_dsn,
-                                 excep=e,
-                                 e_message=e_message,
-                                 debug_message=messages['debug_message'])
-            # TODO to use this approach when we will refactor the handling of exceptions
-            # raise InternalError(e_message)
+            # if os.environ.get('DISPATCHER_DEBUG', 'yes') == 'yes':
+            #     raise
+            # query_out.set_failed('get_query_products',
+            #                      logger=logger,
+            #                      excep=e,
+            #                      e_message=e_message,
+            #                      debug_message=debug_message)
+
+            raise InternalError(internal_error_message)
 
         logger.info('--> data_server_query_status %d' % query_out.get_status())
         logger.info('--> end product query ')