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

strawberry/federation/scalar.py

@@ -1,22 +1,14 @@
-import sys
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from typing import (
     Any,
-    Callable,
     NewType,
-    Optional,
     TypeVar,
-    Union,
     overload,
 )
 
 from strawberry.types.scalar import ScalarWrapper, _process_scalar
 
-# 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=type | NewType)
 
 
 def identity(x: _T) -> _T:  # pragma: no cover
@@ -26,18 +18,18 @@ def identity(x: _T) -> _T:  # pragma: no cover
 @overload
 def scalar(
     *,
-    name: Optional[str] = None,
-    description: Optional[str] = None,
-    specified_by_url: Optional[str] = None,
+    name: str | None = None,
+    description: str | None = None,
+    specified_by_url: str | None = None,
     serialize: Callable = identity,
-    parse_value: Optional[Callable] = None,
-    parse_literal: Optional[Callable] = None,
+    parse_value: Callable | None = None,
+    parse_literal: Callable | None = None,
     directives: Iterable[object] = (),
     authenticated: bool = False,
     inaccessible: bool = False,
-    policy: Optional[list[list[str]]] = None,
-    requires_scopes: Optional[list[list[str]]] = None,
-    tags: Optional[Iterable[str]] = (),
+    policy: list[list[str]] | None = None,
+    requires_scopes: list[list[str]] | None = None,
+    tags: Iterable[str] | None = (),
 ) -> Callable[[_T], _T]: ...
 
 
@@ -45,36 +37,36 @@ def scalar(
 def scalar(
     cls: _T,
     *,
-    name: Optional[str] = None,
-    description: Optional[str] = None,
-    specified_by_url: Optional[str] = None,
+    name: str | None = None,
+    description: str | None = None,
+    specified_by_url: str | None = None,
     serialize: Callable = identity,
-    parse_value: Optional[Callable] = None,
-    parse_literal: Optional[Callable] = None,
+    parse_value: Callable | None = None,
+    parse_literal: Callable | None = None,
     directives: Iterable[object] = (),
     authenticated: bool = False,
     inaccessible: bool = False,
-    policy: Optional[list[list[str]]] = None,
-    requires_scopes: Optional[list[list[str]]] = None,
-    tags: Optional[Iterable[str]] = (),
+    policy: list[list[str]] | None = None,
+    requires_scopes: list[list[str]] | None = None,
+    tags: Iterable[str] | None = (),
 ) -> _T: ...
 
 
 def scalar(
-    cls: Optional[_T] = None,
+    cls: _T | None = None,
     *,
-    name: Optional[str] = None,
-    description: Optional[str] = None,
-    specified_by_url: Optional[str] = None,
+    name: str | None = None,
+    description: str | None = None,
+    specified_by_url: str | None = None,
     serialize: Callable = identity,
-    parse_value: Optional[Callable] = None,
-    parse_literal: Optional[Callable] = None,
+    parse_value: Callable | None = None,
+    parse_literal: Callable | None = None,
     directives: Iterable[object] = (),
     authenticated: bool = False,
     inaccessible: bool = False,
-    policy: Optional[list[list[str]]] = None,
-    requires_scopes: Optional[list[list[str]]] = None,
-    tags: Optional[Iterable[str]] = (),
+    policy: list[list[str]] | None = None,
+    requires_scopes: list[list[str]] | None = None,
+    tags: Iterable[str] | None = (),
 ) -> Any:
     """Annotates a class or type as a GraphQL custom scalar.
 

strawberry/federation/schema.py

@@ -44,18 +44,17 @@ FederationAny = scalar(NewType("_Any", object), name="_Any")  # type: ignore
 class Schema(BaseSchema):
     def __init__(
         self,
-        query: Optional[type] = None,
-        mutation: Optional[type] = None,
-        subscription: Optional[type] = None,
+        query: type | None = None,
+        mutation: type | None = None,
+        subscription: type | None = None,
         # TODO: we should update directives' type in the main schema
         directives: Iterable[type] = (),
         types: Iterable[type] = (),
         extensions: Iterable[Union[type["SchemaExtension"], "SchemaExtension"]] = (),
-        execution_context_class: Optional[type["GraphQLExecutionContext"]] = None,
+        execution_context_class: type["GraphQLExecutionContext"] | None = None,
         config: Optional["StrawberryConfig"] = None,
-        scalar_overrides: Optional[
-            dict[object, Union[type, "ScalarWrapper", "ScalarDefinition"]]
-        ] = None,
+        scalar_overrides: dict[object, Union[type, "ScalarWrapper", "ScalarDefinition"]]
+        | None = None,
         schema_directives: Iterable[object] = (),
         enable_federation_2: bool = False,
     ) -> None:
@@ -85,9 +84,9 @@ class Schema(BaseSchema):
 
     def _get_federation_query_type(
         self,
-        query: Optional[type[WithStrawberryObjectDefinition]],
-        mutation: Optional[type[WithStrawberryObjectDefinition]],
-        subscription: Optional[type[WithStrawberryObjectDefinition]],
+        query: type[WithStrawberryObjectDefinition] | None,
+        mutation: type[WithStrawberryObjectDefinition] | None,
+        subscription: type[WithStrawberryObjectDefinition] | None,
         additional_types: Iterable[type[WithStrawberryObjectDefinition]],
     ) -> type:
         """Returns a new query type that includes the _service field.
@@ -124,7 +123,7 @@ class Schema(BaseSchema):
 
         if entity_type:
             self.entities_resolver.__annotations__["return"] = list[
-                Optional[entity_type]  # type: ignore
+                entity_type | None  # type: ignore
             ]
 
             entities_field = strawberry.field(
@@ -250,7 +249,7 @@ class Schema(BaseSchema):
         directive_by_url[import_url].add(f"@{name}")
 
     def _add_link_directives(
-        self, additional_directives: Optional[list[object]] = None
+        self, additional_directives: list[object] | None = None
     ) -> None:
         from .schema_directives import FederationDirective, Link
 
@@ -312,11 +311,11 @@ class Schema(BaseSchema):
 
 
 def _get_entity_type(
-    query: Optional[type[WithStrawberryObjectDefinition]],
-    mutation: Optional[type[WithStrawberryObjectDefinition]],
-    subscription: Optional[type[WithStrawberryObjectDefinition]],
+    query: type[WithStrawberryObjectDefinition] | None,
+    mutation: type[WithStrawberryObjectDefinition] | None,
+    subscription: type[WithStrawberryObjectDefinition] | None,
     additional_types: Iterable[type[WithStrawberryObjectDefinition]],
-) -> Optional[StrawberryUnion]:
+) -> StrawberryUnion | None:
     # recursively iterate over the schema to find all types annotated with @key
     # if no types are annotated with @key, then the _Entity union and Query._entities
     # field should not be added to the schema

strawberry/federation/schema_directive.py

@@ -1,5 +1,6 @@
 import dataclasses
-from typing import Callable, Optional, TypeVar
+from collections.abc import Callable
+from typing import TypeVar
 from typing_extensions import dataclass_transform
 
 from strawberry.directive import directive_field
@@ -11,12 +12,12 @@ from strawberry.types.type_resolver import _get_fields
 
 @dataclasses.dataclass
 class ComposeOptions:
-    import_url: Optional[str]
+    import_url: str | None
 
 
 @dataclasses.dataclass
 class StrawberryFederationSchemaDirective(StrawberrySchemaDirective):
-    compose_options: Optional[ComposeOptions] = None
+    compose_options: ComposeOptions | None = None
 
 
 T = TypeVar("T", bound=type)
@@ -30,12 +31,12 @@ T = TypeVar("T", bound=type)
 def schema_directive(
     *,
     locations: list[Location],
-    description: Optional[str] = None,
-    name: Optional[str] = None,
+    description: str | None = None,
+    name: str | None = None,
     repeatable: bool = False,
     print_definition: bool = True,
     compose: bool = False,
-    import_url: Optional[str] = None,
+    import_url: str | None = None,
 ) -> Callable[[T], T]:
     def _wrap(cls: T) -> T:
         cls = _wrap_dataclass(cls)  # type: ignore

strawberry/federation/schema_directives.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import ClassVar, Optional
+from typing import ClassVar
 
 from strawberry import directive_field
 from strawberry.schema_directive import Location, schema_directive
@@ -59,7 +59,7 @@ class Provides(FederationDirective):
 )
 class Key(FederationDirective):
     fields: FieldSet
-    resolvable: Optional[bool] = True
+    resolvable: bool | None = True
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
         name="key", url="https://specs.apollo.dev/federation/v2.7"
     )
@@ -81,17 +81,17 @@ class Shareable(FederationDirective):
     locations=[Location.SCHEMA], name="link", repeatable=True, print_definition=False
 )
 class Link:
-    url: Optional[str]
-    as_: Optional[str] = directive_field(name="as")
-    for_: Optional[LinkPurpose] = directive_field(name="for")
-    import_: Optional[list[Optional[LinkImport]]] = directive_field(name="import")
+    url: str | None
+    as_: str | None = directive_field(name="as")
+    for_: LinkPurpose | None = directive_field(name="for")
+    import_: list[LinkImport | None] | None = directive_field(name="import")
 
     def __init__(
         self,
-        url: Optional[str] = UNSET,
-        as_: Optional[str] = UNSET,
-        for_: Optional[LinkPurpose] = UNSET,
-        import_: Optional[list[Optional[LinkImport]]] = UNSET,
+        url: str | None = UNSET,
+        as_: str | None = UNSET,
+        for_: LinkPurpose | None = UNSET,
+        import_: list[LinkImport | None] | None = UNSET,
     ) -> None:
         self.url = url
         self.as_ = as_
@@ -128,7 +128,7 @@ class Tag(FederationDirective):
 )
 class Override(FederationDirective):
     override_from: str = directive_field(name="from")
-    label: Optional[str] = UNSET
+    label: str | None = UNSET
     imported_from: ClassVar[ImportedFrom] = ImportedFrom(
         name="override", url="https://specs.apollo.dev/federation/v2.7"
     )

strawberry/federation/union.py

@@ -1,5 +1,5 @@
 from collections.abc import Collection, Iterable
-from typing import Any, Optional
+from typing import Any
 
 from strawberry.types.union import StrawberryUnion
 from strawberry.types.union import union as base_union
@@ -7,12 +7,12 @@ from strawberry.types.union import union as base_union
 
 def union(
     name: str,
-    types: Optional[Collection[type[Any]]] = None,
+    types: Collection[type[Any]] | None = None,
     *,
-    description: Optional[str] = None,
+    description: str | None = None,
     directives: Iterable[object] = (),
     inaccessible: bool = False,
-    tags: Optional[Iterable[str]] = (),
+    tags: Iterable[str] | None = (),
 ) -> StrawberryUnion:
     """Creates a new named Union type.
 

strawberry/flask/views.py

@@ -4,10 +4,8 @@ import warnings
 from typing import (
     TYPE_CHECKING,
     ClassVar,
-    Optional,
-    Union,
+    TypeGuard,
 )
-from typing_extensions import TypeGuard
 
 from lia import AsyncFlaskHTTPRequestAdapter, FlaskHTTPRequestAdapter, HTTPException
 
@@ -19,19 +17,20 @@ from strawberry.http.typevars import Context, RootValue
 
 if TYPE_CHECKING:
     from flask.typing import ResponseReturnValue
+
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.http.ides import GraphQL_IDE
     from strawberry.schema.base import BaseSchema
 
 
 class BaseGraphQLView:
-    graphql_ide: Optional[GraphQL_IDE]
+    graphql_ide: GraphQL_IDE | None
 
     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,
         multipart_uploads_enabled: bool = False,
     ) -> None:
@@ -52,7 +51,7 @@ class BaseGraphQLView:
 
     def create_response(
         self,
-        response_data: Union[GraphQLHTTPResponse, list[GraphQLHTTPResponse]],
+        response_data: GraphQLHTTPResponse | list[GraphQLHTTPResponse],
         sub_response: Response,
     ) -> Response:
         sub_response.set_data(self.encode_json(response_data))  # type: ignore
@@ -72,7 +71,7 @@ class GraphQLView(
     def get_context(self, request: Request, response: Response) -> Context:
         return {"request": request, "response": response}  # type: ignore
 
-    def get_root_value(self, request: Request) -> Optional[RootValue]:
+    def get_root_value(self, request: Request) -> RootValue | None:
         return None
 
     def get_sub_response(self, request: Request) -> Response:
@@ -105,7 +104,7 @@ class AsyncGraphQLView(
     async def get_context(self, request: Request, response: Response) -> Context:
         return {"request": request, "response": response}  # type: ignore
 
-    async def get_root_value(self, request: Request) -> Optional[RootValue]:
+    async def get_root_value(self, request: Request) -> RootValue | None:
         return None
 
     async def get_sub_response(self, request: Request) -> Response:
@@ -127,11 +126,11 @@ class AsyncGraphQLView(
     def is_websocket_request(self, request: Request) -> TypeGuard[Request]:
         return False
 
-    async def pick_websocket_subprotocol(self, request: Request) -> Optional[str]:
+    async def pick_websocket_subprotocol(self, request: Request) -> str | None:
         raise NotImplementedError
 
     async def create_websocket_response(
-        self, request: Request, subprotocol: Optional[str]
+        self, request: Request, subprotocol: str | None
     ) -> Response:
         raise NotImplementedError
 

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
+from typing_extensions import TypedDict
 
 from strawberry.schema._graphql_core import (
     GraphQLIncrementalExecutionResults,
@@ -11,14 +11,14 @@ from strawberry.schema._graphql_core import (
 
 
 class GraphQLHTTPResponse(TypedDict, total=False):
-    data: Optional[dict[str, object]]
-    errors: Optional[list[object]]
-    extensions: Optional[dict[str, object]]
-    hasNext: Optional[bool]
-    completed: Optional[list[Any]]
-    pending: Optional[list[Any]]
-    initial: Optional[list[Any]]
-    incremental: Optional[list[Any]]
+    data: dict[str, object] | None
+    errors: list[object] | None
+    extensions: dict[str, object] | None
+    hasNext: bool | None
+    completed: list[Any] | None
+    pending: list[Any] | None
+    initial: list[Any] | None
+    incremental: list[Any] | None
 
 
 def process_result(result: ResultType) -> GraphQLHTTPResponse:
@@ -39,10 +39,10 @@ def process_result(result: ResultType) -> GraphQLHTTPResponse:
 class GraphQLRequestData:
     # query is optional here as it can be added by an extensions
     # (for example an extension for persisted queries)
-    query: Optional[str]
-    variables: Optional[dict[str, Any]]
-    operation_name: Optional[str]
-    extensions: Optional[dict[str, Any]]
+    query: str | None
+    variables: dict[str, Any] | None
+    operation_name: str | None
+    extensions: dict[str, Any] | None
     protocol: Literal["http", "multipart-subscription"] = "http"
 
 

strawberry/http/async_base_view.py

@@ -2,19 +2,16 @@ 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,
-    Union,
+    TypeGuard,
     cast,
     overload,
 )
-from typing_extensions import TypeGuard
 
 from graphql import GraphQLError
 from lia import AsyncHTTPRequestAdapter, HTTPException
@@ -87,9 +84,9 @@ class AsyncBaseHTTPView(
     ],
 ):
     schema: BaseSchema
-    graphql_ide: Optional[GraphQL_IDE]
+    graphql_ide: GraphQL_IDE | None
     keep_alive = False
-    keep_alive_interval: Optional[float] = None
+    keep_alive_interval: float | None = None
     connection_init_wait_timeout: timedelta = timedelta(minutes=1)
     request_adapter_class: Callable[[Request], AsyncHTTPRequestAdapter]
     websocket_adapter_class: Callable[
@@ -117,19 +114,19 @@ class AsyncBaseHTTPView(
     @abc.abstractmethod
     async def get_context(
         self,
-        request: Union[Request, WebSocketRequest],
-        response: Union[SubResponse, WebSocketResponse],
+        request: Request | WebSocketRequest,
+        response: SubResponse | WebSocketResponse,
     ) -> Context: ...
 
     @abc.abstractmethod
     async def get_root_value(
-        self, request: Union[Request, WebSocketRequest]
-    ) -> Optional[RootValue]: ...
+        self, request: Request | WebSocketRequest
+    ) -> RootValue | None: ...
 
     @abc.abstractmethod
     def create_response(
         self,
-        response_data: Union[GraphQLHTTPResponse, list[GraphQLHTTPResponse]],
+        response_data: GraphQLHTTPResponse | list[GraphQLHTTPResponse],
         sub_response: SubResponse,
     ) -> Response: ...
 
@@ -147,26 +144,26 @@ class AsyncBaseHTTPView(
 
     @abc.abstractmethod
     def is_websocket_request(
-        self, request: Union[Request, WebSocketRequest]
+        self, request: Request | WebSocketRequest
     ) -> TypeGuard[WebSocketRequest]: ...
 
     @abc.abstractmethod
     async def pick_websocket_subprotocol(
         self, request: WebSocketRequest
-    ) -> Optional[str]: ...
+    ) -> str | None: ...
 
     @abc.abstractmethod
     async def create_websocket_response(
-        self, request: WebSocketRequest, subprotocol: Optional[str]
+        self, request: WebSocketRequest, subprotocol: str | None
     ) -> WebSocketResponse: ...
 
     async def execute_operation(
         self,
         request: Request,
         context: Context,
-        root_value: Optional[RootValue],
+        root_value: RootValue | None,
         sub_response: SubResponse,
-    ) -> Union[ExecutionResult, list[ExecutionResult], SubscriptionExecutionResult]:
+    ) -> ExecutionResult | list[ExecutionResult] | SubscriptionExecutionResult:
         request_adapter = self.request_adapter_class(request)
 
         try:
@@ -223,7 +220,7 @@ class AsyncBaseHTTPView(
         request_adapter: AsyncHTTPRequestAdapter,
         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)
@@ -283,7 +280,7 @@ class AsyncBaseHTTPView(
         self,
         request: Request,
         context: Context = UNSET,
-        root_value: Optional[RootValue] = UNSET,
+        root_value: RootValue | None = UNSET,
     ) -> Response: ...
 
     @overload
@@ -291,15 +288,15 @@ class AsyncBaseHTTPView(
         self,
         request: WebSocketRequest,
         context: Context = UNSET,
-        root_value: Optional[RootValue] = UNSET,
+        root_value: RootValue | None = UNSET,
     ) -> WebSocketResponse: ...
 
     async def run(
         self,
-        request: Union[Request, WebSocketRequest],
+        request: Request | WebSocketRequest,
         context: Context = UNSET,
-        root_value: Optional[RootValue] = UNSET,
-    ) -> Union[Response, WebSocketResponse]:
+        root_value: RootValue | None = UNSET,
+    ) -> Response | WebSocketResponse:
         root_value = (
             await self.get_root_value(request) if root_value is UNSET else root_value
         )
@@ -373,7 +370,6 @@ class AsyncBaseHTTPView(
                 stream,
                 sub_response,
                 headers={
-                    "Transfer-Encoding": "chunked",
                     "Content-Type": "multipart/mixed;boundary=graphql;subscriptionSpec=1.0,application/json",
                 },
             )
@@ -442,12 +438,11 @@ class AsyncBaseHTTPView(
                 stream,
                 sub_response,
                 headers={
-                    "Transfer-Encoding": "chunked",
                     "Content-Type": 'multipart/mixed; boundary="-"',
                 },
             )
 
-        response_data: Union[GraphQLHTTPResponse, list[GraphQLHTTPResponse]]
+        response_data: GraphQLHTTPResponse | list[GraphQLHTTPResponse]
 
         if isinstance(result, list):
             response_data = []
@@ -618,7 +613,7 @@ class AsyncBaseHTTPView(
 
     async def parse_http_body(
         self, request: AsyncHTTPRequestAdapter
-    ) -> Union[GraphQLRequestData, list[GraphQLRequestData]]:
+    ) -> GraphQLRequestData | list[GraphQLRequestData]:
         headers = {key.lower(): value for key, value in request.headers.items()}
         content_type, _ = parse_content_type(request.content_type or "")
         accept = headers.get("accept", "")
@@ -687,7 +682,7 @@ class AsyncBaseHTTPView(
 
     async def on_ws_connect(
         self, context: Context
-    ) -> Union[UnsetType, None, dict[str, object]]:
+    ) -> UnsetType | None | dict[str, object]:
         return UNSET
 
 

strawberry/http/base.py

@@ -1,6 +1,6 @@
 import json
 from collections.abc import Mapping
-from typing import Any, Generic, Optional, Union
+from typing import Any, Generic
 from typing_extensions import Protocol
 
 from lia import HTTPException
@@ -15,7 +15,7 @@ from .typevars import Request
 
 class BaseRequestProtocol(Protocol):
     @property
-    def query_params(self) -> Mapping[str, Optional[Union[str, list[str]]]]: ...
+    def query_params(self) -> Mapping[str, str | list[str] | None]: ...
 
     @property
     def method(self) -> HTTPMethod: ...
@@ -25,7 +25,7 @@ class BaseRequestProtocol(Protocol):
 
 
 class BaseView(Generic[Request]):
-    graphql_ide: Optional[GraphQL_IDE]
+    graphql_ide: GraphQL_IDE | None
     multipart_uploads_enabled: bool = False
     schema: BaseSchema
 
@@ -42,13 +42,13 @@ class BaseView(Generic[Request]):
     def is_request_allowed(self, request: BaseRequestProtocol) -> bool:
         return request.method in ("GET", "POST")
 
-    def parse_json(self, data: Union[str, bytes]) -> Any:
+    def parse_json(self, data: str | bytes) -> Any:
         try:
             return self.decode_json(data)
         except json.JSONDecodeError as e:
             raise HTTPException(400, "Unable to parse request body as JSON") from e
 
-    def decode_json(self, data: Union[str, bytes]) -> object:
+    def decode_json(self, data: str | bytes) -> object:
         return json.loads(data)
 
     def encode_json(self, data: object) -> str:
@@ -78,13 +78,12 @@ class BaseView(Generic[Request]):
     def _is_multipart_subscriptions(
         self, content_type: str, params: dict[str, str]
     ) -> bool:
-        if content_type != "multipart/mixed":
-            return False
-
-        if params.get("boundary") != "graphql":
-            return False
-
-        return params.get("subscriptionspec", "").startswith("1.0")
+        subscription_spec = params.get("subscriptionspec", "").strip("'\"")
+        return (
+            content_type == "multipart/mixed"
+            and ("boundary" not in params or params["boundary"] == "graphql")
+            and subscription_spec.startswith("1.0")
+        )
 
     def _validate_batch_request(
         self, request_data: list[GraphQLRequestData], protocol: str

strawberry/http/ides.py

@@ -1,12 +1,11 @@
 import pathlib
-from typing import Optional
-from typing_extensions import Literal
+from typing import Literal
 
 GraphQL_IDE = Literal["graphiql", "apollo-sandbox", "pathfinder"]
 
 
 def get_graphql_ide_html(
-    graphql_ide: Optional[GraphQL_IDE] = "graphiql",
+    graphql_ide: GraphQL_IDE | None = "graphiql",
 ) -> str:
     here = pathlib.Path(__file__).parents[1]