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

strawberry/relay/fields.py

@@ -8,6 +8,7 @@ from collections.abc import (
     AsyncIterable,
     AsyncIterator,
     Awaitable,
+    Callable,
     Iterable,
     Iterator,
     Mapping,
@@ -17,13 +18,12 @@ from typing import (
     TYPE_CHECKING,
     Annotated,
     Any,
-    Callable,
     ForwardRef,
     Optional,
-    Union,
     cast,
+    get_args,
+    get_origin,
 )
-from typing_extensions import get_args, get_origin
 
 from strawberry.annotation import StrawberryAnnotation
 from strawberry.extensions.field_extension import (
@@ -47,7 +47,7 @@ from strawberry.utils.typing import eval_type, is_generic_alias, is_optional, is
 from .types import Connection, GlobalID, Node
 
 if TYPE_CHECKING:
-    from typing_extensions import Literal
+    from typing import Literal
 
     from strawberry.permission import BasePermission
     from strawberry.types.info import Info
@@ -81,14 +81,14 @@ class NodeExtension(FieldExtension):
 
     def get_node_resolver(
         self, field: StrawberryField
-    ) -> Callable[[Info, GlobalID], Union[Node, None, Awaitable[Union[Node, None]]]]:
+    ) -> Callable[[Info, GlobalID], Node | None | Awaitable[Node | None]]:
         type_ = field.type
         is_optional = isinstance(type_, StrawberryOptional)
 
         def resolver(
             info: Info,
             id: Annotated[GlobalID, argument(description="The ID of the object.")],
-        ) -> Union[Node, None, Awaitable[Union[Node, None]]]:
+        ) -> Node | None | Awaitable[Node | None]:
             node_type = id.resolve_type(info)
             resolved_node = node_type.resolve_node(
                 id.node_id,
@@ -114,7 +114,7 @@ class NodeExtension(FieldExtension):
 
     def get_node_list_resolver(
         self, field: StrawberryField
-    ) -> Callable[[Info, list[GlobalID]], Union[list[Node], Awaitable[list[Node]]]]:
+    ) -> Callable[[Info, list[GlobalID]], list[Node] | Awaitable[list[Node]]]:
         type_ = field.type
         assert isinstance(type_, StrawberryList)
         is_optional = isinstance(type_.of_type, StrawberryOptional)
@@ -124,7 +124,7 @@ class NodeExtension(FieldExtension):
             ids: Annotated[
                 list[GlobalID], argument(description="The IDs of the objects.")
             ],
-        ) -> Union[list[Node], Awaitable[list[Node]]]:
+        ) -> list[Node] | Awaitable[list[Node]]:
             nodes_map: defaultdict[type[Node], list[str]] = defaultdict(list)
             # Store the index of the node in the list of nodes of the same type
             # so that we can return them in the same order while also supporting
@@ -180,6 +180,7 @@ class NodeExtension(FieldExtension):
                                     for nodes in asyncgen_nodes.values()
                                 ),
                             ),
+                            strict=True,
                         )
                     )
 
@@ -207,7 +208,7 @@ class NodeExtension(FieldExtension):
 class ConnectionExtension(FieldExtension):
     connection_type: type[Connection[Node]]
 
-    def __init__(self, max_results: Optional[int] = None) -> None:
+    def __init__(self, max_results: int | None = None) -> None:
         self.max_results = max_results
 
     def apply(self, field: StrawberryField) -> None:
@@ -216,7 +217,7 @@ class ConnectionExtension(FieldExtension):
             StrawberryArgument(
                 python_name="before",
                 graphql_name=None,
-                type_annotation=StrawberryAnnotation(Optional[str]),
+                type_annotation=StrawberryAnnotation(Optional[str]),  # noqa: UP045
                 description=(
                     "Returns the items in the list that come before the "
                     "specified cursor."
@@ -226,7 +227,7 @@ class ConnectionExtension(FieldExtension):
             StrawberryArgument(
                 python_name="after",
                 graphql_name=None,
-                type_annotation=StrawberryAnnotation(Optional[str]),
+                type_annotation=StrawberryAnnotation(Optional[str]),  # noqa: UP045
                 description=(
                     "Returns the items in the list that come after the "
                     "specified cursor."
@@ -236,14 +237,14 @@ class ConnectionExtension(FieldExtension):
             StrawberryArgument(
                 python_name="first",
                 graphql_name=None,
-                type_annotation=StrawberryAnnotation(Optional[int]),
+                type_annotation=StrawberryAnnotation(Optional[int]),  # noqa: UP045
                 description="Returns the first n items from the list.",
                 default=None,
             ),
             StrawberryArgument(
                 python_name="last",
                 graphql_name=None,
-                type_annotation=StrawberryAnnotation(Optional[int]),
+                type_annotation=StrawberryAnnotation(Optional[int]),  # noqa: UP045
                 description=(
                     "Returns the items in the list that come after the "
                     "specified cursor."
@@ -307,10 +308,10 @@ class ConnectionExtension(FieldExtension):
         source: Any,
         info: Info,
         *,
-        before: Optional[str] = None,
-        after: Optional[str] = None,
-        first: Optional[int] = None,
-        last: Optional[int] = None,
+        before: str | None = None,
+        after: str | None = None,
+        first: int | None = None,
+        last: int | None = None,
         **kwargs: Any,
     ) -> Any:
         assert self.connection_type is not None
@@ -330,10 +331,10 @@ class ConnectionExtension(FieldExtension):
         source: Any,
         info: Info,
         *,
-        before: Optional[str] = None,
-        after: Optional[str] = None,
-        first: Optional[int] = None,
-        last: Optional[int] = None,
+        before: str | None = None,
+        after: str | None = None,
+        first: int | None = None,
+        last: int | None = None,
         **kwargs: Any,
     ) -> Any:
         assert self.connection_type is not None
@@ -379,24 +380,24 @@ ConnectionGraphQLType = Any
 
 
 def connection(
-    graphql_type: Optional[ConnectionGraphQLType] = None,
+    graphql_type: ConnectionGraphQLType | None = None,
     *,
-    resolver: Optional[_RESOLVER_TYPE[Any]] = None,
-    name: Optional[str] = None,
+    resolver: _RESOLVER_TYPE[Any] | None = None,
+    name: str | None = None,
     is_subscription: bool = False,
-    description: Optional[str] = None,
-    permission_classes: Optional[list[type[BasePermission]]] = None,
-    deprecation_reason: Optional[str] = None,
+    description: str | None = None,
+    permission_classes: list[type[BasePermission]] | None = None,
+    deprecation_reason: str | None = None,
     default: Any = dataclasses.MISSING,
-    default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
-    metadata: Optional[Mapping[Any, Any]] = None,
-    directives: Optional[Sequence[object]] = (),
+    default_factory: Callable[..., object] | object = dataclasses.MISSING,
+    metadata: Mapping[Any, Any] | None = None,
+    directives: Sequence[object] | None = (),
     extensions: list[FieldExtension] | None = None,
-    max_results: Optional[int] = None,
+    max_results: int | None = None,
     # This init parameter is used by pyright to determine whether this field
     # is added in the constructor or not. It is not used to change
     # any behaviour at the moment.
-    init: Literal[True, False, None] = None,
+    init: Literal[True, False] | None = None,
 ) -> Any:
     """Annotate a property or a method to create a relay connection field.
 

strawberry/relay/types.py

@@ -19,13 +19,16 @@ from typing import (
     ClassVar,
     ForwardRef,
     Generic,
-    Optional,
+    Literal,
+    TypeAlias,
     TypeVar,
     Union,
     cast,
+    get_args,
+    get_origin,
     overload,
 )
-from typing_extensions import Literal, Self, TypeAlias, get_args, get_origin
+from typing_extensions import Self
 
 from strawberry.relay.exceptions import NodeIDAnnotationError
 from strawberry.types.base import (
@@ -56,12 +59,9 @@ if TYPE_CHECKING:
 
 _T = TypeVar("_T")
 
-NodeIterableType: TypeAlias = Union[
-    Iterator[_T],
-    Iterable[_T],
-    AsyncIterator[_T],
-    AsyncIterable[_T],
-]
+NodeIterableType: TypeAlias = (
+    Iterator[_T] | Iterable[_T] | AsyncIterator[_T] | AsyncIterable[_T]
+)
 NodeType = TypeVar("NodeType", bound="Node")
 
 PREFIX = "arrayconnection"
@@ -110,7 +110,7 @@ class GlobalID:
         return to_base64(self.type_name, self.node_id)
 
     @classmethod
-    def from_id(cls, value: Union[str, ID]) -> Self:
+    def from_id(cls, value: str | ID) -> Self:
         """Create a new GlobalID from parsing the given value.
 
         Args:
@@ -158,7 +158,7 @@ class GlobalID:
         *,
         required: bool = ...,
         ensure_type: None = ...,
-    ) -> Optional[Node]: ...
+    ) -> Node | None: ...
 
     async def resolve_node(self, info, *, required=False, ensure_type=None) -> Any:
         """Resolve the type name and node id info to the node itself.
@@ -268,7 +268,7 @@ class GlobalID:
         *,
         required: bool = ...,
         ensure_type: None = ...,
-    ) -> Optional[Node]: ...
+    ) -> Node | None: ...
 
     def resolve_node_sync(self, info, *, required=False, ensure_type=None) -> Any:
         """Resolve the type name and node id info to the node itself.
@@ -378,7 +378,7 @@ class Node:
     ```
     """
 
-    _id_attr: ClassVar[Optional[str]] = None
+    _id_attr: ClassVar[str | None] = None
 
     @field(name="id", description="The Globally Unique ID of this object")
     @classmethod
@@ -513,7 +513,7 @@ class Node:
         info: Info,
         node_ids: Iterable[str],
         required: Literal[False] = ...,
-    ) -> AwaitableOrValue[Iterable[Optional[Self]]]: ...
+    ) -> AwaitableOrValue[Iterable[Self | None]]: ...
 
     @overload
     @classmethod
@@ -523,10 +523,7 @@ class Node:
         info: Info,
         node_ids: Iterable[str],
         required: bool,
-    ) -> Union[
-        AwaitableOrValue[Iterable[Self]],
-        AwaitableOrValue[Iterable[Optional[Self]]],
-    ]: ...
+    ) -> AwaitableOrValue[Iterable[Self]] | AwaitableOrValue[Iterable[Self | None]]: ...
 
     @classmethod
     def resolve_nodes(
@@ -577,7 +574,7 @@ class Node:
         *,
         info: Info,
         required: Literal[False] = ...,
-    ) -> AwaitableOrValue[Optional[Self]]: ...
+    ) -> AwaitableOrValue[Self | None]: ...
 
     @overload
     @classmethod
@@ -587,7 +584,7 @@ class Node:
         *,
         info: Info,
         required: bool,
-    ) -> AwaitableOrValue[Optional[Self]]: ...
+    ) -> AwaitableOrValue[Self | None]: ...
 
     @classmethod
     def resolve_node(
@@ -596,7 +593,7 @@ class Node:
         *,
         info: Info,
         required: bool = False,
-    ) -> AwaitableOrValue[Optional[Self]]:
+    ) -> AwaitableOrValue[Self | None]:
         """Resolve a node given its id.
 
         This method is a convenience method that calls `resolve_nodes` for
@@ -641,10 +638,10 @@ class PageInfo:
     has_previous_page: bool = field(
         description="When paginating backwards, are there more items?",
     )
-    start_cursor: Optional[str] = field(
+    start_cursor: str | None = field(
         description="When paginating backwards, the cursor to continue.",
     )
-    end_cursor: Optional[str] = field(
+    end_cursor: str | None = field(
         description="When paginating forwards, the cursor to continue.",
     )
 
@@ -715,11 +712,11 @@ class Connection(Generic[NodeType]):
         nodes: NodeIterableType[NodeType],
         *,
         info: Info,
-        before: Optional[str] = None,
-        after: Optional[str] = None,
-        first: Optional[int] = None,
-        last: Optional[int] = None,
-        max_results: Optional[int] = None,
+        before: str | None = None,
+        after: str | None = None,
+        first: int | None = None,
+        last: int | None = None,
+        max_results: int | None = None,
         **kwargs: Any,
     ) -> AwaitableOrValue[Self]:
         """Resolve a connection from nodes.
@@ -767,11 +764,11 @@ class ListConnection(Connection[NodeType]):
         nodes: NodeIterableType[NodeType],
         *,
         info: Info,
-        before: Optional[str] = None,
-        after: Optional[str] = None,
-        first: Optional[int] = None,
-        last: Optional[int] = None,
-        max_results: Optional[int] = None,
+        before: str | None = None,
+        after: str | None = None,
+        first: int | None = None,
+        last: int | None = None,
+        max_results: int | None = None,
         **kwargs: Any,
     ) -> AwaitableOrValue[Self]:
         """Resolve a connection from the list of nodes.
@@ -820,7 +817,7 @@ class ListConnection(Connection[NodeType]):
             async def resolver() -> Self:
                 try:
                     iterator = cast(
-                        "Union[AsyncIterator[NodeType], AsyncIterable[NodeType]]",
+                        "AsyncIterator[NodeType] | AsyncIterable[NodeType]",
                         cast("Sequence", nodes)[
                             slice_metadata.start : slice_metadata.overfetch
                         ],
@@ -886,7 +883,7 @@ class ListConnection(Connection[NodeType]):
 
         try:
             iterator = cast(
-                "Union[Iterator[NodeType], Iterable[NodeType]]",
+                "Iterator[NodeType] | Iterable[NodeType]",
                 cast("Sequence", nodes)[
                     slice_metadata.start : slice_metadata.overfetch
                 ],

strawberry/relay/utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import base64
 import dataclasses
 import sys
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any
 from typing_extensions import Self, assert_never
 
 from strawberry.types.base import StrawberryObjectDefinition
@@ -39,7 +39,7 @@ def from_base64(value: str) -> tuple[str, str]:
     return res[0], res[1]
 
 
-def to_base64(type_: Union[str, type, StrawberryObjectDefinition], node_id: Any) -> str:
+def to_base64(type_: str | type | StrawberryObjectDefinition, node_id: Any) -> str:
     """Encode the type name and node id to a base64 string.
 
     Args:

strawberry/resolvers.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 
 def is_default_resolver(func: Callable[..., Any]) -> bool:

strawberry/sanic/context.py

@@ -2,6 +2,7 @@ import warnings
 from typing_extensions import TypedDict
 
 from sanic.request import Request
+
 from strawberry.http.temporal_response import TemporalResponse
 
 

strawberry/sanic/utils.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, Union, cast
+from typing import TYPE_CHECKING, Any, cast
 
 if TYPE_CHECKING:
     from sanic.request import File, Request
@@ -21,12 +21,12 @@ def convert_request_to_files_dict(request: Request) -> dict[str, Any]:
 
     Note that the dictionary entries are lists.
     """
-    request_files = cast("Optional[dict[str, list[File]]]", request.files)
+    request_files = cast("dict[str, list[File]] | None", request.files)
 
     if not request_files:
         return {}
 
-    files_dict: dict[str, Union[File, list[File]]] = {}
+    files_dict: dict[str, File | list[File]] = {}
 
     for field_name, file_list in request_files.items():
         assert len(file_list) == 1

strawberry/sanic/views.py

@@ -5,17 +5,14 @@ import warnings
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Optional,
-    Union,
+    TypeGuard,
 )
-from typing_extensions import TypeGuard
 
 from lia import HTTPException, SanicHTTPRequestAdapter
-
 from sanic.request import Request
 from sanic.response import HTTPResponse, html
 from sanic.views import HTTPMethodView
+
 from strawberry.http.async_base_view import AsyncBaseHTTPView
 from strawberry.http.temporal_response import TemporalResponse
 from strawberry.http.typevars import (
@@ -24,7 +21,7 @@ from strawberry.http.typevars import (
 )
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncGenerator
+    from collections.abc import AsyncGenerator, Callable
 
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.http.ides import GraphQL_IDE
@@ -66,11 +63,11 @@ class GraphQLView(
     def __init__(
         self,
         schema: BaseSchema,
-        graphiql: Optional[bool] = None,
-        graphql_ide: Optional[GraphQL_IDE] = "graphiql",
+        graphiql: bool | None = None,
+        graphql_ide: GraphQL_IDE | None = "graphiql",
         allow_queries_via_get: bool = True,
-        json_encoder: Optional[type[json.JSONEncoder]] = None,
-        json_dumps_params: Optional[dict[str, Any]] = None,
+        json_encoder: type[json.JSONEncoder] | None = None,
+        json_dumps_params: dict[str, Any] | None = None,
         multipart_uploads_enabled: bool = False,
     ) -> None:
         self.schema = schema
@@ -105,7 +102,7 @@ class GraphQLView(
         else:
             self.graphql_ide = graphql_ide
 
-    async def get_root_value(self, request: Request) -> Optional[RootValue]:
+    async def get_root_value(self, request: Request) -> RootValue | None:
         return None
 
     async def get_context(
@@ -121,7 +118,7 @@ class GraphQLView(
 
     def create_response(
         self,
-        response_data: Union[GraphQLHTTPResponse, list[GraphQLHTTPResponse]],
+        response_data: GraphQLHTTPResponse | list[GraphQLHTTPResponse],
         sub_response: TemporalResponse,
     ) -> HTTPResponse:
         status_code = sub_response.status_code
@@ -180,11 +177,11 @@ class GraphQLView(
     def is_websocket_request(self, request: Request) -> TypeGuard[Request]:
         return False
 
-    async def pick_websocket_subprotocol(self, request: Request) -> Optional[str]:
+    async def pick_websocket_subprotocol(self, request: Request) -> str | None:
         raise NotImplementedError
 
     async def create_websocket_response(
-        self, request: Request, subprotocol: Optional[str]
+        self, request: Request, subprotocol: str | None
     ) -> TemporalResponse:
         raise NotImplementedError
 

strawberry/scalars.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import base64
-from typing import TYPE_CHECKING, Any, NewType, Union
+from typing import TYPE_CHECKING, Any, NewType
 
 from strawberry.types.scalar import scalar
 
@@ -59,7 +59,7 @@ Base64 = scalar(
 
 def is_scalar(
     annotation: Any,
-    scalar_registry: Mapping[object, Union[ScalarWrapper, ScalarDefinition]],
+    scalar_registry: Mapping[object, ScalarWrapper | ScalarDefinition],
 ) -> bool:
     if annotation in scalar_registry:
         return True

strawberry/schema/_graphql_core.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import TypeAlias, Union
 
 from graphql.execution import ExecutionContext as GraphQLExecutionContext
 from graphql.execution import ExecutionResult as OriginalGraphQLExecutionResult
@@ -24,9 +24,9 @@ try:
         GraphQLStreamDirective,
     )
 
-    GraphQLExecutionResult = Union[
-        OriginalGraphQLExecutionResult, InitialIncrementalExecutionResult
-    ]
+    GraphQLExecutionResult: TypeAlias = (
+        OriginalGraphQLExecutionResult | InitialIncrementalExecutionResult
+    )
 
 except ImportError:
     GraphQLIncrementalExecutionResults = type(None)
@@ -37,7 +37,7 @@ except ImportError:
 
 
 # TODO: give this a better name, maybe also a better place
-ResultType = Union[
+ResultType = Union[  # noqa: UP007
     OriginalGraphQLExecutionResult,
     GraphQLIncrementalExecutionResults,
     ExecutionResult,

strawberry/schema/base.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from abc import abstractmethod
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any
 from typing_extensions import Protocol
 
 from strawberry.utils.logging import StrawberryLogger
@@ -34,33 +34,33 @@ class BaseSchema(Protocol):
     config: StrawberryConfig
     schema_converter: GraphQLCoreConverter
     query: type[WithStrawberryObjectDefinition]
-    mutation: Optional[type[WithStrawberryObjectDefinition]]
-    subscription: Optional[type[WithStrawberryObjectDefinition]]
+    mutation: type[WithStrawberryObjectDefinition] | None
+    subscription: type[WithStrawberryObjectDefinition] | None
     schema_directives: list[object]
 
     @abstractmethod
     async def execute(
         self,
-        query: Optional[str],
-        variable_values: Optional[dict[str, Any]] = None,
-        context_value: Optional[Any] = None,
-        root_value: Optional[Any] = None,
-        operation_name: Optional[str] = None,
-        allowed_operation_types: Optional[Iterable[OperationType]] = None,
-        operation_extensions: Optional[dict[str, Any]] = None,
+        query: str | None,
+        variable_values: dict[str, Any] | None = None,
+        context_value: Any | None = None,
+        root_value: Any | None = None,
+        operation_name: str | None = None,
+        allowed_operation_types: Iterable[OperationType] | None = None,
+        operation_extensions: dict[str, Any] | None = None,
     ) -> ExecutionResult:
         raise NotImplementedError
 
     @abstractmethod
     def execute_sync(
         self,
-        query: Optional[str],
-        variable_values: Optional[dict[str, Any]] = None,
-        context_value: Optional[Any] = None,
-        root_value: Optional[Any] = None,
-        operation_name: Optional[str] = None,
-        allowed_operation_types: Optional[Iterable[OperationType]] = None,
-        operation_extensions: Optional[dict[str, Any]] = None,
+        query: str | None,
+        variable_values: dict[str, Any] | None = None,
+        context_value: Any | None = None,
+        root_value: Any | None = None,
+        operation_name: str | None = None,
+        allowed_operation_types: Iterable[OperationType] | None = None,
+        operation_extensions: dict[str, Any] | None = None,
     ) -> ExecutionResult:
         raise NotImplementedError
 
@@ -68,29 +68,28 @@ class BaseSchema(Protocol):
     async def subscribe(
         self,
         query: str,
-        variable_values: Optional[dict[str, Any]] = None,
-        context_value: Optional[Any] = None,
-        root_value: Optional[Any] = None,
-        operation_name: Optional[str] = None,
-        operation_extensions: Optional[dict[str, Any]] = None,
+        variable_values: dict[str, Any] | None = None,
+        context_value: Any | None = None,
+        root_value: Any | None = None,
+        operation_name: str | None = None,
+        operation_extensions: dict[str, Any] | None = None,
     ) -> SubscriptionResult:
         raise NotImplementedError
 
     @abstractmethod
     def get_type_by_name(
         self, name: str
-    ) -> Optional[
-        Union[
-            StrawberryObjectDefinition,
-            ScalarDefinition,
-            EnumDefinition,
-            StrawberryUnion,
-        ]
-    ]:
+    ) -> (
+        StrawberryObjectDefinition
+        | ScalarDefinition
+        | EnumDefinition
+        | StrawberryUnion
+        | None
+    ):
         raise NotImplementedError
 
     @abstractmethod
-    def get_directive_by_name(self, graphql_name: str) -> Optional[StrawberryDirective]:
+    def get_directive_by_name(self, graphql_name: str) -> StrawberryDirective | None:
         raise NotImplementedError
 
     @abstractmethod
@@ -108,7 +107,7 @@ class BaseSchema(Protocol):
     def _process_errors(
         self,
         errors: list[GraphQLError],
-        execution_context: Optional[ExecutionContext] = None,
+        execution_context: ExecutionContext | None = None,
     ) -> None:
         if self.config.disable_field_suggestions:
             for error in errors:
@@ -119,7 +118,7 @@ class BaseSchema(Protocol):
     def process_errors(
         self,
         errors: list[GraphQLError],
-        execution_context: Optional[ExecutionContext] = None,
+        execution_context: ExecutionContext | None = None,
     ) -> None:
         for error in errors:
             StrawberryLogger.error(error, execution_context)