fix: fix up calls and added async unit tests

graphql_server/flask/graphqlview.py

@@ -44,7 +44,7 @@ class GraphQLView(View):
     default_query = None
     header_editor_enabled = None
     should_persist_headers = None
-    enable_async = True
+    enable_async = False
 
     methods = ["GET", "POST", "PUT", "DELETE"]
 
@@ -74,7 +74,7 @@ def get_middleware(self):
     @staticmethod
     def get_async_execution_results(execution_results):
         async def await_execution_results(execution_results):
-            return [ex if ex is None or is_awaitable(ex) else await ex for ex in execution_results]
+            return [ex if ex is None or not is_awaitable(ex) else await ex for ex in execution_results]
 
         return asyncio.run(await_execution_results(execution_results))
 
@@ -100,6 +100,7 @@ def dispatch_request(self):
                 root_value=self.get_root_value(),
                 context_value=self.get_context(),
                 middleware=self.get_middleware(),
+                run_sync=not self.enable_async,
             )
 
             if self.enable_async:

tests/flask/app.py

@@ -1,15 +1,16 @@
 from flask import Flask
 
 from graphql_server.flask import GraphQLView
-from tests.flask.schema import Schema
+from tests.flask.schema import AsyncSchema, Schema
 
 
 def create_app(path="/graphql", **kwargs):
     server = Flask(__name__)
     server.debug = True
-    server.add_url_rule(
-        path, view_func=GraphQLView.as_view("graphql", schema=Schema, **kwargs)
-    )
+    if kwargs.get("enable_async", None):
+        server.add_url_rule(path, view_func=GraphQLView.as_view("graphql", schema=AsyncSchema, **kwargs))
+    else:
+        server.add_url_rule(path, view_func=GraphQLView.as_view("graphql", schema=Schema, **kwargs))
     return server
 
 

tests/flask/schema.py

@@ -43,9 +43,28 @@ def resolve_raises(*_):
 
 MutationRootType = GraphQLObjectType(
     name="MutationRoot",
-    fields={
-        "writeTest": GraphQLField(type_=QueryRootType, resolve=lambda *_: QueryRootType)
-    },
+    fields={"writeTest": GraphQLField(type_=QueryRootType, resolve=lambda *_: QueryRootType)},
 )
 
 Schema = GraphQLSchema(QueryRootType, MutationRootType)
+
+
+async def async_resolver(obj, info):
+    return "async"
+
+
+AsyncQueryRootType = GraphQLObjectType(
+    name="QueryRoot",
+    fields={
+        "sync": GraphQLField(GraphQLNonNull(GraphQLString), resolve=lambda obj, info: "sync"),
+        "nsync": GraphQLField(GraphQLNonNull(GraphQLString), resolve=async_resolver),
+    },
+)
+AsyncMutationRootType = GraphQLObjectType(
+    name="MutationRoot",
+    fields={
+        "sync": GraphQLField(type_=GraphQLString, resolve=lambda obj, info: "sync"),
+        "nsync": GraphQLField(type_=GraphQLString, resolve=async_resolver),
+    },
+)
+AsyncSchema = GraphQLSchema(AsyncQueryRootType, AsyncMutationRootType)

tests/flask/test_graphqlview.py

@@ -83,9 +83,7 @@ def test_allows_get_with_operation_name(app, client):
     )
 
     assert response.status_code == 200
-    assert response_json(response) == {
-        "data": {"test": "Hello World", "shared": "Hello Everyone"}
-    }
+    assert response_json(response) == {"data": {"test": "Hello World", "shared": "Hello Everyone"}}
 
 
 def test_reports_validation_errors(app, client):
@@ -272,7 +270,9 @@ def test_supports_post_url_encoded_query_with_string_variables(app, client):
 def test_supports_post_json_query_with_get_variable_values(app, client):
     response = client.post(
         url_string(app, variables=json.dumps({"who": "Dolly"})),
-        data=json_dump_kwarg(query="query helloWho($who: String){ test(who: $who) }",),
+        data=json_dump_kwarg(
+            query="query helloWho($who: String){ test(who: $who) }",
+        ),
         content_type="application/json",
     )
 
@@ -283,7 +283,11 @@ def test_supports_post_json_query_with_get_variable_values(app, client):
 def test_post_url_encoded_query_with_get_variable_values(app, client):
     response = client.post(
         url_string(app, variables=json.dumps({"who": "Dolly"})),
-        data=urlencode(dict(query="query helloWho($who: String){ test(who: $who) }",)),
+        data=urlencode(
+            dict(
+                query="query helloWho($who: String){ test(who: $who) }",
+            )
+        ),
         content_type="application/x-www-form-urlencoded",
     )
 
@@ -320,9 +324,7 @@ def test_allows_post_with_operation_name(app, client):
     )
 
     assert response.status_code == 200
-    assert response_json(response) == {
-        "data": {"test": "Hello World", "shared": "Hello Everyone"}
-    }
+    assert response_json(response) == {"data": {"test": "Hello World", "shared": "Hello Everyone"}}
 
 
 def test_allows_post_with_get_operation_name(app, client):
@@ -340,18 +342,14 @@ def test_allows_post_with_get_operation_name(app, client):
     )
 
     assert response.status_code == 200
-    assert response_json(response) == {
-        "data": {"test": "Hello World", "shared": "Hello Everyone"}
-    }
+    assert response_json(response) == {"data": {"test": "Hello World", "shared": "Hello Everyone"}}
 
 
 @pytest.mark.parametrize("app", [create_app(pretty=True)])
 def test_supports_pretty_printing(app, client):
     response = client.get(url_string(app, query="{test}"))
 
-    assert response.data.decode() == (
-        "{\n" '  "data": {\n' '    "test": "Hello World"\n' "  }\n" "}"
-    )
+    assert response.data.decode() == ("{\n" '  "data": {\n' '    "test": "Hello World"\n' "  }\n" "}")
 
 
 @pytest.mark.parametrize("app", [create_app(pretty=False)])
@@ -364,9 +362,7 @@ def test_not_pretty_by_default(app, client):
 def test_supports_pretty_printing_by_request(app, client):
     response = client.get(url_string(app, query="{test}", pretty="1"))
 
-    assert response.data.decode() == (
-        "{\n" '  "data": {\n' '    "test": "Hello World"\n' "  }\n" "}"
-    )
+    assert response.data.decode() == ("{\n" '  "data": {\n' '    "test": "Hello World"\n' "  }\n" "}")
 
 
 def test_handles_field_errors_caught_by_graphql(app, client):
@@ -403,9 +399,7 @@ def test_handles_errors_caused_by_a_lack_of_query(app, client):
 
     assert response.status_code == 400
     assert response_json(response) == {
-        "errors": [
-            {"message": "Must provide query string.", "locations": None, "path": None}
-        ]
+        "errors": [{"message": "Must provide query string.", "locations": None, "path": None}]
     }
 
 
@@ -425,15 +419,11 @@ def test_handles_batch_correctly_if_is_disabled(app, client):
 
 
 def test_handles_incomplete_json_bodies(app, client):
-    response = client.post(
-        url_string(app), data='{"query":', content_type="application/json"
-    )
+    response = client.post(url_string(app), data='{"query":', content_type="application/json")
 
     assert response.status_code == 400
     assert response_json(response) == {
-        "errors": [
-            {"message": "POST body sent invalid JSON.", "locations": None, "path": None}
-        ]
+        "errors": [{"message": "POST body sent invalid JSON.", "locations": None, "path": None}]
     }
 
 
@@ -445,9 +435,7 @@ def test_handles_plain_post_text(app, client):
     )
     assert response.status_code == 400
     assert response_json(response) == {
-        "errors": [
-            {"message": "Must provide query string.", "locations": None, "path": None}
-        ]
+        "errors": [{"message": "Must provide query string.", "locations": None, "path": None}]
     }
 
 
@@ -461,9 +449,7 @@ def test_handles_poorly_formed_variables(app, client):
     )
     assert response.status_code == 400
     assert response_json(response) == {
-        "errors": [
-            {"message": "Variables are invalid JSON.", "locations": None, "path": None}
-        ]
+        "errors": [{"message": "Variables are invalid JSON.", "locations": None, "path": None}]
     }
 
 
@@ -524,9 +510,7 @@ def test_post_multipart_data(app, client):
     )
 
     assert response.status_code == 200
-    assert response_json(response) == {
-        "data": {u"writeTest": {u"test": u"Hello World"}}
-    }
+    assert response_json(response) == {"data": {"writeTest": {"test": "Hello World"}}}
 
 
 @pytest.mark.parametrize("app", [create_app(batch=True)])
@@ -575,6 +559,25 @@ def test_batch_allows_post_with_operation_name(app, client):
     )
 
     assert response.status_code == 200
-    assert response_json(response) == [
-        {"data": {"test": "Hello World", "shared": "Hello Everyone"}}
-    ]
+    assert response_json(response) == [{"data": {"test": "Hello World", "shared": "Hello Everyone"}}]
+
+
+@pytest.mark.parametrize(
+    ("query", "result"),
+    (
+        ("query sync {sync}", {"sync": "sync"}),
+        ("query nsync {nsync}", {"nsync": "async"}),
+        ("mutation sync {sync}", {"sync": "sync"}),
+        ("mutation nsync {nsync}", {"nsync": "async"}),
+    ),
+)
+@pytest.mark.parametrize("app", [create_app(enable_async=True)])
+def test_async_client_handles_sync_calls(app, client, query, result):
+    response = client.post(
+        url_string(app),
+        data=json_dump_kwarg(query=query),
+        content_type="application/json",
+    )
+
+    assert response.status_code == 200, response.data
+    assert response_json(response) == {"data": result}