strawberry-graphql 0.255.0__py3-none-any.whl → 0.256.1__py3-none-any.whl

strawberry/relay/types.py

@@ -4,27 +4,28 @@ import dataclasses
 import inspect
 import itertools
 import sys
-from typing import (
-    TYPE_CHECKING,
-    Any,
+from collections.abc import (
     AsyncIterable,
     AsyncIterator,
     Awaitable,
+    Iterable,
+    Iterator,
+    Sequence,
+)
+from typing import (
+    TYPE_CHECKING,
+    Annotated,
+    Any,
     ClassVar,
     ForwardRef,
     Generic,
-    Iterable,
-    Iterator,
-    List,
     Optional,
-    Sequence,
-    Type,
     TypeVar,
     Union,
     cast,
     overload,
 )
-from typing_extensions import Annotated, Literal, Self, TypeAlias, get_args, get_origin
+from typing_extensions import Literal, Self, TypeAlias, get_args, get_origin
 
 from strawberry.relay.exceptions import NodeIDAnnotationError
 from strawberry.types.base import (
@@ -33,9 +34,10 @@ from strawberry.types.base import (
     get_object_definition,
 )
 from strawberry.types.field import field
-from strawberry.types.info import Info  # noqa: TCH001
+from strawberry.types.info import Info  # noqa: TC001
 from strawberry.types.lazy_type import LazyType
-from strawberry.types.object_type import interface, type
+from strawberry.types.object_type import interface
+from strawberry.types.object_type import type as strawberry_type
 from strawberry.types.private import StrawberryPrivate
 from strawberry.utils.aio import aenumerate, aislice, resolve_awaitable
 from strawberry.utils.inspect import in_async_context
@@ -137,7 +139,7 @@ class GlobalID:
         info: Info,
         *,
         required: Literal[True] = ...,
-        ensure_type: Type[_T],
+        ensure_type: type[_T],
     ) -> _T: ...
 
     @overload
@@ -211,7 +213,7 @@ class GlobalID:
 
         return node
 
-    def resolve_type(self, info: Info) -> Type[Node]:
+    def resolve_type(self, info: Info) -> type[Node]:
         """Resolve the internal type name to its type itself.
 
         Args:
@@ -247,7 +249,7 @@ class GlobalID:
         info: Info,
         *,
         required: Literal[True] = ...,
-        ensure_type: Type[_T],
+        ensure_type: type[_T],
     ) -> _T: ...
 
     @overload
@@ -391,7 +393,7 @@ class Node:
             parent_type = info._raw_info.parent_type
             type_def = info.schema.get_type_by_name(parent_type.name)
             assert isinstance(type_def, StrawberryObjectDefinition)
-            origin = cast(Type[Node], type_def.origin)
+            origin = cast(type[Node], type_def.origin)
             resolve_id = origin.resolve_id
             resolve_typename = origin.resolve_typename
 
@@ -618,7 +620,7 @@ class Node:
         return next(iter(cast(Iterable[Self], retval)))
 
 
-@type(description="Information to aid in pagination.")
+@strawberry_type(description="Information to aid in pagination.")
 class PageInfo:
     """Information to aid in pagination.
 
@@ -647,7 +649,7 @@ class PageInfo:
     )
 
 
-@type(description="An edge in a connection.")
+@strawberry_type(description="An edge in a connection.")
 class Edge(Generic[NodeType]):
     """An edge in a connection.
 
@@ -666,7 +668,7 @@ class Edge(Generic[NodeType]):
         return cls(cursor=to_base64(PREFIX, cursor), node=node)
 
 
-@type(description="A connection to a list of items.")
+@strawberry_type(description="A connection to a list of items.")
 class Connection(Generic[NodeType]):
     """A connection to a list of items.
 
@@ -679,7 +681,7 @@ class Connection(Generic[NodeType]):
     """
 
     page_info: PageInfo = field(description="Pagination data for this connection")
-    edges: List[Edge[NodeType]] = field(
+    edges: list[Edge[NodeType]] = field(
         description="Contains the nodes in this connection"
     )
 
@@ -738,7 +740,7 @@ class Connection(Generic[NodeType]):
         raise NotImplementedError
 
 
-@type(name="Connection", description="A connection to a list of items.")
+@strawberry_type(name="Connection", description="A connection to a list of items.")
 class ListConnection(Connection[NodeType]):
     """A connection to a list of items.
 
@@ -751,7 +753,7 @@ class ListConnection(Connection[NodeType]):
     """
 
     page_info: PageInfo = field(description="Pagination data for this connection")
-    edges: List[Edge[NodeType]] = field(
+    edges: list[Edge[NodeType]] = field(
         description="Contains the nodes in this connection"
     )
 
@@ -827,7 +829,7 @@ class ListConnection(Connection[NodeType]):
                 # The slice above might return an object that now is not async
                 # iterable anymore (e.g. an already cached django queryset)
                 if isinstance(iterator, (AsyncIterator, AsyncIterable)):
-                    edges: List[Edge] = [
+                    edges: list[Edge] = [
                         edge_class.resolve_edge(
                             cls.resolve_node(v, info=info, **kwargs),
                             cursor=slice_metadata.start + i,
@@ -835,7 +837,7 @@ class ListConnection(Connection[NodeType]):
                         async for i, v in aenumerate(iterator)
                     ]
                 else:
-                    edges: List[Edge] = [  # type: ignore[no-redef]
+                    edges: list[Edge] = [  # type: ignore[no-redef]
                         edge_class.resolve_edge(
                             cls.resolve_node(v, info=info, **kwargs),
                             cursor=slice_metadata.start + i,
@@ -935,17 +937,17 @@ class ListConnection(Connection[NodeType]):
 
 
 __all__ = [
+    "PREFIX",
+    "Connection",
+    "Edge",
     "GlobalID",
     "GlobalIDValueError",
+    "ListConnection",
     "Node",
     "NodeID",
     "NodeIDAnnotationError",
     "NodeIDPrivate",
     "NodeIterableType",
     "NodeType",
-    "PREFIX",
-    "Connection",
-    "Edge",
     "PageInfo",
-    "ListConnection",
 ]

strawberry/relay/utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import base64
 import dataclasses
 import sys
-from typing import TYPE_CHECKING, Any, Tuple, Union
+from typing import TYPE_CHECKING, Any, Union
 from typing_extensions import Self, assert_never
 
 from strawberry.types.base import StrawberryObjectDefinition
@@ -13,7 +13,7 @@ if TYPE_CHECKING:
     from strawberry.types.info import Info
 
 
-def from_base64(value: str) -> Tuple[str, str]:
+def from_base64(value: str) -> tuple[str, str]:
     """Parse the base64 encoded relay value.
 
     Args:
@@ -191,8 +191,8 @@ class SliceMetadata:
 
 
 __all__ = [
+    "SliceMetadata",
     "from_base64",
-    "to_base64",
     "should_resolve_list_connection_edges",
-    "SliceMetadata",
+    "to_base64",
 ]

strawberry/sanic/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from io import BytesIO
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union, cast
+from typing import TYPE_CHECKING, Any, Optional, Union, cast
 
 from sanic.request import File
 
@@ -9,7 +9,7 @@ if TYPE_CHECKING:
     from sanic.request import Request
 
 
-def convert_request_to_files_dict(request: Request) -> Dict[str, Any]:
+def convert_request_to_files_dict(request: Request) -> dict[str, Any]:
     """Converts the request.files dictionary to a dictionary of BytesIO objects.
 
     `request.files` has the following format, even if only a single file is uploaded:
@@ -24,12 +24,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(Optional[dict[str, list[File]]], request.files)
 
     if not request_files:
         return {}
 
-    files_dict: Dict[str, Union[BytesIO, List[BytesIO]]] = {}
+    files_dict: dict[str, Union[BytesIO, list[BytesIO]]] = {}
 
     for field_name, file_list in request_files.items():
         assert len(file_list) == 1

strawberry/sanic/views.py

@@ -5,12 +5,8 @@ import warnings
 from typing import (
     TYPE_CHECKING,
     Any,
-    AsyncGenerator,
     Callable,
-    Dict,
-    Mapping,
     Optional,
-    Type,
     cast,
 )
 from typing_extensions import TypeGuard
@@ -29,6 +25,8 @@ from strawberry.http.typevars import (
 from strawberry.sanic.utils import convert_request_to_files_dict
 
 if TYPE_CHECKING:
+    from collections.abc import AsyncGenerator, Mapping
+
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.http.ides import GraphQL_IDE
     from strawberry.schema import BaseSchema
@@ -109,8 +107,8 @@ class GraphQLView(
         graphiql: Optional[bool] = None,
         graphql_ide: Optional[GraphQL_IDE] = "graphiql",
         allow_queries_via_get: bool = True,
-        json_encoder: Optional[Type[json.JSONEncoder]] = None,
-        json_dumps_params: Optional[Dict[str, Any]] = None,
+        json_encoder: Optional[type[json.JSONEncoder]] = None,
+        json_dumps_params: Optional[dict[str, Any]] = None,
         multipart_uploads_enabled: bool = False,
     ) -> None:
         self.schema = schema
@@ -194,7 +192,7 @@ class GraphQLView(
         request: Request,
         stream: Callable[[], AsyncGenerator[str, None]],
         sub_response: TemporalResponse,
-        headers: Dict[str, str],
+        headers: dict[str, str],
     ) -> HTTPResponse:
         response = await self.request.respond(
             status=sub_response.status_code,

strawberry/scalars.py

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

strawberry/schema/base.py

@@ -2,12 +2,14 @@ from __future__ import annotations
 
 from abc import abstractmethod
 from functools import lru_cache
-from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Type, Union
+from typing import TYPE_CHECKING, Any, Optional, Union
 from typing_extensions import Protocol
 
 from strawberry.utils.logging import StrawberryLogger
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from graphql import GraphQLError
 
     from strawberry.directive import StrawberryDirective
@@ -16,7 +18,10 @@ if TYPE_CHECKING:
         ExecutionContext,
         ExecutionResult,
     )
-    from strawberry.types.base import StrawberryObjectDefinition
+    from strawberry.types.base import (
+        StrawberryObjectDefinition,
+        WithStrawberryObjectDefinition,
+    )
     from strawberry.types.enum import EnumDefinition
     from strawberry.types.graphql import OperationType
     from strawberry.types.scalar import ScalarDefinition
@@ -29,16 +34,16 @@ if TYPE_CHECKING:
 class BaseSchema(Protocol):
     config: StrawberryConfig
     schema_converter: GraphQLCoreConverter
-    query: Type
-    mutation: Optional[Type]
-    subscription: Optional[Type]
-    schema_directives: List[object]
+    query: type[WithStrawberryObjectDefinition]
+    mutation: Optional[type[WithStrawberryObjectDefinition]]
+    subscription: Optional[type[WithStrawberryObjectDefinition]]
+    schema_directives: list[object]
 
     @abstractmethod
     async def execute(
         self,
         query: Optional[str],
-        variable_values: Optional[Dict[str, Any]] = None,
+        variable_values: Optional[dict[str, Any]] = None,
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
@@ -50,7 +55,7 @@ class BaseSchema(Protocol):
     def execute_sync(
         self,
         query: Optional[str],
-        variable_values: Optional[Dict[str, Any]] = None,
+        variable_values: Optional[dict[str, Any]] = None,
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
@@ -62,7 +67,7 @@ class BaseSchema(Protocol):
     async def subscribe(
         self,
         query: str,
-        variable_values: Optional[Dict[str, Any]] = None,
+        variable_values: Optional[dict[str, Any]] = None,
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
@@ -101,7 +106,7 @@ class BaseSchema(Protocol):
 
     def _process_errors(
         self,
-        errors: List[GraphQLError],
+        errors: list[GraphQLError],
         execution_context: Optional[ExecutionContext] = None,
     ) -> None:
         if self.config.disable_field_suggestions:
@@ -112,7 +117,7 @@ class BaseSchema(Protocol):
 
     def process_errors(
         self,
-        errors: List[GraphQLError],
+        errors: list[GraphQLError],
         execution_context: Optional[ExecutionContext] = None,
     ) -> None:
         for error in errors:

strawberry/schema/compat.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Dict, Union
+from typing import TYPE_CHECKING, Union
 
 from strawberry.scalars import is_scalar as is_strawberry_scalar
 from strawberry.types.base import StrawberryType, has_object_definition
@@ -29,7 +29,7 @@ def is_interface_type(type_: Union[StrawberryType, type]) -> TypeGuard[type]:
 
 def is_scalar(
     type_: Union[StrawberryType, type],
-    scalar_registry: Dict[object, Union[ScalarWrapper, ScalarDefinition]],
+    scalar_registry: dict[object, Union[ScalarWrapper, ScalarDefinition]],
 ) -> TypeGuard[type]:
     return is_strawberry_scalar(type_, scalar_registry)
 
@@ -54,10 +54,10 @@ def is_graphql_generic(type_: Union[StrawberryType, type]) -> bool:
 
 
 __all__ = [
+    "is_enum",
+    "is_graphql_generic",
     "is_input_type",
     "is_interface_type",
     "is_scalar",
-    "is_enum",
     "is_schema_directive",
-    "is_graphql_generic",
 ]

strawberry/schema/execute.py

@@ -1,16 +1,12 @@
 from __future__ import annotations
 
 from asyncio import ensure_future
+from collections.abc import Awaitable, Iterable
 from inspect import isawaitable
 from typing import (
     TYPE_CHECKING,
-    Awaitable,
     Callable,
-    Iterable,
-    List,
     Optional,
-    Tuple,
-    Type,
     TypedDict,
     Union,
     cast,
@@ -49,7 +45,7 @@ class ParseOptions(TypedDict):
 
 
 ProcessErrors: TypeAlias = (
-    "Callable[[List[GraphQLError], Optional[ExecutionContext]], None]"
+    "Callable[[list[GraphQLError], Optional[ExecutionContext]], None]"
 )
 
 
@@ -60,8 +56,8 @@ def parse_document(query: str, **kwargs: Unpack[ParseOptions]) -> DocumentNode:
 def validate_document(
     schema: GraphQLSchema,
     document: DocumentNode,
-    validation_rules: Tuple[Type[ASTValidationRule], ...],
-) -> List[GraphQLError]:
+    validation_rules: tuple[type[ASTValidationRule], ...],
+) -> list[GraphQLError]:
     validation_rules = (
         *validation_rules,
         OneOfInputValidationRule,
@@ -150,7 +146,7 @@ async def execute(
     extensions_runner: SchemaExtensionsRunner,
     process_errors: ProcessErrors,
     middleware_manager: MiddlewareManager,
-    execution_context_class: Optional[Type[GraphQLExecutionContext]] = None,
+    execution_context_class: Optional[type[GraphQLExecutionContext]] = None,
 ) -> ExecutionResult | PreExecutionError:
     try:
         async with extensions_runner.operation():
@@ -214,7 +210,7 @@ def execute_sync(
     allowed_operation_types: Iterable[OperationType],
     extensions_runner: SchemaExtensionsRunner,
     execution_context: ExecutionContext,
-    execution_context_class: Optional[Type[GraphQLExecutionContext]] = None,
+    execution_context_class: Optional[type[GraphQLExecutionContext]] = None,
     process_errors: ProcessErrors,
     middleware_manager: MiddlewareManager,
 ) -> ExecutionResult:

strawberry/schema/name_converter.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union, cast
+from typing import TYPE_CHECKING, Optional, Union, cast
 from typing_extensions import Protocol
 
 from strawberry.directive import StrawberryDirective
@@ -126,11 +126,11 @@ class NameConverter:
     def from_generic(
         self,
         generic_type: StrawberryObjectDefinition,
-        types: List[Union[StrawberryType, type]],
+        types: list[Union[StrawberryType, type]],
     ) -> str:
         generic_type_name = generic_type.name
 
-        names: List[str] = []
+        names: list[str] = []
 
         for type_ in types:
             name = self.get_from_type(type_)

strawberry/schema/schema.py

@@ -5,11 +5,7 @@ from functools import cached_property, lru_cache
 from typing import (
     TYPE_CHECKING,
     Any,
-    Dict,
-    Iterable,
-    List,
     Optional,
-    Type,
     Union,
     cast,
 )
@@ -37,7 +33,11 @@ from strawberry.extensions.runner import SchemaExtensionsRunner
 from strawberry.schema.schema_converter import GraphQLCoreConverter
 from strawberry.schema.types.scalar import DEFAULT_SCALAR_REGISTRY
 from strawberry.types import ExecutionContext
-from strawberry.types.base import StrawberryObjectDefinition, has_object_definition
+from strawberry.types.base import (
+    StrawberryObjectDefinition,
+    WithStrawberryObjectDefinition,
+    has_object_definition,
+)
 from strawberry.types.graphql import OperationType
 
 from ..printer import print_schema
@@ -48,6 +48,8 @@ from .execute import execute, execute_sync
 from .subscribe import SubscriptionResult, subscribe
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from graphql import ExecutionContext as GraphQLExecutionContext
 
     from strawberry.directive import StrawberryDirective
@@ -70,16 +72,16 @@ class Schema(BaseSchema):
         self,
         # TODO: can we make sure we only allow to pass
         # something that has been decorated?
-        query: Type,
-        mutation: Optional[Type] = None,
-        subscription: Optional[Type] = None,
+        query: type,
+        mutation: Optional[type] = None,
+        subscription: Optional[type] = None,
         directives: Iterable[StrawberryDirective] = (),
-        types: Iterable[Union[Type, StrawberryType]] = (),
-        extensions: Iterable[Union[Type[SchemaExtension], SchemaExtension]] = (),
-        execution_context_class: Optional[Type[GraphQLExecutionContext]] = None,
+        types: Iterable[Union[type, StrawberryType]] = (),
+        extensions: Iterable[Union[type[SchemaExtension], SchemaExtension]] = (),
+        execution_context_class: Optional[type[GraphQLExecutionContext]] = None,
         config: Optional[StrawberryConfig] = None,
         scalar_overrides: Optional[
-            Dict[object, Union[Type, ScalarWrapper, ScalarDefinition]],
+            dict[object, Union[type, ScalarWrapper, ScalarDefinition]],
         ] = None,
         schema_directives: Iterable[object] = (),
     ) -> None:
@@ -127,7 +129,7 @@ class Schema(BaseSchema):
         self.execution_context_class = execution_context_class
         self.config = config or StrawberryConfig()
 
-        SCALAR_OVERRIDES_DICT_TYPE = Dict[
+        SCALAR_OVERRIDES_DICT_TYPE = dict[
             object, Union["ScalarWrapper", "ScalarDefinition"]
         ]
 
@@ -142,14 +144,24 @@ class Schema(BaseSchema):
         self.directives = directives
         self.schema_directives = list(schema_directives)
 
-        query_type = self.schema_converter.from_object(query.__strawberry_definition__)
+        query_type = self.schema_converter.from_object(
+            cast(type[WithStrawberryObjectDefinition], query).__strawberry_definition__
+        )
         mutation_type = (
-            self.schema_converter.from_object(mutation.__strawberry_definition__)
+            self.schema_converter.from_object(
+                cast(
+                    type[WithStrawberryObjectDefinition], mutation
+                ).__strawberry_definition__
+            )
             if mutation
             else None
         )
         subscription_type = (
-            self.schema_converter.from_object(subscription.__strawberry_definition__)
+            self.schema_converter.from_object(
+                cast(
+                    type[WithStrawberryObjectDefinition], subscription
+                ).__strawberry_definition__
+            )
             if subscription
             else None
         )
@@ -213,7 +225,7 @@ class Schema(BaseSchema):
             formatted_errors = "\n\n".join(f"❌ {error.message}" for error in errors)
             raise ValueError(f"Invalid Schema. Errors:\n\n{formatted_errors}")
 
-    def get_extensions(self, sync: bool = False) -> List[SchemaExtension]:
+    def get_extensions(self, sync: bool = False) -> list[SchemaExtension]:
         extensions = []
         if self.directives:
             extensions = [
@@ -227,11 +239,11 @@ class Schema(BaseSchema):
         ]
 
     @cached_property
-    def _sync_extensions(self) -> List[SchemaExtension]:
+    def _sync_extensions(self) -> list[SchemaExtension]:
         return self.get_extensions(sync=True)
 
     @cached_property
-    def _async_extensions(self) -> List[SchemaExtension]:
+    def _async_extensions(self) -> list[SchemaExtension]:
         return self.get_extensions(sync=False)
 
     def create_extensions_runner(
@@ -256,7 +268,7 @@ class Schema(BaseSchema):
         self,
         query: Optional[str],
         allowed_operation_types: Iterable[OperationType],
-        variable_values: Optional[Dict[str, Any]] = None,
+        variable_values: Optional[dict[str, Any]] = None,
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
@@ -320,13 +332,13 @@ class Schema(BaseSchema):
 
     def get_fields(
         self, type_definition: StrawberryObjectDefinition
-    ) -> List[StrawberryField]:
+    ) -> list[StrawberryField]:
         return type_definition.fields
 
     async def execute(
         self,
         query: Optional[str],
-        variable_values: Optional[Dict[str, Any]] = None,
+        variable_values: Optional[dict[str, Any]] = None,
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
@@ -361,7 +373,7 @@ class Schema(BaseSchema):
     def execute_sync(
         self,
         query: Optional[str],
-        variable_values: Optional[Dict[str, Any]] = None,
+        variable_values: Optional[dict[str, Any]] = None,
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
@@ -397,7 +409,7 @@ class Schema(BaseSchema):
     async def subscribe(
         self,
         query: Optional[str],
-        variable_values: Optional[Dict[str, Any]] = None,
+        variable_values: Optional[dict[str, Any]] = None,
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
@@ -495,7 +507,7 @@ class Schema(BaseSchema):
 
     __str__ = as_str
 
-    def introspect(self) -> Dict[str, Any]:
+    def introspect(self) -> dict[str, Any]:
         """Return the introspection query result for the current schema.
 
         Raises: