Update diverse things

Author: LeanderCS

flask_inputfilter/conditions/integer_bigger_than_condition.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Any
+
 from flask_inputfilter.models import BaseCondition
 
 
@@ -45,7 +47,7 @@ def __init__(self, bigger_field: str, smaller_field: str) -> None:
         self.bigger_field = bigger_field
         self.smaller_field = smaller_field
 
-    def check(self, data: dict[str, int]) -> bool:
+    def check(self, data: dict[str, Any]) -> bool:
         if (
             data.get(self.bigger_field) is None
             or data.get(self.smaller_field) is None

flask_inputfilter/conditions/n_of_condition.py

@@ -45,7 +45,7 @@ def __init__(self, fields: list[str], n: int) -> None:
         self.fields = fields
         self.n = n
 
-    def check(self, data: Any) -> bool:
+    def check(self, data: dict[str, Any]) -> bool:
         return (
             sum(1 for field in self.fields if data.get(field) is not None)
             >= self.n

flask_inputfilter/conditions/string_longer_than_condition.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Any
+
 from flask_inputfilter.models import BaseCondition
 
 
@@ -40,7 +42,7 @@ def __init__(self, longer_field: str, shorter_field: str) -> None:
         self.longer_field = longer_field
         self.shorter_field = shorter_field
 
-    def check(self, value: dict[str, str]) -> bool:
-        return len(value.get(self.longer_field) or 0) > len(
-            value.get(self.shorter_field) or 0
+    def check(self, data: dict[str, Any]) -> bool:
+        return len(data.get(self.longer_field) or "") > len(
+            data.get(self.shorter_field) or ""
         )

flask_inputfilter/declarative/_utils.py

@@ -16,11 +16,17 @@ def register_class_attribute(attribute_name: str, value: Any) -> None:
         attribute_name: The name of the attribute to set on the class
         value: The value to set for the attribute
     """
-    frame = inspect.currentframe()
-    if frame and frame.f_back and frame.f_back.f_back:
-        caller_locals = frame.f_back.f_back.f_locals
-        if "__module__" in caller_locals and "__qualname__" in caller_locals:
-            caller_locals[attribute_name] = value
+    try:
+        frame = inspect.currentframe()
+        if frame and frame.f_back and frame.f_back.f_back:
+            caller_locals = frame.f_back.f_back.f_locals
+            if (
+                "__module__" in caller_locals
+                and "__qualname__" in caller_locals
+            ):
+                caller_locals[attribute_name] = value
+    except (AttributeError, KeyError):
+        pass
 
 
 def append_to_class_list(list_name: str, value: Any) -> None:
@@ -36,10 +42,16 @@ def append_to_class_list(list_name: str, value: Any) -> None:
         list_name: The name of the list attribute on the class
         value: The value to append to the list
     """
-    frame = inspect.currentframe()
-    if frame and frame.f_back and frame.f_back.f_back:
-        caller_locals = frame.f_back.f_back.f_locals
-        if "__module__" in caller_locals and "__qualname__" in caller_locals:
-            if list_name not in caller_locals:
-                caller_locals[list_name] = []
-            caller_locals[list_name].append(value)
+    try:
+        frame = inspect.currentframe()
+        if frame and frame.f_back and frame.f_back.f_back:
+            caller_locals = frame.f_back.f_back.f_locals
+            if (
+                "__module__" in caller_locals
+                and "__qualname__" in caller_locals
+            ):
+                if list_name not in caller_locals:
+                    caller_locals[list_name] = []
+                caller_locals[list_name].append(value)
+    except (AttributeError, KeyError):
+        pass

flask_inputfilter/filters/string_remove_emojis_filter.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Optional, Union
+from typing import Any, Union
 
 from flask_inputfilter.models import BaseFilter
 
@@ -38,7 +38,7 @@ class CommentFilter(InputFilter):
 
     __slots__ = ()
 
-    def apply(self, value: Any) -> Union[Optional[str], Any]:
+    def apply(self, value: Any) -> Union[str, Any]:
         if not isinstance(value, str):
             return value
 

flask_inputfilter/filters/string_slugify_filter.py

@@ -2,7 +2,7 @@
 
 import re
 import unicodedata
-from typing import Any, Optional, Union
+from typing import Any, Union
 
 from flask_inputfilter.enums import UnicodeFormEnum
 from flask_inputfilter.models import BaseFilter
@@ -29,7 +29,7 @@ class PostFilter(InputFilter):
 
     __slots__ = ()
 
-    def apply(self, value: Any) -> Union[Optional[str], Any]:
+    def apply(self, value: Any) -> Union[str, Any]:
         if not isinstance(value, str):
             return value
 

flask_inputfilter/filters/to_alpha_numeric_filter.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Optional, Union
+from typing import Any, Union
 
 from flask_inputfilter.models import BaseFilter
 
@@ -28,7 +28,7 @@ class CodeFilter(InputFilter):
 
     __slots__ = ()
 
-    def apply(self, value: Any) -> Union[Optional[str], Any]:
+    def apply(self, value: Any) -> Union[str, Any]:
         if not isinstance(value, str):
             return value
 

flask_inputfilter/filters/to_boolean_filter.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Optional, Union
+from typing import Any, Union
 
 from flask_inputfilter.models import BaseFilter
 
@@ -26,5 +26,5 @@ class ActiveFilter(InputFilter):
 
     __slots__ = ()
 
-    def apply(self, value: Any) -> Union[Optional[bool], Any]:
+    def apply(self, value: Any) -> Union[bool, Any]:
         return bool(value)

flask_inputfilter/filters/to_dataclass_filter.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Type, Union
+from typing import Any, Type
 
 from flask_inputfilter.models import BaseFilter
 
@@ -36,7 +36,7 @@ class DataFilter(InputFilter):
     def __init__(self, dataclass_type: Type[dict]) -> None:
         self.dataclass_type = dataclass_type
 
-    def apply(self, value: Any) -> Union[Any]:
+    def apply(self, value: Any) -> Any:
         if not isinstance(value, dict):
             return value
 

flask_inputfilter/filters/to_pascal_case_filter.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Optional, Union
+from typing import Any, Union
 
 from flask_inputfilter.models import BaseFilter
 
@@ -28,7 +28,7 @@ class ClassNameFilter(InputFilter):
 
     __slots__ = ()
 
-    def apply(self, value: Any) -> Union[Optional[str], Any]:
+    def apply(self, value: Any) -> Union[str, Any]:
         if not isinstance(value, str):
             return value