Merge pull request #28 from LeanderCS/27

LeanderCS · web-flow · commit 056e534c7db4 · 2025-01-29T22:05:56.000+01:00
27 | Optimize performance
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.7-slim
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y gcc python3-dev
+RUN apt-get update && apt-get install -y gcc python3-dev git
 
 RUN pip install --upgrade pip
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -9,7 +9,7 @@
 project = "flask-inputfilter"
 copyright = "2025, Leander Cain Slotosch"
 author = "Leander Cain Slotosch"
-release = "0.0.8"
+release = "0.0.9"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
diff --git a/flask_inputfilter/Condition/TemporalOrderCondition.py b/flask_inputfilter/Condition/TemporalOrderCondition.py
@@ -38,7 +38,6 @@ def _parse_date(value: Any) -> datetime:
             except ValueError:
                 raise ValidationError(f"Invalid date format: {value}")
 
-        else:
-            raise ValidationError(
-                f"Unsupported type for date parsing: {type(value)}"
-            )
+        raise ValidationError(
+            f"Unsupported type for date parsing: {type(value)}"
+        )
diff --git a/flask_inputfilter/Filter/BlacklistFilter.py b/flask_inputfilter/Filter/BlacklistFilter.py
@@ -15,10 +15,10 @@ def apply(self, value: Any) -> Any:
                 value = value.replace(item, "")
             return value.strip()
 
-        if isinstance(value, list):
+        elif isinstance(value, list):
             return [item for item in value if item not in self.blacklist]
 
-        if isinstance(value, dict):
+        elif isinstance(value, dict):
             return {
                 key: value
                 for key, value in value.items()
diff --git a/flask_inputfilter/Filter/ToDataclassFilter.py b/flask_inputfilter/Filter/ToDataclassFilter.py
@@ -8,11 +8,11 @@ class ToDataclassFilter(BaseFilter):
     Filter that converts a dictionary to a dataclass.
     """
 
-    def __init__(self, dataclass: Type[Any]) -> None:
-        self.dataclass = dataclass
+    def __init__(self, dataclass_type: Type[dict]) -> None:
+        self.dataclass_type = dataclass_type
 
     def apply(self, value: Any) -> Union[Any]:
         if not isinstance(value, dict):
             return value
 
-        return self.dataclass(**value)
+        return self.dataclass_type(**value)
diff --git a/flask_inputfilter/Filter/ToDateFilter.py b/flask_inputfilter/Filter/ToDateFilter.py
@@ -14,15 +14,11 @@ def apply(self, value: Any) -> Union[date, Any]:
         if isinstance(value, datetime):
             return value.date()
 
-        elif isinstance(value, date):
-            return value
-
         elif isinstance(value, str):
             try:
                 return datetime.fromisoformat(value).date()
 
             except ValueError:
                 return value
 
-        else:
-            return value
+        return value
diff --git a/flask_inputfilter/Filter/ToDateTimeFilter.py b/flask_inputfilter/Filter/ToDateTimeFilter.py
@@ -24,5 +24,4 @@ def apply(self, value: Any) -> Union[datetime, Any]:
             except ValueError:
                 return value
 
-        else:
-            return value
+        return value
diff --git a/flask_inputfilter/Filter/ToEnumFilter.py b/flask_inputfilter/Filter/ToEnumFilter.py
@@ -16,7 +16,7 @@ def apply(self, value: Any) -> Union[Enum, Any]:
         if not isinstance(value, (str, int)):
             return value
 
-        if isinstance(value, Enum):
+        elif isinstance(value, Enum):
             return value
 
         try:
diff --git a/flask_inputfilter/Filter/ToIsoFilter.py b/flask_inputfilter/Filter/ToIsoFilter.py
@@ -16,5 +16,4 @@ def apply(self, value: Any) -> Union[str, Any]:
         elif isinstance(value, date):
             return value.isoformat()
 
-        else:
-            return value
+        return value
diff --git a/flask_inputfilter/Filter/WhitelistFilter.py b/flask_inputfilter/Filter/WhitelistFilter.py
@@ -15,10 +15,10 @@ def apply(self, value: Any) -> Any:
                 [word for word in value.split() if word in self.whitelist]
             )
 
-        if isinstance(value, list):
+        elif isinstance(value, list):
             return [item for item in value if item in self.whitelist]
 
-        if isinstance(value, dict):
+        elif isinstance(value, dict):
             return {
                 key: value
                 for key, value in value.items()
diff --git a/flask_inputfilter/InputFilter.py b/flask_inputfilter/InputFilter.py
@@ -86,27 +86,22 @@ def addGlobalValidator(self, validator: BaseValidator) -> None:
         self.global_validators.append(validator)
 
     @final
-    def __applyFilters(self, field_name: str, value: Any) -> Any:
+    def __applyFilters(self, filters: List[BaseFilter], value: Any) -> Any:
         """
         Apply filters to the field value.
         """
 
         if value is None:
             return value
 
-        for filter_ in self.global_filters:
-            value = filter_.apply(value)
-
-        field = self.fields.get(field_name)
-
-        for filter_ in field.get("filters"):
+        for filter_ in self.global_filters + filters:
             value = filter_.apply(value)
 
         return value
 
     @final
     def __validateField(
-        self, field_name: str, field_info: Any, value: Any
+        self, validators: List[BaseValidator], fallback: Any, value: Any
     ) -> None:
         """
         Validate the field value.
@@ -116,22 +111,20 @@ def __validateField(
             return
 
         try:
-            for validator in self.global_validators:
-                validator.validate(value)
-
-            field = self.fields.get(field_name)
-
-            for validator in field.get("validators"):
+            for validator in self.global_validators + validators:
                 validator.validate(value)
         except ValidationError:
-            if field_info.get("fallback") is None:
+            if fallback is None:
                 raise
 
-            return field_info.get("fallback")
+            return fallback
 
     @final
     def __applySteps(
-        self, field_name: str, field_info: Any, value: Any
+        self,
+        steps: List[Union[BaseFilter, BaseValidator]],
+        fallback: Any,
+        value: Any,
     ) -> Any:
         """
         Apply multiple filters and validators in a specific order.
@@ -140,32 +133,28 @@ def __applySteps(
         if value is None:
             return
 
-        field = self.fields.get(field_name)
-
         try:
-            for step in field.get("steps"):
+            for step in steps:
                 if isinstance(step, BaseFilter):
                     value = step.apply(value)
                 elif isinstance(step, BaseValidator):
                     step.validate(value)
         except ValidationError:
-            if field_info.get("fallback") is None:
+            if fallback is None:
                 raise
-            return field_info.get("fallback")
+            return fallback
 
         return value
 
     @final
     def __callExternalApi(
-        self, field_info: Any, validated_data: dict
+        self, config: ExternalApiConfig, fallback: Any, validated_data: dict
     ) -> Optional[Any]:
         """
         Führt den API-Aufruf durch und gibt den Wert zurück,
         der im Antwortkörper zu finden ist.
         """
 
-        config: ExternalApiConfig = field_info.get("external_api")
-
         requestData = {
             "headers": {},
             "params": {},
@@ -206,13 +195,13 @@ def __callExternalApi(
 
             return result
         except Exception:
-            if field_info and field_info.get("fallback") is None:
+            if fallback is None:
                 raise ValidationError(
                     f"External API call failed for field "
                     f"'{config.data_key}'."
                 )
 
-            return field_info.get("fallback")
+            return fallback
 
     @staticmethod
     @final
@@ -246,7 +235,11 @@ def __replacePlaceholdersInParams(
     @staticmethod
     @final
     def __checkForRequired(
-        field_name: str, field_info: dict, value: Any
+        field_name: str,
+        required: bool,
+        default: Any,
+        fallback: Any,
+        value: Any,
     ) -> Any:
         """
         Determine the value of the field, considering the required and
@@ -262,11 +255,11 @@ def __checkForRequired(
         if value is not None:
             return value
 
-        if not field_info.get("required"):
-            return field_info.get("default")
+        if not required:
+            return default
 
-        if field_info.get("fallback") is not None:
-            return field_info.get("fallback")
+        if fallback is not None:
+            return fallback
 
         raise ValidationError(f"Field '{field_name}' is required.")
 
@@ -276,39 +269,44 @@ def __checkConditions(self, validated_data: dict) -> None:
                 raise ValidationError(f"Condition '{condition}' not met.")
 
     @final
-    def validateData(
-        self, data: Dict[str, Any], kwargs: Dict[str, Any] = None
-    ) -> Dict[str, Any]:
+    def validateData(self, data: Dict[str, Any]) -> Dict[str, Any]:
         """
         Validate the input data, considering both request data and
         URL parameters (kwargs).
         """
 
-        if kwargs is None:
-            kwargs = {}
-
         validated_data = {}
-        combined_data = {**data, **kwargs}
 
         for field_name, field_info in self.fields.items():
-            value = combined_data.get(field_name)
+            value = data.get(field_name)
+
+            required = field_info["required"]
+            default = field_info["default"]
+            fallback = field_info["fallback"]
+            filters = field_info["filters"]
+            validators = field_info["validators"]
+            steps = field_info["steps"]
+            external_api = field_info["external_api"]
+            copy = field_info["copy"]
+
+            if copy:
+                value = validated_data.get(copy)
+
+            if external_api:
+                value = self.__callExternalApi(
+                    external_api, fallback, validated_data
+                )
 
-            if field_info.get("copy"):
-                value = validated_data.get(field_info.get("copy"))
+            value = self.__applyFilters(filters, value)
 
-            if field_info.get("external_api"):
-                value = self.__callExternalApi(field_info, validated_data)
+            value = self.__validateField(validators, fallback, value) or value
 
-            value = self.__applyFilters(field_name, value)
+            value = self.__applySteps(steps, fallback, value) or value
 
-            value = (
-                self.__validateField(field_name, field_info, value) or value
+            value = self.__checkForRequired(
+                field_name, required, default, fallback, value
             )
 
-            value = self.__applySteps(field_name, field_info, value) or value
-
-            value = self.__checkForRequired(field_name, field_info, value)
-
             validated_data[field_name] = value
 
         self.__checkConditions(validated_data)
@@ -339,13 +337,14 @@ def decorator(
             def wrapper(
                 *args, **kwargs
             ) -> Union[Response, Tuple[Any, Dict[str, Any]]]:
-                if request.method not in cls().methods:
+                input_filter = cls()
+                if request.method not in input_filter.methods:
                     return Response(status=405, response="Method Not Allowed")
 
                 data = request.json if request.is_json else request.args
 
                 try:
-                    g.validated_data = cls().validateData(data, kwargs)
+                    g.validated_data = input_filter.validateData(data)
 
                 except ValidationError as e:
                     return Response(status=400, response=str(e))
diff --git a/flask_inputfilter/Validator/IsDataclassValidator.py b/flask_inputfilter/Validator/IsDataclassValidator.py
@@ -12,7 +12,7 @@ class IsDataclassValidator(BaseValidator):
 
     def __init__(
         self,
-        dataclass_type: Optional[Type[Any]] = None,
+        dataclass_type: Optional[Type[dict]] = None,
         error_message: Optional[str] = None,
     ) -> None:
         self.dataclass_type = dataclass_type
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="flask_inputfilter",
-    version="0.0.8",
+    version="0.0.9",
     author="Leander Cain Slotosch",
     author_email="slotosch.leander@outlook.de",
     description="A library to filter and validate input data in"
diff --git a/test.py b/test.py
diff --git a/test/test_filter.py b/test/test_filter.py
diff --git a/test/test_validator.py b/test/test_validator.py
