strawberry-graphql 0.273.3__tar.gz → 0.274.1__tar.gz

{strawberry_graphql-0.273.3 → strawberry_graphql-0.274.1}/PKG-INFO

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

{strawberry_graphql-0.273.3 → strawberry_graphql-0.274.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "strawberry-graphql"
-version = "0.273.3"
+version = "0.274.1"
 description = "A library for creating GraphQL APIs"
 authors = [{ name = "Patrick Arminio", email = "patrick.arminio@gmail.com" }]
 license = { text = "MIT" }

{strawberry_graphql-0.273.3 → strawberry_graphql-0.274.1}/strawberry/annotation.py

@@ -145,10 +145,8 @@ class StrawberryAnnotation:
             return evaled_type
         if self._is_list(evaled_type):
             return self.create_list(evaled_type)
-        if type_of := self._get_maybe_type(evaled_type):
-            return StrawberryMaybe(
-                of_type=type_of,
-            )
+        if self._is_maybe(evaled_type):
+            return self.create_maybe(evaled_type)
 
         if self._is_graphql_generic(evaled_type):
             if any(is_type_var(type_) for type_ in get_args(evaled_type)):
@@ -224,6 +222,17 @@ class StrawberryAnnotation:
 
         return StrawberryOptional(of_type)
 
+    def create_maybe(self, evaled_type: Any) -> StrawberryMaybe:
+        # we expect a single arg to the evaled type,
+        # as unions on input types are not supported
+        # and maybe[t] already represents t | None
+        inner_type = get_args(evaled_type)[0]
+
+        of_type = StrawberryAnnotation(
+            annotation=inner_type, namespace=self.namespace
+        ).resolve()
+        return StrawberryMaybe(of_type)
+
     def create_type_var(self, evaled_type: TypeVar) -> StrawberryTypeVar:
         return StrawberryTypeVar(evaled_type)
 
@@ -320,8 +329,8 @@ class StrawberryAnnotation:
         )
 
     @classmethod
-    def _get_maybe_type(cls, annotation: Any) -> type | None:
-        return get_args(annotation)[0] if _annotation_is_maybe(annotation) else None
+    def _is_maybe(cls, annotation: Any) -> bool:
+        return _annotation_is_maybe(annotation)
 
     @classmethod
     def _is_strawberry_type(cls, evaled_type: Any) -> bool:

{strawberry_graphql-0.273.3 → strawberry_graphql-0.274.1}/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,
@@ -330,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.3 → strawberry_graphql-0.274.1}/strawberry/http/sync_base_view.py

@@ -20,7 +20,10 @@ 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
@@ -193,6 +196,8 @@ class SyncBaseHTTPView(
                 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.3 → strawberry_graphql-0.274.1}/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.3 → strawberry_graphql-0.274.1}/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.3 → strawberry_graphql-0.274.1}/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.3 → strawberry_graphql-0.274.1}/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.3 → strawberry_graphql-0.274.1}/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.3 → strawberry_graphql-0.274.1}/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