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

strawberry/http/sync_base_view.py

@@ -1,11 +1,9 @@
 import abc
 import json
+from collections.abc import Callable
 from typing import (
-    Callable,
     Generic,
     Literal,
-    Optional,
-    Union,
 )
 
 from graphql import GraphQLError
@@ -39,8 +37,8 @@ class SyncBaseHTTPView(
     Generic[Request, Response, SubResponse, Context, RootValue],
 ):
     schema: BaseSchema
-    graphiql: Optional[bool]
-    graphql_ide: Optional[GraphQL_IDE]
+    graphiql: bool | None
+    graphql_ide: GraphQL_IDE | None
     request_adapter_class: Callable[[Request], SyncHTTPRequestAdapter]
 
     # Methods that need to be implemented by individual frameworks
@@ -56,12 +54,12 @@ class SyncBaseHTTPView(
     def get_context(self, request: Request, response: SubResponse) -> Context: ...
 
     @abc.abstractmethod
-    def get_root_value(self, request: Request) -> Optional[RootValue]: ...
+    def get_root_value(self, request: Request) -> RootValue | None: ...
 
     @abc.abstractmethod
     def create_response(
         self,
-        response_data: Union[GraphQLHTTPResponse, list[GraphQLHTTPResponse]],
+        response_data: GraphQLHTTPResponse | list[GraphQLHTTPResponse],
         sub_response: SubResponse,
     ) -> Response: ...
 
@@ -72,9 +70,9 @@ class SyncBaseHTTPView(
         self,
         request: Request,
         context: Context,
-        root_value: Optional[RootValue],
+        root_value: RootValue | None,
         sub_response: SubResponse,
-    ) -> Union[ExecutionResult, list[ExecutionResult]]:
+    ) -> ExecutionResult | list[ExecutionResult]:
         request_adapter = self.request_adapter_class(request)
 
         try:
@@ -119,7 +117,7 @@ class SyncBaseHTTPView(
         request_adapter: SyncHTTPRequestAdapter,
         sub_response: SubResponse,
         context: Context,
-        root_value: Optional[RootValue],
+        root_value: RootValue | None,
         request_data: GraphQLRequestData,
     ) -> ExecutionResult:
         allowed_operation_types = OperationType.from_http(request_adapter.method)
@@ -159,7 +157,7 @@ class SyncBaseHTTPView(
 
     def parse_http_body(
         self, request: SyncHTTPRequestAdapter
-    ) -> Union[GraphQLRequestData, list[GraphQLRequestData]]:
+    ) -> GraphQLRequestData | list[GraphQLRequestData]:
         headers = {key.lower(): value for key, value in request.headers.items()}
         content_type, params = parse_content_type(request.content_type or "")
         accept = headers.get("accept", "")
@@ -233,7 +231,7 @@ class SyncBaseHTTPView(
         self,
         request: Request,
         context: Context = UNSET,
-        root_value: Optional[RootValue] = UNSET,
+        root_value: RootValue | None = UNSET,
     ) -> Response:
         request_adapter = self.request_adapter_class(request)
 
@@ -260,7 +258,7 @@ class SyncBaseHTTPView(
             sub_response=sub_response,
         )
 
-        response_data: Union[GraphQLHTTPResponse, list[GraphQLHTTPResponse]]
+        response_data: GraphQLHTTPResponse | list[GraphQLHTTPResponse]
 
         if isinstance(result, list):
             response_data = []

strawberry/http/types.py

@@ -1,12 +1,12 @@
 from collections.abc import Mapping
-from typing import Any, Optional
-from typing_extensions import Literal, TypedDict
+from typing import Any, Literal
+from typing_extensions import TypedDict
 
 HTTPMethod = Literal[
     "GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS", "TRACE"
 ]
 
-QueryParams = Mapping[str, Optional[str]]
+QueryParams = Mapping[str, str | None]
 
 
 class FormData(TypedDict):

strawberry/litestar/controller.py

@@ -8,17 +8,13 @@ from datetime import timedelta
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     ClassVar,
-    Optional,
+    TypeAlias,
     TypedDict,
-    Union,
+    TypeGuard,
 )
-from typing_extensions import TypeGuard
 
 from lia import HTTPException, LitestarRequestAdapter
-from msgspec import Struct
-
 from litestar import (
     Controller,
     MediaType,
@@ -38,6 +34,8 @@ from litestar.exceptions import (
 )
 from litestar.response.streaming import Stream
 from litestar.status_codes import HTTP_200_OK
+from msgspec import Struct
+
 from strawberry.exceptions import InvalidCustomContext
 from strawberry.http.async_base_view import (
     AsyncBaseHTTPView,
@@ -52,18 +50,25 @@ from strawberry.http.typevars import Context, RootValue
 from strawberry.subscriptions import GRAPHQL_TRANSPORT_WS_PROTOCOL, GRAPHQL_WS_PROTOCOL
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncGenerator, AsyncIterator, Mapping, Sequence
+    from collections.abc import (
+        AsyncGenerator,
+        AsyncIterator,
+        Callable,
+        Mapping,
+        Sequence,
+    )
 
     from litestar.types import AnyCallable, Dependencies
+
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.http.ides import GraphQL_IDE
     from strawberry.schema import BaseSchema
 
 
 class BaseContext(Struct, kw_only=True):
-    request: Optional[Request] = None
-    websocket: Optional[WebSocket] = None
-    response: Optional[Response] = None
+    request: Request | None = None
+    websocket: WebSocket | None = None
+    response: Response | None = None
 
 
 class HTTPContextType:
@@ -88,9 +93,9 @@ class WebSocketContextDict(TypedDict):
     socket: WebSocket
 
 
-MergedContext = Union[
-    BaseContext, WebSocketContextDict, HTTPContextDict, dict[str, Any]
-]
+MergedContext: TypeAlias = (
+    BaseContext | WebSocketContextDict | HTTPContextDict | dict[str, Any]
+)
 
 
 async def _none_custom_context_getter() -> None:
@@ -102,7 +107,7 @@ async def _none_root_value_getter() -> None:
 
 
 async def _context_getter_ws(
-    custom_context: Optional[Any], socket: WebSocket
+    custom_context: Any | None, socket: WebSocket
 ) -> MergedContext:
     if isinstance(custom_context, BaseContext):
         custom_context.websocket = socket
@@ -124,7 +129,7 @@ def _response_getter() -> Response:
 
 
 async def _context_getter_http(
-    custom_context: Optional[Any],
+    custom_context: Any | None,
     response: Response,
     request: Request[Any, Any, Any],
 ) -> MergedContext:
@@ -145,9 +150,9 @@ async def _context_getter_http(
 
 
 class GraphQLResource(Struct):
-    data: Optional[dict[str, object]]
-    errors: Optional[list[object]]
-    extensions: Optional[dict[str, object]]
+    data: dict[str, object] | None
+    errors: list[object] | None
+    extensions: dict[str, object] | None
 
 
 class LitestarWebSocketAdapter(AsyncWebSocketAdapter):
@@ -208,11 +213,11 @@ class GraphQLController(
     }
 
     request_adapter_class = LitestarRequestAdapter
-    websocket_adapter_class = LitestarWebSocketAdapter
+    websocket_adapter_class = LitestarWebSocketAdapter  # type: ignore
 
     allow_queries_via_get: bool = True
     graphiql_allowed_accept: frozenset[str] = frozenset({"text/html", "*/*"})
-    graphql_ide: Optional[GraphQL_IDE] = "graphiql"
+    graphql_ide: GraphQL_IDE | None = "graphiql"
     connection_init_wait_timeout: timedelta = timedelta(minutes=1)
     protocols: Sequence[str] = (
         GRAPHQL_TRANSPORT_WS_PROTOCOL,
@@ -222,18 +227,18 @@ class GraphQLController(
     keep_alive_interval: float = 1
 
     def is_websocket_request(
-        self, request: Union[Request, WebSocket]
+        self, request: Request | WebSocket
     ) -> TypeGuard[WebSocket]:
         return isinstance(request, WebSocket)
 
-    async def pick_websocket_subprotocol(self, request: WebSocket) -> Optional[str]:
+    async def pick_websocket_subprotocol(self, request: WebSocket) -> str | None:
         subprotocols = request.scope["subprotocols"]
         intersection = set(subprotocols) & set(self.protocols)
         sorted_intersection = sorted(intersection, key=subprotocols.index)
         return next(iter(sorted_intersection), None)
 
     async def create_websocket_response(
-        self, request: WebSocket, subprotocol: Optional[str]
+        self, request: WebSocket, subprotocol: str | None
     ) -> WebSocket:
         await request.accept(subprotocols=subprotocol)
         return request
@@ -243,7 +248,7 @@ class GraphQLController(
         request: Request[Any, Any, Any],
         context: Any,
         root_value: Any,
-    ) -> Response[Union[GraphQLResource, str]]:
+    ) -> Response[GraphQLResource | str]:
         try:
             return await self.run(
                 request,
@@ -264,7 +269,7 @@ class GraphQLController(
 
     def create_response(
         self,
-        response_data: Union[GraphQLHTTPResponse, list[GraphQLHTTPResponse]],
+        response_data: GraphQLHTTPResponse | list[GraphQLHTTPResponse],
         sub_response: Response[bytes],
     ) -> Response[bytes]:
         response = Response(
@@ -305,7 +310,7 @@ class GraphQLController(
         context: Any,
         root_value: Any,
         response: Response,
-    ) -> Response[Union[GraphQLResource, str]]:
+    ) -> Response[GraphQLResource | str]:
         self.temporal_response = response
 
         return await self.execute_request(
@@ -321,7 +326,7 @@ class GraphQLController(
         context: Any,
         root_value: Any,
         response: Response,
-    ) -> Response[Union[GraphQLResource, str]]:
+    ) -> Response[GraphQLResource | str]:
         self.temporal_response = response
 
         return await self.execute_request(
@@ -345,14 +350,14 @@ class GraphQLController(
 
     async def get_context(
         self,
-        request: Union[Request[Any, Any, Any], WebSocket],
-        response: Union[Response, WebSocket],
+        request: Request[Any, Any, Any] | WebSocket,
+        response: Response | WebSocket,
     ) -> Context:  # pragma: no cover
         msg = "`get_context` is not used by Litestar's controller"
         raise ValueError(msg)
 
     async def get_root_value(
-        self, request: Union[Request[Any, Any, Any], WebSocket]
+        self, request: Request[Any, Any, Any] | WebSocket
     ) -> RootValue | None:  # pragma: no cover
         msg = "`get_root_value` is not used by Litestar's controller"
         raise ValueError(msg)
@@ -364,15 +369,15 @@ class GraphQLController(
 def make_graphql_controller(
     schema: BaseSchema,
     path: str = "",
-    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 = False,
     keep_alive_interval: float = 1,
     # TODO: root typevar
-    root_value_getter: Optional[AnyCallable] = None,
+    root_value_getter: AnyCallable | None = None,
     # TODO: context typevar
-    context_getter: Optional[AnyCallable] = None,
+    context_getter: AnyCallable | None = None,
     subscription_protocols: Sequence[str] = (
         GRAPHQL_TRANSPORT_WS_PROTOCOL,
         GRAPHQL_WS_PROTOCOL,
@@ -392,7 +397,7 @@ def make_graphql_controller(
 
     schema_: BaseSchema = schema
     allow_queries_via_get_: bool = allow_queries_via_get
-    graphql_ide_: Optional[GraphQL_IDE]
+    graphql_ide_: GraphQL_IDE | None
 
     if graphiql is not None:
         warnings.warn(

strawberry/permission.py

@@ -7,8 +7,6 @@ from inspect import iscoroutinefunction
 from typing import (
     TYPE_CHECKING,
     Any,
-    Optional,
-    Union,
 )
 
 from strawberry.exceptions import StrawberryGraphQLError
@@ -50,18 +48,18 @@ class BasePermission(abc.ABC):
     ```
     """
 
-    message: Optional[str] = None
+    message: str | None = None
 
-    error_extensions: Optional[GraphQLErrorExtensions] = None
+    error_extensions: GraphQLErrorExtensions | None = None
 
     error_class: type[GraphQLError] = StrawberryGraphQLError
 
-    _schema_directive: Optional[object] = None
+    _schema_directive: object | None = None
 
     @abc.abstractmethod
     def has_permission(
         self, source: Any, info: Info, **kwargs: Any
-    ) -> Union[bool, Awaitable[bool]]:
+    ) -> bool | Awaitable[bool]:
         """Check if the permission should be accepted.
 
         This method should be overridden by the subclasses.

strawberry/printer/ast_from_value.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import re
 from collections.abc import Mapping
 from math import isfinite
-from typing import TYPE_CHECKING, Any, Optional, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from graphql.language import (
     BooleanValueNode,
@@ -44,9 +44,7 @@ __all__ = ["ast_from_value"]
 _re_integer_string = re.compile("^-?(?:0|[1-9][0-9]*)$")
 
 
-def ast_from_leaf_type(
-    serialized: object, type_: Optional[GraphQLInputType]
-) -> ValueNode:
+def ast_from_leaf_type(serialized: object, type_: GraphQLInputType | None) -> ValueNode:
     # Others serialize based on their corresponding Python scalar types.
     if isinstance(serialized, bool):
         return BooleanValueNode(value=serialized)
@@ -86,7 +84,7 @@ def ast_from_leaf_type(
     )  # pragma: no cover
 
 
-def ast_from_value(value: Any, type_: GraphQLInputType) -> Optional[ValueNode]:
+def ast_from_value(value: Any, type_: GraphQLInputType) -> ValueNode | None:
     # custom ast_from_value that allows to also serialize custom scalar that aren't
     # basic types, namely JSON scalar types
 

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,9 +555,7 @@ def print_schema_definition(
     return f"schema{directives} {{\n" + "\n".join(operation_types) + "\n}"
 
 
-def print_directive(
-    directive: GraphQLDirective, *, schema: BaseSchema
-) -> Optional[str]:
+def print_directive(directive: GraphQLDirective, *, schema: BaseSchema) -> str | None:
     strawberry_directive = directive.extensions.get("strawberry-definition")
 
     if strawberry_directive is None or (

strawberry/quart/views.py

@@ -1,16 +1,15 @@
 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
-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,
     AsyncWebSocketAdapter,
@@ -26,6 +25,7 @@ from strawberry.subscriptions import GRAPHQL_TRANSPORT_WS_PROTOCOL, GRAPHQL_WS_P
 
 if TYPE_CHECKING:
     from quart.typing import ResponseReturnValue
+
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.schema.base import BaseSchema
 
@@ -78,13 +78,13 @@ 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,
@@ -126,13 +126,11 @@ class GraphQLView(
         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:
@@ -166,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