update fork (#1)

* Bump ddtrace from 1.2.3 to 1.3.0 (strawberry-graphql#2050) Bumps [ddtrace](https://github.com/DataDog/dd-trace-py) from 1.2.3 to 1.3.0. - [Release notes](https://github.com/DataDog/dd-trace-py/releases) - [Changelog](https://github.com/DataDog/dd-trace-py/blob/1.x/CHANGELOG.md) - [Commits](DataDog/dd-trace-py@v1.2.3...v1.3.0) --- updated-dependencies: - dependency-name: ddtrace dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump types-setuptools from 63.2.1 to 63.2.2 (strawberry-graphql#2049) Bumps [types-setuptools](https://github.com/python/typeshed) from 63.2.1 to 63.2.2. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-setuptools dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add support for printing dictionaries when using custom scalars (strawberry-graphql#2048) * Add support for printing dictionaries when using custom scalars * Add support for nested dicts * Add support for arguments * Add test for bool and float * Add test for id * Test for list with values * Add comment back * Fix variable * More tests * More tests for lists * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add support for objects as default values * Test more cases * Ignore code paths * Add one more test for floats Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Release 🍓 0.122.0 * Remove autoreload test (strawberry-graphql#2053) * Fix aiohttp query operation selection (strawberry-graphql#2055) * Release 🍓 0.122.1 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Patrick Arminio <patrick.arminio@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Botberry <bot@strawberry.rocks> Co-authored-by: Jonathan Ehwald <github@ehwald.info>
nrbnlulu · Aug 1, 2022 · 038cc59 · 038cc59
1 parent 46f5f59
commit 038cc59
Show file tree

Hide file tree

Showing 13 changed files with 473 additions and 164 deletions.
diff --git a/.flake8 b/.flake8
@@ -13,3 +13,4 @@ per-file-ignores =
     tests/types/test_string_annotations.py:E800
     tests/federation/test_printer.py:E800
     tests/federation/test_printer.py:E501
+    tests/test_printer/test_basic.py:E501
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,45 @@
 CHANGELOG
 =========
 
+0.122.1 - 2022-07-31
+--------------------
+
+This release fixes that the AIOHTTP integration ignored the `operationName` of query
+operations. This behaviour is a regression introduced in version 0.107.0.
+
+Contributed by [Jonathan Ehwald](https://github.com/DoctorJohn) via [PR #2055](https://github.com/strawberry-graphql/strawberry/pull/2055/)
+
+
+0.122.0 - 2022-07-29
+--------------------
+
+This release adds support for printing default values for scalars like JSON.
+
+For example the following:
+
+```python
+import strawberry
+from strawberry.scalars import JSON
+
+
+@strawberry.input
+class MyInput:
+    j: JSON = strawberry.field(default_factory=dict)
+    j2: JSON = strawberry.field(default_factory=lambda: {"hello": "world"})
+```
+
+will print the following schema:
+
+```graphql
+input MyInput {
+    j: JSON! = {}
+    j2: JSON! = {hello: "world"}
+}
+```
+
+Contributed by [Patrick Arminio](https://github.com/patrick91) via [PR #2048](https://github.com/strawberry-graphql/strawberry/pull/2048/)
+
+
 0.121.1 - 2022-07-27
 --------------------
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.121.1"
+version = "0.122.1"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"
@@ -89,7 +89,7 @@ pytest-aiohttp = "^1.0.3"
 types-typed-ast = "^1.5.3"
 types-toml = "^0.10.7"
 types-ujson = "^5.4.0"
-types-setuptools = "^63.2.0"
+types-setuptools = "^63.2.2"
 types-requests = "^2.28.5"
 types-python-dateutil = "^2.8.16"
 types-freezegun = "^1.1.9"
@@ -101,7 +101,7 @@ fastapi = {version = ">=0.65.0", optional = false}
 pytest-xprocess = "^0.19.0"
 MarkupSafe = "2.1.1"
 pytest-snapshot = "^0.9.0"
-ddtrace = "^1.2.2"
+ddtrace = "^1.3.0"
 
 [tool.poetry.extras]
 aiohttp = ["aiohttp", "pytest-aiohttp"]

diff --git a/strawberry/aiohttp/handlers/http_handler.py b/strawberry/aiohttp/handlers/http_handler.py
@@ -87,6 +87,7 @@ async def execute_request(
                 root_value=root_value,
                 variable_values=request_data.variables,
                 context_value=context,
+                operation_name=request_data.operation_name,
                 allowed_operation_types=allowed_operation_types,
             )
         except InvalidOperationTypeError as e:

diff --git a/strawberry/printer/__init__.py b/strawberry/printer/__init__.py
@@ -0,0 +1,4 @@
+from .printer import print_schema
+
+
+__all__ = ["print_schema"]
diff --git a/strawberry/printer/ast_from_value.py b/strawberry/printer/ast_from_value.py
@@ -0,0 +1,145 @@
+import dataclasses
+import re
+from math import isfinite
+from typing import Any, Mapping, Optional, cast
+
+from graphql.language import (
+    BooleanValueNode,
+    EnumValueNode,
+    FloatValueNode,
+    IntValueNode,
+    ListValueNode,
+    NameNode,
+    NullValueNode,
+    ObjectFieldNode,
+    ObjectValueNode,
+    StringValueNode,
+    ValueNode,
+)
+from graphql.pyutils import Undefined, inspect, is_iterable
+from graphql.type import (
+    GraphQLID,
+    GraphQLInputObjectType,
+    GraphQLInputType,
+    GraphQLList,
+    GraphQLNonNull,
+    is_enum_type,
+    is_input_object_type,
+    is_leaf_type,
+    is_list_type,
+    is_non_null_type,
+)
+
+
+__all__ = ["ast_from_value"]
+
+_re_integer_string = re.compile("^-?(?:0|[1-9][0-9]*)$")
+
+
+def ast_from_leaf_type(
+    serialized: object, type_: Optional[GraphQLInputType]
+) -> ValueNode:
+    # Others serialize based on their corresponding Python scalar types.
+    if isinstance(serialized, bool):
+        return BooleanValueNode(value=serialized)
+
+    # Python ints and floats correspond nicely to Int and Float values.
+    if isinstance(serialized, int):
+        return IntValueNode(value=str(serialized))
+    if isinstance(serialized, float) and isfinite(serialized):
+        value = str(serialized)
+        if value.endswith(".0"):
+            value = value[:-2]
+        return FloatValueNode(value=value)
+
+    if isinstance(serialized, str):
+        # Enum types use Enum literals.
+        if type_ and is_enum_type(type_):
+            return EnumValueNode(value=serialized)
+
+        # ID types can use Int literals.
+        if type_ is GraphQLID and _re_integer_string.match(serialized):
+            return IntValueNode(value=serialized)
+
+        return StringValueNode(value=serialized)
+
+    if isinstance(serialized, dict):
+        return ObjectValueNode(
+            fields=[
+                ObjectFieldNode(
+                    name=NameNode(value=key),
+                    value=ast_from_leaf_type(value, None),
+                )
+                for key, value in serialized.items()
+            ]
+        )
+
+    raise TypeError(
+        f"Cannot convert value to AST: {inspect(serialized)}."
+    )  # pragma: no cover
+
+
+def ast_from_value(value: Any, type_: GraphQLInputType) -> Optional[ValueNode]:
+    # custom ast_from_value that allows to also serialize custom scalar that aren't
+    # basic types, namely JSON scalar types
+
+    if is_non_null_type(type_):
+        type_ = cast(GraphQLNonNull, type_)
+        ast_value = ast_from_value(value, type_.of_type)
+        if isinstance(ast_value, NullValueNode):
+            return None
+        return ast_value
+
+    # only explicit None, not Undefined or NaN
+    if value is None:
+        return NullValueNode()
+
+    # undefined
+    if value is Undefined:
+        return None
+
+    # Convert Python list to GraphQL list. If the GraphQLType is a list, but the value
+    # is not a list, convert the value using the list's item type.
+    if is_list_type(type_):
+        type_ = cast(GraphQLList, type_)
+        item_type = type_.of_type
+        if is_iterable(value):
+            maybe_value_nodes = (ast_from_value(item, item_type) for item in value)
+            value_nodes = tuple(node for node in maybe_value_nodes if node)
+            return ListValueNode(values=value_nodes)
+        return ast_from_value(value, item_type)
+
+    # Populate the fields of the input object by creating ASTs from each value in the
+    # Python dict according to the fields in the input type.
+    if is_input_object_type(type_):
+        # TODO: is this the right place?
+        if hasattr(value, "_type_definition"):
+            value = dataclasses.asdict(value)
+
+        if value is None or not isinstance(value, Mapping):
+            return None
+
+        type_ = cast(GraphQLInputObjectType, type_)
+        field_items = (
+            (field_name, ast_from_value(value[field_name], field.type))
+            for field_name, field in type_.fields.items()
+            if field_name in value
+        )
+        field_nodes = tuple(
+            ObjectFieldNode(name=NameNode(value=field_name), value=field_value)
+            for field_name, field_value in field_items
+            if field_value
+        )
+        return ObjectValueNode(fields=field_nodes)
+
+    if is_leaf_type(type_):
+        # Since value is an internally represented value, it must be serialized to an
+        # externally represented value before converting into an AST.
+        serialized = type_.serialize(value)  # type: ignore
+        if serialized is None or serialized is Undefined:
+            return None  # pragma: no cover
+
+        return ast_from_leaf_type(serialized, type_)
+
+    # Not reachable. All possible input types have been considered.
+    raise TypeError(f"Unexpected input type: {inspect(type_)}.")  # pragma: no cover
diff --git a/strawberry/printer.py → strawberry/printer/printer.py b/strawberry/printer.py → strawberry/printer/printer.py
@@ -16,26 +16,25 @@
     overload,
 )
 
+from graphql import GraphQLArgument
 from graphql.language.printer import print_ast
 from graphql.type import (
     is_enum_type,
     is_input_type,
+    is_interface_type,
     is_object_type,
     is_scalar_type,
     is_specified_directive,
 )
 from graphql.type.directives import GraphQLDirective
-from graphql.utilities.ast_from_value import ast_from_value
 from graphql.utilities.print_schema import (
     is_defined_type,
-    print_args,
     print_block,
     print_deprecated,
     print_description,
     print_directive,
     print_enum,
     print_implemented_interfaces,
-    print_input_value,
     print_scalar,
     print_schema_definition,
     print_type as original_print_type,
@@ -47,6 +46,8 @@
 from strawberry.type import StrawberryContainer
 from strawberry.unset import UNSET
 
+from .ast_from_value import ast_from_value
+
 
 if TYPE_CHECKING:
     from strawberry.schema import BaseSchema
@@ -161,6 +162,30 @@ def print_field_directives(
     )
 
 
+def print_args(args: Dict[str, GraphQLArgument], indentation: str = "") -> str:
+    if not args:
+        return ""
+
+    # If every arg does not have a description, print them on one line.
+    if not any(arg.description for arg in args.values()):
+        return (
+            "("
+            + ", ".join(print_input_value(name, arg) for name, arg in args.items())
+            + ")"
+        )
+
+    return (
+        "(\n"
+        + "\n".join(
+            print_description(arg, f"  {indentation}", not i)
+            + f"  {indentation}"
+            + print_input_value(name, arg)
+            for i, (name, arg) in enumerate(args.items())
+        )
+        + f"\n{indentation})"
+    )
+
+
 def print_fields(type_, schema: BaseSchema, *, extras: PrintExtras) -> str:
     fields = []
 
@@ -234,6 +259,25 @@ def _print_object(type_, schema: BaseSchema, *, extras: PrintExtras) -> str:
     )
 
 
+def _print_interface(type_, schema: BaseSchema, *, extras: PrintExtras) -> str:
+    return (
+        print_description(type_)
+        + print_extends(type_, schema)
+        + f"interface {type_.name}"
+        + print_implemented_interfaces(type_)
+        + print_type_directives(type_, schema, extras=extras)
+        + print_fields(type_, schema, extras=extras)
+    )
+
+
+def print_input_value(name: str, arg: GraphQLArgument) -> str:
+    default_ast = ast_from_value(arg.default_value, arg.type)
+    arg_decl = f"{name}: {arg.type}"
+    if default_ast:
+        arg_decl += f" = {print_ast(default_ast)}"
+    return arg_decl + print_deprecated(arg.deprecation_reason)
+
+
 def _print_input_object(type_, schema: BaseSchema, *, extras: PrintExtras) -> str:
     fields = [
         print_description(field, "  ", not i) + "  " + print_input_value(name, field)
@@ -261,6 +305,9 @@ def _print_type(type_, schema: BaseSchema, *, extras: PrintExtras) -> str:
     if is_input_type(type_):
         return _print_input_object(type_, schema, extras=extras)
 
+    if is_interface_type(type_):
+        return _print_interface(type_, schema, extras=extras)
+
     return original_print_type(type_)
 
 

diff --git a/strawberry/schema/schema.py b/strawberry/schema/schema.py
@@ -1,5 +1,5 @@
 from functools import lru_cache
-from typing import Any, Dict, Iterable, List, Optional, Sequence, Type, Union
+from typing import Any, Dict, Iterable, List, Optional, Type, Union
 
 from graphql import (
     ExecutionContext as GraphQLExecutionContext,
@@ -49,9 +49,9 @@ def __init__(
         query: Type,
         mutation: Optional[Type] = None,
         subscription: Optional[Type] = None,
-        directives: Sequence[StrawberryDirective] = (),
+        directives: Iterable[StrawberryDirective] = (),
         types=(),
-        extensions: Sequence[Union[Type[Extension], Extension]] = (),
+        extensions: Iterable[Union[Type[Extension], Extension]] = (),
         execution_context_class: Optional[Type[GraphQLExecutionContext]] = None,
         config: Optional[StrawberryConfig] = None,
         scalar_overrides: Optional[
@@ -117,8 +117,6 @@ def __init__(
             formatted_errors = "\n\n".join(f"❌ {error.message}" for error in errors)
             raise ValueError(f"Invalid Schema. Errors:\n\n{formatted_errors}")
 
-        self.query = self.schema_converter.type_map[query_type.name]
-
     def get_extensions(
         self, sync: bool = False
     ) -> List[Union[Type[Extension], Extension]]:

diff --git a/tests/aiohttp/test_http.py b/tests/aiohttp/test_http.py
@@ -120,3 +120,22 @@ async def test_not_allowed_methods(aiohttp_app_client):
     for method in not_allowed_methods:
         response = await aiohttp_app_client.request(method, "/graphql")
         assert response.status == 405, method
+
+
+async def test_operation_selection(aiohttp_app_client):
+    query = {
+        "query": """
+            query Operation1 {
+                hello(name: "Operation1")
+            }
+            query Operation2 {
+                hello(name: "Operation2")
+            }
+        """,
+        "operationName": "Operation2",
+    }
+
+    response = await aiohttp_app_client.post("/graphql", json=query)
+    data = await response.json()
+    assert response.status == 200
+    assert data["data"]["hello"] == "Hello Operation2"