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

strawberry/exceptions/invalid_argument_type.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from strawberry.types.base import get_object_definition
 
@@ -55,7 +55,7 @@ class InvalidArgumentTypeError(StrawberryException):
         )
 
     @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/exceptions/invalid_superclass_interface.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -36,6 +36,6 @@ class InvalidSuperclassInterfaceError(StrawberryException):
         super().__init__(self.message)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         source_finder = SourceFinder()
         return source_finder.find_class_from_object(self.cls)

strawberry/exceptions/invalid_union_type.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from functools import cached_property
 from inspect import getframeinfo, stack
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from strawberry.exceptions.utils.source_finder import SourceFinder
 
@@ -24,7 +24,7 @@ class InvalidUnionTypeError(StrawberryException):
         self,
         union_name: str,
         invalid_type: object,
-        union_definition: Optional[StrawberryUnion] = None,
+        union_definition: StrawberryUnion | None = None,
     ) -> None:
         from strawberry.types.base import StrawberryList
         from strawberry.types.scalar import ScalarWrapper
@@ -58,7 +58,7 @@ class InvalidUnionTypeError(StrawberryException):
         self.annotation_message = "invalid type here"
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         source_finder = SourceFinder()
 
         if self.union_definition:
@@ -100,7 +100,7 @@ class InvalidTypeForUnionMergeError(StrawberryException):
         self.annotation_message = "invalid type here"
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         source_finder = SourceFinder()
 
         return source_finder.find_union_merge(self.union, self.other, frame=self.frame)

strawberry/exceptions/missing_arguments_annotations.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -52,7 +52,7 @@ class MissingArgumentsAnnotationsError(StrawberryException):
         return f'arguments "{head}" and "{arguments[-1]}"'
 
     @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/exceptions/missing_dependencies.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 
 class MissingOptionalDependenciesError(Exception):
     """Some optional dependencies that are required for a particular task are missing."""
@@ -9,8 +7,8 @@ class MissingOptionalDependenciesError(Exception):
     def __init__(
         self,
         *,
-        packages: Optional[list[str]] = None,
-        extras: Optional[list[str]] = None,
+        packages: list[str] | None = None,
+        extras: list[str] | None = None,
     ) -> None:
         """Initialize the error.
 

strawberry/exceptions/missing_field_annotation.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -32,7 +32,7 @@ class MissingFieldAnnotationError(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
 

strawberry/exceptions/missing_return_annotation.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -37,7 +37,7 @@ class MissingReturnAnnotationError(StrawberryException):
         self.annotation_message = "resolver missing annotation"
 
     @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/exceptions/object_is_not_a_class.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from enum import Enum
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -56,7 +56,7 @@ class ObjectIsNotClassError(StrawberryException):
         return cls(obj, cls.MethodType.TYPE)
 
     @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/exceptions/object_is_not_an_enum.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -31,7 +31,7 @@ class ObjectIsNotAnEnumError(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
 

strawberry/exceptions/permission_fail_silently_requires_optional.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -32,7 +32,7 @@ class PermissionFailSilentlyRequiresOptionalError(StrawberryException):
         super().__init__(self.message)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         origin = self.field.origin
         source_finder = SourceFinder()
 

strawberry/exceptions/private_strawberry_field.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from .exception import StrawberryException
 from .utils.source_finder import SourceFinder
@@ -32,7 +32,7 @@ class PrivateStrawberryFieldError(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
 

strawberry/exceptions/scalar_already_registered.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from functools import cached_property
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from strawberry.exceptions.utils.source_finder import SourceFinder
 
@@ -45,7 +45,7 @@ class ScalarAlreadyRegisteredError(StrawberryException):
         super().__init__(self.message)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         if not all(
             (self.scalar_definition._source_file, self.scalar_definition._source_line)
         ):

strawberry/exceptions/syntax.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from pygments.lexers import PythonLexer
 from rich.segment import Segment
@@ -15,9 +15,9 @@ class Syntax(RichSyntax):
         self,
         code: str,
         line_range: tuple[int, int],
-        highlight_lines: Optional[set[int]] = None,
+        highlight_lines: set[int] | None = None,
         line_offset: int = 0,
-        line_annotations: Optional[dict[int, str]] = None,
+        line_annotations: dict[int, str] | None = None,
     ) -> None:
         self.line_offset = line_offset
         self.line_annotations = line_annotations or {}

strawberry/exceptions/unresolved_field_type.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from strawberry.exceptions.utils.source_finder import SourceFinder
 
@@ -40,7 +40,7 @@ class UnresolvedFieldTypeError(StrawberryException):
         super().__init__(self.message)
 
     @cached_property
-    def exception_source(self) -> Optional[ExceptionSource]:
+    def exception_source(self) -> ExceptionSource | None:
         source_finder = SourceFinder()
 
         # field could be attached to the class or not

strawberry/exceptions/utils/source_finder.py

@@ -6,12 +6,12 @@ import sys
 from dataclasses import dataclass
 from functools import cached_property
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Optional, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from strawberry.exceptions.exception_source import ExceptionSource
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import Callable, Sequence
     from inspect import Traceback
 
     from libcst import BinaryOperation, Call, CSTNode, FunctionDef
@@ -30,7 +30,7 @@ class LibCSTSourceFinder:
     def __init__(self) -> None:
         self.cst = importlib.import_module("libcst")
 
-    def find_source(self, module: str) -> Optional[SourcePath]:
+    def find_source(self, module: str) -> SourcePath | None:
         # TODO: support for pyodide
 
         source_module = sys.modules.get(module)
@@ -73,11 +73,11 @@ class LibCSTSourceFinder:
 
     def _find_definition_by_qualname(
         self, qualname: str, nodes: Sequence[CSTNode]
-    ) -> Optional[CSTNode]:
+    ) -> CSTNode | None:
         from libcst import ClassDef, FunctionDef
 
         for definition in nodes:
-            parent: Optional[CSTNode] = definition
+            parent: CSTNode | None = definition
             stack = []
 
             while parent:
@@ -101,7 +101,7 @@ class LibCSTSourceFinder:
 
     def _find_function_definition(
         self, source: SourcePath, function: Callable[..., Any]
-    ) -> Optional[FunctionDef]:
+    ) -> FunctionDef | None:
         import libcst.matchers as m
 
         matcher = m.FunctionDef(name=m.Name(value=function.__name__))
@@ -115,7 +115,7 @@ class LibCSTSourceFinder:
 
     def _find_class_definition(
         self, source: SourcePath, cls: type[Any]
-    ) -> Optional[CSTNode]:
+    ) -> CSTNode | None:
         import libcst.matchers as m
 
         matcher = m.ClassDef(name=m.Name(value=cls.__name__))
@@ -123,7 +123,7 @@ class LibCSTSourceFinder:
         class_defs = self._find(source.code, matcher)
         return self._find_definition_by_qualname(cls.__qualname__, class_defs)
 
-    def find_class(self, cls: type[Any]) -> Optional[ExceptionSource]:
+    def find_class(self, cls: type[Any]) -> ExceptionSource | None:
         source = self.find_source(cls.__module__)
 
         if source is None:
@@ -149,7 +149,7 @@ class LibCSTSourceFinder:
 
     def find_class_attribute(
         self, cls: type[Any], attribute_name: str
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         source = self.find_source(cls.__module__)
 
         if source is None:
@@ -191,7 +191,7 @@ class LibCSTSourceFinder:
             error_column_end=attribute_position.end.column,
         )
 
-    def find_function(self, function: Callable[..., Any]) -> Optional[ExceptionSource]:
+    def find_function(self, function: Callable[..., Any]) -> ExceptionSource | None:
         source = self.find_source(function.__module__)
 
         if source is None:
@@ -225,7 +225,7 @@ class LibCSTSourceFinder:
 
     def find_argument(
         self, function: Callable[..., Any], argument_name: str
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         source = self.find_source(function.__module__)
 
         if source is None:
@@ -263,7 +263,7 @@ class LibCSTSourceFinder:
 
     def find_union_call(
         self, path: Path, union_name: str, invalid_type: object
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         import libcst.matchers as m
 
         source = path.read_text()
@@ -339,7 +339,7 @@ class LibCSTSourceFinder:
 
     def find_union_merge(
         self, union: StrawberryUnion, other: object, frame: Traceback
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         import libcst.matchers as m
 
         path = Path(frame.filename)
@@ -375,7 +375,7 @@ class LibCSTSourceFinder:
 
     def find_annotated_union(
         self, union_definition: StrawberryUnion, invalid_type: object
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         if union_definition._source_file is None:
             return None
 
@@ -503,7 +503,7 @@ class LibCSTSourceFinder:
 
     def find_scalar_call(
         self, scalar_definition: ScalarDefinition
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         if scalar_definition._source_file is None:
             return None  # pragma: no cover
 
@@ -571,7 +571,7 @@ class LibCSTSourceFinder:
         call_node: Any,
         scalar_definition: ScalarDefinition,
         is_newtype: bool,
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         """Helper method to create ExceptionSource for scalar calls."""
         import libcst.matchers as m
 
@@ -615,33 +615,33 @@ class LibCSTSourceFinder:
 
 class SourceFinder:
     @cached_property
-    def cst(self) -> Optional[LibCSTSourceFinder]:
+    def cst(self) -> LibCSTSourceFinder | None:
         try:
             return LibCSTSourceFinder()
         except ImportError:
             return None  # pragma: no cover
 
-    def find_class_from_object(self, cls: type[Any]) -> Optional[ExceptionSource]:
+    def find_class_from_object(self, cls: type[Any]) -> ExceptionSource | None:
         return self.cst.find_class(cls) if self.cst else None
 
     def find_class_attribute_from_object(
         self, cls: type[Any], attribute_name: str
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         return self.cst.find_class_attribute(cls, attribute_name) if self.cst else None
 
     def find_function_from_object(
         self, function: Callable[..., Any]
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         return self.cst.find_function(function) if self.cst else None
 
     def find_argument_from_object(
         self, function: Callable[..., Any], argument_name: str
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         return self.cst.find_argument(function, argument_name) if self.cst else None
 
     def find_union_call(
         self, path: Path, union_name: str, invalid_type: object
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         return (
             self.cst.find_union_call(path, union_name, invalid_type)
             if self.cst
@@ -650,17 +650,17 @@ class SourceFinder:
 
     def find_union_merge(
         self, union: StrawberryUnion, other: object, frame: Traceback
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         return self.cst.find_union_merge(union, other, frame) if self.cst else None
 
     def find_scalar_call(
         self, scalar_definition: ScalarDefinition
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         return self.cst.find_scalar_call(scalar_definition) if self.cst else None
 
     def find_annotated_union(
         self, union_definition: StrawberryUnion, invalid_type: object
-    ) -> Optional[ExceptionSource]:
+    ) -> ExceptionSource | None:
         return (
             self.cst.find_annotated_union(union_definition, invalid_type)
             if self.cst

strawberry/experimental/pydantic/_compat.py

@@ -1,8 +1,9 @@
 import dataclasses
+from collections.abc import Callable
 from dataclasses import dataclass
 from decimal import Decimal
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
 from uuid import UUID
 
 import pydantic
@@ -24,12 +25,12 @@ class CompatModelField:
     type_: Any
     outer_type_: Any
     default: Any
-    default_factory: Optional[Callable[[], Any]]
+    default_factory: Callable[[], Any] | None
     required: bool
-    alias: Optional[str]
+    alias: str | None
     allow_none: bool
     has_alias: bool
-    description: Optional[str]
+    description: str | None
     _missing_type: Any
     is_v1: bool
 
@@ -43,8 +44,8 @@ class CompatModelField:
 
 
 ATTR_TO_TYPE_MAP = {
-    "NoneStr": Optional[str],
-    "NoneBytes": Optional[bytes],
+    "NoneStr": Optional[str],  # noqa: UP045
+    "NoneBytes": Optional[bytes],  # noqa: UP045
     "StrBytes": None,
     "NoneStrBytes": None,
     "StrictStr": str,
@@ -296,7 +297,7 @@ class PydanticCompat:
 
 
 if IS_PYDANTIC_V2:
-    from typing_extensions import get_args, get_origin
+    from typing import get_args, get_origin
 
     from pydantic.v1.typing import is_new_type
     from pydantic.v1.utils import lenient_issubclass, smart_deepcopy

strawberry/experimental/pydantic/conversion.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import copy
 import dataclasses
-from typing import TYPE_CHECKING, Any, Union, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from strawberry.types.base import (
     StrawberryList,
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 
 
 def _convert_from_pydantic_to_strawberry_type(
-    type_: Union[StrawberryType, type],
+    type_: StrawberryType | type,
     data_from_model=None,  # noqa: ANN001
     extra=None,  # noqa: ANN001
 ) -> Any:

strawberry/experimental/pydantic/conversion_types.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
 from typing_extensions import Protocol
 
 from pydantic import BaseModel
@@ -22,7 +22,7 @@ class StrawberryTypeFromPydantic(Protocol[PydanticModel]):
 
     @staticmethod
     def from_pydantic(
-        instance: PydanticModel, extra: Optional[dict[str, Any]] = None
+        instance: PydanticModel, extra: dict[str, Any] | None = None
     ) -> StrawberryTypeFromPydantic[PydanticModel]: ...
 
     def to_pydantic(self, **kwargs: Any) -> PydanticModel: ...

strawberry/experimental/pydantic/error_type.py

@@ -5,9 +5,7 @@ import warnings
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Optional,
-    Union,
     cast,
 )
 
@@ -31,18 +29,18 @@ from strawberry.utils.typing import get_list_annotation, is_list
 from .exceptions import MissingFieldsListError
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import Callable, Sequence
 
     from strawberry.types.base import WithStrawberryObjectDefinition
 
 
-def get_type_for_field(field: CompatModelField) -> Union[type[Union[None, list]], Any]:
+def get_type_for_field(field: CompatModelField) -> type[None | list] | Any:
     type_ = field.outer_type_
     type_ = normalize_type(type_)
     return field_type_to_type(type_)
 
 
-def field_type_to_type(type_: type) -> Union[Any, list[Any], None]:
+def field_type_to_type(type_: type) -> Any | list[Any] | None:
     error_class: Any = str
     strawberry_type: Any = error_class
 
@@ -56,21 +54,21 @@ def field_type_to_type(type_: type) -> Union[Any, list[Any], None]:
         else:
             strawberry_type = list[error_class]
 
-        strawberry_type = Optional[strawberry_type]
+        strawberry_type = Optional[strawberry_type]  # noqa: UP045
     elif lenient_issubclass(type_, BaseModel):
         strawberry_type = get_strawberry_type_from_model(type_)
-        return Optional[strawberry_type]
+        return Optional[strawberry_type]  # noqa: UP045
 
-    return Optional[list[strawberry_type]]
+    return Optional[list[strawberry_type]]  # noqa: UP045
 
 
 def error_type(
     model: type[BaseModel],
     *,
-    fields: Optional[list[str]] = None,
-    name: Optional[str] = None,
-    description: Optional[str] = None,
-    directives: Optional[Sequence[object]] = (),
+    fields: list[str] | None = None,
+    name: str | None = None,
+    description: str | None = None,
+    directives: Sequence[object] | None = (),
     all_fields: bool = False,
 ) -> Callable[..., type]:
     def wrap(cls: type) -> type:

strawberry/experimental/pydantic/fields.py

@@ -1,5 +1,11 @@
 import builtins
-from typing import Annotated, Any, Union
+from types import UnionType
+from typing import (
+    Annotated,
+    Any,
+    Union,
+)
+from typing import GenericAlias as TypingGenericAlias  # type: ignore
 
 from pydantic import BaseModel
 
@@ -14,18 +20,6 @@ from strawberry.experimental.pydantic.exceptions import (
 )
 from strawberry.types.base import StrawberryObjectDefinition
 
-try:
-    from types import UnionType as TypingUnionType
-except ImportError:
-    import sys
-
-    if sys.version_info < (3, 10):
-        TypingUnionType = ()
-    else:
-        raise
-
-from typing import GenericAlias as TypingGenericAlias  # type: ignore
-
 
 def replace_pydantic_types(type_: Any, is_input: bool) -> Any:
     if lenient_issubclass(type_, BaseModel):
@@ -55,8 +49,8 @@ def replace_types_recursively(
 
     if isinstance(replaced_type, TypingGenericAlias):
         return TypingGenericAlias(origin, converted)
-    if isinstance(replaced_type, TypingUnionType):
-        return Union[converted]
+    if isinstance(replaced_type, UnionType):
+        return Union[converted]  # noqa: UP007
 
     # TODO: investigate if we could move the check for annotated to the top
     if origin is Annotated and converted: