strawberry-graphql 0.275.3__tar.gz → 0.275.5__tar.gz

{strawberry_graphql-0.275.3 → strawberry_graphql-0.275.5}/PKG-INFO

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

{strawberry_graphql-0.275.3 → strawberry_graphql-0.275.5}/pyproject.toml

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

{strawberry_graphql-0.275.3 → strawberry_graphql-0.275.5}/strawberry/http/async_base_view.py

@@ -198,8 +198,6 @@ class AsyncBaseHTTPView(
         if not self.allow_queries_via_get and request_adapter.method == "GET":
             allowed_operation_types = allowed_operation_types - {OperationType.QUERY}
 
-        assert self.schema
-
         if request_data.protocol == "multipart-subscription":
             return await self.schema.subscribe(
                 request_data.query,  # type: ignore
@@ -291,7 +289,7 @@ class AsyncBaseHTTPView(
                     view=self,
                     websocket=websocket,
                     context=context,
-                    root_value=root_value,  # type: ignore
+                    root_value=root_value,
                     schema=self.schema,
                     debug=self.debug,
                     connection_init_wait_timeout=self.connection_init_wait_timeout,
@@ -301,7 +299,7 @@ class AsyncBaseHTTPView(
                     view=self,
                     websocket=websocket,
                     context=context,
-                    root_value=root_value,  # type: ignore
+                    root_value=root_value,
                     schema=self.schema,
                     debug=self.debug,
                     keep_alive=self.keep_alive,
@@ -536,9 +534,16 @@ class AsyncBaseHTTPView(
                 "The GraphQL operation's `query` must be a string or null, if provided.",
             )
 
+        variables = data.get("variables")
+        if not isinstance(variables, (dict, type(None))):
+            raise HTTPException(
+                400,
+                "The GraphQL operation's `variables` must be an object or null, if provided.",
+            )
+
         return GraphQLRequestData(
             query=query,
-            variables=data.get("variables"),
+            variables=variables,
             operation_name=data.get("operationName"),
             extensions=data.get("extensions"),
             protocol=protocol,

{strawberry_graphql-0.275.3 → strawberry_graphql-0.275.5}/strawberry/http/sync_base_view.py

@@ -116,8 +116,6 @@ class SyncBaseHTTPView(
         if not self.allow_queries_via_get and request_adapter.method == "GET":
             allowed_operation_types = allowed_operation_types - {OperationType.QUERY}
 
-        assert self.schema
-
         return self.schema.execute_sync(
             request_data.query,
             root_value=root_value,
@@ -161,9 +159,16 @@ class SyncBaseHTTPView(
                 "The GraphQL operation's `query` must be a string or null, if provided.",
             )
 
+        variables = data.get("variables")
+        if not isinstance(variables, (dict, type(None))):
+            raise HTTPException(
+                400,
+                "The GraphQL operation's `variables` must be an object or null, if provided.",
+            )
+
         return GraphQLRequestData(
             query=query,
-            variables=data.get("variables"),
+            variables=variables,
             operation_name=data.get("operationName"),
             extensions=data.get("extensions"),
         )

{strawberry_graphql-0.275.3 → strawberry_graphql-0.275.5}/strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -53,7 +53,7 @@ class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
         view: AsyncBaseHTTPView[Any, Any, Any, Any, Any, Context, RootValue],
         websocket: AsyncWebSocketAdapter,
         context: Context,
-        root_value: RootValue,
+        root_value: Optional[RootValue],
         schema: BaseSchema,
         debug: bool,
         connection_init_wait_timeout: timedelta,

{strawberry_graphql-0.275.3 → strawberry_graphql-0.275.5}/strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -42,7 +42,7 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
         view: AsyncBaseHTTPView[Any, Any, Any, Any, Any, Context, RootValue],
         websocket: AsyncWebSocketAdapter,
         context: Context,
-        root_value: RootValue,
+        root_value: Optional[RootValue],
         schema: BaseSchema,
         debug: bool,
         keep_alive: bool,

{strawberry_graphql-0.275.3 → strawberry_graphql-0.275.5}/strawberry/types/arguments.py

@@ -144,12 +144,52 @@ class StrawberryArgument:
         return isinstance(self.type, StrawberryMaybe)
 
 
+def _is_leaf_type(
+    type_: Union[StrawberryType, type],
+    scalar_registry: Mapping[object, Union[ScalarWrapper, ScalarDefinition]],
+    skip_classes: tuple[type, ...] = (),
+) -> bool:
+    if type_ in skip_classes:
+        return False
+
+    if is_scalar(type_, scalar_registry):
+        return True
+
+    if isinstance(type_, EnumDefinition):
+        return True
+
+    if isinstance(type_, LazyType):
+        return _is_leaf_type(type_.resolve_type(), scalar_registry)
+
+    if hasattr(type_, "_enum_definition"):
+        enum_definition: EnumDefinition = type_._enum_definition
+        return _is_leaf_type(enum_definition, scalar_registry)
+
+    return False
+
+
+def _is_optional_leaf_type(
+    type_: Union[StrawberryType, type],
+    scalar_registry: Mapping[object, Union[ScalarWrapper, ScalarDefinition]],
+    skip_classes: tuple[type, ...] = (),
+) -> bool:
+    if type_ in skip_classes:
+        return False
+
+    if isinstance(type_, StrawberryOptional):
+        return _is_leaf_type(type_.of_type, scalar_registry, skip_classes)
+
+    return False
+
+
 def convert_argument(
     value: object,
     type_: Union[StrawberryType, type],
     scalar_registry: Mapping[object, Union[ScalarWrapper, ScalarDefinition]],
     config: StrawberryConfig,
 ) -> object:
+    from strawberry.relay.types import GlobalID
+
     # TODO: move this somewhere else and make it first class
     if isinstance(type_, StrawberryOptional):
         res = convert_argument(value, type_.of_type, scalar_registry, config)
@@ -164,22 +204,27 @@ def convert_argument(
 
     if isinstance(type_, StrawberryList):
         value_list = cast("Iterable", value)
+
+        if _is_leaf_type(
+            type_.of_type, scalar_registry, skip_classes=(GlobalID,)
+        ) or _is_optional_leaf_type(
+            type_.of_type, scalar_registry, skip_classes=(GlobalID,)
+        ):
+            return value_list
+
+        value_list = cast("Iterable", value)
+
         return [
             convert_argument(x, type_.of_type, scalar_registry, config)
             for x in value_list
         ]
 
-    if is_scalar(type_, scalar_registry):
-        from strawberry.relay.types import GlobalID
-
+    if _is_leaf_type(type_, scalar_registry):
         if type_ is GlobalID:
             return GlobalID.from_id(value)  # type: ignore
 
         return value
 
-    if isinstance(type_, EnumDefinition):
-        return value
-
     if isinstance(type_, LazyType):
         return convert_argument(value, type_.resolve_type(), scalar_registry, config)