Improved return_promise behavior

Author: syrusakbary

graphql/execution/executor.py

@@ -23,7 +23,8 @@
 
 
 def execute(schema, document_ast, root_value=None, context_value=None,
-            variable_values=None, operation_name=None, executor=None, middleware=None):
+            variable_values=None, operation_name=None, executor=None,
+            return_promise=False, middleware=None):
     assert schema, 'Must provide schema'
     assert isinstance(schema, GraphQLSchema), (
         'Schema must be an instance of GraphQLSchema. Also ensure that there are ' +
@@ -64,7 +65,14 @@ def on_resolve(data):
             return ExecutionResult(data=data)
         return ExecutionResult(data=data, errors=context.errors)
 
-    return Promise.resolve(None).then(executor).catch(on_rejected).then(on_resolve)
+    promise = Promise.resolve(None).then(
+        executor).catch(on_rejected).then(on_resolve)
+
+    if not return_promise:
+        context.executor.wait_until_finished()
+        return promise.get()
+
+    return promise
 
 
 def execute_operation(exe_context, operation, root_value):

graphql/graphql.py

@@ -30,10 +30,19 @@
 #    one operation.
 
 
+def graphql(*args, **kwargs):
+    return_promise = kwargs.get('return_promise', False)
+    promise_result = graphql_impl(*args, **kwargs)
+    if not return_promise:
+        return promise_result.get()
+
+    return promise_result
+
+
 @promisify
-def graphql(schema, request_string='', root_value=None, context_value=None,
-            variable_values=None, operation_name=None, executor=None,
-            middleware=None):
+def graphql_impl(schema, request_string='', root_value=None, context_value=None,
+                 variable_values=None, operation_name=None, executor=None,
+                 return_promise=False, middleware=None):
     try:
         if isinstance(request_string, Document):
             ast = request_string
@@ -55,6 +64,7 @@ def graphql(schema, request_string='', root_value=None, context_value=None,
             variable_values=variable_values or {},
             executor=executor,
             middleware=middleware,
+            return_promise=return_promise
         )
     except Exception as e:
         return ExecutionResult(