strawberry-graphql 0.283.0__py3-none-any.whl → 0.284.3__py3-none-any.whl

strawberry/dataloader.py

@@ -8,11 +8,8 @@ from dataclasses import dataclass
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Generic,
-    Optional,
     TypeVar,
-    Union,
     overload,
 )
 
@@ -20,7 +17,14 @@ from .exceptions import WrongNumberOfResultsReturned
 
 if TYPE_CHECKING:
     from asyncio.events import AbstractEventLoop
-    from collections.abc import Awaitable, Hashable, Iterable, Mapping, Sequence
+    from collections.abc import (
+        Awaitable,
+        Callable,
+        Hashable,
+        Iterable,
+        Mapping,
+        Sequence,
+    )
 
 
 T = TypeVar("T")
@@ -46,9 +50,9 @@ class Batch(Generic[K, T]):
         return len(self.tasks)
 
 
-class AbstractCache(Generic[K, T], ABC):
+class AbstractCache(ABC, Generic[K, T]):
     @abstractmethod
-    def get(self, key: K) -> Union[Future[T], None]:
+    def get(self, key: K) -> Future[T] | None:
         pass
 
     @abstractmethod
@@ -65,13 +69,13 @@ class AbstractCache(Generic[K, T], ABC):
 
 
 class DefaultCache(AbstractCache[K, T]):
-    def __init__(self, cache_key_fn: Optional[Callable[[K], Hashable]] = None) -> None:
+    def __init__(self, cache_key_fn: Callable[[K], Hashable] | None = None) -> None:
         self.cache_key_fn: Callable[[K], Hashable] = (
             cache_key_fn if cache_key_fn is not None else lambda x: x
         )
         self.cache_map: dict[Hashable, Future[T]] = {}
 
-    def get(self, key: K) -> Union[Future[T], None]:
+    def get(self, key: K) -> Future[T] | None:
         return self.cache_map.get(self.cache_key_fn(key))
 
     def set(self, key: K, value: Future[T]) -> None:
@@ -85,7 +89,7 @@ class DefaultCache(AbstractCache[K, T]):
 
 
 class DataLoader(Generic[K, T]):
-    batch: Optional[Batch[K, T]] = None
+    batch: Batch[K, T] | None = None
     cache: bool = False
     cache_map: AbstractCache[K, T]
 
@@ -93,12 +97,12 @@ class DataLoader(Generic[K, T]):
     def __init__(
         self,
         # any BaseException is rethrown in 'load', so should be excluded from the T type
-        load_fn: Callable[[list[K]], Awaitable[Sequence[Union[T, BaseException]]]],
-        max_batch_size: Optional[int] = None,
+        load_fn: Callable[[list[K]], Awaitable[Sequence[T | BaseException]]],
+        max_batch_size: int | None = None,
         cache: bool = True,
-        loop: Optional[AbstractEventLoop] = None,
-        cache_map: Optional[AbstractCache[K, T]] = None,
-        cache_key_fn: Optional[Callable[[K], Hashable]] = None,
+        loop: AbstractEventLoop | None = None,
+        cache_map: AbstractCache[K, T] | None = None,
+        cache_key_fn: Callable[[K], Hashable] | None = None,
     ) -> None: ...
 
     # fallback if load_fn is untyped and there's no other info for inference
@@ -106,21 +110,21 @@ class DataLoader(Generic[K, T]):
     def __init__(
         self: DataLoader[K, Any],
         load_fn: Callable[[list[K]], Awaitable[list[Any]]],
-        max_batch_size: Optional[int] = None,
+        max_batch_size: int | None = None,
         cache: bool = True,
-        loop: Optional[AbstractEventLoop] = None,
-        cache_map: Optional[AbstractCache[K, T]] = None,
-        cache_key_fn: Optional[Callable[[K], Hashable]] = None,
+        loop: AbstractEventLoop | None = None,
+        cache_map: AbstractCache[K, T] | None = None,
+        cache_key_fn: Callable[[K], Hashable] | None = None,
     ) -> None: ...
 
     def __init__(
         self,
-        load_fn: Callable[[list[K]], Awaitable[Sequence[Union[T, BaseException]]]],
-        max_batch_size: Optional[int] = None,
+        load_fn: Callable[[list[K]], Awaitable[Sequence[T | BaseException]]],
+        max_batch_size: int | None = None,
         cache: bool = True,
-        loop: Optional[AbstractEventLoop] = None,
-        cache_map: Optional[AbstractCache[K, T]] = None,
-        cache_key_fn: Optional[Callable[[K], Hashable]] = None,
+        loop: AbstractEventLoop | None = None,
+        cache_map: AbstractCache[K, T] | None = None,
+        cache_key_fn: Callable[[K], Hashable] | None = None,
     ):
         self.load_fn = load_fn
         self.max_batch_size = max_batch_size
@@ -244,7 +248,7 @@ async def dispatch_batch(loader: DataLoader, batch: Batch) -> None:
                 expected=len(batch), received=len(values)
             )
 
-        for task, value in zip(batch.tasks, values):
+        for task, value in zip(batch.tasks, values, strict=True):
             # Trying to set_result in a cancelled future would raise
             # asyncio.exceptions.InvalidStateError
             if task.future.cancelled():

strawberry/directive.py

@@ -6,9 +6,7 @@ from typing import (
     TYPE_CHECKING,
     Annotated,
     Any,
-    Callable,
     Generic,
-    Optional,
     TypeVar,
 )
 
@@ -24,6 +22,7 @@ from strawberry.types.unset import UNSET
 
 if TYPE_CHECKING:
     import inspect
+    from collections.abc import Callable
 
     from strawberry.types.arguments import StrawberryArgument
 
@@ -82,17 +81,17 @@ class StrawberryDirectiveResolver(StrawberryResolver[T]):
     )
 
     @cached_property
-    def value_parameter(self) -> Optional[inspect.Parameter]:
+    def value_parameter(self) -> inspect.Parameter | None:
         return self.reserved_parameters.get(VALUE_PARAMSPEC)
 
 
 @dataclasses.dataclass
 class StrawberryDirective(Generic[T]):
     python_name: str
-    graphql_name: Optional[str]
+    graphql_name: str | None
     resolver: StrawberryDirectiveResolver[T]
     locations: list[DirectiveLocation]
-    description: Optional[str] = None
+    description: str | None = None
 
     @cached_property
     def arguments(self) -> list[StrawberryArgument]:
@@ -102,8 +101,8 @@ class StrawberryDirective(Generic[T]):
 def directive(
     *,
     locations: list[DirectiveLocation],
-    description: Optional[str] = None,
-    name: Optional[str] = None,
+    description: str | None = None,
+    name: str | None = None,
 ) -> Callable[[Callable[..., T]], StrawberryDirective[T]]:
     """Decorator to create a GraphQL operation directive.
 

strawberry/django/test/client.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from strawberry.test import BaseGraphQLTestClient
 
@@ -7,8 +7,8 @@ class GraphQLTestClient(BaseGraphQLTestClient):
     def request(
         self,
         body: dict[str, object],
-        headers: Optional[dict[str, object]] = None,
-        files: Optional[dict[str, object]] = None,
+        headers: dict[str, object] | None = None,
+        files: dict[str, object] | None = None,
     ) -> Any:
         if files:
             return self._client.post(

strawberry/django/views.py

@@ -5,11 +5,8 @@ import warnings
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Optional,
-    Union,
+    TypeGuard,
 )
-from typing_extensions import TypeGuard
 
 from asgiref.sync import markcoroutinefunction
 from django.core.serializers.json import DjangoJSONEncoder
@@ -37,7 +34,7 @@ from strawberry.http.typevars import (
 from .context import StrawberryDjangoContext
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncIterator
+    from collections.abc import AsyncIterator, Callable
 
     from django.template.response import TemplateResponse
 
@@ -48,7 +45,7 @@ if TYPE_CHECKING:
 
 # TODO: remove this and unify temporal responses
 class TemporalHttpResponse(JsonResponse):
-    status_code: Optional[int] = None  # pyright: ignore
+    status_code: int | None = None  # pyright: ignore
 
     def __init__(self) -> None:
         super().__init__({})
@@ -71,8 +68,8 @@ class BaseView:
     def __init__(
         self,
         schema: BaseSchema,
-        graphiql: Optional[str] = None,
-        graphql_ide: Optional[GraphQL_IDE] = "graphiql",
+        graphiql: str | None = None,
+        graphql_ide: GraphQL_IDE | None = "graphiql",
         allow_queries_via_get: bool = True,
         multipart_uploads_enabled: bool = False,
         **kwargs: Any,
@@ -95,7 +92,7 @@ class BaseView:
 
     def create_response(
         self,
-        response_data: Union[GraphQLHTTPResponse, list[GraphQLHTTPResponse]],
+        response_data: GraphQLHTTPResponse | list[GraphQLHTTPResponse],
         sub_response: HttpResponse,
     ) -> HttpResponseBase:
         data = self.encode_json(response_data)
@@ -143,13 +140,13 @@ class GraphQLView(
     ],
     View,
 ):
-    graphiql: Optional[bool] = None
-    graphql_ide: Optional[GraphQL_IDE] = "graphiql"
+    graphiql: bool | None = None
+    graphql_ide: GraphQL_IDE | None = "graphiql"
     allow_queries_via_get = True
     schema: BaseSchema = None  # type: ignore
     request_adapter_class = DjangoHTTPRequestAdapter
 
-    def get_root_value(self, request: HttpRequest) -> Optional[RootValue]:
+    def get_root_value(self, request: HttpRequest) -> RootValue | None:
         return None
 
     def get_context(self, request: HttpRequest, response: HttpResponse) -> Context:
@@ -160,7 +157,7 @@ class GraphQLView(
 
     def dispatch(
         self, request: HttpRequest, *args: Any, **kwargs: Any
-    ) -> Union[HttpResponseNotAllowed, TemplateResponse, HttpResponseBase]:
+    ) -> HttpResponseNotAllowed | TemplateResponse | HttpResponseBase:
         try:
             return self.run(request=request)
         except HTTPException as e:
@@ -191,8 +188,8 @@ class AsyncGraphQLView(
     ],
     View,
 ):
-    graphiql: Optional[bool] = None
-    graphql_ide: Optional[GraphQL_IDE] = "graphiql"
+    graphiql: bool | None = None
+    graphql_ide: GraphQL_IDE | None = "graphiql"
     allow_queries_via_get = True
     schema: BaseSchema = None  # type: ignore
     request_adapter_class = AsyncDjangoHTTPRequestAdapter
@@ -207,7 +204,7 @@ class AsyncGraphQLView(
 
         return view
 
-    async def get_root_value(self, request: HttpRequest) -> Optional[RootValue]:
+    async def get_root_value(self, request: HttpRequest) -> RootValue | None:
         return None
 
     async def get_context(
@@ -220,7 +217,7 @@ class AsyncGraphQLView(
 
     async def dispatch(  # pyright: ignore
         self, request: HttpRequest, *args: Any, **kwargs: Any
-    ) -> Union[HttpResponseNotAllowed, TemplateResponse, HttpResponseBase]:
+    ) -> HttpResponseNotAllowed | TemplateResponse | HttpResponseBase:
         try:
             return await self.run(request=request)
         except HTTPException as e:
@@ -240,11 +237,11 @@ class AsyncGraphQLView(
     def is_websocket_request(self, request: HttpRequest) -> TypeGuard[HttpRequest]:
         return False
 
-    async def pick_websocket_subprotocol(self, request: HttpRequest) -> Optional[str]:
+    async def pick_websocket_subprotocol(self, request: HttpRequest) -> str | None:
         raise NotImplementedError
 
     async def create_websocket_response(
-        self, request: HttpRequest, subprotocol: Optional[str]
+        self, request: HttpRequest, subprotocol: str | None
     ) -> TemporalHttpResponse:
         raise NotImplementedError
 

strawberry/exceptions/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from graphql import GraphQLError
 
@@ -72,20 +72,20 @@ class InvalidTypeInputForUnion(Exception):
 class MissingTypesForGenericError(Exception):
     """Raised when a generic types was used without passing any type."""
 
-    def __init__(self, annotation: Union[StrawberryType, type]) -> None:
+    def __init__(self, annotation: StrawberryType | type) -> None:
         message = f'The type "{annotation!r}" is generic, but no type has been passed'
 
         super().__init__(message)
 
 
 class UnsupportedTypeError(StrawberryException):
-    def __init__(self, annotation: Union[StrawberryType, type]) -> None:
+    def __init__(self, annotation: StrawberryType | type) -> None:
         message = f"{annotation} conversion is not supported"
 
         super().__init__(message)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         return None
 
 

strawberry/exceptions/conflicting_arguments.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -43,7 +43,7 @@ class ConflictingArgumentsError(StrawberryException):
         )
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         if self.function is None:
             return None  # pragma: no cover
 

strawberry/exceptions/duplicated_type_name.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -17,8 +17,8 @@ class DuplicatedTypeName(StrawberryException):
 
     def __init__(
         self,
-        first_cls: Optional[type],
-        second_cls: Optional[type],
+        first_cls: type | None,
+        second_cls: type | None,
         duplicated_type_name: str,
     ) -> None:
         self.first_cls = first_cls
@@ -66,7 +66,7 @@ class DuplicatedTypeName(StrawberryException):
         )
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         if self.first_cls is None:
             return None  # pragma: no cover
 

strawberry/exceptions/exception.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from strawberry.utils.str_converters import to_kebab_case
 
@@ -40,7 +40,7 @@ class StrawberryException(Exception, ABC):
 
     @cached_property
     @abstractmethod
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         return None
 
     @property
@@ -61,7 +61,7 @@ class StrawberryException(Exception, ABC):
             f"[link={self.documentation_url}]{self.documentation_url}"
         ).strip()
 
-    def __rich__(self) -> Optional[RenderableType]:
+    def __rich__(self) -> RenderableType | None:
         from rich.box import SIMPLE
         from rich.console import Group
         from rich.panel import Panel

strawberry/exceptions/handler.py

@@ -1,8 +1,9 @@
 import os
 import sys
 import threading
+from collections.abc import Callable
 from types import TracebackType
-from typing import Any, Callable, Optional, cast
+from typing import Any, cast
 
 from .exception import StrawberryException, UnableToFindExceptionSource
 
@@ -10,7 +11,7 @@ original_threading_exception_hook = threading.excepthook
 
 
 ExceptionHandler = Callable[
-    [type[BaseException], BaseException, Optional[TracebackType]], None
+    [type[BaseException], BaseException, TracebackType | None], None
 ]
 
 
@@ -31,7 +32,7 @@ def _get_handler(exception_type: type[BaseException]) -> ExceptionHandler:
             def _handler(
                 exception_type: type[BaseException],
                 exception: BaseException,
-                traceback: Optional[TracebackType],
+                traceback: TracebackType | None,
             ) -> None:
                 try:
                     rich.print(exception)
@@ -49,7 +50,7 @@ def _get_handler(exception_type: type[BaseException]) -> ExceptionHandler:
 def strawberry_exception_handler(
     exception_type: type[BaseException],
     exception: BaseException,
-    traceback: Optional[TracebackType],
+    traceback: TracebackType | None,
 ) -> None:
     _get_handler(exception_type)(exception_type, exception, traceback)
 
@@ -57,9 +58,9 @@ def strawberry_exception_handler(
 def strawberry_threading_exception_handler(
     args: tuple[
         type[BaseException],
-        Optional[BaseException],
-        Optional[TracebackType],
-        Optional[threading.Thread],
+        BaseException | None,
+        TracebackType | None,
+        threading.Thread | None,
     ],
 ) -> None:
     (exception_type, exception, traceback, _) = args

strawberry/exceptions/invalid_argument_type.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from strawberry.types.base import get_object_definition
 
@@ -55,7 +55,7 @@ class InvalidArgumentTypeError(StrawberryException):
         )
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         if self.function is None:
             return None  # pragma: no cover
 

strawberry/exceptions/invalid_superclass_interface.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -36,6 +36,6 @@ class InvalidSuperclassInterfaceError(StrawberryException):
         super().__init__(self.message)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         source_finder = SourceFinder()
         return source_finder.find_class_from_object(self.cls)

strawberry/exceptions/invalid_union_type.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from functools import cached_property
 from inspect import getframeinfo, stack
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from strawberry.exceptions.utils.source_finder import SourceFinder
 
@@ -24,7 +24,7 @@ class InvalidUnionTypeError(StrawberryException):
         self,
         union_name: str,
         invalid_type: object,
-        union_definition: Optional[StrawberryUnion] = None,
+        union_definition: StrawberryUnion | None = None,
     ) -> None:
         from strawberry.types.base import StrawberryList
         from strawberry.types.scalar import ScalarWrapper
@@ -58,7 +58,7 @@ class InvalidUnionTypeError(StrawberryException):
         self.annotation_message = "invalid type here"
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         source_finder = SourceFinder()
 
         if self.union_definition:
@@ -100,7 +100,7 @@ class InvalidTypeForUnionMergeError(StrawberryException):
         self.annotation_message = "invalid type here"
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         source_finder = SourceFinder()
 
         return source_finder.find_union_merge(self.union, self.other, frame=self.frame)

strawberry/exceptions/missing_arguments_annotations.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -52,7 +52,7 @@ class MissingArgumentsAnnotationsError(StrawberryException):
         return f'arguments "{head}" and "{arguments[-1]}"'
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         if self.function is None:
             return None  # pragma: no cover
 

strawberry/exceptions/missing_dependencies.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 
 class MissingOptionalDependenciesError(Exception):
     """Some optional dependencies that are required for a particular task are missing."""
@@ -9,8 +7,8 @@ class MissingOptionalDependenciesError(Exception):
     def __init__(
         self,
         *,
-        packages: Optional[list[str]] = None,
-        extras: Optional[list[str]] = None,
+        packages: list[str] | None = None,
+        extras: list[str] | None = None,
     ) -> None:
         """Initialize the error.
 

strawberry/exceptions/missing_field_annotation.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -32,7 +32,7 @@ class MissingFieldAnnotationError(StrawberryException):
         super().__init__(self.message)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         if self.cls is None:
             return None  # pragma: no cover
 

strawberry/exceptions/missing_return_annotation.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -37,7 +37,7 @@ class MissingReturnAnnotationError(StrawberryException):
         self.annotation_message = "resolver missing annotation"
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         if self.function is None:
             return None  # pragma: no cover
 

strawberry/exceptions/object_is_not_a_class.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from enum import Enum
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -56,7 +56,7 @@ class ObjectIsNotClassError(StrawberryException):
         return cls(obj, cls.MethodType.TYPE)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         if self.function is None:
             return None  # pragma: no cover
 

strawberry/exceptions/object_is_not_an_enum.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -31,7 +31,7 @@ class ObjectIsNotAnEnumError(StrawberryException):
         super().__init__(self.message)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         if self.cls is None:
             return None  # pragma: no cover
 

strawberry/exceptions/permission_fail_silently_requires_optional.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -32,7 +32,7 @@ class PermissionFailSilentlyRequiresOptionalError(StrawberryException):
         super().__init__(self.message)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         origin = self.field.origin
         source_finder = SourceFinder()