clear-skies 2.0.7__py3-none-any.whl → 2.0.8__py3-none-any.whl

clearskies/columns/belongs_to_model.py

@@ -3,8 +3,7 @@ from __future__ import annotations
 from collections import OrderedDict
 from typing import TYPE_CHECKING, Any, Self, overload
 
-import clearskies.decorators
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.column import Column
 from clearskies.columns.belongs_to_id import BelongsToId
 from clearskies.functional import validations
@@ -19,10 +18,10 @@ class BelongsToModel(Column):
     """ The name of the belongs to column we are connected to. """
     belongs_to_column_name = configs.ModelColumn(required=True)
 
-    is_temporary = clearskies.configs.boolean.Boolean(default=True)
+    is_temporary = configs.boolean.Boolean(default=True)
     _descriptor_config_map = None
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         belongs_to_column_name: str,
@@ -45,11 +44,11 @@ class BelongsToModel(Column):
         belongs_to_column.model_column_name = name
 
     @overload
-    def __get__(self, instance: None, cls: type[Model]) -> Self:
+    def __get__(self, model: None, cls: type[Model]) -> Self:
         pass
 
     @overload
-    def __get__(self, instance: Model, cls: type[Model]) -> Model:
+    def __get__(self, model: Model, cls: type[Model]) -> Model:
         pass
 
     def __get__(self, model, cls):
@@ -106,9 +105,7 @@ class BelongsToModel(Column):
     def join_table_alias(self) -> str:
         return getattr(self.model_class, self.belongs_to_column_name).join_table_alias()
 
-    def add_search(
-        self, model: clearskies.model.Model, value: str, operator: str = "", relationship_reference: str = ""
-    ) -> clearskies.model.Model:
+    def add_search(self, model: Model, value: str, operator: str = "", relationship_reference: str = "") -> Model:
         return getattr(self.model_class, self.belongs_to_column_name).add_search(
             model, value, operator, relationship_reference=relationship_reference
         )

clearskies/columns/belongs_to_self.py

@@ -1,9 +1,13 @@
-from typing import Callable
+from __future__ import annotations
 
-import clearskies.decorators
-import clearskies.typing
+from typing import TYPE_CHECKING, Callable
+
+from clearskies import decorators
 from clearskies.columns.belongs_to_id import BelongsToId
 
+if TYPE_CHECKING:
+    from clearskies import typing
+
 
 class BelongsToSelf(BelongsToId):
     """
@@ -69,22 +73,22 @@ class BelongsToSelf(BelongsToId):
 
     _descriptor_config_map = None
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         readable_parent_columns: list[str] = [],
         join_type: str | None = None,
-        where: clearskies.typing.condition | list[clearskies.typing.condition] = [],
+        where: typing.condition | list[typing.condition] = [],
         default: str | None = None,
         setable: str | Callable | None = None,
         is_readable: bool = True,
         is_writeable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        validators: clearskies.typing.validator | list[clearskies.typing.validator] = [],
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        validators: typing.validator | list[typing.validator] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
         created_by_source_type: str = "",
         created_by_source_key: str = "",
         created_by_source_strict: bool = True,

clearskies/columns/boolean.py

@@ -2,17 +2,14 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Callable, Self, overload
 
-import clearskies.configs.actions
-import clearskies.decorators
-import clearskies.typing
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.autodoc.schema import Boolean as AutoDocBoolean
-from clearskies.autodoc.schema import Schema as AutoDocSchema
 from clearskies.column import Column
-from clearskies.query import Condition
 
 if TYPE_CHECKING:
-    from clearskies import Model
+    from clearskies import Model, typing
+    from clearskies.autodoc.schema import Schema as AutoDocSchema
+    from clearskies.query import Condition
 
 
 class Boolean(Column):
@@ -21,12 +18,12 @@ class Boolean(Column):
     """
     Actions to trigger when the column changes to True
     """
-    on_true = clearskies.configs.actions.Actions(default=[])
+    on_true = configs.actions.Actions(default=[])
 
     """
     Actions to trigger when the column changes to False
     """
-    on_false = clearskies.configs.actions.Actions(default=[])
+    on_false = configs.actions.Actions(default=[])
 
     """
     The class to use when documenting this column
@@ -38,7 +35,7 @@ class Boolean(Column):
     setable = configs.BooleanOrCallable()  #  type: ignore
     _descriptor_config_map = None
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         default: bool | None = None,
@@ -47,12 +44,12 @@ class Boolean(Column):
         is_writeable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        validators: clearskies.typing.validator | list[clearskies.typing.validator] = [],
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_true: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_false: clearskies.typing.action | list[clearskies.typing.action] = [],
+        validators: typing.validator | list[typing.validator] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
+        on_true: typing.action | list[typing.action] = [],
+        on_false: typing.action | list[typing.action] = [],
         created_by_source_type: str = "",
         created_by_source_key: str = "",
         created_by_source_strict: bool = True,

clearskies/columns/category_tree.py

@@ -2,13 +2,11 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Callable
 
-import clearskies.decorators
-import clearskies.typing
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.columns.belongs_to_id import BelongsToId
 
 if TYPE_CHECKING:
-    from clearskies import Model
+    from clearskies import Model, typing
 
 
 class CategoryTree(BelongsToId):
@@ -163,7 +161,7 @@ class CategoryTree(BelongsToId):
 
     _descriptor_config_map = None
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         tree_model_class,
@@ -175,17 +173,17 @@ class CategoryTree(BelongsToId):
         load_relatives_strategy: str = "join",
         readable_parent_columns: list[str] = [],
         join_type: str | None = None,
-        where: clearskies.typing.condition | list[clearskies.typing.condition] = [],
+        where: typing.condition | list[typing.condition] = [],
         default: str | None = None,
         setable: str | Callable | None = None,
         is_readable: bool = True,
         is_writeable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        validators: clearskies.typing.validator | list[clearskies.typing.validator] = [],
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        validators: typing.validator | list[typing.validator] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
         created_by_source_type: str = "",
         created_by_source_key: str = "",
         created_by_source_strict: bool = True,
@@ -216,7 +214,7 @@ class CategoryTree(BelongsToId):
         self.update_tree_table(model, id, model.latest(self.name, data))
         return
 
-    def force_tree_update(self, model: Model):
+    def force_tree_update(self, model: Model) -> None:
         self.update_tree_table(model, getattr(model, model.id_column_name), getattr(model, self.name))
 
     def update_tree_table(self, model: Model, child_id: int | str, direct_parent_id: int | str) -> None:

clearskies/columns/category_tree_children.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Self, overload
 
-import clearskies.decorators
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.column import Column
 from clearskies.columns import CategoryTree
 
@@ -36,7 +35,7 @@ class CategoryTreeChildren(Column):
     is_searchable = configs.Boolean(default=False)
     _descriptor_config_map = None
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         category_tree_column_name: str,

clearskies/columns/category_tree_descendants.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Self, Type, overload
+from typing import TYPE_CHECKING, Self, overload
 
 from clearskies.columns import CategoryTreeChildren
 

clearskies/columns/created.py

@@ -1,16 +1,13 @@
 from __future__ import annotations
 
-import datetime
 from typing import TYPE_CHECKING, Any
 
-import clearskies.decorators
-import clearskies.di
-import clearskies.typing
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.columns.datetime import Datetime
+from clearskies.di import inject
 
 if TYPE_CHECKING:
-    from clearskies import Model
+    from clearskies import Model, typing
 
 
 class Created(Datetime):
@@ -66,9 +63,9 @@ class Created(Datetime):
     is_writeable = configs.Boolean(default=False)
     _descriptor_config_map = None
 
-    now = clearskies.di.inject.Now()
+    now = inject.Now()
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         date_format: str = "%Y-%m-%d %H:%M:%S",
@@ -77,9 +74,9 @@ class Created(Datetime):
         is_readable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
     ):
         pass
 

clearskies/columns/created_by_authorization_data.py

@@ -1,14 +1,12 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
-import clearskies.decorators
-import clearskies.typing
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.columns.string import String
 
 if TYPE_CHECKING:
-    from clearskies import Model
+    from clearskies import typing
 
 
 class CreatedByAuthorizationData(String):
@@ -100,7 +98,7 @@ class CreatedByAuthorizationData(String):
 
     _allowed_search_operators = ["=", "in", "is not null", "is null", "like"]
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         authorization_data_key_name: str,
@@ -108,9 +106,9 @@ class CreatedByAuthorizationData(String):
         is_readable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
     ):
         self.created_by_source_key = authorization_data_key_name
         self.created_by_source_type = "authorization_data"

clearskies/columns/created_by_header.py

@@ -1,8 +1,12 @@
-import clearskies.decorators
-import clearskies.typing
-from clearskies import configs
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from clearskies import configs, decorators
 from clearskies.columns.string import String
-from clearskies.query import Condition
+
+if TYPE_CHECKING:
+    from clearskies import typing
 
 
 class CreatedByHeader(String):
@@ -83,7 +87,7 @@ class CreatedByHeader(String):
 
     _allowed_search_operators = ["=", "in", "is not null", "is null", "like"]
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         header_name: str,
@@ -91,9 +95,9 @@ class CreatedByHeader(String):
         is_readable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
     ):
         self.created_by_source_key = header_name
         self.created_by_source_type = "http_header"

clearskies/columns/created_by_ip.py

@@ -2,13 +2,11 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-import clearskies.decorators
-import clearskies.typing
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.columns.string import String
 
 if TYPE_CHECKING:
-    from clearskies import Model
+    from clearskies import Model, typing
 
 
 class CreatedByIp(String):
@@ -70,15 +68,15 @@ class CreatedByIp(String):
 
     _allowed_search_operators = ["=", "in", "is not null", "is null", "like"]
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         is_readable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
     ):
         pass
 

clearskies/columns/created_by_routing_data.py

@@ -1,8 +1,13 @@
-import clearskies.decorators
-import clearskies.typing
-from clearskies import configs
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from clearskies import configs, decorators
 from clearskies.columns.string import String
 
+if TYPE_CHECKING:
+    from clearskies import typing
+
 
 class CreatedByRoutingData(String):
     """
@@ -81,7 +86,7 @@ class CreatedByRoutingData(String):
 
     _allowed_search_operators = ["=", "in", "is not null", "is null", "like"]
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         routing_path_name: str,
@@ -89,9 +94,9 @@ class CreatedByRoutingData(String):
         is_readable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
     ):
         self.created_by_source_key = routing_path_name
         self.created_by_source_type = "routing_data"

clearskies/columns/created_by_user_agent.py

@@ -1,15 +1,12 @@
 from __future__ import annotations
 
-import datetime
 from typing import TYPE_CHECKING, Any
 
-import clearskies.decorators
-import clearskies.typing
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.columns.string import String
 
 if TYPE_CHECKING:
-    from clearskies import Model
+    from clearskies import Model, typing
 
 
 class CreatedByUserAgent(String):
@@ -70,15 +67,15 @@ class CreatedByUserAgent(String):
 
     _allowed_search_operators = ["=", "in", "is not null", "is null", "like"]
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         is_readable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
     ):
         pass
 

clearskies/columns/date.py

@@ -3,18 +3,16 @@ from __future__ import annotations
 import datetime
 from typing import TYPE_CHECKING, Any, Callable, Self, overload
 
-import dateparser  # type: ignore
+import dateparser
 
-import clearskies.decorators
-import clearskies.typing
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.autodoc.schema import Datetime as AutoDocDatetime
-from clearskies.autodoc.schema import Schema as AutoDocSchema
 from clearskies.columns.datetime import Datetime
-from clearskies.query import Condition
 
 if TYPE_CHECKING:
-    from clearskies import Model
+    from clearskies import Model, typing
+    from clearskies.autodoc.schema import Schema as AutoDocSchema
+    from clearskies.query import Condition
 
 
 class Date(Datetime):
@@ -102,7 +100,7 @@ class Date(Datetime):
     auto_doc_class: type[AutoDocSchema] = AutoDocDatetime
     _descriptor_config_map = None
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         date_format: str = "%Y-%m-%d",
@@ -113,10 +111,10 @@ class Date(Datetime):
         is_writeable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        validators: clearskies.typing.validator | list[clearskies.typing.validator] = [],
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        validators: typing.validator | list[typing.validator] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
         created_by_source_type: str = "",
         created_by_source_key: str = "",
         created_by_source_strict: bool = True,
@@ -218,10 +216,10 @@ class Date(Datetime):
 
         if type(value_1) == str:
             value_1 = dateparser.parse(value_1)
-            value_1 = datetime.date(value_1.year, value_1.month, value_1.day)
+            value_1 = datetime.date(value_1.year, value_1.month, value_1.day) if value_1 else None
         if type(value_2) == str:
             value_2 = dateparser.parse(value_2)
-            value_2 = datetime.date(value_2.year, value_2.month, value_2.day)
+            value_2 = datetime.date(value_2.year, value_2.month, value_2.day) if value_2 else None
 
         # two times can be the same but if one is datetime-aware and one is not, python will treat them as not equal.
         # we want to treat such times as being the same.  Therefore, check for equality but ignore the timezone.

clearskies/columns/datetime.py

@@ -5,16 +5,14 @@ from typing import TYPE_CHECKING, Any, Callable, Self, overload
 
 import dateparser  # type: ignore
 
-import clearskies.decorators
-import clearskies.typing
-from clearskies import configs
+from clearskies import configs, decorators
 from clearskies.autodoc.schema import Datetime as AutoDocDatetime
-from clearskies.autodoc.schema import Schema as AutoDocSchema
 from clearskies.column import Column
-from clearskies.query import Condition
 
 if TYPE_CHECKING:
-    from clearskies import Model
+    from clearskies import Model, typing
+    from clearskies.autodoc.schema import Schema as AutoDocSchema
+    from clearskies.query import Condition
 
 
 class Datetime(Column):
@@ -127,7 +125,7 @@ class Datetime(Column):
     auto_doc_class: type[AutoDocSchema] = AutoDocDatetime
     _descriptor_config_map = None
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         date_format: str = "%Y-%m-%d %H:%M:%S",
@@ -140,10 +138,10 @@ class Datetime(Column):
         is_writeable: bool = True,
         is_searchable: bool = True,
         is_temporary: bool = False,
-        validators: clearskies.typing.validator | list[clearskies.typing.validator] = [],
-        on_change_pre_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_post_save: clearskies.typing.action | list[clearskies.typing.action] = [],
-        on_change_save_finished: clearskies.typing.action | list[clearskies.typing.action] = [],
+        validators: typing.validator | list[typing.validator] = [],
+        on_change_pre_save: typing.action | list[typing.action] = [],
+        on_change_post_save: typing.action | list[typing.action] = [],
+        on_change_save_finished: typing.action | list[typing.action] = [],
         created_by_source_type: str = "",
         created_by_source_key: str = "",
         created_by_source_strict: bool = True,
@@ -184,7 +182,7 @@ class Datetime(Column):
             self.name: value.strftime(self.date_format),
         }
 
-    def to_json(self, model: clearskies.model.Model) -> dict[str, Any]:
+    def to_json(self, model: Model) -> dict[str, Any]:
         """Grabs the column out of the model and converts it into a representation that can be turned into JSON."""
         value = self.__get__(model, model.__class__)
         if value and (isinstance(value, datetime.datetime) or isinstance(value, datetime.date)):
@@ -242,13 +240,13 @@ class Datetime(Column):
             return "date is missing timezone information"
         return ""
 
-    def values_match(self, value_1, value_2):
+    def values_match(self, value_1: None | str | datetime.datetime, value_2: None | str | datetime.datetime) -> bool:
         """Compare two values to see if they are the same."""
         # in this function we deal with data directly out of the backend, so our date is likely
         # to be string-ified and we want to look for default (e.g. null) values in string form.
-        if type(value_1) == str and ("0000-00-00" in value_1 or value_1 == self.backend_default):
+        if isinstance(value_1, str) and ("0000-00-00" in value_1 or value_1 == self.backend_default):
             value_1 = None
-        if type(value_2) == str and ("0000-00-00" in value_2 or value_2 == self.backend_default):
+        if isinstance(value_2, str) and ("0000-00-00" in value_2 or value_2 == self.backend_default):
             value_2 = None
         number_values = 0
         if value_1:
@@ -260,11 +258,15 @@ class Datetime(Column):
         if number_values == 1:
             return False
 
-        if type(value_1) == str:
+        if isinstance(value_1, str):
             value_1 = dateparser.parse(value_1)
-        if type(value_2) == str:
+        if isinstance(value_2, str):
             value_2 = dateparser.parse(value_2)
 
+        # If neither value is a datetime, we can't compare them so they don't match.
+        if not isinstance(value_1, datetime.datetime) or not isinstance(value_2, datetime.datetime):
+            return False
+
         # we need to make sure we're comparing in the same timezones.  For our purposes, a difference in timezone
         # is fine as long as they represent the same time (e.g. 16:00EST == 20:00UTC).  For python, same time in different
         # timezones is treated as different datetime objects.

clearskies/columns/email.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re
 
 from clearskies.columns.string import String
@@ -65,7 +67,7 @@ class Email(String):
     """
 
     def input_error_for_value(self, value: str, operator: str | None = None) -> str:
-        if type(value) != str:
+        if not isinstance(value, str):
             return f"Value must be a string for {self.name}"
         if operator and operator.lower() == "like":
             # don't check for an email if doing a fuzzy search, since we may be searching