strawberry-graphql 0.273.3__py3-none-any.whl → 0.274.0__py3-none-any.whl

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/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/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/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/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/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/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/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

{strawberry_graphql-0.273.3.dist-info → strawberry_graphql-0.274.0.dist-info}/METADATA

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

{strawberry_graphql-0.273.3.dist-info → strawberry_graphql-0.274.0.dist-info}/RECORD

@@ -134,12 +134,12 @@ strawberry/file_uploads/utils.py,sha256=-c6TbqUI-Dkb96hWCrZabh6TL2OabBuQNkCarOqg
 strawberry/flask/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/flask/views.py,sha256=MCvAsNgTZLU8RvTYKWfnLU2w7Wv1ZZpxW9W3TyTZuPY,6355
 strawberry/http/__init__.py,sha256=ytAirKk7K7D5knY21tpCGeZ-sCPgwMsijL5AxmOy-94,1163
-strawberry/http/async_base_view.py,sha256=UXzY0CU12uYZ-6LvqkIeryEn16OdRu8y94p-LgJTFNY,19963
+strawberry/http/async_base_view.py,sha256=fEJGBPqEOnEiYc0bBT4vroqyidoHNBnfF-1iScmOQi0,20124
 strawberry/http/base.py,sha256=MiX0-RqOkhRvlfpmuvgTHp4tygbUmG8fnLc0uCrOllU,2550
 strawberry/http/exceptions.py,sha256=9E2dreS1crRoJVUEPuHyx23NcDELDHNzkAOa-rGv-8I,348
 strawberry/http/ides.py,sha256=WjU0nsMDgr3Bd1ebWkUEkO2d1hk0dI16mLqXyCHqklA,613
 strawberry/http/parse_content_type.py,sha256=CYHO8F9b9DP1gJ1xxPjc9L2GkBwsyC1O_GCEp1QOuG0,381
-strawberry/http/sync_base_view.py,sha256=3T7rkAyqQfJpJTw0NENQyluT9QR4Rw-a_5BPT_2MGX4,7263
+strawberry/http/sync_base_view.py,sha256=_lYjw3uAQoYJ8QEWBWr7g6a88aM5NX8YFTFeZ5qzH88,7424
 strawberry/http/temporal_response.py,sha256=HTt65g-YxqlPGxjqvH5bzGoU1b3CctVR-9cmCRo5dUo,196
 strawberry/http/types.py,sha256=H0wGOdCO-5tNKZM_6cAtNRwZAjoEXnAC5N0Q7b70AtU,398
 strawberry/http/typevars.py,sha256=Uu6NkKe3h7o29ZWwldq6sJy4ioSSeXODTCDRvY2hUpE,489
@@ -168,9 +168,9 @@ strawberry/schema/__init__.py,sha256=u1QCyDVQExUVDA20kyosKPz3TS5HMCN2NrXclhiFAL4
 strawberry/schema/base.py,sha256=wqvEOQ_aVkfebk9SlG9zg1YXl3MlwxGZhxFRoIkAxu0,4053
 strawberry/schema/compat.py,sha256=xNpOEDfi-MODpplMGaKuKeQIVcr-tcAaKaU3TlBc1Zs,1873
 strawberry/schema/config.py,sha256=6d2MPrAgq97-7aze555dRcB3yw-aeUexYMP3KVN22c0,1024
-strawberry/schema/exceptions.py,sha256=xXq-2wXfeGualEJObXja6yVIKzFTh_iDXCIWttpIOSE,769
+strawberry/schema/exceptions.py,sha256=8gsMxxFDynMvRkUDuVL9Wwxk_zsmo6QoJ2l4NPxd64M,1137
 strawberry/schema/name_converter.py,sha256=xFOXEgqldFkxXRkIQvsJN1dPkWbEUaIrTYNOMYSEVwQ,6945
-strawberry/schema/schema.py,sha256=pTs_dfhqsftecPblY_jCPU7my8RKB1QnleicCJL35WE,37287
+strawberry/schema/schema.py,sha256=dnmSxoNdlrT02mca32Crtl0F55eweIqE-VOC77kuGjE,37723
 strawberry/schema/schema_converter.py,sha256=vxFghA8c4vPLx0XM07gjIbWqMWUnaognzmsuCWTSkTk,39112
 strawberry/schema/types/__init__.py,sha256=oHO3COWhL3L1KLYCJNY1XFf5xt2GGtHiMC-UaYbFfnA,68
 strawberry/schema/types/base_scalars.py,sha256=JRUq0WjEkR9dFewstZnqnZKp0uOEipo4UXNF5dzRf4M,1971
@@ -187,10 +187,10 @@ strawberry/static/pathfinder.html,sha256=0DPx9AmJ2C_sJstFXnWOz9k5tVQHeHaK7qdVY4l
 strawberry/subscriptions/__init__.py,sha256=1VGmiCzFepqRFyCikagkUoHHdoTG3XYlFu9GafoQMws,170
 strawberry/subscriptions/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/subscriptions/protocols/graphql_transport_ws/__init__.py,sha256=wN6dkMu6WiaIZTE19PGoN9xXpIN_RdDE_q7F7ZgjCxk,138
-strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py,sha256=8F93epfxwktsAgTF7_TwC-9kBnjrzOpF-McEV36xEVw,15257
+strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py,sha256=XJYPq_Nl6PWYu-u_uAmh-AO1k2wD3gAQjGMhRjkcwbo,15475
 strawberry/subscriptions/protocols/graphql_transport_ws/types.py,sha256=N9r2mXg5jmmjYoZV5rWf3lAzgylCOUrbKGmClXCoOso,2169
 strawberry/subscriptions/protocols/graphql_ws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-strawberry/subscriptions/protocols/graphql_ws/handlers.py,sha256=5mFyfP3brn0aS3SmeF7-z2vWTS2NhsLTD3JVE1zbr6k,8891
+strawberry/subscriptions/protocols/graphql_ws/handlers.py,sha256=4o_ptDXL1gMLVQUfxJYO8Xfm_I3gt-Y1Z2CsOb7K1yw,8658
 strawberry/subscriptions/protocols/graphql_ws/types.py,sha256=Uumiz-1O5qQnx-ERBaQtaf7db5yx-V9LMypOn9oGKwM,2003
 strawberry/test/__init__.py,sha256=lKVbKJDBnrYSPYHIKrg54UpaZcSoL93Z01zOpA1IzZM,115
 strawberry/test/client.py,sha256=ILAttb6A3jplH5wJNMeyyT1u_Q8KnollfpYLP_BVZR4,6438
@@ -203,7 +203,7 @@ strawberry/types/auto.py,sha256=WZ2cQAI8nREUigBzpzFqIKGjJ_C2VqpAPNe8vPjTciM,3007
 strawberry/types/base.py,sha256=Bfa-5Wen8qR7m6tlSMRRGlGE-chRGMHjQMopfNdbbrk,15197
 strawberry/types/cast.py,sha256=fx86MkLW77GIximBAwUk5vZxSGwDqUA6XicXvz8EXwQ,916
 strawberry/types/enum.py,sha256=IcCz0FLswJtDC_bU8aG1cjreawcqHywAzzVRBZUSAqs,6229
-strawberry/types/execution.py,sha256=Ylc0lH0nyHyQW509mVqBh2sIN5qpf4cJtt8QhVmWGgI,3749
+strawberry/types/execution.py,sha256=m27VlmvaRLQsMnWWymxMMPOlaf0lUge4ZXea_OsoH2k,3761
 strawberry/types/field.py,sha256=vxb7JvkHfRmDCYsjhDmVnO2lMbtSOteQm3jQUeSFu6g,21605
 strawberry/types/fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/types/fields/resolver.py,sha256=b6lxfw6AMOUFWm7vs7a9KzNkpR8b_S110DoIosrrWDQ,14679
@@ -229,11 +229,11 @@ strawberry/utils/graphql_lexer.py,sha256=JUVJrJ6Ax0t7m6-DTWFzf4cvXrC02VPmL1NS2zM
 strawberry/utils/importer.py,sha256=NtTgNaNSW4TnlLo_S34nxXq14RxUAec-QlEZ0LON28M,629
 strawberry/utils/inspect.py,sha256=-aFT65PkQ9KXo5w8Q2uveBJ8jEpi40sTqRipRQVdYR8,3406
 strawberry/utils/logging.py,sha256=U1cseHGquN09YFhFmRkiphfASKCyK0HUZREImPgVb0c,746
-strawberry/utils/operation.py,sha256=CCIREeh3-CzjvjyjhmYPRCVDZUX36jAxF6LbK8r5wEw,1222
+strawberry/utils/operation.py,sha256=ZgVOw3K2jQuLjNOYUHauF7itJD0QDNoPw9PBi0IYf6k,1234
 strawberry/utils/str_converters.py,sha256=-eH1Cl16IO_wrBlsGM-km4IY0IKsjhjnSNGRGOwQjVM,897
 strawberry/utils/typing.py,sha256=SDvX-Du-9HAV3-XXjqi7Q5f5qPDDFd_gASIITiwBQT4,14073
-strawberry_graphql-0.273.3.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.273.3.dist-info/METADATA,sha256=I0ZsVsO1wjkPWnRZeORNDtTmagpWN1jDNu7oZT9_DuE,7444
-strawberry_graphql-0.273.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-strawberry_graphql-0.273.3.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.273.3.dist-info/RECORD,,
+strawberry_graphql-0.274.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.274.0.dist-info/METADATA,sha256=Qi_EBzRuPvmFcfFTQWmxWId7EoPQVqlgJusjp9345kk,7444
+strawberry_graphql-0.274.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+strawberry_graphql-0.274.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.274.0.dist-info/RECORD,,