Some cleanup to keep all logic in custom ExecutionContext

Author: jkimbo

strawberry/schema/execute.py

@@ -2,8 +2,6 @@
 from inspect import isawaitable
 from typing import Any, Awaitable, Dict, List, Optional, Sequence, Type, cast
 
-from promise import Promise, is_thenable
-
 from graphql import (
     ExecutionContext as GraphQLExecutionContext,
     ExecutionResult as GraphQLExecutionResult,
@@ -12,7 +10,6 @@
     execute as original_execute,
     parse,
 )
-from graphql.pyutils import is_awaitable as default_is_awaitable
 from graphql.validation import validate
 
 from strawberry.extensions import Extension
@@ -99,12 +96,6 @@ async def execute(
     )
 
 
-def is_awaitable(value):
-    if is_thenable(value):
-        return False
-    return default_is_awaitable(value)
-
-
 def execute_sync(
     schema: GraphQLSchema,
     query: str,

strawberry/schema/execute_context.py

@@ -8,8 +8,23 @@
     GraphQLOutputType,
     GraphQLResolveInfo,
 )
-from graphql.language import FieldNode
-from graphql.pyutils import AwaitableOrValue, Path, Undefined
+from graphql.language import FieldNode, OperationDefinitionNode
+from graphql.pyutils import (
+    AwaitableOrValue,
+    Path,
+    Undefined,
+    is_awaitable as default_is_awaitable,
+)
+
+
+def is_awaitable(value):
+    """
+    Create custom is_awaitable function to make sure that Promises' aren't
+    considered awaitable
+    """
+    if is_thenable(value):
+        return False
+    return default_is_awaitable(value)
 
 
 S = TypeVar("S")
@@ -31,6 +46,20 @@ def handle_success(resolved_values: List[S]) -> Dict[Hashable, S]:
 
 
 class ExecutionContextWithPromise(ExecutionContext):
+    is_awaitable = staticmethod(is_awaitable)
+
+    def execute_operation(
+        self, operation: OperationDefinitionNode, root_value: Any
+    ) -> Optional[AwaitableOrValue[Any]]:
+        # Wrap execute in a Promise
+        original_execute_operation = super().execute_operation
+
+        def promise_executor(v):
+            return original_execute_operation(operation, root_value)
+
+        promise = Promise.resolve(None).then(promise_executor)
+        return promise
+
     def build_response(self, data):
         if is_thenable(data):
             original_build_response = super().build_response
@@ -43,7 +72,7 @@ def on_resolve(data):
                 return original_build_response(data)
 
             promise = data.catch(on_rejected).then(on_resolve)
-            return promise
+            return promise.get()
         return super().build_response(data)
 
     def complete_value_catching_error(