strawberry-graphql 0.254.0__tar.gz → 0.255.0__tar.gz

{strawberry_graphql-0.254.0 → strawberry_graphql-0.255.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strawberry-graphql
-Version: 0.254.0
+Version: 0.255.0
 Summary: A library for creating GraphQL APIs
 Home-page: https://strawberry.rocks/
 License: MIT

{strawberry_graphql-0.254.0 → strawberry_graphql-0.255.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.254.0"
+version = "0.255.0"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"
@@ -100,6 +100,10 @@ poetry-plugin-export = "^1.6.0"
 urllib3 = "<2"
 graphlib_backport = {version = "*", python = "<3.9", optional = false}
 inline-snapshot = "^0.10.1"
+types-deprecated = "^1.2.15.20241117"
+types-six = "^1.17.0.20241205"
+types-pyyaml = "^6.0.12.20240917"
+mypy = "^1.13.0"
 
 [tool.poetry.group.integrations]
 optional = true

{strawberry_graphql-0.254.0 → strawberry_graphql-0.255.0}/strawberry/annotation.py

@@ -208,7 +208,7 @@ class StrawberryAnnotation:
         )
 
         # Note that passing a single type to `Union` is equivalent to not using `Union`
-        # at all. This allows us to not di any checks for how many types have been
+        # at all. This allows us to not do any checks for how many types have been
         # passed as we can safely use `Union` for both optional types
         # (e.g. `Optional[str]`) and optional unions (e.g.
         # `Optional[Union[TypeA, TypeB]]`)

{strawberry_graphql-0.254.0 → strawberry_graphql-0.255.0}/strawberry/http/async_base_view.py

@@ -13,6 +13,7 @@ from typing import (
     Mapping,
     Optional,
     Tuple,
+    Type,
     Union,
     cast,
     overload,
@@ -116,11 +117,19 @@ class AsyncBaseHTTPView(
     connection_init_wait_timeout: timedelta = timedelta(minutes=1)
     request_adapter_class: Callable[[Request], AsyncHTTPRequestAdapter]
     websocket_adapter_class: Callable[
-        ["AsyncBaseHTTPView", WebSocketRequest, WebSocketResponse],
+        [
+            "AsyncBaseHTTPView[Any, Any, Any, Any, Any, Context, RootValue]",
+            WebSocketRequest,
+            WebSocketResponse,
+        ],
         AsyncWebSocketAdapter,
     ]
-    graphql_transport_ws_handler_class = BaseGraphQLTransportWSHandler
-    graphql_ws_handler_class = BaseGraphQLWSHandler
+    graphql_transport_ws_handler_class: Type[
+        BaseGraphQLTransportWSHandler[Context, RootValue]
+    ] = BaseGraphQLTransportWSHandler[Context, RootValue]
+    graphql_ws_handler_class: Type[BaseGraphQLWSHandler[Context, RootValue]] = (
+        BaseGraphQLWSHandler[Context, RootValue]
+    )
 
     @property
     @abc.abstractmethod
@@ -281,8 +290,8 @@ class AsyncBaseHTTPView(
                 await self.graphql_transport_ws_handler_class(
                     view=self,
                     websocket=websocket,
-                    context=context,
-                    root_value=root_value,
+                    context=context,  # type: ignore
+                    root_value=root_value,  # type: ignore
                     schema=self.schema,
                     debug=self.debug,
                     connection_init_wait_timeout=self.connection_init_wait_timeout,
@@ -291,8 +300,8 @@ class AsyncBaseHTTPView(
                 await self.graphql_ws_handler_class(
                     view=self,
                     websocket=websocket,
-                    context=context,
-                    root_value=root_value,
+                    context=context,  # type: ignore
+                    root_value=root_value,  # type: ignore
                     schema=self.schema,
                     debug=self.debug,
                     keep_alive=self.keep_alive,

{strawberry_graphql-0.254.0 → strawberry_graphql-0.255.0}/strawberry/http/typevars.py

@@ -1,20 +1,20 @@
-from typing import TypeVar
+from typing_extensions import TypeVar
 
 Request = TypeVar("Request", contravariant=True)
 Response = TypeVar("Response")
 SubResponse = TypeVar("SubResponse")
 WebSocketRequest = TypeVar("WebSocketRequest")
 WebSocketResponse = TypeVar("WebSocketResponse")
-Context = TypeVar("Context")
-RootValue = TypeVar("RootValue")
+Context = TypeVar("Context", default=None)
+RootValue = TypeVar("RootValue", default=None)
 
 
 __all__ = [
+    "Context",
     "Request",
     "Response",
+    "RootValue",
     "SubResponse",
     "WebSocketRequest",
     "WebSocketResponse",
-    "Context",
-    "RootValue",
 ]

{strawberry_graphql-0.254.0 → strawberry_graphql-0.255.0}/strawberry/relay/fields.py

@@ -24,9 +24,8 @@ from typing import (
     Type,
     Union,
     cast,
-    overload,
 )
-from typing_extensions import Annotated, get_origin
+from typing_extensions import Annotated, get_args, get_origin
 
 from strawberry.annotation import StrawberryAnnotation
 from strawberry.extensions.field_extension import (
@@ -44,9 +43,9 @@ from strawberry.types.field import _RESOLVER_TYPE, StrawberryField, field
 from strawberry.types.fields.resolver import StrawberryResolver
 from strawberry.types.lazy_type import LazyType
 from strawberry.utils.aio import asyncgen_to_list
-from strawberry.utils.typing import eval_type, is_generic_alias
+from strawberry.utils.typing import eval_type, is_generic_alias, is_optional, is_union
 
-from .types import Connection, GlobalID, Node, NodeIterableType, NodeType
+from .types import Connection, GlobalID, Node
 
 if TYPE_CHECKING:
     from typing_extensions import Literal
@@ -233,7 +232,11 @@ class ConnectionExtension(FieldExtension):
             f_type = f_type.resolve_type()
             field.type = f_type
 
+        if isinstance(f_type, StrawberryOptional):
+            f_type = f_type.of_type
+
         type_origin = get_origin(f_type) if is_generic_alias(f_type) else f_type
+
         if not isinstance(type_origin, type) or not issubclass(type_origin, Connection):
             raise RelayWrongAnnotationError(field.name, cast(type, field.origin))
 
@@ -253,13 +256,19 @@ class ConnectionExtension(FieldExtension):
                 None,
             )
 
+        if is_union(resolver_type):
+            assert is_optional(resolver_type)
+
+            resolver_type = get_args(resolver_type)[0]
+
         origin = get_origin(resolver_type)
+
         if origin is None or not issubclass(
             origin, (Iterator, Iterable, AsyncIterator, AsyncIterable)
         ):
             raise RelayWrongResolverAnnotationError(field.name, field.base_resolver)
 
-        self.connection_type = cast(Type[Connection[Node]], field.type)
+        self.connection_type = cast(Type[Connection[Node]], f_type)
 
     def resolve(
         self,
@@ -327,44 +336,17 @@ else:
         return field(*args, **kwargs)
 
 
-@overload
-def connection(
-    graphql_type: Optional[Type[Connection[NodeType]]] = None,
-    *,
-    resolver: Optional[_RESOLVER_TYPE[NodeIterableType[Any]]] = None,
-    name: Optional[str] = None,
-    is_subscription: bool = False,
-    description: Optional[str] = None,
-    init: Literal[True] = True,
-    permission_classes: Optional[List[Type[BasePermission]]] = None,
-    deprecation_reason: Optional[str] = None,
-    default: Any = dataclasses.MISSING,
-    default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
-    metadata: Optional[Mapping[Any, Any]] = None,
-    directives: Optional[Sequence[object]] = (),
-    extensions: List[FieldExtension] = (),  # type: ignore
-) -> Any: ...
-
-
-@overload
-def connection(
-    graphql_type: Optional[Type[Connection[NodeType]]] = None,
-    *,
-    name: Optional[str] = None,
-    is_subscription: bool = False,
-    description: Optional[str] = None,
-    permission_classes: Optional[List[Type[BasePermission]]] = None,
-    deprecation_reason: Optional[str] = None,
-    default: Any = dataclasses.MISSING,
-    default_factory: Union[Callable[..., object], object] = dataclasses.MISSING,
-    metadata: Optional[Mapping[Any, Any]] = None,
-    directives: Optional[Sequence[object]] = (),
-    extensions: List[FieldExtension] = (),  # type: ignore
-) -> StrawberryField: ...
+# we used to have `Type[Connection[NodeType]]` here, but that when we added
+# support for making the Connection type optional, we had to change it to
+# `Any` because otherwise it wouldn't be type check since `Optional[Connection[Something]]`
+# is not a `Type`, but a special form, see https://discuss.python.org/t/is-annotated-compatible-with-type-t/43898/46
+# for more information, and also https://peps.python.org/pep-0747/, which is currently
+# in draft status (and no type checker supports it yet)
+ConnectionGraphQLType = Any
 
 
 def connection(
-    graphql_type: Optional[Type[Connection[NodeType]]] = None,
+    graphql_type: Optional[ConnectionGraphQLType] = None,
     *,
     resolver: Optional[_RESOLVER_TYPE[Any]] = None,
     name: Optional[str] = None,
@@ -379,7 +361,7 @@ def connection(
     extensions: List[FieldExtension] = (),  # type: ignore
     # This init parameter is used by pyright to determine whether this field
     # is added in the constructor or not. It is not used to change
-    # any behavior at the moment.
+    # any behaviour at the moment.
     init: Literal[True, False, None] = None,
 ) -> Any:
     """Annotate a property or a method to create a relay connection field.

{strawberry_graphql-0.254.0 → strawberry_graphql-0.255.0}/strawberry/schema/subscribe.py

@@ -138,7 +138,7 @@ async def subscribe(
         middleware_manager,
         execution_context_class,
     )
-    # GrapQL-core might return an initial error result instead of an async iterator.
+    # GraphQL-core might return an initial error result instead of an async iterator.
     # This happens when "there was an immediate error" i.e resolver is not an async iterator.
     # To overcome this while maintaining the extension contexts we do this trick.
     first = await asyncgen.__anext__()

{strawberry_graphql-0.254.0 → strawberry_graphql-0.255.0}/strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -5,8 +5,10 @@ import logging
 from contextlib import suppress
 from typing import (
     TYPE_CHECKING,
+    Any,
     Awaitable,
     Dict,
+    Generic,
     List,
     Optional,
     cast,
@@ -20,6 +22,7 @@ from strawberry.http.exceptions import (
     NonTextMessageReceived,
     WebSocketDisconnected,
 )
+from strawberry.http.typevars import Context, RootValue
 from strawberry.subscriptions.protocols.graphql_transport_ws.types import (
     CompleteMessage,
     ConnectionInitMessage,
@@ -44,15 +47,15 @@ if TYPE_CHECKING:
     from strawberry.schema.subscribe import SubscriptionResult
 
 
-class BaseGraphQLTransportWSHandler:
+class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
     task_logger: logging.Logger = logging.getLogger("strawberry.ws.task")
 
     def __init__(
         self,
-        view: AsyncBaseHTTPView,
+        view: AsyncBaseHTTPView[Any, Any, Any, Any, Any, Context, RootValue],
         websocket: AsyncWebSocketAdapter,
-        context: object,
-        root_value: object,
+        context: Context,
+        root_value: RootValue,
         schema: BaseSchema,
         debug: bool,
         connection_init_wait_timeout: timedelta,
@@ -68,7 +71,7 @@ class BaseGraphQLTransportWSHandler:
         self.connection_init_received = False
         self.connection_acknowledged = False
         self.connection_timed_out = False
-        self.operations: Dict[str, Operation] = {}
+        self.operations: Dict[str, Operation[Context, RootValue]] = {}
         self.completed_tasks: List[asyncio.Task] = []
 
     async def handle(self) -> None:
@@ -184,6 +187,8 @@ class BaseGraphQLTransportWSHandler:
         elif hasattr(self.context, "connection_params"):
             self.context.connection_params = payload
 
+        self.context = cast(Context, self.context)
+
         try:
             connection_ack_payload = await self.view.on_ws_connect(self.context)
         except ConnectionRejectionError:
@@ -250,7 +255,7 @@ class BaseGraphQLTransportWSHandler:
         operation.task = asyncio.create_task(self.run_operation(operation))
         self.operations[message["id"]] = operation
 
-    async def run_operation(self, operation: Operation) -> None:
+    async def run_operation(self, operation: Operation[Context, RootValue]) -> None:
         """The operation task's top level method. Cleans-up and de-registers the operation once it is done."""
         # TODO: Handle errors in this method using self.handle_task_exception()
 
@@ -334,7 +339,7 @@ class BaseGraphQLTransportWSHandler:
                 await task
 
 
-class Operation:
+class Operation(Generic[Context, RootValue]):
     """A class encapsulating a single operation with its id. Helps enforce protocol state transition."""
 
     __slots__ = [
@@ -350,7 +355,7 @@ class Operation:
 
     def __init__(
         self,
-        handler: BaseGraphQLTransportWSHandler,
+        handler: BaseGraphQLTransportWSHandler[Context, RootValue],
         id: str,
         operation_type: OperationType,
         query: str,

{strawberry_graphql-0.254.0 → strawberry_graphql-0.255.0}/strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -4,14 +4,17 @@ import asyncio
 from contextlib import suppress
 from typing import (
     TYPE_CHECKING,
+    Any,
     AsyncGenerator,
     Dict,
+    Generic,
     Optional,
     cast,
 )
 
 from strawberry.exceptions import ConnectionRejectionError
 from strawberry.http.exceptions import NonTextMessageReceived, WebSocketDisconnected
+from strawberry.http.typevars import Context, RootValue
 from strawberry.subscriptions.protocols.graphql_ws.types import (
     ConnectionInitMessage,
     ConnectionTerminateMessage,
@@ -29,13 +32,16 @@ if TYPE_CHECKING:
     from strawberry.schema import BaseSchema
 
 
-class BaseGraphQLWSHandler:
+class BaseGraphQLWSHandler(Generic[Context, RootValue]):
+    context: Context
+    root_value: RootValue
+
     def __init__(
         self,
-        view: AsyncBaseHTTPView,
+        view: AsyncBaseHTTPView[Any, Any, Any, Any, Any, Context, RootValue],
         websocket: AsyncWebSocketAdapter,
-        context: object,
-        root_value: object,
+        context: Context,
+        root_value: RootValue,
         schema: BaseSchema,
         debug: bool,
         keep_alive: bool,
@@ -100,6 +106,8 @@ class BaseGraphQLWSHandler:
         elif hasattr(self.context, "connection_params"):
             self.context.connection_params = payload
 
+        self.context = cast(Context, self.context)
+
         try:
             connection_ack_payload = await self.view.on_ws_connect(self.context)
         except ConnectionRejectionError as e: