Merge branch 'main' into graphiql-v2

graphene_django/debug/middleware.py

@@ -9,32 +9,32 @@ from .types import DjangoDebug
 
 class DjangoDebugContext:
     def __init__(self):
-        self.debug_promise = None
+        self.debug_result = None
-        self.promises = []
+        self.results = []
         self.object = DjangoDebug(sql=[], exceptions=[])
         self.enable_instrumentation()
 
-    def get_debug_promise(self):
+    def get_debug_result(self):
-        if not self.debug_promise:
+        if not self.debug_result:
-            self.debug_promise = Promise.all(self.promises)
+            self.debug_result = self.results
-            self.promises = []
+            self.results = []
-        return self.debug_promise.then(self.on_resolve_all_promises).get()
+        return self.on_resolve_all_results()
 
     def on_resolve_error(self, value):
         if hasattr(self, "object"):
             self.object.exceptions.append(wrap_exception(value))
-        return Promise.reject(value)
+        return value
 
-    def on_resolve_all_promises(self, values):
+    def on_resolve_all_results(self):
-        if self.promises:
+        if self.results:
-            self.debug_promise = None
+            self.debug_result = None
-            return self.get_debug_promise()
+            return self.get_debug_result()
         self.disable_instrumentation()
         return self.object
 
-    def add_promise(self, promise):
+    def add_result(self, result):
-        if self.debug_promise:
+        if self.debug_result:
-            self.promises.append(promise)
+            self.results.append(result)
 
     def enable_instrumentation(self):
         # This is thread-safe because database connections are thread-local.
@@ -62,10 +62,10 @@ class DjangoDebugMiddleware:
                     )
                 )
         if info.schema.get_type("DjangoDebug") == info.return_type:
-            return context.django_debug.get_debug_promise()
+            return context.django_debug.get_debug_result()
         try:
-            promise = next(root, info, **args)
+            result = next(root, info, **args)
         except Exception as e:
             return context.django_debug.on_resolve_error(e)
-        context.django_debug.add_promise(promise)
+        context.django_debug.add_result(result)
-        return promise
+        return result

graphene_django/views.py

@@ -66,9 +66,9 @@ class GraphQLView(View):
     react_dom_sri = "sha256-nbMykgB6tsOFJ7OdVmPpdqMFVk4ZsqWocT6issAPUF0="
 
     # The GraphiQL React app.
-    graphiql_version = "1.4.1"  # "1.0.3"
+    graphiql_version = "1.4.7"  # "1.0.3"
-    graphiql_sri = "sha256-JUMkXBQWZMfJ7fGEsTXalxVA10lzKOS9loXdLjwZKi4="  # "sha256-VR4buIDY9ZXSyCNFHFNik6uSe0MhigCzgN4u7moCOTk="
+    graphiql_sri = "sha256-cpZ8w9D/i6XdEbY/Eu7yAXeYzReVw0mxYd7OU3gUcsc="  # "sha256-VR4buIDY9ZXSyCNFHFNik6uSe0MhigCzgN4u7moCOTk="
-    graphiql_css_sri = "sha256-Md3vdR7PDzWyo/aGfsFVF4tvS5/eAUWuIsg9QHUusCY="  # "sha256-LwqxjyZgqXDYbpxQJ5zLQeNcf7WVNSJ+r8yp2rnWE/E="
+    graphiql_css_sri = "sha256-HADQowUuFum02+Ckkv5Yu5ygRoLllHZqg0TFZXY7NHI="  # "sha256-LwqxjyZgqXDYbpxQJ5zLQeNcf7WVNSJ+r8yp2rnWE/E="
 
     # The websocket transport library for subscriptions.
     subscriptions_transport_ws_version = "0.9.18"

tox.ini

@@ -23,6 +23,7 @@ passenv = *
 usedevelop = True
 setenv =
     DJANGO_SETTINGS_MODULE=examples.django_test_settings
+    PYTHONPATH=.
 deps =
     -e.[test]
     psycopg2-binary