Improved query execution using pluggable backend

Author: syrusakbary

Diff for: .travis.yml

@@ -6,12 +6,12 @@ matrix:
     env: TOX_ENV=pypy
   - python: '2.7'
     env: TOX_ENV=py27
-  - python: '3.3'
-    env: TOX_ENV=py33
   - python: '3.4'
     env: TOX_ENV=py34
   - python: '3.5'
-    env: TOX_ENV=py35,import-order,flake8
+    env: TOX_ENV=py35
+  - python: '3.6'
+    env: TOX_ENV=py36,import-order,flake8
 cache:
   directories:
   - $HOME/.cache/pip

Diff for: graphql_server/__init__.py

@@ -2,11 +2,9 @@
 from collections import namedtuple, MutableMapping
 
 import six
-from graphql import Source, execute, parse, validate
-from graphql.error import format_error as format_graphql_error
-from graphql.error import GraphQLError
+from graphql import get_default_backend
+from graphql.error import format_error as default_format_error
 from graphql.execution import ExecutionResult
-from graphql.utils.get_operation_ast import get_operation_ast
 
 from .error import HttpQueryError
 
@@ -19,13 +17,6 @@ class SkipException(Exception):
 GraphQLResponse = namedtuple('GraphQLResponse', 'result,status_code')
 
 
-def default_format_error(error):
-    if isinstance(error, GraphQLError):
-        return format_graphql_error(error)
-
-    return {'message': six.text_type(error)}
-
-
 def run_http_query(schema, request_method, data, query_data=None, batch_enabled=False, catch=False, **execute_options):
     if request_method not in ('get', 'post'):
         raise HttpQueryError(
@@ -110,15 +101,15 @@ def load_json_variables(variables):
     if variables and isinstance(variables, six.string_types):
         try:
             return json.loads(variables)
-        except:
+        except Exception:
             raise HttpQueryError(400, 'Variables are invalid JSON.')
     return variables
 
 
 def get_graphql_params(data, query_data):
     query = data.get('query') or query_data.get('query')
     variables = data.get('variables') or query_data.get('variables')
-    # id = data.get('id')
+    # document_id = data.get('documentId')
     operation_name = data.get('operationName') or query_data.get('operationName')
 
     return GraphQLParams(query, load_json_variables(variables), operation_name)
@@ -159,51 +150,58 @@ def format_execution_result(execution_result, format_error):
     return GraphQLResponse(response, status_code)
 
 
-def execute_graphql_request(schema, params, allow_only_query=False, **kwargs):
+def execute_graphql_request(schema, params, allow_only_query=False, backend=None, **kwargs):
     if not params.query:
         raise HttpQueryError(400, 'Must provide query string.')
 
     try:
-        source = Source(params.query, name='GraphQL request')
-        ast = parse(source)
-        validation_errors = validate(schema, ast)
-        if validation_errors:
-            return ExecutionResult(
-                errors=validation_errors,
-                invalid=True,
-            )
+        if not backend:
+            backend = get_default_backend()
+        document = backend.document_from_string(schema, params.query)
     except Exception as e:
         return ExecutionResult(errors=[e], invalid=True)
 
     if allow_only_query:
-        operation_ast = get_operation_ast(ast, params.operation_name)
-        if operation_ast and operation_ast.operation != 'query':
+        operation_type = document.get_operation_type(params.operation_name)
+        if operation_type and operation_type != 'query':
             raise HttpQueryError(
                 405,
-                'Can only perform a {} operation from a POST request.'.format(operation_ast.operation),
+                'Can only perform a {} operation from a POST request.'.format(operation_type),
                 headers={
                     'Allow': 'POST',
                 }
             )
 
     try:
-        return execute(
-            schema,
-            ast,
+        return document.execute(
             operation_name=params.operation_name,
-            variable_values=params.variables,
+            variables=params.variables,
             **kwargs
         )
-
     except Exception as e:
         return ExecutionResult(errors=[e], invalid=True)
 
 
 def load_json_body(data):
     try:
         return json.loads(data)
-    except:
+    except Exception:
         raise HttpQueryError(
             400,
             'POST body sent invalid JSON.'
         )
+
+
+__all__ = [
+    'default_format_error',
+    'SkipException',
+    'run_http_query',
+    'encode_execution_results',
+    'json_encode',
+    'load_json_variables',
+    'get_graphql_params',
+    'get_response',
+    'format_execution_result',
+    'execute_graphql_request',
+    'load_json_body'
+]

Diff for: setup.py

@@ -1,10 +1,13 @@
 from setuptools import setup, find_packages
 
-required_packages = ['graphql-core', 'promise']
+required_packages = [
+    'graphql-core>=2.1rc1',
+    'promise'
+]
 
 setup(
     name='graphql-server-core',
-    version='1.0.dev20170322001',
+    version='1.1rc0',
     description='GraphQL Server tools for powering your server',
     long_description=open('README.rst').read(),
     url='https://github.com/graphql-python/graphql-server-core',

Diff for: tests/schema.py

@@ -12,15 +12,15 @@ def resolve_raises(*_):
     fields={
         'thrower': GraphQLField(GraphQLNonNull(GraphQLString), resolver=resolve_raises),
         'request': GraphQLField(GraphQLNonNull(GraphQLString),
-                                resolver=lambda obj, args, context, info: context.args.get('q')),
+                                resolver=lambda obj, info: context.args.get('q')),
         'context': GraphQLField(GraphQLNonNull(GraphQLString),
-                                resolver=lambda obj, args, context, info: context),
+                                resolver=lambda obj, info: context),
         'test': GraphQLField(
             type=GraphQLString,
             args={
                 'who': GraphQLArgument(GraphQLString)
             },
-            resolver=lambda obj, args, context, info: 'Hello %s' % (args.get('who') or 'World')
+            resolver=lambda obj, info, who='World': 'Hello %s' % who
         )
     }
 )

Diff for: tox.ini

@@ -7,21 +7,21 @@ setenv =
     PYTHONPATH = {toxinidir}
 deps =
     pytest>=2.7.2
-    graphql-core>=1.0
+    graphql-core>=2.1rc1
     pytest-cov
 commands =
-    py{py,27,33,34,35}: py.test tests {posargs}
+    py{py,27,34,35,36}: py.test tests {posargs}
 
 [testenv:flake8]
-basepython=python3.5
+basepython=python3.6
 deps = flake8
 commands =
     flake8 graphql_server
 
 [testenv:import-order]
-basepython=python3.5
+basepython=python3.6
 deps =
     isort
-    graphql-core>=1.0
+    graphql-core>=2.1rc1
 commands =
     isort --check-only graphql_server/ -rc