fix: erase optional

ara/controller/pagination.py

@@ -1,12 +1,12 @@
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
 
 class PaginatedData(BaseModel):
     count: int
-    next: Optional[str]
-    previous: Optional[str]
+    next: str | None
+    previous: str | None
     results: list[Any]
 
 

ara/controller/response.py

@@ -1,5 +1,5 @@
 from http import HTTPStatus
-from typing import Any, NamedTuple, Optional
+from typing import Any, NamedTuple
 
 from pydantic import BaseModel
 
@@ -11,7 +11,7 @@ class NewAraResponse(NamedTuple):
 
 class NewAraErrorResponseBody(BaseModel):
     # necessary
-    error_code: Optional[int]
+    error_code: int | None
     error_reason: str = ""
 
     def __init__(self, exception: Exception):

ara/infra/django_infra.py

@@ -1,4 +1,4 @@
-from typing import Any, Generic, Optional, Type, TypeVar, Union
+from typing import Any, Generic, Type, TypeVar, Union
 
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db.models import Model
@@ -31,7 +31,7 @@ def get_by_id(self, id: Any, *, is_select_for_update: bool = False) -> T:
     def get_filtered_objects(
         self,
         *,
-        columns: Optional[list[str]] = None,
+        columns: list[str] | None = None,
         conditions: dict[str, Any],
         is_select_for_update: bool = False,
     ) -> list[Union[T, dict[str, Any]]]:
@@ -40,7 +40,7 @@ def get_filtered_objects(
         Should not be used for complex & specific purpose queries.
 
         Args:
-            columns (Optional[List[str]]):
+            columns (List[str] | None):
                 List of column names to fetch. Get all columns if None. Default None.
             conditions (Dict[str, Any]):
                 Dictionary of field names and their corresponding values to filter by.
@@ -93,7 +93,7 @@ def create_manual(self, **kwargs) -> T:
     def update_or_create(self, **kwargs) -> tuple[T, bool]:
         return self.model.objects.update_or_create(**kwargs)
 
-    def get_by(self, **kwargs) -> Optional[T]:
+    def get_by(self, **kwargs) -> T | None:
         """Returns repository model instance if exists.
 
         :param kwargs: keyword arguments of fields