Dump

Author: ulgens

graphene_django/converter.py

@@ -23,7 +23,7 @@
 )
 from graphene.types.json import JSONString
 from graphene.utils.str_converters import to_camel_case, to_const
-from graphql import assert_valid_name
+from graphql import assert_valid_name, GraphQLError
 
 from .settings import graphene_settings
 from .compat import ArrayField, HStoreField, JSONField, RangeField
@@ -34,7 +34,7 @@ def convert_choice_name(name):
     name = to_const(force_str(name))
     try:
         assert_valid_name(name)
-    except AssertionError:
+    except GraphQLError:
         name = "A_%s" % name
     return name
 
@@ -64,7 +64,7 @@ def convert_choices_to_named_enum_with_descriptions(name, choices):
     class EnumWithDescriptionsType(object):
         @property
         def description(self):
-            return named_choices_descriptions[self.name]
+            return str(named_choices_descriptions[self.name])
 
     return Enum(name, list(named_choices), type=EnumWithDescriptionsType)
 
@@ -276,3 +276,12 @@ def convert_postgres_range_to_string(field, registry=None):
     if not isinstance(inner_type, (List, NonNull)):
         inner_type = type(inner_type)
     return List(inner_type, description=field.help_text, required=not field.null)
+
+
+from django.utils.functional import Promise
+from graphql.pyutils import register_description
+
+
+# Register Django lazy()-wrapped values as GraphQL description/help_text.
+# This is needed for using lazy translations, see https://github.com/graphql-python/graphql-core-next/issues/58.
+register_description(Promise)

graphene_django/debug/middleware.py

@@ -17,7 +17,7 @@ def get_debug_promise(self):
         if not self.debug_promise:
             self.debug_promise = Promise.all(self.promises)
             self.promises = []
-        return self.debug_promise.then(self.on_resolve_all_promises)
+        return self.debug_promise.then(self.on_resolve_all_promises).get()
 
     def on_resolve_all_promises(self, values):
         if self.promises:

graphene_django/fields.py

@@ -1,12 +1,13 @@
 from functools import partial
 
 from django.db.models.query import QuerySet
+from graphene.relay.connection import page_info_adapter, connection_adapter
 
 from graphql_relay.connection.arrayconnection import connection_from_array_slice
 from promise import Promise
 
 from graphene import NonNull
-from graphene.relay import ConnectionField, PageInfo
+from graphene.relay import ConnectionField
 from graphene.types import Field, List
 
 from .settings import graphene_settings
@@ -127,11 +128,11 @@ def resolve_connection(cls, connection, args, iterable):
             iterable,
             args,
             slice_start=0,
-            connection_type=connection,
             array_length=_len,
             array_slice_length=_len,
+            connection_type=partial(connection_adapter, connection),
             edge_type=connection.Edge,
-            page_info_type=PageInfo,
+            page_info_type=page_info_adapter,
         )
         connection.iterable = iterable
         connection.length = _len

graphene_django/filter/tests/test_fields.py

@@ -809,38 +809,56 @@ class Query(ObjectType):
 
     assert str(schema) == dedent(
         """\
-        schema {
-          query: Query
+        type Query {
+          pets(before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null): PetTypeConnection
         }
 
-        interface Node {
-          id: ID!
+        type PetTypeConnection {
+          \"""Pagination data for this connection.\"""
+          pageInfo: PageInfo!
+
+          \"""Contains the nodes in this connection.\"""
+          edges: [PetTypeEdge]!
         }
 
+        \"""
+        The Relay compliant `PageInfo` type, containing data necessary to paginate this connection.
+        \"""
         type PageInfo {
+          \"""When paginating forwards, are there more items?\"""
           hasNextPage: Boolean!
+    
+          \"""When paginating backwards, are there more items?\"""
           hasPreviousPage: Boolean!
+    
+          \"""When paginating backwards, the cursor to continue.\"""
           startCursor: String
+    
+          \"""When paginating forwards, the cursor to continue.\"""
           endCursor: String
         }
-
-        type PetType implements Node {
-          age: Int!
-          id: ID!
-        }
-
-        type PetTypeConnection {
-          pageInfo: PageInfo!
-          edges: [PetTypeEdge]!
-        }
-
+    
+        \"""A Relay edge containing a `PetType` and its cursor.\"""
         type PetTypeEdge {
+          \"""The item at the end of the edge\"""
           node: PetType
+    
+          \"""A cursor for use in pagination\"""
           cursor: String!
         }
-
-        type Query {
-          pets(before: String, after: String, first: Int, last: Int, age: Int): PetTypeConnection
+    
+        type PetType implements Node {
+          \"""\"""
+          age: Int!
+    
+          \"""The ID of the object\"""
+          id: ID!
+        }
+    
+        \"""An object with an ID\"""
+        interface Node {
+          \"""The ID of the object\"""
+          id: ID!
         }
     """
     )
@@ -861,40 +879,58 @@ class Query(ObjectType):
 
     assert str(schema) == dedent(
         """\
-        schema {
-          query: Query
+        type Query {
+          pets(before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null, age_Isnull: Boolean = null, age_Lt: Int = null): PetTypeConnection
         }
 
-        interface Node {
-          id: ID!
+        type PetTypeConnection {
+          \"""Pagination data for this connection.\"""
+          pageInfo: PageInfo!
+          
+          \"""Contains the nodes in this connection.\"""
+          edges: [PetTypeEdge]!
         }
 
+        \"""
+        The Relay compliant `PageInfo` type, containing data necessary to paginate this connection.
+        \"""
         type PageInfo {
+          \"""When paginating forwards, are there more items?\"""
           hasNextPage: Boolean!
+
+          \"""When paginating backwards, are there more items?\"""
           hasPreviousPage: Boolean!
-          startCursor: String
-          endCursor: String
-        }
 
-        type PetType implements Node {
-          age: Int!
-          id: ID!
-        }
+          \"""When paginating backwards, the cursor to continue.\"""
+          startCursor: String
 
-        type PetTypeConnection {
-          pageInfo: PageInfo!
-          edges: [PetTypeEdge]!
+          \"""When paginating forwards, the cursor to continue.\"""
+          endCursor: String
         }
 
+        \"""A Relay edge containing a `PetType` and its cursor.\"""
         type PetTypeEdge {
+          \"""The item at the end of the edge\"""
           node: PetType
+        
+          \"""A cursor for use in pagination\"""
           cursor: String!
         }
 
-        type Query {
-          pets(before: String, after: String, first: Int, last: Int, age: Int, age_Isnull: Boolean, age_Lt: Int): PetTypeConnection
+        type PetType implements Node {
+          \"""\"""
+          age: Int!
+        
+          \"""The ID of the object\"""
+          id: ID!
         }
-    """
+
+        \"""An object with an ID\"""
+        interface Node {
+          \"""The ID of the object\"""
+          id: ID!
+        }
+        """
     )
 
 

graphene_django/management/commands/graphql_schema.py

@@ -55,7 +55,7 @@ def save_json_file(self, out, schema_dict, indent):
 
     def save_graphql_file(self, out, schema):
         with open(out, "w") as outfile:
-            outfile.write(print_schema(schema))
+            outfile.write(print_schema(schema.graphql_schema))
 
     def get_schema(self, schema, out, indent):
         schema_dict = {"data": schema.introspect()}

graphene_django/rest_framework/tests/test_mutation.py

@@ -18,6 +18,7 @@ def mock_info():
         None,
         None,
         None,
+        path=None,
         schema=None,
         fragments=None,
         root_value=None,

graphene_django/tests/test_command.py

@@ -51,10 +51,6 @@ class Query(ObjectType):
     schema_output = handle.write.call_args[0][0]
     assert schema_output == dedent(
         """\
-        schema {
-          query: Query
-        }
-
         type Query {
           hi: String
         }

graphene_django/tests/test_query.py

@@ -620,9 +620,9 @@ class Query(graphene.ObjectType):
 
     result = schema.execute(query)
     assert len(result.errors) == 1
-    assert str(result.errors[0]) == (
+    assert str(result.errors[0]).startswith(
         "You must provide a `first` or `last` value to properly "
-        "paginate the `allReporters` connection."
+        "paginate the `allReporters` connection.\n"
     )
     assert result.data == expected
 
@@ -661,9 +661,9 @@ class Query(graphene.ObjectType):
 
     result = schema.execute(query)
     assert len(result.errors) == 1
-    assert str(result.errors[0]) == (
+    assert str(result.errors[0]).startswith(
         "Requesting 101 records on the `allReporters` connection "
-        "exceeds the `first` limit of 100 records."
+        "exceeds the `first` limit of 100 records.\n"
     )
     assert result.data == expected
 
@@ -704,9 +704,9 @@ class Query(graphene.ObjectType):
 
     result = schema.execute(query)
     assert len(result.errors) == 1
-    assert str(result.errors[0]) == (
+    assert str(result.errors[0]).startswith(
         "Requesting 101 records on the `allReporters` connection "
-        "exceeds the `last` limit of 100 records."
+        "exceeds the `last` limit of 100 records.\n"
     )
     assert result.data == expected
 
@@ -725,7 +725,7 @@ class Query(graphene.ObjectType):
         all_reporters = DjangoConnectionField(ReporterType)
 
         def resolve_all_reporters(self, info, **args):
-            return Promise.resolve([Reporter(id=1)])
+            return Promise.resolve([Reporter(id=1)]).get()
 
     schema = graphene.Schema(query=Query)
     query = """
@@ -854,7 +854,7 @@ class Meta:
         articles = DjangoConnectionField(ArticleType)
 
         def resolve_articles(self, info, **args):
-            return article_loader.load(self.id)
+            return article_loader.load(self.id).get()
 
     class Query(graphene.ObjectType):
         all_reporters = DjangoConnectionField(ReporterType)
@@ -1117,6 +1117,7 @@ def resolve_films(root, info, **kwargs):
         }
     """
     schema = graphene.Schema(query=Query)
+
     with django_assert_num_queries(3) as captured:
         result = schema.execute(query)
     assert not result.errors