chore: upgrade graphql-core

Author: syfun

examples/scalar.py

@@ -0,0 +1,31 @@
+from gql import gql, make_schema, query
+from graphql import graphql_sync
+
+
+type_defs = gql(
+    """
+scalar JSON
+
+type Query {
+    me: JSON
+}
+"""
+)
+
+
+@query
+def me(_, info):
+    return {'name': 'Jack'}
+
+
+schema = make_schema(type_defs=type_defs)
+
+q = """
+query {
+    me
+}
+"""
+
+result = graphql_sync(schema, q)
+print(result.data)
+print(result.errors)

gql/__init__.py

@@ -15,4 +15,4 @@
 from .schema_visitor import SchemaDirectiveVisitor  # noqa
 from .utils import gql  # noqa
 
-__version__ = '0.2.4'
+__version__ = '0.2.5'

gql/execute.py

@@ -1,14 +1,17 @@
 from typing import Any, Callable, Dict, List, Optional, Union
 
 import graphql
+from graphql import located_error
 from graphql.execution.execute import get_field_def
-from graphql.execution.values import get_variable_values
+from graphql.execution.values import get_argument_values, get_variable_values
+
 from graphql.pyutils import AwaitableOrValue, FrozenList, Path, Undefined, inspect
 
 from .middleware import MiddlewareManager
 
 
 class ExecutionContext(graphql.ExecutionContext):
+    # custom Middleware Manager
     middleware_manager: MiddlewareManager
 
     @classmethod
@@ -114,6 +117,7 @@ def resolve_field(
         if not field_def:
             return Undefined
 
+        return_type = field_def.type
         resolve_fn = field_def.resolve or self.field_resolver
 
         if self.middleware_manager:
@@ -125,6 +129,48 @@ def resolve_field(
 
         # Get the resolve function, regardless of if its result is normal or abrupt
         # (error).
-        result = self.resolve_field_value_or_error(field_def, field_nodes, resolve_fn, source, info)
-
-        return self.complete_value_catching_error(field_def.type, field_nodes, info, path, result)
+        try:
+            # Build a dictionary of arguments from the field.arguments AST, using the
+            # variables scope to fulfill any variable references.
+            args = get_argument_values(field_def, field_nodes[0], self.variable_values)
+
+            # Note that contrary to the JavaScript implementation, we pass the context
+            # value as part of the resolve info.
+            result = resolve_fn(source, info, **args)
+
+            completed: AwaitableOrValue[Any]
+            if self.is_awaitable(result):
+                # noinspection PyShadowingNames
+                async def await_result() -> Any:
+                    try:
+                        completed = self.complete_value(
+                            return_type, field_nodes, info, path, await result
+                        )
+                        if self.is_awaitable(completed):
+                            return await completed
+                        return completed
+                    except Exception as raw_error:
+                        error = located_error(raw_error, field_nodes, path.as_list())
+                        self.handle_field_error(error, return_type)
+                        return None
+
+                return await_result()
+
+            completed = self.complete_value(return_type, field_nodes, info, path, result)
+            if self.is_awaitable(completed):
+                # noinspection PyShadowingNames
+                async def await_completed() -> Any:
+                    try:
+                        return await completed
+                    except Exception as raw_error:
+                        error = located_error(raw_error, field_nodes, path.as_list())
+                        self.handle_field_error(error, return_type)
+                        return None
+
+                return await_completed()
+
+            return completed
+        except Exception as raw_error:
+            error = located_error(raw_error, field_nodes, path.as_list())
+            self.handle_field_error(error, return_type)
+            return None

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-gql"
-version = "0.2.4"
+version = "0.2.5"
 description = "Python schema-first GraphQL library based on GraphQL-core"
 authors = ["ysun <sunyu418@gmail.com>"]
 license = "MIT"