strawberry-graphql 0.273.2__tar.gz → 0.274.0__tar.gz

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: strawberry-graphql
-Version: 0.273.2
+Version: 0.274.0
 Summary: A library for creating GraphQL APIs
 License: MIT
 Keywords: graphql,api,rest,starlette,async

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "strawberry-graphql"
-version = "0.273.2"
+version = "0.274.0"
 description = "A library for creating GraphQL APIs"
 authors = [{ name = "Patrick Arminio", email = "patrick.arminio@gmail.com" }]
 license = { text = "MIT" }
@@ -108,6 +108,7 @@ types-deprecated = "^1.2.15.20241117"
 types-six = "^1.17.0.20250403"
 types-pyyaml = "^6.0.12.20240917"
 mypy = "^1.15.0"
+pyright = "1.1.401"
 codeflash = ">=0.9.2"
 
 [tool.poetry.group.integrations]

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/aiohttp/views.py

@@ -36,7 +36,7 @@ from strawberry.http.typevars import (
 from strawberry.subscriptions import GRAPHQL_TRANSPORT_WS_PROTOCOL, GRAPHQL_WS_PROTOCOL
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncGenerator, Iterable, Mapping
+    from collections.abc import AsyncGenerator, Mapping, Sequence
 
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.http.ides import GraphQL_IDE
@@ -144,7 +144,7 @@ class GraphQLView(
         keep_alive: bool = True,
         keep_alive_interval: float = 1,
         debug: bool = False,
-        subscription_protocols: Iterable[str] = (
+        subscription_protocols: Sequence[str] = (
             GRAPHQL_TRANSPORT_WS_PROTOCOL,
             GRAPHQL_WS_PROTOCOL,
         ),

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/channels/handlers/http_handler.py

@@ -360,7 +360,7 @@ class SyncGraphQLHTTPConsumer(
     def run(
         self,
         request: ChannelsRequest,
-        context: Optional[Context] = UNSET,
+        context: Context = UNSET,
         root_value: Optional[RootValue] = UNSET,
     ) -> ChannelsResponse | MultipartChannelsResponse:
         return super().run(request, context, root_value)

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/channels/handlers/ws_handler.py

@@ -19,7 +19,7 @@ from strawberry.subscriptions import GRAPHQL_TRANSPORT_WS_PROTOCOL, GRAPHQL_WS_P
 from .base import ChannelsWSConsumer
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncGenerator, Mapping
+    from collections.abc import AsyncGenerator, Mapping, Sequence
 
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.schema import BaseSchema
@@ -110,7 +110,7 @@ class GraphQLWSConsumer(
         keep_alive: bool = False,
         keep_alive_interval: float = 1,
         debug: bool = False,
-        subscription_protocols: tuple[str, str] = (
+        subscription_protocols: Sequence[str] = (
             GRAPHQL_TRANSPORT_WS_PROTOCOL,
             GRAPHQL_WS_PROTOCOL,
         ),

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/http/async_base_view.py

@@ -26,7 +26,10 @@ from strawberry.http import (
 )
 from strawberry.http.ides import GraphQL_IDE
 from strawberry.schema.base import BaseSchema
-from strawberry.schema.exceptions import InvalidOperationTypeError
+from strawberry.schema.exceptions import (
+    CannotGetOperationTypeError,
+    InvalidOperationTypeError,
+)
 from strawberry.subscriptions import GRAPHQL_TRANSPORT_WS_PROTOCOL, GRAPHQL_WS_PROTOCOL
 from strawberry.subscriptions.protocols.graphql_transport_ws.handlers import (
     BaseGraphQLTransportWSHandler,
@@ -248,7 +251,7 @@ class AsyncBaseHTTPView(
     async def run(
         self,
         request: Request,
-        context: Optional[Context] = UNSET,
+        context: Context = UNSET,
         root_value: Optional[RootValue] = UNSET,
     ) -> Response: ...
 
@@ -256,14 +259,14 @@ class AsyncBaseHTTPView(
     async def run(
         self,
         request: WebSocketRequest,
-        context: Optional[Context] = UNSET,
+        context: Context = UNSET,
         root_value: Optional[RootValue] = UNSET,
     ) -> WebSocketResponse: ...
 
     async def run(
         self,
         request: Union[Request, WebSocketRequest],
-        context: Optional[Context] = UNSET,
+        context: Context = UNSET,
         root_value: Optional[RootValue] = UNSET,
     ) -> Union[Response, WebSocketResponse]:
         root_value = (
@@ -287,7 +290,7 @@ class AsyncBaseHTTPView(
                 await self.graphql_transport_ws_handler_class(
                     view=self,
                     websocket=websocket,
-                    context=context,  # type: ignore
+                    context=context,
                     root_value=root_value,  # type: ignore
                     schema=self.schema,
                     debug=self.debug,
@@ -297,7 +300,7 @@ class AsyncBaseHTTPView(
                 await self.graphql_ws_handler_class(
                     view=self,
                     websocket=websocket,
-                    context=context,  # type: ignore
+                    context=context,
                     root_value=root_value,  # type: ignore
                     schema=self.schema,
                     debug=self.debug,
@@ -318,8 +321,6 @@ class AsyncBaseHTTPView(
             else context
         )
 
-        assert context
-
         if not self.is_request_allowed(request_adapter):
             raise HTTPException(405, "GraphQL only supports GET and POST requests.")
 
@@ -332,6 +333,8 @@ class AsyncBaseHTTPView(
             result = await self.execute_operation(
                 request=request, context=context, root_value=root_value
             )
+        except CannotGetOperationTypeError as e:
+            raise HTTPException(400, e.as_http_error_reason()) from e
         except InvalidOperationTypeError as e:
             raise HTTPException(
                 400, e.as_http_error_reason(request_adapter.method)

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/http/sync_base_view.py

@@ -11,7 +11,6 @@ from typing import (
 
 from graphql import GraphQLError
 
-from strawberry import UNSET
 from strawberry.exceptions import MissingQueryError
 from strawberry.file_uploads.utils import replace_placeholders_with_files
 from strawberry.http import (
@@ -21,9 +20,13 @@ from strawberry.http import (
 )
 from strawberry.http.ides import GraphQL_IDE
 from strawberry.schema import BaseSchema
-from strawberry.schema.exceptions import InvalidOperationTypeError
+from strawberry.schema.exceptions import (
+    CannotGetOperationTypeError,
+    InvalidOperationTypeError,
+)
 from strawberry.types import ExecutionResult
 from strawberry.types.graphql import OperationType
+from strawberry.types.unset import UNSET
 
 from .base import BaseView
 from .exceptions import HTTPException
@@ -166,7 +169,7 @@ class SyncBaseHTTPView(
     def run(
         self,
         request: Request,
-        context: Optional[Context] = UNSET,
+        context: Context = UNSET,
         root_value: Optional[RootValue] = UNSET,
     ) -> Response:
         request_adapter = self.request_adapter_class(request)
@@ -187,14 +190,14 @@ class SyncBaseHTTPView(
         )
         root_value = self.get_root_value(request) if root_value is UNSET else root_value
 
-        assert context
-
         try:
             result = self.execute_operation(
                 request=request,
                 context=context,
                 root_value=root_value,
             )
+        except CannotGetOperationTypeError as e:
+            raise HTTPException(400, e.as_http_error_reason()) from e
         except InvalidOperationTypeError as e:
             raise HTTPException(
                 400, e.as_http_error_reason(request_adapter.method)

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/litestar/controller.py

@@ -55,7 +55,7 @@ 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
+    from collections.abc import AsyncGenerator, AsyncIterator, Mapping, Sequence
 
     from litestar.types import AnyCallable, Dependencies
     from strawberry.http import GraphQLHTTPResponse
@@ -253,7 +253,7 @@ class GraphQLController(
     graphql_ide: Optional[GraphQL_IDE] = "graphiql"
     debug: bool = False
     connection_init_wait_timeout: timedelta = timedelta(minutes=1)
-    protocols: tuple[str, ...] = (
+    protocols: Sequence[str] = (
         GRAPHQL_TRANSPORT_WS_PROTOCOL,
         GRAPHQL_WS_PROTOCOL,
     )
@@ -411,7 +411,7 @@ def make_graphql_controller(
     root_value_getter: Optional[AnyCallable] = None,
     # TODO: context typevar
     context_getter: Optional[AnyCallable] = None,
-    subscription_protocols: tuple[str, ...] = (
+    subscription_protocols: Sequence[str] = (
         GRAPHQL_TRANSPORT_WS_PROTOCOL,
         GRAPHQL_WS_PROTOCOL,
     ),

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/schema/exceptions.py

@@ -1,9 +1,21 @@
+from typing import Optional
+
 from strawberry.types.graphql import OperationType
 
 
 class CannotGetOperationTypeError(Exception):
     """Internal error raised when we cannot get the operation type from a GraphQL document."""
 
+    def __init__(self, operation_name: Optional[str]) -> None:
+        self.operation_name = operation_name
+
+    def as_http_error_reason(self) -> str:
+        return (
+            "Can't get GraphQL operation type"
+            if self.operation_name is None
+            else f'Unknown operation named "{self.operation_name}".'
+        )
+
 
 class InvalidOperationTypeError(Exception):
     def __init__(self, operation_type: OperationType) -> None:

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/schema/schema.py

@@ -498,7 +498,7 @@ class Schema(BaseSchema):
         try:
             operation_type = context.operation_type
         except RuntimeError as error:
-            raise CannotGetOperationTypeError from error
+            raise CannotGetOperationTypeError(context.operation_name) from error
 
         if operation_type not in context.allowed_operations:
             raise InvalidOperationTypeError(operation_type)
@@ -609,7 +609,11 @@ class Schema(BaseSchema):
                         # only return a sanitised version to the client.
                         self._process_errors(result.errors, execution_context)
 
-        except (MissingQueryError, InvalidOperationTypeError):
+        except (
+            MissingQueryError,
+            CannotGetOperationTypeError,
+            InvalidOperationTypeError,
+        ):
             raise
         except Exception as exc:  # noqa: BLE001
             return await self._handle_execution_result(
@@ -677,8 +681,15 @@ class Schema(BaseSchema):
                             extensions=extensions_runner.get_extensions_results_sync(),
                         )
 
-                if execution_context.operation_type not in allowed_operation_types:
-                    raise InvalidOperationTypeError(execution_context.operation_type)  # noqa: TRY301
+                try:
+                    operation_type = execution_context.operation_type
+                except RuntimeError as error:
+                    raise CannotGetOperationTypeError(
+                        execution_context.operation_name
+                    ) from error
+
+                if operation_type not in execution_context.allowed_operations:
+                    raise InvalidOperationTypeError(operation_type)  # noqa: TRY301
 
                 with extensions_runner.validation():
                     _run_validation(execution_context)
@@ -725,7 +736,11 @@ class Schema(BaseSchema):
                             # extension). That way we can log the original errors but
                             # only return a sanitised version to the client.
                             self._process_errors(result.errors, execution_context)
-        except (MissingQueryError, InvalidOperationTypeError):
+        except (
+            MissingQueryError,
+            CannotGetOperationTypeError,
+            InvalidOperationTypeError,
+        ):
             raise
         except Exception as exc:  # noqa: BLE001
             errors = [_coerce_error(exc)]

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -20,6 +20,7 @@ from strawberry.http.exceptions import (
     WebSocketDisconnected,
 )
 from strawberry.http.typevars import Context, RootValue
+from strawberry.schema.exceptions import CannotGetOperationTypeError
 from strawberry.subscriptions.protocols.graphql_transport_ws.types import (
     CompleteMessage,
     ConnectionInitMessage,
@@ -221,13 +222,13 @@ class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
         try:
             operation_type = get_operation_type(graphql_document, operation_name)
         except RuntimeError:
+            # Unlike in the other protocol implementations, we access the operation type
+            # before executing the operation. Therefore, we don't get a nice
+            # CannotGetOperationTypeError, but rather the underlying RuntimeError.
+            e = CannotGetOperationTypeError(operation_name)
             await self.websocket.close(
                 code=4400,
-                reason=(
-                    f'Unknown operation named "{operation_name}".'
-                    if operation_name
-                    else "Can't get GraphQL operation type"
-                ),
+                reason=e.as_http_error_reason(),
             )
             return
 

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -194,18 +194,12 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
 
             await self.send_message(CompleteMessage(type="complete", id=operation_id))
 
-        except CannotGetOperationTypeError:
+        except CannotGetOperationTypeError as e:
             await self.send_message(
                 ErrorMessage(
                     type="error",
                     id=operation_id,
-                    payload={
-                        "message": (
-                            f'Unknown operation named "{operation_name}".'
-                            if operation_name
-                            else "Can't get GraphQL operation type"
-                        )
-                    },
+                    payload={"message": e.as_http_error_reason()},
                 )
             )
         except asyncio.CancelledError:

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/types/execution.py

@@ -57,7 +57,7 @@ class ExecutionContext:
 
     @property
     def operation_name(self) -> Optional[str]:
-        if self._provided_operation_name:
+        if self._provided_operation_name is not None:
             return self._provided_operation_name
 
         definition = self._get_first_operation()

{strawberry_graphql-0.273.2 → strawberry_graphql-0.274.0}/strawberry/utils/operation.py

@@ -25,7 +25,7 @@ def get_operation_type(
 ) -> OperationType:
     definition: Optional[OperationDefinitionNode] = None
 
-    if operation_name:
+    if operation_name is not None:
         for d in graphql_document.definitions:
             if not isinstance(d, OperationDefinitionNode):
                 continue