fix: asynchronously gather execution results

instead of awaiting them sequentially

Author: kiendang

graphql_server/aiohttp/graphqlview.py

@@ -1,10 +1,12 @@
+import asyncio
 import copy
 from collections.abc import MutableMapping
 from functools import partial
 from typing import List
 
 from aiohttp import web
-from graphql import ExecutionResult, GraphQLError, specified_rules
+from graphql import GraphQLError, specified_rules
+from graphql.pyutils import is_awaitable
 from graphql.type.schema import GraphQLSchema
 
 from graphql_server import (
@@ -22,6 +24,7 @@
     GraphiQLOptions,
     render_graphiql_async,
 )
+from graphql_server.utils import ensure_async
 
 
 class GraphQLView:
@@ -161,10 +164,14 @@ async def __call__(self, request):
             )
 
             exec_res = (
-                [
-                    ex if ex is None or isinstance(ex, ExecutionResult) else await ex
-                    for ex in execution_results
-                ]
+                await asyncio.gather(
+                    *(
+                        ex
+                        if ex is not None and is_awaitable(ex)
+                        else ensure_async(lambda: ex)()
+                        for ex in execution_results
+                    )
+                )
                 if self.enable_async
                 else execution_results
             )

graphql_server/quart/graphqlview.py

@@ -1,10 +1,12 @@
+import asyncio
 import copy
 from collections.abc import MutableMapping
 from functools import partial
 from typing import List
 
-from graphql import ExecutionResult, specified_rules
+from graphql import specified_rules
 from graphql.error import GraphQLError
+from graphql.pyutils import is_awaitable
 from graphql.type.schema import GraphQLSchema
 from quart import Response, render_template_string, request
 from quart.views import View
@@ -24,6 +26,7 @@
     GraphiQLOptions,
     render_graphiql_sync,
 )
+from graphql_server.utils import ensure_async
 
 
 class GraphQLView(View):
@@ -108,10 +111,14 @@ async def dispatch_request(self):
                 validation_rules=self.get_validation_rules(),
             )
             exec_res = (
-                [
-                    ex if ex is None or isinstance(ex, ExecutionResult) else await ex
-                    for ex in execution_results
-                ]
+                await asyncio.gather(
+                    *(
+                        ex
+                        if ex is not None and is_awaitable(ex)
+                        else ensure_async(lambda: ex)()
+                        for ex in execution_results
+                    )
+                )
                 if self.enable_async
                 else execution_results
             )

graphql_server/sanic/graphqlview.py

@@ -1,10 +1,12 @@
+import asyncio
 import copy
 from cgi import parse_header
 from collections.abc import MutableMapping
 from functools import partial
 from typing import List
 
-from graphql import ExecutionResult, GraphQLError, specified_rules
+from graphql import GraphQLError, specified_rules
+from graphql.pyutils import is_awaitable
 from graphql.type.schema import GraphQLSchema
 from sanic.response import HTTPResponse, html
 from sanic.views import HTTPMethodView
@@ -24,6 +26,7 @@
     GraphiQLOptions,
     render_graphiql_async,
 )
+from graphql_server.utils import ensure_async
 
 
 class GraphQLView(HTTPMethodView):
@@ -114,12 +117,14 @@ async def __handle_request(self, request, *args, **kwargs):
                     validation_rules=self.get_validation_rules(),
                 )
                 exec_res = (
-                    [
-                        ex
-                        if ex is None or isinstance(ex, ExecutionResult)
-                        else await ex
-                        for ex in execution_results
-                    ]
+                    await asyncio.gather(
+                        *(
+                            ex
+                            if ex is not None and is_awaitable(ex)
+                            else ensure_async(lambda: ex)()
+                            for ex in execution_results
+                        )
+                    )
                     if self.enable_async
                     else execution_results
                 )

graphql_server/utils.py

@@ -0,0 +1,25 @@
+import sys
+from typing import Awaitable, Callable, TypeVar
+
+if sys.version_info >= (3, 10):
+    from typing import ParamSpec
+else:
+    from typing_extensions import ParamSpec
+
+
+__all__ = ["ensure_async"]
+
+P = ParamSpec("P")
+R = TypeVar("R")
+
+
+def ensure_async(f: Callable[P, R]) -> Callable[P, Awaitable[R]]:
+    """Convert a sync callable (normal def or lambda) to a coroutine (async def).
+
+    This is similar to asyncio.coroutine which was deprecated in Python 3.8.
+    """
+
+    async def f_async(*args: P.args, **kwargs: P.kwargs) -> R:
+        return f(*args, **kwargs)
+
+    return f_async