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

strawberry/channels/handlers/ws_handler.py

@@ -5,11 +5,9 @@ import datetime
 import json
 from typing import (
     TYPE_CHECKING,
-    Optional,
     TypedDict,
-    Union,
+    TypeGuard,
 )
-from typing_extensions import TypeGuard
 
 from strawberry.http.async_base_view import AsyncBaseHTTPView, AsyncWebSocketAdapter
 from strawberry.http.exceptions import NonJsonMessageReceived, NonTextMessageReceived
@@ -62,7 +60,7 @@ class ChannelsWebSocketAdapter(AsyncWebSocketAdapter):
 
 
 class MessageQueueData(TypedDict):
-    message: Union[str, None]
+    message: str | None
     disconnected: bool
 
 
@@ -102,7 +100,7 @@ class GraphQLWSConsumer(
     ```
     """
 
-    websocket_adapter_class = ChannelsWebSocketAdapter
+    websocket_adapter_class = ChannelsWebSocketAdapter  # type: ignore
 
     def __init__(
         self,
@@ -113,7 +111,7 @@ class GraphQLWSConsumer(
             GRAPHQL_TRANSPORT_WS_PROTOCOL,
             GRAPHQL_WS_PROTOCOL,
         ),
-        connection_init_wait_timeout: Optional[datetime.timedelta] = None,
+        connection_init_wait_timeout: datetime.timedelta | None = None,
     ) -> None:
         if connection_init_wait_timeout is None:
             connection_init_wait_timeout = datetime.timedelta(minutes=1)
@@ -123,7 +121,7 @@ class GraphQLWSConsumer(
         self.keep_alive_interval = keep_alive_interval
         self.protocols = subscription_protocols
         self.message_queue: asyncio.Queue[MessageQueueData] = asyncio.Queue()
-        self.run_task: Optional[asyncio.Task] = None
+        self.run_task: asyncio.Task | None = None
 
         super().__init__()
 
@@ -131,7 +129,7 @@ class GraphQLWSConsumer(
         self.run_task = asyncio.create_task(self.run(self))
 
     async def receive(
-        self, text_data: Optional[str] = None, bytes_data: Optional[bytes] = None
+        self, text_data: str | None = None, bytes_data: bytes | None = None
     ) -> None:
         if text_data:
             self.message_queue.put_nowait({"message": text_data, "disconnected": False})
@@ -143,7 +141,7 @@ class GraphQLWSConsumer(
         assert self.run_task
         await self.run_task
 
-    async def get_root_value(self, request: GraphQLWSConsumer) -> Optional[RootValue]:
+    async def get_root_value(self, request: GraphQLWSConsumer) -> RootValue | None:
         return None
 
     async def get_context(
@@ -163,7 +161,7 @@ class GraphQLWSConsumer(
 
     def create_response(
         self,
-        response_data: Union[GraphQLHTTPResponse, list[GraphQLHTTPResponse]],
+        response_data: GraphQLHTTPResponse | list[GraphQLHTTPResponse],
         sub_response: GraphQLWSConsumer,
     ) -> GraphQLWSConsumer:
         raise NotImplementedError
@@ -178,14 +176,14 @@ class GraphQLWSConsumer(
 
     async def pick_websocket_subprotocol(
         self, request: GraphQLWSConsumer
-    ) -> Optional[str]:
+    ) -> str | None:
         protocols = request.scope["subprotocols"]
         intersection = set(protocols) & set(self.protocols)
         sorted_intersection = sorted(intersection, key=protocols.index)
         return next(iter(sorted_intersection), None)
 
     async def create_websocket_response(
-        self, request: GraphQLWSConsumer, subprotocol: Optional[str]
+        self, request: GraphQLWSConsumer, subprotocol: str | None
     ) -> GraphQLWSConsumer:
         await request.accept(subprotocol=subprotocol)
         return request

strawberry/channels/router.py

@@ -7,11 +7,10 @@ on preferences and client support. Then it hands off to the appropriate consumer
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
-
-from django.urls import re_path
+from typing import TYPE_CHECKING
 
 from channels.routing import ProtocolTypeRouter, URLRouter
+from django.urls import re_path
 
 from .handlers.http_handler import GraphQLHTTPConsumer
 from .handlers.ws_handler import GraphQLWSConsumer
@@ -47,7 +46,7 @@ class GraphQLProtocolTypeRouter(ProtocolTypeRouter):
     def __init__(
         self,
         schema: BaseSchema,
-        django_application: Optional[str] = None,
+        django_application: str | None = None,
         url_pattern: str = "^graphql",
     ) -> None:
         http_urls = [re_path(url_pattern, GraphQLHTTPConsumer.as_asgi(schema=schema))]

strawberry/channels/testing.py

@@ -4,13 +4,11 @@ import uuid
 from typing import (
     TYPE_CHECKING,
     Any,
-    Optional,
-    Union,
 )
 
+from channels.testing.websocket import WebsocketCommunicator
 from graphql import GraphQLError, GraphQLFormattedError
 
-from channels.testing.websocket import WebsocketCommunicator
 from strawberry.subscriptions import GRAPHQL_TRANSPORT_WS_PROTOCOL, GRAPHQL_WS_PROTOCOL
 from strawberry.subscriptions.protocols.graphql_transport_ws import (
     types as transport_ws_types,
@@ -53,7 +51,7 @@ class GraphQLWebsocketCommunicator(WebsocketCommunicator):
         self,
         application: ASGIApplication,
         path: str,
-        headers: Optional[list[tuple[bytes, bytes]]] = None,
+        headers: list[tuple[bytes, bytes]] | None = None,
         protocol: str = GRAPHQL_TRANSPORT_WS_PROTOCOL,
         connection_params: dict | None = None,
         **kwargs: Any,
@@ -83,9 +81,9 @@ class GraphQLWebsocketCommunicator(WebsocketCommunicator):
 
     async def __aexit__(
         self,
-        exc_type: Optional[type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
     ) -> None:
         await self.disconnect()
 
@@ -114,8 +112,8 @@ class GraphQLWebsocketCommunicator(WebsocketCommunicator):
     # get transformed into `FormattedExecutionResult` on the wire, but we attempt
     # to do a limited representation of them here, to make testing simpler.
     async def subscribe(
-        self, query: str, variables: Optional[dict] = None
-    ) -> Union[ExecutionResult, AsyncIterator[ExecutionResult]]:
+        self, query: str, variables: dict | None = None
+    ) -> ExecutionResult | AsyncIterator[ExecutionResult]:
         id_ = uuid.uuid4().hex
 
         if self.protocol == GRAPHQL_TRANSPORT_WS_PROTOCOL:

strawberry/cli/commands/codegen.py

@@ -4,7 +4,7 @@ import functools
 import importlib
 import inspect
 from pathlib import Path  # noqa: TC003
-from typing import Optional, Union, cast
+from typing import cast
 
 import rich
 import typer
@@ -22,9 +22,9 @@ def _is_codegen_plugin(obj: object) -> bool:
     )
 
 
-def _import_plugin(plugin: str) -> Optional[type[QueryCodegenPlugin]]:
+def _import_plugin(plugin: str) -> type[QueryCodegenPlugin] | None:
     module_name = plugin
-    symbol_name: Optional[str] = None
+    symbol_name: str | None = None
 
     if ":" in plugin:
         module_name, symbol_name = plugin.split(":", 1)
@@ -61,7 +61,7 @@ def _import_plugin(plugin: str) -> Optional[type[QueryCodegenPlugin]]:
 @functools.lru_cache
 def _load_plugin(
     plugin_path: str,
-) -> type[Union[QueryCodegenPlugin, ConsolePlugin]]:
+) -> type[QueryCodegenPlugin | ConsolePlugin]:
     # try to import plugin_name from current folder
     # then try to import from strawberry.codegen.plugins
 
@@ -79,7 +79,7 @@ def _load_plugin(
 
 def _load_plugins(
     plugin_ids: list[str], query: Path
-) -> list[Union[QueryCodegenPlugin, ConsolePlugin]]:
+) -> list[QueryCodegenPlugin | ConsolePlugin]:
     plugins = []
     for ptype_id in plugin_ids:
         ptype = _load_plugin(ptype_id)
@@ -91,7 +91,7 @@ def _load_plugins(
 
 @app.command(help="Generate code from a query")
 def codegen(
-    query: Optional[list[Path]] = typer.Argument(
+    query: list[Path] | None = typer.Argument(
         default=None, exists=True, dir_okay=False
     ),
     schema: str = typer.Option(..., help="Python path to the schema file"),
@@ -120,7 +120,7 @@ def codegen(
         "-p",
         "--plugins",
     ),
-    cli_plugin: Optional[str] = None,
+    cli_plugin: str | None = None,
 ) -> None:
     if not query:
         return

strawberry/cli/commands/schema_codegen.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -10,7 +9,7 @@ from strawberry.schema_codegen import codegen
 @app.command(help="Generate code from a query")
 def schema_codegen(
     schema: Path = typer.Argument(exists=True),
-    output: Optional[Path] = typer.Option(
+    output: Path | None = typer.Option(
         None,
         "-o",
         "--output",

strawberry/cli/commands/upgrade/__init__.py

@@ -47,8 +47,6 @@ def upgrade(
 
         raise typer.Exit(2)
 
-    python_target_version = tuple(int(x) for x in python_target.split("."))
-
     transformer: ConvertUnionToAnnotatedUnion | UpdateImportsCodemod
 
     if codemod == "update-imports":
@@ -57,7 +55,7 @@ def upgrade(
     else:
         transformer = ConvertUnionToAnnotatedUnion(
             CodemodContext(),
-            use_pipe_syntax=python_target_version >= (3, 10),
+            use_pipe_syntax=True,
             use_typing_extensions=use_typing_extensions,
         )
 

strawberry/cli/commands/upgrade/_run_codemod.py

@@ -4,7 +4,7 @@ import contextlib
 import os
 from importlib.metadata import version
 from multiprocessing import Pool, cpu_count
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any, TypeAlias
 
 from libcst.codemod._cli import ExecutionConfig, ExecutionResult, _execute_transform
 from rich.progress import Progress
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 
     from libcst.codemod import Codemod
 
-ProgressType = Union[type[Progress], type[FakeProgress]]
+ProgressType: TypeAlias = type[Progress] | type[FakeProgress]
 
 
 def _get_libcst_version() -> tuple[int, int, int]:

strawberry/codegen/plugins/print_operation.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import textwrap
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from strawberry.codegen import CodegenFile, QueryCodegenPlugin
 from strawberry.codegen.types import (
@@ -93,7 +93,7 @@ class PrintOperationPlugin(QueryCodegenPlugin):
         return f"({variables})"
 
     def _print_graphql_type(
-        self, type: GraphQLType, parent_type: Optional[GraphQLType] = None
+        self, type: GraphQLType, parent_type: GraphQLType | None = None
     ) -> str:
         if isinstance(type, GraphQLOptional):
             return self._print_graphql_type(type.of_type, type)

strawberry/codegen/plugins/python.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import textwrap
 from collections import defaultdict
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, ClassVar, Optional
+from typing import TYPE_CHECKING, ClassVar
 
 from strawberry.codegen import CodegenFile, QueryCodegenPlugin
 from strawberry.codegen.types import (
@@ -31,7 +31,7 @@ if TYPE_CHECKING:
 @dataclass
 class PythonType:
     type: str
-    module: Optional[str] = None
+    module: str | None = None
 
 
 class PythonPlugin(QueryCodegenPlugin):

strawberry/codegen/query_codegen.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Iterable, Mapping, Sequence
+from collections.abc import Callable, Iterable, Mapping, Sequence
 from dataclasses import MISSING, dataclass
 from enum import Enum
 from functools import cmp_to_key, partial
@@ -8,12 +8,9 @@ from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Optional,
-    Union,
     cast,
 )
-from typing_extensions import Literal, Protocol
+from typing_extensions import Protocol
 
 import rich
 from graphql import (
@@ -122,7 +119,7 @@ class CodegenResult:
 
 
 class HasSelectionSet(Protocol):
-    selection_set: Optional[SelectionSetNode]
+    selection_set: SelectionSetNode | None
 
 
 class QueryCodegenPlugin:
@@ -234,7 +231,7 @@ class QueryCodegenPluginManager:
     def __init__(
         self,
         plugins: list[QueryCodegenPlugin],
-        console_plugin: Optional[ConsolePlugin] = None,
+        console_plugin: ConsolePlugin | None = None,
     ) -> None:
         self.plugins = plugins
         self.console_plugin = console_plugin
@@ -298,7 +295,7 @@ class QueryCodegen:
         self,
         schema: Schema,
         plugins: list[QueryCodegenPlugin],
-        console_plugin: Optional[ConsolePlugin] = None,
+        console_plugin: ConsolePlugin | None = None,
     ) -> None:
         self.schema = schema
         self.plugin_manager = QueryCodegenPluginManager(plugins, console_plugin)
@@ -390,7 +387,7 @@ class QueryCodegen:
         raise ValueError(f"Unsupported type: {type(selection)}")  # pragma: no cover
 
     def _convert_selection_set(
-        self, selection_set: Optional[SelectionSetNode]
+        self, selection_set: SelectionSetNode | None
     ) -> list[GraphQLSelection]:
         if selection_set is None:
             return []
@@ -473,18 +470,13 @@ class QueryCodegen:
             class_name=result_class_name,
         )
 
-        operation_kind = cast(
-            "Literal['query', 'mutation', 'subscription']",
-            operation_definition.operation.value,
-        )
-
         variables, variables_type = self._convert_variable_definitions(
             operation_definition.variable_definitions, operation_name=operation_name
         )
 
         return GraphQLOperation(
             operation_definition.name.value,
-            kind=operation_kind,
+            kind=operation_definition.operation.value,
             selections=self._convert_selection_set(operation_definition.selection_set),
             directives=self._convert_directives(operation_definition.directives),
             variables=variables,
@@ -494,9 +486,9 @@ class QueryCodegen:
 
     def _convert_variable_definitions(
         self,
-        variable_definitions: Optional[Iterable[VariableDefinitionNode]],
+        variable_definitions: Iterable[VariableDefinitionNode] | None,
         operation_name: str,
-    ) -> tuple[list[GraphQLVariable], Optional[GraphQLObjectType]]:
+    ) -> tuple[list[GraphQLVariable], GraphQLObjectType | None]:
         if not variable_definitions:
             return [], None
 
@@ -527,7 +519,7 @@ class QueryCodegen:
 
     def _get_field_type(
         self,
-        field_type: Union[StrawberryType, type],
+        field_type: StrawberryType | type,
     ) -> GraphQLType:
         if isinstance(field_type, StrawberryOptional):
             return GraphQLOptional(self._get_field_type(field_type.of_type))
@@ -557,7 +549,7 @@ class QueryCodegen:
         raise ValueError(f"Unsupported type: {field_type}")  # pragma: no cover
 
     def _collect_type_from_strawberry_type(
-        self, strawberry_type: Union[type, StrawberryType]
+        self, strawberry_type: type | StrawberryType
     ) -> GraphQLType:
         type_: GraphQLType
 
@@ -596,9 +588,9 @@ class QueryCodegen:
         return type_
 
     def _collect_type_from_variable(
-        self, variable_type: TypeNode, parent_type: Optional[TypeNode] = None
+        self, variable_type: TypeNode, parent_type: TypeNode | None = None
     ) -> GraphQLType:
-        type_: Optional[GraphQLType] = None
+        type_: GraphQLType | None = None
 
         if isinstance(variable_type, ListTypeNode):
             type_ = GraphQLList(
@@ -637,11 +629,9 @@ class QueryCodegen:
         )
 
     def _unwrap_type(
-        self, type_: Union[type, StrawberryType]
-    ) -> tuple[
-        Union[type, StrawberryType], Optional[Callable[[GraphQLType], GraphQLType]]
-    ]:
-        wrapper: Optional[Callable[[GraphQLType], GraphQLType]] = None
+        self, type_: type | StrawberryType
+    ) -> tuple[type | StrawberryType, Callable[[GraphQLType], GraphQLType] | None]:
+        wrapper: Callable[[GraphQLType], GraphQLType] | None = None
 
         if isinstance(type_, StrawberryOptional):
             type_, previous_wrapper = self._unwrap_type(type_.of_type)
@@ -738,7 +728,7 @@ class QueryCodegen:
         selection: HasSelectionSet,
         parent_type: StrawberryObjectDefinition,
         class_name: str,
-    ) -> Union[GraphQLObjectType, GraphQLUnion]:
+    ) -> GraphQLObjectType | GraphQLUnion:
         sub_types = self._collect_types_using_fragments(
             selection, parent_type, class_name
         )
@@ -773,7 +763,7 @@ class QueryCodegen:
             )
 
         current_type = graph_ql_object_type_factory(class_name)
-        fields: list[Union[GraphQLFragmentSpread, GraphQLField]] = []
+        fields: list[GraphQLFragmentSpread | GraphQLField] = []
 
         for sub_selection in selection_set.selections:
             if isinstance(sub_selection, FragmentSpreadNode):
@@ -844,7 +834,7 @@ class QueryCodegen:
                 list(common_fields),
                 graphql_typename=type_condition_name,
             )
-            fields: list[Union[GraphQLFragmentSpread, GraphQLField]] = []
+            fields: list[GraphQLFragmentSpread | GraphQLField] = []
 
             for sub_selection in fragment.selection_set.selections:
                 if isinstance(sub_selection, FragmentSpreadNode):
@@ -899,7 +889,7 @@ class QueryCodegen:
         return sub_types
 
     def _collect_scalar(
-        self, scalar_definition: ScalarDefinition, python_type: Optional[type]
+        self, scalar_definition: ScalarDefinition, python_type: type | None
     ) -> GraphQLScalar:
         graphql_scalar = GraphQLScalar(scalar_definition.name, python_type=python_type)
 

strawberry/codegen/types.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, TypeAlias
 
 if TYPE_CHECKING:
     from collections.abc import Mapping
     from enum import EnumMeta
-    from typing_extensions import Literal
+    from typing import Literal
 
     from strawberry.types.unset import UnsetType
 
@@ -30,9 +30,9 @@ class GraphQLUnion:
 @dataclass
 class GraphQLField:
     name: str
-    alias: Optional[str]
+    alias: str | None
     type: GraphQLType
-    default_value: Optional[GraphQLArgumentValue] = None
+    default_value: GraphQLArgumentValue | None = None
 
 
 @dataclass
@@ -44,7 +44,7 @@ class GraphQLFragmentSpread:
 class GraphQLObjectType:
     name: str
     fields: list[GraphQLField] = field(default_factory=list)
-    graphql_typename: Optional[str] = None
+    graphql_typename: str | None = None
 
 
 # Subtype of GraphQLObjectType.
@@ -54,7 +54,7 @@ class GraphQLObjectType:
 class GraphQLFragmentType(GraphQLObjectType):
     name: str
     fields: list[GraphQLField] = field(default_factory=list)
-    graphql_typename: Optional[str] = None
+    graphql_typename: str | None = None
     on: str = ""
 
     def __post_init__(self) -> None:
@@ -74,23 +74,23 @@ class GraphQLEnum:
 @dataclass
 class GraphQLScalar:
     name: str
-    python_type: Optional[type]
+    python_type: type | None
 
 
-GraphQLType = Union[
-    GraphQLObjectType,
-    GraphQLEnum,
-    GraphQLScalar,
-    GraphQLOptional,
-    GraphQLList,
-    GraphQLUnion,
-]
+GraphQLType: TypeAlias = (
+    GraphQLObjectType
+    | GraphQLEnum
+    | GraphQLScalar
+    | GraphQLOptional
+    | GraphQLList
+    | GraphQLUnion
+)
 
 
 @dataclass
 class GraphQLFieldSelection:
     field: str
-    alias: Optional[str]
+    alias: str | None
     selections: list[GraphQLSelection]
     directives: list[GraphQLDirective]
     arguments: list[GraphQLArgument]
@@ -102,9 +102,9 @@ class GraphQLInlineFragment:
     selections: list[GraphQLSelection]
 
 
-GraphQLSelection = Union[
-    GraphQLFieldSelection, GraphQLInlineFragment, GraphQLFragmentSpread
-]
+GraphQLSelection: TypeAlias = (
+    GraphQLFieldSelection | GraphQLInlineFragment | GraphQLFragmentSpread
+)
 
 
 @dataclass
@@ -125,7 +125,7 @@ class GraphQLFloatValue:
 @dataclass
 class GraphQLEnumValue:
     name: str
-    enum_type: Optional[str] = None
+    enum_type: str | None = None
 
 
 @dataclass
@@ -155,17 +155,17 @@ class GraphQLVariableReference:
     value: str
 
 
-GraphQLArgumentValue = Union[
-    GraphQLStringValue,
-    GraphQLNullValue,
-    GraphQLIntValue,
-    GraphQLVariableReference,
-    GraphQLFloatValue,
-    GraphQLListValue,
-    GraphQLEnumValue,
-    GraphQLBoolValue,
-    GraphQLObjectValue,
-]
+GraphQLArgumentValue: TypeAlias = (
+    GraphQLStringValue
+    | GraphQLNullValue
+    | GraphQLIntValue
+    | GraphQLVariableReference
+    | GraphQLFloatValue
+    | GraphQLListValue
+    | GraphQLEnumValue
+    | GraphQLBoolValue
+    | GraphQLObjectValue
+)
 
 
 @dataclass
@@ -194,7 +194,7 @@ class GraphQLOperation:
     directives: list[GraphQLDirective]
     variables: list[GraphQLVariable]
     type: GraphQLObjectType
-    variables_type: Optional[GraphQLObjectType]
+    variables_type: GraphQLObjectType | None
 
 
 __all__ = [

strawberry/codemods/annotated_unions.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 import libcst as cst
 import libcst.matchers as m
@@ -50,7 +50,7 @@ class ConvertUnionToAnnotatedUnion(VisitorBasedCodemodCommand):
 
         super().__init__(context)
 
-    def visit_Module(self, node: cst.Module) -> Optional[bool]:  # noqa: N802
+    def visit_Module(self, node: cst.Module) -> bool | None:  # noqa: N802
         self._is_using_named_import = False
 
         return super().visit_Module(node)