Merge pull request #131 from graphql-python/features/better-errors

Improved error reporting

Author: syrusakbary

graphql/error/base.py

@@ -43,4 +43,4 @@ def locations(self):
             source = self.source
             if self.positions and source:
                 self._locations = [get_location(source, pos) for pos in self.positions]
-        return self._locations
+        return self._locations

graphql/execution/base.py

@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
+import sys
+
 from ..error import GraphQLError
 from ..language import ast
 from ..pyutils.default_ordered_dict import DefaultOrderedDict
-from ..type.definition import GraphQLInterfaceType, GraphQLUnionType
+from ..type.definition import Undefined, GraphQLInterfaceType, GraphQLUnionType
 from ..type.directives import GraphQLIncludeDirective, GraphQLSkipDirective
 from ..type.introspection import (SchemaMetaFieldDef, TypeMetaFieldDef,
                                   TypeNameMetaFieldDef)
 from ..utils.type_from_ast import type_from_ast
 from .values import get_argument_values, get_variable_values
 
-Undefined = object()
-
 
 class ExecutionContext(object):
     """Data that must be available at all points during query execution.
@@ -82,6 +82,10 @@ def get_argument_values(self, field_def, field_ast):
 
         return result
 
+    def report_error(self, error, traceback=None):
+        sys.excepthook(type(error), error, getattr(error, 'stack', None) or traceback)
+        self.errors.append(error)
+
     def get_sub_fields(self, return_type, field_asts):
         k = return_type, tuple(field_asts)
         if k not in self._subfields_cache:

graphql/execution/executor.py

@@ -63,8 +63,8 @@ def execute(schema, document_ast, root_value=None, context_value=None,
         middleware
     )
 
-    def executor(resolve, reject):
-        return resolve(execute_operation(context, context.operation, root_value))
+    def executor(v):
+        return execute_operation(context, context.operation, root_value)
 
     def on_rejected(error):
         context.errors.append(error)
@@ -75,7 +75,7 @@ def on_resolve(data):
             return ExecutionResult(data=data)
         return ExecutionResult(data=data, errors=context.errors)
 
-    promise = Promise(executor).catch(on_rejected).then(on_resolve)
+    promise = Promise.resolve(None).then(executor).catch(on_rejected).then(on_resolve)
     if return_promise:
         return promise
     context.executor.wait_until_finished()
@@ -218,14 +218,16 @@ def complete_value_catching_error(exe_context, return_type, field_asts, info, re
         completed = complete_value(exe_context, return_type, field_asts, info, result)
         if is_thenable(completed):
             def handle_error(error):
-                exe_context.errors.append(error)
+                traceback = completed._traceback
+                exe_context.report_error(error, traceback)
                 return None
 
             return completed.catch(handle_error)
 
         return completed
     except Exception as e:
-        exe_context.errors.append(e)
+        traceback = sys.exc_info()[2]
+        exe_context.report_error(e, traceback)
         return None
 
 

graphql/execution/executors/utils.py

@@ -1,6 +1,11 @@
+from sys import exc_info
+
+
 def process(p, f, args, kwargs):
     try:
         val = f(*args, **kwargs)
         p.do_resolve(val)
     except Exception as e:
-        p.do_reject(e)
+        traceback = exc_info()[2]
+        e.stack = traceback
+        p.do_reject(e, traceback=traceback)

graphql/execution/tests/test_dataloader.py

@@ -9,7 +9,7 @@
 
 @pytest.mark.parametrize("executor", [
     SyncExecutor(),
-    ThreadExecutor(),
+    # ThreadExecutor(),
 ])
 def test_batches_correctly(executor):
 

graphql/execution/tests/test_executor.py

@@ -119,7 +119,7 @@ def deeper(self):
 
 def test_merges_parallel_fragments():
     ast = parse('''
-        { a, ...FragOne, ...FragTwo }
+        { a, deep {...FragOne, ...FragTwo} }
 
         fragment FragOne on Type {
             b
@@ -148,14 +148,15 @@ def test_merges_parallel_fragments():
     assert result.data == \
         {
             'a': 'Apple',
-            'b': 'Banana',
-            'c': 'Cherry',
             'deep': {
                 'b': 'Banana',
                 'c': 'Cherry',
-                'deeper': {
+                'deep': {
                     'b': 'Banana',
-                    'c': 'Cherry'}}
+                    'c': 'Cherry',
+                    'deeper': {
+                        'b': 'Banana',
+                        'c': 'Cherry'}}}
         }
 
 

graphql/execution/tests/test_resolve.py

@@ -8,20 +8,7 @@
                           GraphQLObjectType, GraphQLSchema, GraphQLString)
 from promise import Promise
 
-class CustomPromise(object):
-    def __init__(self, fn=None, promise=None):
-        self._promise = promise or Promise(fn)
-
-    def get(self, _=None):
-        raise NotImplementedError("Blocking for results not allowed. Use 'then' if you want to "
-                                  "work with the result.")
-
-    def then(self, success=None, failure=None):
-        return self.__class__(promise=self._promise.then(success, failure))
-
-    def __getattr__(self, item):
-        return getattr(self._promise, item)
-
+class CustomPromise(Promise):
     @classmethod
     def fulfilled(cls, x):
         p = cls()

graphql/type/__init__.py

@@ -19,7 +19,8 @@
     is_leaf_type,
     is_type,
     get_nullable_type,
-    is_output_type
+    is_output_type,
+    Undefined
 )
 from .directives import (
     # "Enum" of Directive locations

graphql/type/definition.py

@@ -7,6 +7,16 @@
 from ..utils.assert_valid_name import assert_valid_name
 
 
+class _Undefined(object):
+    def __bool__(self):
+        return False
+
+    __nonzero__ = __bool__
+
+
+Undefined = _Undefined()
+
+
 def is_type(type):
     return isinstance(type, (
         GraphQLScalarType,