Improved GraphQL server integration

Author: syrusakbary

flask_graphql/graphqlview.py

@@ -1,10 +1,11 @@
 import json
+from functools import partial
 
 from flask import Response, request
 from flask.views import View
 
 from graphql.type.schema import GraphQLSchema
-from graphql_server import run_http_query, HttpQueryError, default_format_error, load_json_body, format_execution_result
+from graphql_server import run_http_query, HttpQueryError, default_format_error, load_json_body, encode_execution_results, json_encode
 
 from .render_graphiql import render_graphiql
 
@@ -54,8 +55,10 @@ def render_graphiql(self, params, result):
             graphiql_template=self.graphiql_template,
         )
 
+    format_error = staticmethod(default_format_error)
+    encode = staticmethod(json_encode)
+
     def dispatch_request(self):
-        
         try:
             request_method = request.method.lower()
             data = self.parse_body()
@@ -72,24 +75,19 @@ def dispatch_request(self):
                 query_data=request.args,
                 batch_enabled=self.batch,
                 catch=catch,
+
                 # Execute options
                 root_value=self.get_root_value(),
                 context_value=self.get_context(),
                 middleware=self.get_middleware(),
                 executor=self.get_executor(),
             )
-            responses = [
-                format_execution_result(execution_result, default_format_error)
-                for execution_result in execution_results
-            ]
-            result, status_codes = zip(*responses)
-            status_code = max(status_codes)
-
-            # If is not batch
-            if not isinstance(data, list):
-                result = result[0]
-
-            result = self.json_encode(result, pretty)
+            result, status_code = encode_execution_results(
+                execution_results,
+                is_batch=isinstance(data, list),
+                format_error=self.format_error,
+                encode=partial(self.encode, pretty=pretty)
+            )
 
             if show_graphiql:
                 return self.render_graphiql(
@@ -105,8 +103,8 @@ def dispatch_request(self):
 
         except HttpQueryError as e:
             return Response(
-                self.json_encode({
-                    'errors': [default_format_error(e)]
+                self.encode({
+                    'errors': [self.format_error(e)]
                 }),
                 status=e.status_code,
                 headers=e.headers,
@@ -131,17 +129,6 @@ def parse_body(self):
 
         return {}
 
-    @staticmethod
-    def json_encode(data, pretty=False):
-        if not pretty:
-            return json.dumps(data, separators=(',', ':'))
-
-        return json.dumps(
-            data,
-            indent=2,
-            separators=(',', ': ')
-        )
-
     def should_display_graphiql(self):
         if not self.graphiql or 'raw' in request.args:
             return False

graphql_server/__init__.py

@@ -67,7 +67,7 @@ def run_http_query(schema, request_method, data, query_data=None, batch_enabled=
         extra_data = {}
         # If is a batch request, we don't consume the data from the query
         if not is_batch:
-            extra_data = query_data
+            extra_data = query_data or {}
 
         all_params = [get_graphql_params(entry, extra_data) for entry in data]
 
@@ -82,6 +82,31 @@ def run_http_query(schema, request_method, data, query_data=None, batch_enabled=
         return responses, all_params
 
 
+def encode_execution_results(execution_results, format_error, is_batch, encode):
+    responses = [
+        format_execution_result(execution_result, format_error)
+        for execution_result in execution_results
+    ]
+    result, status_codes = zip(*responses)
+    status_code = max(status_codes)
+
+    if not is_batch:
+        result = result[0]
+
+    return encode(result), status_code
+
+
+def json_encode(data, pretty=False):
+    if not pretty:
+        return json.dumps(data, separators=(',', ':'))
+
+    return json.dumps(
+        data,
+        indent=2,
+        separators=(',', ': ')
+    )
+
+
 def load_json_variables(variables):
     if variables and isinstance(variables, six.text_type):
         try:
@@ -111,21 +136,14 @@ def get_response(schema, params, catch=None, allow_only_query=False, **kwargs):
             **kwargs
         )
     except catch:
-        execution_result = ExecutionResult(
-            data=None,
-            invalid=True,
-        )
-        # return GraphQLResponse(None, 400)
-    
+        return None
+
     return execution_result
 
 
 def format_execution_result(execution_result, format_error):
     status_code = 200
 
-    if isinstance(execution_result, Promise):
-        execution_result = execution_result.get()
-
     if execution_result:
         response = {}