Added return_promise

Author: syrusakbary

.travis.yml

@@ -33,6 +33,8 @@ after_success:
 matrix:
   include:
     - python: "3.5"
+      after_install:
+        - pip install pytest-asyncio
       script:
         - flake8
         - isort --check-only graphql/ -rc

graphql/execution/executor.py

@@ -19,7 +19,8 @@
 
 
 def execute(schema, document_ast, root_value=None, context_value=None,
-            variable_values=None, operation_name=None, executor=None):
+            variable_values=None, operation_name=None, executor=None,
+            return_promise=False):
     assert schema, 'Must provide schema'
     assert isinstance(schema, GraphQLSchema), (
         'Schema must be an instance of GraphQLSchema. Also ensure that there are ' +
@@ -49,9 +50,11 @@ def on_rejected(error):
     def on_resolve(data):
         return ExecutionResult(data=data, errors=context.errors)
 
-    p = Promise(executor).catch(on_rejected).then(on_resolve)
+    promise = Promise(executor).catch(on_rejected).then(on_resolve)
+    if return_promise:
+        return promise
     context.executor.wait_until_finished()
-    return p.get()
+    return promise.get()
 
 
 def execute_operation(exe_context, operation, root_value):
@@ -318,15 +321,15 @@ def complete_abstract_value(exe_context, return_type, field_asts, info, result):
             runtime_type = get_default_resolve_type_fn(result, exe_context.context_value, info, return_type)
 
     assert isinstance(runtime_type, GraphQLObjectType), (
-            'Abstract type {} must resolve to an Object type at runtime ' +
-            'for field {}.{} with value "{}", received "{}".'
-        ).format(
-            return_type,
-            info.parent_type,
-            info.field_name,
-            result,
-            runtime_type,
-        )
+        'Abstract type {} must resolve to an Object type at runtime ' +
+        'for field {}.{} with value "{}", received "{}".'
+    ).format(
+        return_type,
+        info.parent_type,
+        info.field_name,
+        result,
+        runtime_type,
+    )
 
     if not exe_context.schema.is_possible_type(return_type, runtime_type):
         raise GraphQLError(

graphql/graphql.py

@@ -27,7 +27,8 @@
 #    possible operations. Can be omitted if requestString contains only
 #    one operation.
 def graphql(schema, request_string='', root_value=None, context_value=None,
-            variable_values=None, operation_name=None, executor=None):
+            variable_values=None, operation_name=None, executor=None,
+            return_promise=False):
     try:
         source = Source(request_string, 'GraphQL request')
         ast = parse(source)
@@ -44,7 +45,8 @@ def graphql(schema, request_string='', root_value=None, context_value=None,
             context_value,
             operation_name=operation_name,
             variable_values=variable_values or {},
-            executor=executor
+            executor=executor,
+            return_promise=return_promise
         )
     except Exception as e:
         return ExecutionResult(

tests_py35/core_execution/test_asyncio_executor.py

@@ -39,6 +39,32 @@ def resolver_3(context, *_):
     assert result.data == {'a': 'hey', 'b': 'hey2', 'c': 'hey3'}
 
 
+@pytest.mark.asyncio
+async def test_asyncio_py35_executor_return_promise(event_loop):
+    ast = parse('query Example { a, b, c }')
+
+    async def resolver(context, *_):
+        await asyncio.sleep(0.001)
+        return 'hey'
+
+    async def resolver_2(context, *_):
+        await asyncio.sleep(0.003)
+        return 'hey2'
+
+    def resolver_3(context, *_):
+        return 'hey3'
+
+    Type = GraphQLObjectType('Type', {
+        'a': GraphQLField(GraphQLString, resolver=resolver),
+        'b': GraphQLField(GraphQLString, resolver=resolver_2),
+        'c': GraphQLField(GraphQLString, resolver=resolver_3)
+    })
+
+    result = await execute(GraphQLSchema(Type), ast, executor=AsyncioExecutor(loop=event_loop), return_promise=True)
+    assert not result.errors
+    assert result.data == {'a': 'hey', 'b': 'hey2', 'c': 'hey3'}
+
+
 def test_asyncio_py35_executor_with_error():
     ast = parse('query Example { a, b }')