strawberry-graphql 0.283.3__py3-none-any.whl → 0.284.1__py3-none-any.whl

strawberry/flask/views.py

@@ -5,9 +5,9 @@ from typing import (
     TYPE_CHECKING,
     ClassVar,
     Optional,
+    TypeGuard,
     Union,
 )
-from typing_extensions import TypeGuard
 
 from lia import AsyncFlaskHTTPRequestAdapter, FlaskHTTPRequestAdapter, HTTPException
 

strawberry/http/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Optional
-from typing_extensions import Literal, TypedDict
+from typing import Any, Literal, Optional
+from typing_extensions import TypedDict
 
 from strawberry.schema._graphql_core import (
     GraphQLIncrementalExecutionResults,

strawberry/http/async_base_view.py

@@ -2,19 +2,18 @@ import abc
 import asyncio
 import contextlib
 import json
-from collections.abc import AsyncGenerator, Mapping
+from collections.abc import AsyncGenerator, Callable, Mapping
 from datetime import timedelta
 from typing import (
     Any,
-    Callable,
     Generic,
     Literal,
     Optional,
+    TypeGuard,
     Union,
     cast,
     overload,
 )
-from typing_extensions import TypeGuard
 
 from graphql import GraphQLError
 from lia import AsyncHTTPRequestAdapter, HTTPException

strawberry/http/ides.py

@@ -1,6 +1,5 @@
 import pathlib
-from typing import Optional
-from typing_extensions import Literal
+from typing import Literal, Optional
 
 GraphQL_IDE = Literal["graphiql", "apollo-sandbox", "pathfinder"]
 

strawberry/http/sync_base_view.py

@@ -1,7 +1,7 @@
 import abc
 import json
+from collections.abc import Callable
 from typing import (
-    Callable,
     Generic,
     Literal,
     Optional,

strawberry/http/types.py

@@ -1,6 +1,6 @@
 from collections.abc import Mapping
-from typing import Any, Optional
-from typing_extensions import Literal, TypedDict
+from typing import Any, Literal, Optional
+from typing_extensions import TypedDict
 
 HTTPMethod = Literal[
     "GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS", "TRACE"

strawberry/litestar/controller.py

@@ -8,13 +8,12 @@ from datetime import timedelta
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     ClassVar,
     Optional,
     TypedDict,
+    TypeGuard,
     Union,
 )
-from typing_extensions import TypeGuard
 
 from lia import HTTPException, LitestarRequestAdapter
 from msgspec import Struct
@@ -52,7 +51,13 @@ 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

strawberry/printer/printer.py

@@ -5,7 +5,6 @@ from itertools import chain
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Optional,
     TypeVar,
     Union,
@@ -46,6 +45,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,

strawberry/quart/views.py

@@ -1,10 +1,9 @@
 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, Optional, TypeGuard, Union
 
 from lia import HTTPException, QuartHTTPRequestAdapter
 

strawberry/relay/fields.py

@@ -8,6 +8,7 @@ from collections.abc import (
     AsyncIterable,
     AsyncIterator,
     Awaitable,
+    Callable,
     Iterable,
     Iterator,
     Mapping,
@@ -17,13 +18,13 @@ 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 +48,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
@@ -180,6 +181,7 @@ class NodeExtension(FieldExtension):
                                     for nodes in asyncgen_nodes.values()
                                 ),
                             ),
+                            strict=True,
                         )
                     )
 

strawberry/relay/types.py

@@ -19,13 +19,17 @@ from typing import (
     ClassVar,
     ForwardRef,
     Generic,
+    Literal,
     Optional,
+    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 (

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/views.py

@@ -5,11 +5,10 @@ import warnings
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Optional,
+    TypeGuard,
     Union,
 )
-from typing_extensions import TypeGuard
 
 from lia import HTTPException, SanicHTTPRequestAdapter
 
@@ -24,7 +23,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

strawberry/schema/compat.py

@@ -11,7 +11,7 @@ from strawberry.types.base import StrawberryType, has_object_definition
 
 if TYPE_CHECKING:
     from collections.abc import Mapping
-    from typing_extensions import TypeGuard
+    from typing import TypeGuard
 
     from strawberry.types.scalar import ScalarDefinition, ScalarWrapper
 

strawberry/schema/config.py

@@ -1,12 +1,15 @@
 from __future__ import annotations
 
 from dataclasses import InitVar, dataclass, field
-from typing import Any, Callable, Optional, TypedDict
+from typing import TYPE_CHECKING, Any, Optional, TypedDict
 
 from strawberry.types.info import Info
 
 from .name_converter import NameConverter
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 
 class BatchingConfig(TypedDict):
     max_operations: int

strawberry/schema/schema.py

@@ -2,13 +2,12 @@ from __future__ import annotations
 
 import warnings
 from asyncio import ensure_future
-from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Iterable
+from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable, Iterable
 from functools import cached_property, lru_cache
 from inspect import isawaitable
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     NamedTuple,
     Optional,
     Union,
@@ -83,7 +82,7 @@ from .exceptions import CannotGetOperationTypeError, InvalidOperationTypeError
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Mapping
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
     from graphql.language import DocumentNode
     from graphql.pyutils import Path

strawberry/schema/schema_converter.py

@@ -8,7 +8,6 @@ from typing import (
     TYPE_CHECKING,
     Annotated,
     Any,
-    Callable,
     Generic,
     Optional,
     TypeVar,
@@ -82,7 +81,7 @@ from . import compat
 from .types.concrete_type import ConcreteType
 
 if TYPE_CHECKING:
-    from collections.abc import Awaitable, Mapping
+    from collections.abc import Awaitable, Callable, Mapping
 
     from graphql import (
         GraphQLInputType,

strawberry/schema/types/base_scalars.py

@@ -1,8 +1,8 @@
 import datetime
 import decimal
 import uuid
+from collections.abc import Callable
 from operator import methodcaller
-from typing import Callable
 
 import dateutil.parser
 from graphql import GraphQLError

strawberry/schema_codegen/__init__.py

@@ -4,8 +4,8 @@ import dataclasses
 import keyword
 from collections import defaultdict
 from graphlib import TopologicalSorter
-from typing import TYPE_CHECKING, Union
-from typing_extensions import Protocol, TypeAlias
+from typing import TYPE_CHECKING, TypeAlias, Union
+from typing_extensions import Protocol
 
 import libcst as cst
 from graphql import (

strawberry/schema_directive.py

@@ -1,6 +1,7 @@
 import dataclasses
+from collections.abc import Callable
 from enum import Enum
-from typing import Callable, Optional, TypeVar
+from typing import Optional, TypeVar
 from typing_extensions import dataclass_transform
 
 from strawberry.types.field import StrawberryField, field

strawberry/subscriptions/protocols/graphql_transport_ws/types.py

@@ -1,5 +1,5 @@
-from typing import TypedDict, Union
-from typing_extensions import Literal, NotRequired
+from typing import Literal, TypedDict, Union
+from typing_extensions import NotRequired
 
 from graphql import GraphQLFormattedError
 

strawberry/subscriptions/protocols/graphql_ws/types.py

@@ -1,5 +1,5 @@
-from typing import TypedDict, Union
-from typing_extensions import Literal, NotRequired
+from typing import Literal, TypedDict, Union
+from typing_extensions import NotRequired
 
 from graphql import GraphQLFormattedError
 

strawberry/test/client.py

@@ -4,8 +4,8 @@ import json
 import warnings
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Optional, Union
-from typing_extensions import Literal, TypedDict
+from typing import TYPE_CHECKING, Any, Literal, Optional, Union
+from typing_extensions import TypedDict
 
 if TYPE_CHECKING:
     from collections.abc import Coroutine, Mapping

strawberry/types/arguments.py

@@ -9,8 +9,9 @@ from typing import (
     Optional,
     Union,
     cast,
+    get_args,
+    get_origin,
 )
-from typing_extensions import get_args, get_origin
 
 from strawberry.annotation import StrawberryAnnotation
 from strawberry.exceptions import MultipleStrawberryArgumentsError, UnsupportedTypeError

strawberry/types/auto.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from typing import Annotated, Any, Optional, Union, cast
-from typing_extensions import get_args, get_origin
+from typing import Annotated, Any, Optional, Union, cast, get_args, get_origin
 
 from strawberry.annotation import StrawberryAnnotation
 from strawberry.types.base import StrawberryType

strawberry/types/base.py

@@ -5,14 +5,14 @@ from abc import ABC, abstractmethod
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     ClassVar,
+    Literal,
     Optional,
     TypeVar,
     Union,
     overload,
 )
-from typing_extensions import Literal, Protocol, Self, deprecated
+from typing_extensions import Protocol, Self, deprecated
 
 from strawberry.utils.deprecations import DEPRECATION_MESSAGES, DeprecatedDescriptor
 from strawberry.utils.inspect import get_specialized_type_var_map
@@ -20,8 +20,8 @@ from strawberry.utils.typing import is_concrete_generic
 from strawberry.utils.typing import is_generic as is_type_generic
 
 if TYPE_CHECKING:
-    from collections.abc import Mapping, Sequence
-    from typing_extensions import TypeGuard
+    from collections.abc import Callable, Mapping, Sequence
+    from typing import TypeGuard
 
     from graphql import GraphQLAbstractType, GraphQLResolveInfo
 
@@ -291,7 +291,9 @@ class StrawberryObjectDefinition(StrawberryType):
             resolved_type = StrawberryAnnotation(passed_type).resolve()
             resolved_types.append(resolved_type)
 
-        type_var_map = dict(zip((param.__name__ for param in params), resolved_types))
+        type_var_map = dict(
+            zip((param.__name__ for param in params), resolved_types, strict=True)
+        )
 
         return self.copy_with(type_var_map)
 

strawberry/types/enum.py

@@ -1,9 +1,8 @@
 import dataclasses
-from collections.abc import Iterable, Mapping
+from collections.abc import Callable, Iterable, Mapping
 from enum import EnumMeta
 from typing import (
     Any,
-    Callable,
     Optional,
     TypeVar,
     Union,

strawberry/types/field.py

@@ -4,12 +4,11 @@ import contextlib
 import copy
 import dataclasses
 import sys
-from collections.abc import Awaitable, Coroutine, Mapping, Sequence
+from collections.abc import Awaitable, Callable, Coroutine, Mapping, Sequence
 from functools import cached_property
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Optional,
     TypeVar,
     Union,
@@ -29,7 +28,8 @@ from .fields.resolver import StrawberryResolver
 
 if TYPE_CHECKING:
     import builtins
-    from typing_extensions import Literal, Self
+    from typing import Literal
+    from typing_extensions import Self
 
     from strawberry.extensions.field_extension import FieldExtension
     from strawberry.permission import BasePermission
@@ -92,11 +92,9 @@ class StrawberryField(dataclasses.Field):
         # basic fields are fields with no provided resolver
         is_basic_field = not base_resolver
 
-        kwargs: Any = {}
-
-        # kw_only was added to python 3.10 and it is required
-        if sys.version_info >= (3, 10):
-            kwargs["kw_only"] = dataclasses.MISSING
+        kwargs: Any = {
+            "kw_only": True,
+        }
 
         # doc was added to python 3.14 and it is required
         if sys.version_info >= (3, 14):

strawberry/types/fields/resolver.py

@@ -10,15 +10,15 @@ from typing import (
     TYPE_CHECKING,
     Annotated,
     Any,
-    Callable,
     Generic,
     NamedTuple,
     Optional,
     TypeVar,
     Union,
     cast,
+    get_origin,
 )
-from typing_extensions import Protocol, get_origin
+from typing_extensions import Protocol
 
 from strawberry.annotation import StrawberryAnnotation
 from strawberry.exceptions import (
@@ -33,7 +33,7 @@ from strawberry.utils.typing import type_has_annotation
 
 if TYPE_CHECKING:
     import builtins
-    from collections.abc import Mapping
+    from collections.abc import Callable, Mapping
 
 
 class Parameter(inspect.Parameter):

strawberry/types/maybe.py

@@ -1,6 +1,6 @@
+import re
 import typing
-from typing import TYPE_CHECKING, Any, Generic, TypeVar, Union
-from typing_extensions import TypeAlias
+from typing import TYPE_CHECKING, Any, Generic, TypeAlias, TypeVar, Union
 
 T = TypeVar("T")
 
@@ -37,7 +37,16 @@ else:
     class Maybe(Generic[T]): ...
 
 
+_maybe_re = re.compile(r"^(?:strawberry\.)?Maybe\[(.+)\]$")
+
+
 def _annotation_is_maybe(annotation: Any) -> bool:
+    if isinstance(annotation, str):
+        # Ideally we would try to evaluate the annotation, but the args inside
+        # may still not be available, as the module is still being constructed.
+        # Checking for the pattern should be good enough for now.
+        return _maybe_re.match(annotation) is not None
+
     return (orig := typing.get_origin(annotation)) and orig is Maybe
 
 

strawberry/types/mutation.py

@@ -4,12 +4,11 @@ import dataclasses
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
+    Literal,
     Optional,
     Union,
     overload,
 )
-from typing_extensions import Literal
 
 from strawberry.types.field import (
     _RESOLVER_TYPE,
@@ -21,8 +20,8 @@ from strawberry.types.field import (
 )
 
 if TYPE_CHECKING:
-    from collections.abc import Mapping, Sequence
-    from typing_extensions import Literal
+    from collections.abc import Callable, Mapping, Sequence
+    from typing import Literal
 
     from strawberry.extensions.field_extension import FieldExtension
     from strawberry.permission import BasePermission

strawberry/types/object_type.py

@@ -1,12 +1,10 @@
 import builtins
 import dataclasses
 import inspect
-import sys
 import types
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from typing import (
     Any,
-    Callable,
     Optional,
     TypeVar,
     Union,
@@ -105,24 +103,7 @@ def _wrap_dataclass(cls: builtins.type[T]) -> builtins.type[T]:
     """Wrap a strawberry.type class with a dataclass and check for any issues before doing so."""
     # Ensure all Fields have been properly type-annotated
     _check_field_annotations(cls)
-
-    dclass_kwargs: dict[str, bool] = {}
-
-    # Python 3.10 introduces the kw_only param. If we're on an older version
-    # then generate our own custom init function
-    if sys.version_info >= (3, 10):
-        dclass_kwargs["kw_only"] = True
-    else:
-        dclass_kwargs["init"] = False
-
-    dclass = dataclasses.dataclass(cls, **dclass_kwargs)
-
-    if sys.version_info < (3, 10):
-        from strawberry.utils.dataclasses import add_custom_init_fn
-
-        add_custom_init_fn(dclass)
-
-    return dclass
+    return dataclasses.dataclass(kw_only=True)(cls)
 
 
 def _inject_default_for_maybe_annotations(

strawberry/types/scalar.py

@@ -5,7 +5,6 @@ from dataclasses import dataclass
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     NewType,
     Optional,
     TypeVar,
@@ -18,16 +17,12 @@ from strawberry.types.base import StrawberryType
 from strawberry.utils.str_converters import to_camel_case
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable, Mapping
+    from collections.abc import Callable, Iterable, Mapping
 
     from graphql import GraphQLScalarType
 
 
-# in python 3.10+ NewType is a class
-if sys.version_info >= (3, 10):
-    _T = TypeVar("_T", bound=Union[type, NewType])
-else:
-    _T = TypeVar("_T", bound=type)
+_T = TypeVar("_T", bound=Union[type, NewType])
 
 
 def identity(x: _T) -> _T:

strawberry/types/union.py

@@ -13,8 +13,8 @@ from typing import (
     TypeVar,
     Union,
     cast,
+    get_origin,
 )
-from typing_extensions import get_origin
 
 from graphql import GraphQLNamedType, GraphQLUnionType
 

strawberry/utils/aio.py

@@ -1,9 +1,14 @@
 import sys
-from collections.abc import AsyncGenerator, AsyncIterable, AsyncIterator, Awaitable
+from collections.abc import (
+    AsyncGenerator,
+    AsyncIterable,
+    AsyncIterator,
+    Awaitable,
+    Callable,
+)
 from contextlib import asynccontextmanager, suppress
 from typing import (
     Any,
-    Callable,
     Optional,
     TypeVar,
     Union,

strawberry/utils/inspect.py

@@ -1,9 +1,9 @@
 import asyncio
 import inspect
+from collections.abc import Callable
 from functools import lru_cache
 from typing import (
     Any,
-    Callable,
     Generic,
     Optional,
     Protocol,
@@ -99,7 +99,7 @@ def get_specialized_type_var_map(cls: type) -> Optional[dict[str, type]]:
         if (type_params := getattr(origin, "__parameters__", None)) is not None:
             args = get_args(tp)
             if args:
-                for type_param, arg in zip(type_params, args):
+                for type_param, arg in zip(type_params, args, strict=True):
                     if type_param not in param_args:
                         param_args[type_param] = arg
             else: