fix: exceptions handling update (#829)

CS-SI · Sep 14, 2023 · a721a4e · a721a4e
1 parent c8ef1b9
commit a721a4e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/eodag/plugins/crunch/filter_latest_tpl_name.py b/eodag/plugins/crunch/filter_latest_tpl_name.py
@@ -20,7 +20,7 @@
 import re
 
 from eodag.plugins.crunch.base import Crunch
-from eodag.utils.exceptions import MisconfiguredError
+from eodag.utils.exceptions import ValidationError
 
 logger = logging.getLogger("eodag.plugins.crunch.filter_latest_tpl_name")
 
@@ -43,7 +43,7 @@ def __init__(self, config):
         super(FilterLatestByName, self).__init__(config)
         name_pattern = config.pop("name_pattern")
         if not self.NAME_PATTERN_CONSTRAINT.search(name_pattern):
-            raise MisconfiguredError(
+            raise ValidationError(
                 "Name pattern should respect the regex: {}".format(
                     self.NAME_PATTERN_CONSTRAINT.pattern
                 )

diff --git a/eodag/rest/server.py b/eodag/rest/server.py
@@ -209,7 +209,6 @@ async def default_exception_handler(request: Request, error):
     )
 
 
-@app.exception_handler(MisconfiguredError)
 @app.exception_handler(NoMatchingProductType)
 @app.exception_handler(UnsupportedProductType)
 @app.exception_handler(UnsupportedProvider)
@@ -238,6 +237,7 @@ async def handle_resource_not_found(request: Request, error):
     )
 
 
+@app.exception_handler(MisconfiguredError)
 @app.exception_handler(AuthenticationError)
 async def handle_auth_error(request: Request, error):
     """AuthenticationError should be sent as internal server error to the client"""

diff --git a/eodag/rest/stac.py b/eodag/rest/stac.py
@@ -45,7 +45,6 @@
     urljoin,
 )
 from eodag.utils.exceptions import (
-    MisconfiguredError,
     NoMatchingProductType,
     NotAvailableError,
     ValidationError,
@@ -361,7 +360,7 @@ def __filter_item_model_properties(self, item_model, product_type):
                 if pt["ID"] == product_type
             ][0]
         except IndexError:
-            raise MisconfiguredError(
+            raise NoMatchingProductType(
                 "Product type {} not available for {}".format(
                     product_type, self.provider
                 )

diff --git a/eodag/rest/utils.py b/eodag/rest/utils.py
@@ -721,7 +721,7 @@ def search_stac_items(url, arguments, root="/", catalogs=[], provider=None):
         )
         arguments.pop("collections")
     else:
-        raise NoMatchingProductType("No product_type found in collections argument")
+        raise NoMatchingProductType("Invalid request, collections argument is missing")
 
     # get products by ids
     ids = arguments.get("ids", None)

diff --git a/eodag/utils/__init__.py b/eodag/utils/__init__.py
@@ -72,6 +72,7 @@
 from tqdm.auto import tqdm
 
 from eodag.utils import logging as eodag_logging
+from eodag.utils.exceptions import MisconfiguredError
 
 try:
     from importlib.metadata import metadata  # type: ignore
@@ -995,9 +996,10 @@ def format_string(key, str_to_format, **format_variables):
             # defaultdict usage will return "" for missing keys in format_args
             try:
                 result = str_to_format.format_map(defaultdict(str, **format_variables))
-            except TypeError:
-                logger.error("Unable to format str=%s" % str_to_format)
-                raise
+            except TypeError as e:
+                raise MisconfiguredError(
+                    f"Unable to format str={str_to_format} using {str(format_variables)}: {str(e)}"
+                )
 
         # try to convert string to python object
         try: