Merge branch 'master' into fix-deprecation-warnings

Author: syrusakbary

docs/filtering.rst

@@ -4,7 +4,7 @@ Filtering
 Graphene integrates with
 `django-filter <https://django-filter.readthedocs.org>`__ to provide
 filtering of results. See the `usage
-documentation <https://django-filter.readthedocs.org/en/latest/usage.html#the-filter>`__
+documentation <https://django-filter.readthedocs.io/en/latest/guide/usage.html#the-filter>`__
 for details on the format for ``filter_fields``.
 
 This filtering is automatically available when implementing a ``relay.Node``.
@@ -26,7 +26,7 @@ Filterable fields
 The ``filter_fields`` parameter is used to specify the fields which can
 be filtered upon. The value specified here is passed directly to
 ``django-filter``, so see the `filtering
-documentation <https://django-filter.readthedocs.org/en/latest/usage.html#the-filter>`__
+documentation <https://django-filter.readthedocs.io/en/latest/guide/usage.html#the-filter>`__
 for full details on the range of options available.
 
 For example:

examples/starwars/schema.py

@@ -16,7 +16,7 @@ class Meta:
         interfaces = (relay.Node, )
 
     @classmethod
-    def get_node(cls, id, context, info):
+    def get_node(cls, info, id):
         node = get_ship(id)
         return node
 
@@ -34,7 +34,7 @@ class Meta:
         interfaces = (relay.Node, )
 
     @classmethod
-    def get_node(cls, id, context, info):
+    def get_node(cls, info, id):
         return get_faction(id)
 
 
@@ -48,9 +48,7 @@ class Input:
     faction = graphene.Field(Faction)
 
     @classmethod
-    def mutate_and_get_payload(cls, input, context, info):
-        ship_name = input.get('ship_name')
-        faction_id = input.get('faction_id')
+    def mutate_and_get_payload(cls, root, info, ship_name, faction_id, client_mutation_id=None):
         ship = create_ship(ship_name, faction_id)
         faction = get_faction(faction_id)
         return IntroduceShip(ship=ship, faction=faction)

graphene_django/__init__.py

@@ -5,5 +5,10 @@
     DjangoConnectionField,
 )
 
-__all__ = ['DjangoObjectType',
-           'DjangoConnectionField']
+__version__ = '2.0.dev2017073101'
+
+__all__ = [
+    '__version__',
+    'DjangoObjectType',
+    'DjangoConnectionField'
+]

graphene_django/converter.py

@@ -2,15 +2,14 @@
 from django.utils.encoding import force_text
 
 from graphene import (ID, Boolean, Dynamic, Enum, Field, Float, Int, List,
-                      NonNull, String)
-from graphene.relay import is_node
+                      NonNull, String, UUID)
 from graphene.types.datetime import DateTime, Time
 from graphene.types.json import JSONString
 from graphene.utils.str_converters import to_camel_case, to_const
 from graphql import assert_valid_name
 
 from .compat import ArrayField, HStoreField, JSONField, RangeField
-from .fields import get_connection_field, DjangoListField
+from .fields import DjangoListField, DjangoConnectionField
 from .utils import import_single_dispatch
 
 singledispatch = import_single_dispatch()
@@ -79,11 +78,15 @@ def convert_field_to_string(field, registry=None):
 
 
 @convert_django_field.register(models.AutoField)
-@convert_django_field.register(models.UUIDField)
 def convert_field_to_id(field, registry=None):
     return ID(description=field.help_text, required=not field.null)
 
 
+@convert_django_field.register(models.UUIDField)
+def convert_field_to_uuid(field, registry=None):
+    return UUID(description=field.help_text, required=not field.null)
+
+
 @convert_django_field.register(models.PositiveIntegerField)
 @convert_django_field.register(models.PositiveSmallIntegerField)
 @convert_django_field.register(models.SmallIntegerField)
@@ -148,8 +151,16 @@ def dynamic_type():
         if not _type:
             return
 
-        if is_node(_type):
-            return get_connection_field(_type)
+        # If there is a connection, we should transform the field
+        # into a DjangoConnectionField
+        if _type._meta.connection:
+            # Use a DjangoFilterConnectionField if there are
+            # defined filter_fields in the DjangoObjectType Meta
+            if _type._meta.filter_fields:
+                from .filter.fields import DjangoFilterConnectionField
+                return DjangoFilterConnectionField(_type)
+
+            return DjangoConnectionField(_type)
 
         return DjangoListField(_type)
 

graphene_django/debug/middleware.py

@@ -39,7 +39,8 @@ def disable_instrumentation(self):
 
 class DjangoDebugMiddleware(object):
 
-    def resolve(self, next, root, args, context, info):
+    def resolve(self, next, root, info, **args):
+        context = info.context
         django_debug = getattr(context, 'django_debug', None)
         if not django_debug:
             if context is None:
@@ -52,6 +53,6 @@ def resolve(self, next, root, args, context, info):
                 ))
         if info.schema.get_type('DjangoDebug') == info.return_type:
             return context.django_debug.get_debug_promise()
-        promise = next(root, args, context, info)
+        promise = next(root, info, **args)
         context.django_debug.add_promise(promise)
         return promise

graphene_django/debug/tests/test_query.py

@@ -33,7 +33,7 @@ class Query(graphene.ObjectType):
         reporter = graphene.Field(ReporterType)
         debug = graphene.Field(DjangoDebug, name='__debug')
 
-        def resolve_reporter(self, *args, **kwargs):
+        def resolve_reporter(self, info, **args):
             return Reporter.objects.first()
 
     query = '''
@@ -80,7 +80,7 @@ class Query(graphene.ObjectType):
         all_reporters = graphene.List(ReporterType)
         debug = graphene.Field(DjangoDebug, name='__debug')
 
-        def resolve_all_reporters(self, *args, **kwargs):
+        def resolve_all_reporters(self, info, **args):
             return Reporter.objects.all()
 
     query = '''
@@ -129,7 +129,7 @@ class Query(graphene.ObjectType):
         all_reporters = DjangoConnectionField(ReporterType)
         debug = graphene.Field(DjangoDebug, name='__debug')
 
-        def resolve_all_reporters(self, *args, **kwargs):
+        def resolve_all_reporters(self, info, **args):
             return Reporter.objects.all()
 
     query = '''
@@ -181,11 +181,11 @@ class Meta:
             interfaces = (Node, )
 
     class Query(graphene.ObjectType):
-        all_reporters = DjangoFilterConnectionField(ReporterType)
+        all_reporters = DjangoFilterConnectionField(ReporterType, fields=['last_name'])
         s = graphene.String(resolver=lambda *_: "S")
         debug = graphene.Field(DjangoDebug, name='__debug')
 
-        def resolve_all_reporters(self, *args, **kwargs):
+        def resolve_all_reporters(self, info, **args):
             return Reporter.objects.all()
 
     query = '''

graphene_django/fields.py

@@ -9,7 +9,7 @@
 from graphql_relay.connection.arrayconnection import connection_from_list_slice
 
 from .settings import graphene_settings
-from .utils import DJANGO_FILTER_INSTALLED, maybe_queryset
+from .utils import maybe_queryset
 
 
 class DjangoListField(Field):
@@ -22,8 +22,8 @@ def model(self):
         return self.type.of_type._meta.node._meta.model
 
     @staticmethod
-    def list_resolver(resolver, root, args, context, info):
-        return maybe_queryset(resolver(root, args, context, info))
+    def list_resolver(resolver, root, info, **args):
+        return maybe_queryset(resolver(root, info, **args))
 
     def get_resolver(self, parent_resolver):
         return partial(self.list_resolver, parent_resolver)
@@ -43,6 +43,14 @@ def __init__(self, *args, **kwargs):
         )
         super(DjangoConnectionField, self).__init__(*args, **kwargs)
 
+    @property
+    def type(self):
+        from .types import DjangoObjectType
+        _type = super(ConnectionField, self).type
+        assert issubclass(_type, DjangoObjectType), "DjangoConnectionField only accepts DjangoObjectType types"
+        assert _type._meta.connection, "The type {} doesn't have a connection".format(_type.__name__)
+        return _type._meta.connection
+
     @property
     def node_type(self):
         return self.type._meta.node
@@ -89,7 +97,7 @@ def resolve_connection(cls, connection, default_manager, args, iterable):
 
     @classmethod
     def connection_resolver(cls, resolver, connection, default_manager, max_limit,
-                            enforce_first_or_last, root, args, context, info):
+                            enforce_first_or_last, root, info, **args):
         first = args.get('first')
         last = args.get('last')
 
@@ -111,7 +119,7 @@ def connection_resolver(cls, resolver, connection, default_manager, max_limit,
                 ).format(first, info.field_name, max_limit)
                 args['last'] = min(last, max_limit)
 
-        iterable = resolver(root, args, context, info)
+        iterable = resolver(root, info, **args)
         on_resolve = partial(cls.resolve_connection, connection, default_manager, args)
 
         if Promise.is_thenable(iterable):
@@ -128,10 +136,3 @@ def get_resolver(self, parent_resolver):
             self.max_limit,
             self.enforce_first_or_last
         )
-
-
-def get_connection_field(*args, **kwargs):
-    if DJANGO_FILTER_INSTALLED:
-        from .filter.fields import DjangoFilterConnectionField
-        return DjangoFilterConnectionField(*args, **kwargs)
-    return DjangoConnectionField(*args, **kwargs)

graphene_django/filter/fields.py

@@ -1,7 +1,6 @@
 from collections import OrderedDict
 from functools import partial
 
-# from graphene.relay import is_node
 from graphene.types.argument import to_arguments
 from ..fields import DjangoConnectionField
 from .utils import get_filtering_args_from_filterset, get_filterset_class
@@ -69,7 +68,7 @@ def merge_querysets(default_queryset, queryset):
     @classmethod
     def connection_resolver(cls, resolver, connection, default_manager, max_limit,
                             enforce_first_or_last, filterset_class, filtering_args,
-                            root, args, context, info):
+                            root, info, **args):
         filter_kwargs = {k: v for k, v in args.items() if k in filtering_args}
         qs = filterset_class(
             data=filter_kwargs,
@@ -83,9 +82,8 @@ def connection_resolver(cls, resolver, connection, default_manager, max_limit,
             max_limit,
             enforce_first_or_last,
             root,
-            args,
-            context,
-            info
+            info,
+            **args
         )
 
     def get_resolver(self, parent_resolver):

graphene_django/filter/tests/test_fields.py

@@ -114,9 +114,9 @@ def test_filter_explicit_filterset_orderable():
     assert_orderable(field)
 
 
-def test_filter_shortcut_filterset_orderable_true():
-    field = DjangoFilterConnectionField(ReporterNode)
-    assert_not_orderable(field)
+# def test_filter_shortcut_filterset_orderable_true():
+#     field = DjangoFilterConnectionField(ReporterNode)
+#     assert_not_orderable(field)
 
 
 # def test_filter_shortcut_filterset_orderable_headline():
@@ -356,7 +356,7 @@ def test_recursive_filter_connection():
     class ReporterFilterNode(DjangoObjectType):
         child_reporters = DjangoFilterConnectionField(lambda: ReporterFilterNode)
 
-        def resolve_child_reporters(self, args, context, info):
+        def resolve_child_reporters(self, **args):
             return []
 
         class Meta:
@@ -399,7 +399,7 @@ class Query(ObjectType):
             filterset_class=ReporterFilter
         )
 
-        def resolve_all_reporters(self, args, context, info):
+        def resolve_all_reporters(self, info, **args):
             return Reporter.objects.order_by('a_choice')
 
     Reporter.objects.create(
@@ -499,7 +499,7 @@ class Query(ObjectType):
             filterset_class=ReporterFilter
         )
 
-        def resolve_all_reporters(self, args, context, info):
+        def resolve_all_reporters(self, info, **args):
             return Reporter.objects.order_by('a_choice')[:2]
 
     Reporter.objects.create(

graphene_django/form_converter.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.forms.fields import BaseTemporalField
 
-from graphene import ID, Boolean, Float, Int, List, String
+from graphene import ID, Boolean, Float, Int, List, String, UUID
 
 from .forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 from .utils import import_single_dispatch
@@ -32,11 +32,15 @@ def convert_form_field(field):
 @convert_form_field.register(forms.ChoiceField)
 @convert_form_field.register(forms.RegexField)
 @convert_form_field.register(forms.Field)
-@convert_form_field.register(UUIDField)
 def convert_form_field_to_string(field):
     return String(description=field.help_text, required=field.required)
 
 
+@convert_form_field.register(UUIDField)
+def convert_form_field_to_uuid(field):
+    return UUID(description=field.help_text, required=field.required)
+
+
 @convert_form_field.register(forms.IntegerField)
 @convert_form_field.register(forms.NumberInput)
 def convert_form_field_to_int(field):

graphene_django/registry.py

@@ -1,3 +1,4 @@
+
 class Registry(object):
 
     def __init__(self):