Updated error handling and changed broad Exception to specific errors

Author: LeanderCS

docs/source/changelog.rst

@@ -3,6 +3,15 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+[0.3.1] - 2025-04-14
+--------------------
+
+Changed
+^^^^^^^
+- Updated error handling and changed broad ``Exception`` to specific errors.
+- Smaller performance improvements
+
+
 [0.3.0] - 2025-04-10
 --------------------
 

docs/source/conf.py

@@ -1,7 +1,7 @@
 project = "flask-inputfilter"
 copyright = "2025, Leander Cain Slotosch"
 author = "Leander Cain Slotosch"
-release = "0.3.0"
+release = "0.3.1"
 
 extensions = ["sphinx_rtd_theme"]
 

docs/source/guides/create_own_components.rst

@@ -149,7 +149,7 @@ Example implementation
                     if value not in self.haystack:
                         raise ValidationError
 
-            except Exception:
+            except ValidationError:
                 raise ValidationError(
                     self.error_message
                     or f"Value '{value}' is not in the allowed "

flask_inputfilter/Filter/Base64ImageDownscaleFilter.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
 import base64
+import binascii
 import io
 from typing import Any, Optional
 
-from PIL import Image
+from PIL import Image, UnidentifiedImageError
 
 from flask_inputfilter.Filter import BaseFilter
 
@@ -38,7 +39,13 @@ def apply(self, value: Any) -> Any:
             image = Image.open(io.BytesIO(base64.b64decode(value)))
             return self.resize_picture(image)
 
-        except Exception:
+        except (
+            binascii.Error,
+            UnidentifiedImageError,
+            OSError,
+            ValueError,
+            TypeError,
+        ):
             return value
 
     def resize_picture(self, image: Image) -> str:

flask_inputfilter/Filter/Base64ImageResizeFilter.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
 import base64
+import binascii
 import io
 from typing import Any
 
-from PIL import Image
+from PIL import Image, UnidentifiedImageError
 
 from flask_inputfilter.Enum import ImageFormatEnum
 from flask_inputfilter.Filter import BaseFilter
@@ -45,7 +46,13 @@ def apply(self, value: Any) -> Any:
 
             value = Image.open(io.BytesIO(base64.b64decode(value)))
             return self.reduce_image(value)
-        except Exception:
+        except (
+            binascii.Error,
+            UnidentifiedImageError,
+            OSError,
+            ValueError,
+            TypeError,
+        ):
             return value
 
     def reduce_image(self, image: Image) -> Image:

flask_inputfilter/InputFilter.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import logging
 from typing import (
     Any,
     Callable,
@@ -87,7 +88,7 @@ def isValid(self) -> bool:
                 all required conditions; otherwise, returns False.
         """
         try:
-            self.validateData(self._data)
+            self.validateData()
 
         except ValidationError as e:
             self._errors = e.args[0]
@@ -133,9 +134,9 @@ def wrapper(
                     validated_data = input_filter.validateData()
 
                     if input_filter._model_class is not None:
-                        validated_data = input_filter.serialize()
-
-                    g.validated_data = validated_data
+                        g.validated_data = input_filter.serialize()
+                    else:
+                        g.validated_data = validated_data
 
                 except ValidationError as e:
                     return Response(
@@ -144,6 +145,13 @@ def wrapper(
                         mimetype="application/json",
                     )
 
+                except Exception:
+                    logging.getLogger(__name__).exception(
+                        "An unexpected exception occurred while "
+                        "validating input data.",
+                    )
+                    return Response(status=500)
+
                 return f(*args, **kwargs)
 
             return wrapper
@@ -175,7 +183,6 @@ def validateData(
                 logical steps execution of the respective fields or conditions
                 will propagate without explicit handling here.
         """
-        validated_data = self._validated_data
         data = data or self._data
         errors = {}
 
@@ -193,11 +200,11 @@ def validateData(
 
             try:
                 if copy:
-                    value = validated_data.get(copy)
+                    value = self._validated_data.get(copy)
 
                 if external_api:
                     value = self._ExternalApiMixin__callExternalApi(
-                        external_api, fallback, validated_data
+                        external_api, fallback, self._validated_data
                     )
 
                 value = self._FilterMixin__applyFilters(filters, value)
@@ -215,18 +222,17 @@ def validateData(
                     field_name, required, default, fallback, value
                 )
 
-                validated_data[field_name] = value
+                self._validated_data[field_name] = value
 
             except ValidationError as e:
                 errors[field_name] = str(e)
 
         try:
-            self._ConditionMixin__checkConditions(validated_data)
+            self._ConditionMixin__checkConditions(self._validated_data)
         except ValidationError as e:
             errors["_condition"] = str(e)
 
         if errors:
             raise ValidationError(errors)
 
-        self._validated_data = validated_data
-        return validated_data
+        return self._validated_data

flask_inputfilter/Mixin/DataMixin.py

@@ -155,6 +155,7 @@ def hasUnknown(self) -> bool:
         """
         if not self._data and self._fields:
             return True
+
         return any(
             field_name not in self._fields.keys()
             for field_name in self._data.keys()

flask_inputfilter/Mixin/ExternalApiMixin.py

@@ -81,28 +81,37 @@ def __callExternalApi(
 
         try:
             response = requests.request(**requestData)
-
-            if response.status_code != 200:
-                logger.error(
-                    f"External_api request inside of InputFilter "
-                    f"failed: {response.text}"
-                )
-                raise
-
             result = response.json()
-
-            if data_key:
-                return result.get(data_key)
-
-            return result
-        except Exception:
+        except requests.exceptions.RequestException:
+            if fallback is None:
+                logger.exception("External API request failed unexpectedly.")
+                raise ValidationError(
+                    f"External API call failed for field " f"'{data_key}'."
+                )
+            return fallback
+        except ValueError:
             if fallback is None:
+                logger.exception(
+                    "External API response could not be parsed to json."
+                )
                 raise ValidationError(
                     f"External API call failed for field " f"'{data_key}'."
                 )
+            return fallback
 
+        if response.status_code != 200:
+            if fallback is None:
+                logger.error(
+                    f"External API request failed with status "
+                    f"{response.status_code}: {response.text}"
+                )
+                raise ValidationError(
+                    f"External API call failed for field " f"'{data_key}'."
+                )
             return fallback
 
+        return result.get(data_key) if data_key else result
+
     @staticmethod
     def __replacePlaceholders(value: str, validated_data: dict) -> str:
         """

flask_inputfilter/Mixin/ModelMixin.py

@@ -55,7 +55,7 @@ def merge(self, other: "InputFilter") -> None:
         for key, new_field in other.getInputs().items():
             self._fields[key] = new_field
 
-        self._conditions = self._conditions + other._conditions
+        self._conditions += other._conditions
 
         for filter in other._global_filters:
             existing_type_map = {

flask_inputfilter/Validator/InArrayValidator.py

@@ -35,7 +35,7 @@ def validate(self, value: Any) -> None:
                 if value not in self.haystack:
                     raise ValidationError
 
-        except Exception:
+        except ValidationError:
             raise ValidationError(
                 self.error_message
                 or f"Value '{value}' is not in the allowed "