Move execute back to base

Author: SmileyChris

graphql_ws/base.py

@@ -1,7 +1,7 @@
 import json
 from collections import OrderedDict
 
-from graphql import format_error
+from graphql import format_error, graphql
 
 from .constants import (
     GQL_CONNECTION_ERROR,
@@ -57,6 +57,9 @@ def __init__(self, schema, keep_alive=True):
         self.schema = schema
         self.keep_alive = keep_alive
 
+    def execute(self, params):
+        return graphql(self.schema, **dict(params, allow_subscriptions=True))
+
     def process_message(self, connection_context, parsed_message):
         op_id = parsed_message.get("id")
         op_type = parsed_message.get("type")
@@ -96,11 +99,13 @@ def on_connection_terminate(self, connection_context, op_id):
         return connection_context.close(1011)
 
     def get_graphql_params(self, connection_context, payload):
+        context = payload.get('context') or {}
+        context.setdefault('request_context', connection_context.request_context)
         return {
             "request_string": payload.get("query"),
             "variable_values": payload.get("variables"),
             "operation_name": payload.get("operationName"),
-            "context_value": payload.get("context"),
+            "context_value": context,
             "executor": self.graphql_executor(),
         }
 

graphql_ws/base_async.py

@@ -79,7 +79,7 @@ async def on_connection_init(self, connection_context, op_id, payload):
             await connection_context.close(1011)
 
     async def on_start(self, connection_context, op_id, params):
-        execution_result = self.execute(connection_context.request_context, params)
+        execution_result = self.execute(params)
 
         if isawaitable(execution_result):
             execution_result = await execution_result

graphql_ws/base_sync.py

@@ -1,4 +1,3 @@
-from graphql import graphql
 from graphql.execution.executors.sync import SyncExecutor
 from rx import Observable, Observer
 
@@ -20,9 +19,6 @@ def unsubscribe(self, connection_context, op_id):
     def on_operation_complete(self, connection_context, op_id):
         pass
 
-    def execute(self, request_context, params):
-        return graphql(self.schema, **dict(params, allow_subscriptions=True))
-
     def handle(self, ws, request_context=None):
         raise NotImplementedError("handle method not implemented")
 
@@ -51,7 +47,7 @@ def on_stop(self, connection_context, op_id):
 
     def on_start(self, connection_context, op_id, params):
         try:
-            execution_result = self.execute(connection_context.request_context, params)
+            execution_result = self.execute(params)
             assert isinstance(
                 execution_result, Observable
             ), "A subscription must return an observable"