Extend use of simplified optionals

Author: kkirsche

src/mui/v5/integrations/sqlalchemy/structures/query.py

@@ -198,7 +198,7 @@ def pages(self, total: Optional[int] = None) -> int:
         """
         if not total:
             total = self.total()
-        return int(ceil(total / float(self.per_page)))
+        return ceil(total / float(self.per_page))
 
     @property
     def page(self) -> int:

src/mui/v6/integrations/sqlalchemy/filter/applicators/after.py

@@ -1,14 +1,16 @@
 """The is after applicator applies the is after operator to the data."""
 
+from __future__ import annotations
+
 from datetime import datetime
 from operator import gt
-from typing import Any, Optional
+from typing import Any
 from zoneinfo import ZoneInfo
 
 from mui.v6.integrations.sqlalchemy.utils import apply_timezone_to_datetime
 
 
-def apply_after_operator(column: Any, value: Any, timezone: Optional[ZoneInfo]) -> Any:
+def apply_after_operator(column: Any, value: Any, timezone: ZoneInfo | None) -> Any:
     """Handles applying the after x-data-grid operator to a column.
 
     Args:

src/mui/v6/integrations/sqlalchemy/filter/applicators/before.py

@@ -1,14 +1,16 @@
 """The is before applicator applies the is before operator to the data."""
 
+from __future__ import annotations
+
 from datetime import datetime
 from operator import lt
-from typing import Any, Optional
+from typing import Any
 from zoneinfo import ZoneInfo
 
 from mui.v6.integrations.sqlalchemy.utils import apply_timezone_to_datetime
 
 
-def apply_before_operator(column: Any, value: Any, timezone: Optional[ZoneInfo]) -> Any:
+def apply_before_operator(column: Any, value: Any, timezone: ZoneInfo | None) -> Any:
     """Handles applying the before x-data-grid operator to a column.
 
     Args:

src/mui/v6/integrations/sqlalchemy/filter/applicators/does_not_contain.py

@@ -7,6 +7,7 @@
 
 from sqlalchemy import not_
 
+
 def apply_does_not_contain_operator(column: Any, value: Any) -> Any:
     """Handles applying the doesNotContain x-data-grid operator to a column.
 
@@ -23,4 +24,4 @@ def apply_does_not_contain_operator(column: Any, value: Any) -> Any:
     # only '=', '!=', 'is_()', 'is_not()', 'is_distinct_from()',
     # 'is_not_distinct_from()' operators can be used with None/True/False
     # so below have to special case them.
-    return not_(column.contains(value if value is not None else ""))
+    return not_(column.contains(value if value is not None else ""))

src/mui/v6/integrations/sqlalchemy/filter/applicators/is_.py

@@ -3,9 +3,11 @@
 Meant as an equality check.
 """
 
+from __future__ import annotations
+
 from datetime import date, datetime, time
 from operator import eq
-from typing import Any, Optional
+from typing import Any
 from zoneinfo import ZoneInfo
 
 from mui.v6.integrations.sqlalchemy.utils import (
@@ -14,7 +16,7 @@
 )
 
 
-def apply_is_operator(column: Any, value: Any, timezone: Optional[ZoneInfo]) -> Any:
+def apply_is_operator(column: Any, value: Any, timezone: ZoneInfo | None) -> Any:
     """Handles applying the is x-data-grid operator to a column.
 
     The is operator requires special handling when differentiating between data

src/mui/v6/integrations/sqlalchemy/filter/applicators/not_.py

@@ -1,8 +1,10 @@
 """The is not applicator applies the is not operator to the data."""
 
+from __future__ import annotations
+
 from datetime import date, datetime, time
 from operator import ne
-from typing import Any, Optional
+from typing import Any
 from zoneinfo import ZoneInfo
 
 from mui.v6.integrations.sqlalchemy.utils import (
@@ -11,7 +13,7 @@
 )
 
 
-def apply_not_operator(column: Any, value: Any, timezone: Optional[ZoneInfo]) -> Any:
+def apply_not_operator(column: Any, value: Any, timezone: ZoneInfo | None) -> Any:
     """Handles applying the not x-data-grid operator to a column.
 
     The not operator exists on enum selections as well as datetimes. Care

src/mui/v6/integrations/sqlalchemy/filter/applicators/on_or_after.py

@@ -1,15 +1,17 @@
 """The is on or after applicator applies the is on or after operator to the data."""
 
+from __future__ import annotations
+
 from datetime import datetime
 from operator import ge
-from typing import Any, Optional
+from typing import Any
 from zoneinfo import ZoneInfo
 
 from mui.v6.integrations.sqlalchemy.utils import apply_timezone_to_datetime
 
 
 def apply_on_or_after_operator(
-    column: Any, value: Any, timezone: Optional[ZoneInfo]
+    column: Any, value: Any, timezone: ZoneInfo | None
 ) -> Any:
     """Handles applying the on or after x-data-grid operator to a column.
 

src/mui/v6/integrations/sqlalchemy/filter/applicators/on_or_before.py

@@ -1,15 +1,17 @@
 """The is before applicator applies the is before operator to the data."""
 
+from __future__ import annotations
+
 from datetime import datetime
 from operator import le
-from typing import Any, Optional
+from typing import Any
 from zoneinfo import ZoneInfo
 
 from mui.v6.integrations.sqlalchemy.utils import apply_timezone_to_datetime
 
 
 def apply_on_or_before_operator(
-    column: Any, value: Any, timezone: Optional[ZoneInfo]
+    column: Any, value: Any, timezone: ZoneInfo | None
 ) -> Any:
     """Handles applying the on or before x-data-grid operator to a column.
 

src/mui/v6/integrations/sqlalchemy/filter/apply_items.py

@@ -1,6 +1,8 @@
 """The apply_model module is responsible for applying a GridSortModel to a query."""
 
-from typing import Any, Callable, Optional, TypeVar
+from __future__ import annotations
+
+from typing import Any, Callable, TypeVar
 from zoneinfo import ZoneInfo
 
 from sqlalchemy import and_, or_
@@ -56,7 +58,7 @@ def _get_link_operator(
 
 
 def apply_operator_to_column(
-    item: GridFilterItem, resolver: Resolver, timezone: Optional[ZoneInfo]
+    item: GridFilterItem, resolver: Resolver, timezone: ZoneInfo | None
 ) -> Any:
     """Applies the operator value represented by the GridFilterItem to the column.
 
@@ -141,11 +143,11 @@ def apply_operator_to_column(
 
 
 def apply_filter_items_to_query_from_items(
-    query: "Query[_Q]",
+    query: Query[_Q],
     model: GridFilterModel,
     resolver: Resolver,
-    timezone: Optional[ZoneInfo],
-) -> "Query[_Q]":
+    timezone: ZoneInfo | None,
+) -> Query[_Q]:
     """Applies a grid filter model's items section to a SQLAlchemy query.
 
     Args:

src/mui/v6/integrations/sqlalchemy/structures/query.py

@@ -4,8 +4,10 @@
 total row counts.
 """
 
+from __future__ import annotations
+
 from math import ceil
-from typing import Generic, Optional, TypeVar, Union, overload
+from typing import Generic, TypeVar, overload
 from zoneinfo import ZoneInfo
 
 from sqlalchemy.orm import Query
@@ -30,22 +32,22 @@ class DataGridQuery(Generic[_T]):
         Generic (_type_): The model being retrieved by the query.
     """
 
-    _query: "Query[_T]"
+    _query: Query[_T]
     column_resovler: Resolver
-    filter_model: Optional[GridFilterModel]
-    pagination_model: Optional[GridPaginationModel]
-    query: "Query[_T]"
-    sort_model: Optional[GridSortModel]
-    timezone: Optional[ZoneInfo]
+    filter_model: GridFilterModel | None
+    pagination_model: GridPaginationModel | None
+    query: Query[_T]
+    sort_model: GridSortModel | None
+    timezone: ZoneInfo | None
 
     def __init__(  # noqa: PLR0917
         self,
-        query: "Query[_T]",
+        query: Query[_T],
         column_resolver: Resolver,
-        filter_model: Optional[GridFilterModel] = None,
-        sort_model: Optional[GridSortModel] = None,
-        pagination_model: Optional[GridPaginationModel] = None,
-        timezone: Optional[ZoneInfo] = None,
+        filter_model: GridFilterModel | None = None,
+        sort_model: GridSortModel | None = None,
+        pagination_model: GridPaginationModel | None = None,
+        timezone: ZoneInfo | None = None,
     ) -> None:
         """Initialize a new data grid query.
 
@@ -73,7 +75,7 @@ def __init__(  # noqa: PLR0917
         query = self._paginate_query(query=query)
         self.query = query
 
-    def _filter_query(self, query: "Query[_T]") -> "Query[_T]":
+    def _filter_query(self, query: Query[_T]) -> Query[_T]:
         """Applies the filter model to the query.
 
         Args:
@@ -91,7 +93,7 @@ def _filter_query(self, query: "Query[_T]") -> "Query[_T]":
             timezone=self.timezone,
         )
 
-    def _order_query(self, query: "Query[_T]") -> "Query[_T]":
+    def _order_query(self, query: Query[_T]) -> Query[_T]:
         """Applies the sort model to the query.
 
         Args:
@@ -106,7 +108,7 @@ def _order_query(self, query: "Query[_T]") -> "Query[_T]":
             query=query, model=self.sort_model, resolver=self.column_resovler
         )
 
-    def _paginate_query(self, query: "Query[_T]") -> "Query[_T]":
+    def _paginate_query(self, query: Query[_T]) -> Query[_T]:
         """Applies the pagination model to the query.
 
         Args:
@@ -168,9 +170,7 @@ def items(self, factory: Factory[_T, _R]) -> list[_R]:
             List[_R]: The list of created items.
         """
 
-    def items(
-        self, factory: Optional[Factory[_T, _R]] = None
-    ) -> Union[list[_T], list[_R]]:
+    def items(self, factory: Factory[_T, _R] | None = None) -> list[_T] | list[_R]:
         """Returns all results of the query, after all models have been applied.
 
         Args:
@@ -184,7 +184,7 @@ def items(
         items = self.query.all()
         return [factory(item) for item in items] if factory is not None else items
 
-    def pages(self, total: Optional[int] = None) -> int:
+    def pages(self, total: int | None = None) -> int:
         """Returns the number of pages to display all results.
 
         Args:
@@ -198,7 +198,7 @@ def pages(self, total: Optional[int] = None) -> int:
         """
         if not total:
             total = self.total()
-        return int(ceil(total / float(self.per_page)))
+        return ceil(total / float(self.per_page))
 
     @property
     def page(self) -> int: