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

strawberry/printer/printer.py

@@ -5,10 +5,7 @@ from itertools import chain
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Optional,
     TypeVar,
-    Union,
     cast,
     overload,
 )
@@ -46,6 +43,8 @@ from strawberry.types.unset import UNSET
 from .ast_from_value import ast_from_value
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from graphql import (
         GraphQLArgument,
         GraphQLEnumType,
@@ -78,7 +77,7 @@ def _serialize_dataclasses(
 
 @overload
 def _serialize_dataclasses(
-    value: Union[list[object], tuple[object]],
+    value: list[object] | tuple[object],
     *,
     name_converter: Callable[[str], str] | None = None,
 ) -> list[object]: ...
@@ -190,7 +189,7 @@ def print_schema_directive(
 
 
 def print_field_directives(
-    field: Optional[StrawberryField], schema: BaseSchema, *, extras: PrintExtras
+    field: StrawberryField | None, schema: BaseSchema, *, extras: PrintExtras
 ) -> str:
     if not field:
         return ""
@@ -363,7 +362,7 @@ def print_extends(type_: GraphQLObjectType, schema: BaseSchema) -> str:
     from strawberry.schema.schema_converter import GraphQLCoreConverter
 
     strawberry_type = cast(
-        "Optional[StrawberryObjectDefinition]",
+        "StrawberryObjectDefinition | None",
         type_.extensions
         and type_.extensions.get(GraphQLCoreConverter.DEFINITION_BACKREF),
     )
@@ -380,7 +379,7 @@ def print_type_directives(
     from strawberry.schema.schema_converter import GraphQLCoreConverter
 
     strawberry_type = cast(
-        "Optional[StrawberryObjectDefinition]",
+        "StrawberryObjectDefinition | None",
         type_.extensions
         and type_.extensions.get(GraphQLCoreConverter.DEFINITION_BACKREF),
     )
@@ -534,9 +533,7 @@ def _all_root_names_are_common_names(schema: BaseSchema) -> bool:
     )
 
 
-def print_schema_definition(
-    schema: BaseSchema, *, extras: PrintExtras
-) -> Optional[str]:
+def print_schema_definition(schema: BaseSchema, *, extras: PrintExtras) -> str | None:
     # TODO: add support for description
 
     if _all_root_names_are_common_names(schema) and not schema.schema_directives:
@@ -558,12 +555,10 @@ def print_schema_definition(
     return f"schema{directives} {{\n" + "\n".join(operation_types) + "\n}"
 
 
-def print_directive(
-    directive: GraphQLDirective, *, schema: BaseSchema
-) -> Optional[str]:
-    strawberry_directive = directive.extensions["strawberry-definition"]
+def print_directive(directive: GraphQLDirective, *, schema: BaseSchema) -> str | None:
+    strawberry_directive = directive.extensions.get("strawberry-definition")
 
-    if (
+    if strawberry_directive is None or (
         isinstance(strawberry_directive, StrawberrySchemaDirective)
         and not strawberry_directive.print_definition
     ):
@@ -621,6 +616,14 @@ def print_schema(schema: BaseSchema) -> str:
         if (printed_directive := print_directive(directive, schema=schema)) is not None
     ]
 
+    if schema.config.enable_experimental_incremental_execution:
+        directives.append(
+            "directive @defer(if: Boolean, label: String) on FRAGMENT_SPREAD | INLINE_FRAGMENT"
+        )
+        directives.append(
+            "directive @stream(if: Boolean, label: String, initialCount: Int = 0) on FIELD"
+        )
+
     def _name_getter(type_: Any) -> str:
         if hasattr(type_, "name"):
             return type_.name

strawberry/quart/views.py

@@ -1,65 +1,35 @@
 import asyncio
 import warnings
-from collections.abc import AsyncGenerator, Mapping, Sequence
+from collections.abc import AsyncGenerator, Callable, Mapping, Sequence
 from datetime import timedelta
 from json.decoder import JSONDecodeError
-from typing import TYPE_CHECKING, Callable, ClassVar, Optional, Union, cast
-from typing_extensions import TypeGuard
+from typing import TYPE_CHECKING, ClassVar, TypeGuard, Union
 
+from lia import HTTPException, QuartHTTPRequestAdapter
 from quart import Request, Response, Websocket, request, websocket
 from quart.ctx import has_websocket_context
 from quart.views import View
+
 from strawberry.http.async_base_view import (
     AsyncBaseHTTPView,
-    AsyncHTTPRequestAdapter,
     AsyncWebSocketAdapter,
 )
 from strawberry.http.exceptions import (
-    HTTPException,
     NonJsonMessageReceived,
     NonTextMessageReceived,
     WebSocketDisconnected,
 )
 from strawberry.http.ides import GraphQL_IDE
-from strawberry.http.types import FormData, HTTPMethod, QueryParams
 from strawberry.http.typevars import Context, RootValue
 from strawberry.subscriptions import GRAPHQL_TRANSPORT_WS_PROTOCOL, GRAPHQL_WS_PROTOCOL
 
 if TYPE_CHECKING:
     from quart.typing import ResponseReturnValue
+
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.schema.base import BaseSchema
 
 
-class QuartHTTPRequestAdapter(AsyncHTTPRequestAdapter):
-    def __init__(self, request: Request) -> None:
-        self.request = request
-
-    @property
-    def query_params(self) -> QueryParams:
-        return self.request.args.to_dict()
-
-    @property
-    def method(self) -> HTTPMethod:
-        return cast("HTTPMethod", self.request.method.upper())
-
-    @property
-    def content_type(self) -> Optional[str]:
-        return self.request.content_type
-
-    @property
-    def headers(self) -> Mapping[str, str]:
-        return self.request.headers  # type: ignore
-
-    async def get_body(self) -> str:
-        return (await self.request.data).decode()
-
-    async def get_form_data(self) -> FormData:
-        files = await self.request.files
-        form = await self.request.form
-        return FormData(files=files, form=form)
-
-
 class QuartWebSocketAdapter(AsyncWebSocketAdapter):
     def __init__(
         self, view: AsyncBaseHTTPView, request: Websocket, response: Response
@@ -108,17 +78,16 @@ class GraphQLView(
     methods: ClassVar[list[str]] = ["GET", "POST"]
     allow_queries_via_get: bool = True
     request_adapter_class = QuartHTTPRequestAdapter
-    websocket_adapter_class = QuartWebSocketAdapter
+    websocket_adapter_class = QuartWebSocketAdapter  # type: ignore
 
     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,
         keep_alive: bool = True,
         keep_alive_interval: float = 1,
-        debug: bool = False,
         subscription_protocols: Sequence[str] = (
             GRAPHQL_TRANSPORT_WS_PROTOCOL,
             GRAPHQL_WS_PROTOCOL,
@@ -130,7 +99,6 @@ class GraphQLView(
         self.allow_queries_via_get = allow_queries_via_get
         self.keep_alive = keep_alive
         self.keep_alive_interval = keep_alive_interval
-        self.debug = debug
         self.subscription_protocols = subscription_protocols
         self.connection_init_wait_timeout = connection_init_wait_timeout
         self.multipart_uploads_enabled = multipart_uploads_enabled
@@ -149,20 +117,20 @@ class GraphQLView(
         return Response(self.graphql_ide_html)
 
     def create_response(
-        self, response_data: "GraphQLHTTPResponse", sub_response: Response
+        self,
+        response_data: Union["GraphQLHTTPResponse", list["GraphQLHTTPResponse"]],
+        sub_response: Response,
     ) -> Response:
         sub_response.set_data(self.encode_json(response_data))
 
         return sub_response
 
     async def get_context(
-        self, request: Union[Request, Websocket], response: Response
+        self, request: Request | Websocket, response: Response
     ) -> Context:
         return {"request": request, "response": response}  # type: ignore
 
-    async def get_root_value(
-        self, request: Union[Request, Websocket]
-    ) -> Optional[RootValue]:
+    async def get_root_value(self, request: Request | Websocket) -> RootValue | None:
         return None
 
     async def get_sub_response(self, request: Request) -> Response:
@@ -196,18 +164,18 @@ class GraphQLView(
         )
 
     def is_websocket_request(
-        self, request: Union[Request, Websocket]
+        self, request: Request | Websocket
     ) -> TypeGuard[Websocket]:
         return has_websocket_context()
 
-    async def pick_websocket_subprotocol(self, request: Websocket) -> Optional[str]:
+    async def pick_websocket_subprotocol(self, request: Websocket) -> str | None:
         protocols = request.requested_subprotocols
         intersection = set(protocols) & set(self.subscription_protocols)
         sorted_intersection = sorted(intersection, key=protocols.index)
         return next(iter(sorted_intersection), None)
 
     async def create_websocket_response(
-        self, request: Websocket, subprotocol: Optional[str]
+        self, request: Websocket, subprotocol: str | None
     ) -> Response:
         await request.accept(subprotocol=subprotocol)
         return Response()

strawberry/relay/exceptions.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional, cast
+from typing import TYPE_CHECKING, cast
 
 from strawberry.exceptions.exception import StrawberryException
 from strawberry.exceptions.utils.source_finder import SourceFinder
@@ -32,7 +32,7 @@ class NodeIDAnnotationError(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
 
@@ -63,7 +63,7 @@ class RelayWrongAnnotationError(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
 
@@ -97,7 +97,7 @@ class RelayWrongResolverAnnotationError(StrawberryException):
         super().__init__(self.message)
 
     @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/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.
@@ -762,16 +759,16 @@ class ListConnection(Connection[NodeType]):
     )
 
     @classmethod
-    def resolve_connection(  # noqa: PLR0915
+    def resolve_connection(
         cls,
         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
                 ],