Make resolvers simple again

syrusakbary · syrusakbary · commit 9769612a44c5 · 2017-07-23T23:10:15.000-07:00
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Also, Graphene is fully compatible with the GraphQL spec, working seamlessly wit
 For instaling graphene, just run this command in your shell
 
 ```bash
-pip install "graphene>=2.0"
+pip install "graphene>=2.0.dev"
 ```
 
 ## 2.0 Upgrade Guide
@@ -48,7 +48,7 @@ Here is one example for you to get started:
 class Query(graphene.ObjectType):
     hello = graphene.String(description='A typical hello world')
 
-    def resolve_hello(self, args, context, info):
+    def resolve_hello(self):
         return 'World'
 
 schema = graphene.Schema(query=Query)
diff --git a/README.rst b/README.rst
@@ -65,7 +65,7 @@ Here is one example for you to get started:
     class Query(graphene.ObjectType):
         hello = graphene.String(description='A typical hello world')
 
-        def resolve_hello(self, args, context, info):
+        def resolve_hello(self):
             return 'World'
 
     schema = graphene.Schema(query=Query)
diff --git a/UPGRADE-v2.0.md b/UPGRADE-v2.0.md
@@ -49,7 +49,7 @@ class Pet(CommonFields, Interface):
 
 ### resolve\_only\_args
 
-`resolve_only_args` is now deprecated in favor of type annotations (using the polyfill `@graphene.annotate` in Python 2).
+`resolve_only_args` is now deprecated in favor of type annotations (using the polyfill `@graphene.annotate` in Python 2 in case is necessary for accessing `context` or `info`).
 
 Before:
 
@@ -68,8 +68,7 @@ With 2.0:
 class User(ObjectType):
     name = String()
 
-    # Decorate the resolver with @annotate in Python 2
-    def resolve_name(self) -> str:
+    def resolve_name(self):
         return self.name
 ```
 
@@ -129,7 +128,7 @@ def is_user_id(id):
     return id.startswith('userid_')
 
 class Query(ObjectType):
-    user = graphene.Field(User, id=UserInput())
+    user = graphene.Field(User, input=UserInput())
 
     @resolve_only_args
     def resolve_user(self, input):
@@ -149,10 +148,9 @@ class UserInput(InputObjectType):
         return self.id.startswith('userid_')
 
 class Query(ObjectType):
-    user = graphene.Field(User, id=UserInput())
+    user = graphene.Field(User, input=UserInput())
 
-    # Decorate the resolver with @annotate(input=UserInput) in Python 2
-    def resolve_user(self, input: UserInput) -> User:
+    def resolve_user(self, input):
         if input.is_user_id:
             return get_user(input.id)
 
diff --git a/examples/context_example.py b/examples/context_example.py
@@ -9,7 +9,8 @@ class User(graphene.ObjectType):
 class Query(graphene.ObjectType):
     me = graphene.Field(User)
 
-    def resolve_me(self, args, context, info):
+    @graphene.annotate(context=graphene.Context)
+    def resolve_me(self, context):
         return context['user']
 
 
diff --git a/examples/simple_example.py b/examples/simple_example.py
@@ -11,7 +11,7 @@ class Query(graphene.ObjectType):
 
     patron = graphene.Field(Patron)
 
-    def resolve_patron(self, args, context, info):
+    def resolve_patron(self):
         return Patron(id=1, name='Syrus', age=27)
 
 
diff --git a/examples/starwars/schema.py b/examples/starwars/schema.py
@@ -1,5 +1,4 @@
 import graphene
-from graphene import annotate
 
 from .data import get_character, get_droid, get_hero, get_human
 
@@ -16,7 +15,7 @@ class Character(graphene.Interface):
     friends = graphene.List(lambda: Character)
     appears_in = graphene.List(Episode)
 
-    def resolve_friends(self, args, *_):
+    def resolve_friends(self):
         # The character friends is a list of strings
         return [get_character(f) for f in self.friends]
 
@@ -46,15 +45,12 @@ class Query(graphene.ObjectType):
                            id=graphene.String()
                            )
 
-    @annotate(episode=Episode)
     def resolve_hero(self, episode=None):
         return get_hero(episode)
 
-    @annotate(id=str)
     def resolve_human(self, id):
         return get_human(id)
 
-    @annotate(id=str)
     def resolve_droid(self, id):
         return get_droid(id)
 
diff --git a/examples/starwars_relay/schema.py b/examples/starwars_relay/schema.py
@@ -32,7 +32,6 @@ class Meta:
     name = graphene.String(description='The name of the faction.')
     ships = relay.ConnectionField(ShipConnection, description='The ships used by the faction.')
 
-    @annotate
     def resolve_ships(self, **args):
         # Transform the instance ship_ids into real instances
         return [get_ship(ship_id) for ship_id in self.ships]
@@ -65,11 +64,9 @@ class Query(graphene.ObjectType):
     empire = graphene.Field(Faction)
     node = relay.Node.Field()
 
-    @annotate
     def resolve_rebels(self):
         return get_rebels()
 
-    @annotate
     def resolve_empire(self):
         return get_empire()
 
diff --git a/graphene/relay/mutation.py b/graphene/relay/mutation.py
@@ -3,8 +3,9 @@
 
 from promise import Promise, is_thenable
 
-from ..types import Field, InputObjectType, String
+from ..types import Field, InputObjectType, String, Context, ResolveInfo
 from ..types.mutation import Mutation
+from ..utils.annotate import annotate
 
 
 class ClientIDMutation(Mutation):
@@ -49,9 +50,8 @@ def __init_subclass_with_meta__(cls, output=None, arguments=None, name=None, **o
         )
 
     @classmethod
-    def mutate(cls, root, args, context, info):
-        input = args.get('input')
-
+    @annotate(context=Context, info=ResolveInfo)
+    def mutate(cls, root, input, context, info):
         def on_resolve(payload):
             try:
                 payload.client_mutation_id = input.get('clientMutationId')
diff --git a/graphene/relay/tests/test_connection_query.py b/graphene/relay/tests/test_connection_query.py
@@ -31,13 +31,13 @@ class Query(ObjectType):
 
     node = Node.Field()
 
-    def resolve_letters(self, args, context, info):
+    def resolve_letters(self, **args):
         return list(letters.values())
 
-    def resolve_promise_letters(self, args, context, info):
+    def resolve_promise_letters(self, **args):
         return Promise.resolve(list(letters.values()))
 
-    def resolve_connection_letters(self, args, context, info):
+    def resolve_connection_letters(self, **args):
         return LetterConnection(
             page_info=PageInfo(
                 has_next_page=True,
diff --git a/graphene/tests/issues/test_313.py b/graphene/tests/issues/test_313.py
@@ -29,7 +29,6 @@ class Input:
 
     result = graphene.Field(CreatePostResult)
 
-    @resolve_only_args
     def mutate(self, text):
         result = Success(yeah='yeah')
 
diff --git a/graphene/tests/issues/test_490.py b/graphene/tests/issues/test_490.py
@@ -6,8 +6,8 @@
 class Query(graphene.ObjectType):
     some_field = graphene.String(from_=graphene.String(name="from"))
 
-    def resolve_some_field(_, args, context, infos):
-        return args.get("from_")
+    def resolve_some_field(self, from_=None):
+        return from_
 
 
 def test_issue():
diff --git a/graphene/types/field.py b/graphene/types/field.py
@@ -7,7 +7,6 @@
 from .structures import NonNull
 from .unmountedtype import UnmountedType
 from .utils import get_type
-from ..utils.auto_resolver import auto_resolver
 
 base_type = type
 
@@ -64,4 +63,4 @@ def type(self):
         return get_type(self._type)
 
     def get_resolver(self, parent_resolver):
-        return auto_resolver(self.resolver or parent_resolver)
+        return self.resolver or parent_resolver
diff --git a/graphene/types/mutation.py b/graphene/types/mutation.py
@@ -5,6 +5,7 @@
 from .field import Field
 from .objecttype import ObjectType, ObjectTypeOptions
 from .utils import yank_fields_from_attrs
+from ..utils.auto_resolver import auto_resolver
 
 
 class MutationOptions(ObjectTypeOptions):
@@ -59,7 +60,7 @@ def __init_subclass_with_meta__(cls, resolver=None, output=None, arguments=None,
             _meta.fields = fields
 
         _meta.output = output
-        _meta.resolver = resolver
+        _meta.resolver = auto_resolver(resolver)
         _meta.arguments = arguments
 
         super(Mutation, cls).__init_subclass_with_meta__(_meta=_meta, **options)
diff --git a/graphene/types/tests/test_datetime.py b/graphene/types/tests/test_datetime.py
@@ -11,12 +11,11 @@ class Query(ObjectType):
     datetime = DateTime(_in=DateTime(name='in'))
     time = Time(_at=Time(name='at'))
 
-    def resolve_datetime(self, args, context, info):
-        _in = args.get('_in')
+    def resolve_datetime(self, _in=None):
         return _in
 
-    def resolve_time(self, args, context, info):
-        return args.get('_at')
+    def resolve_time(self, _at=None):
+        return _at
 
 
 schema = Schema(query=Query)
diff --git a/graphene/types/tests/test_generic.py b/graphene/types/tests/test_generic.py
@@ -6,8 +6,7 @@
 class Query(ObjectType):
     generic = GenericScalar(input=GenericScalar())
 
-    def resolve_generic(self, args, context, info):
-        input = args.get('input')
+    def resolve_generic(self, input=None):
         return input
 
 
diff --git a/graphene/types/tests/test_json.py b/graphene/types/tests/test_json.py
@@ -7,8 +7,7 @@
 class Query(ObjectType):
     json = JSONString(input=JSONString())
 
-    def resolve_json(self, args, context, info):
-        input = args.get('input')
+    def resolve_json(self, input):
         return input
 
 schema = Schema(query=Query)
diff --git a/graphene/types/tests/test_mutation.py b/graphene/types/tests/test_mutation.py
@@ -12,14 +12,14 @@ def test_generate_mutation_no_args():
     class MyMutation(Mutation):
         '''Documentation'''
 
-        @classmethod
-        def mutate(cls, *args, **kwargs):
-            pass
+        def mutate(self, **args):
+            return args
 
     assert issubclass(MyMutation, ObjectType)
     assert MyMutation._meta.name == "MyMutation"
     assert MyMutation._meta.description == "Documentation"
-    assert MyMutation.Field().resolver == MyMutation.mutate
+    resolved = MyMutation.Field().resolver(None, {'name': 'Peter'}, None, None)
+    assert resolved == {'name': 'Peter'}
 
 
 def test_generate_mutation_with_meta():
@@ -29,13 +29,13 @@ class Meta:
             name = 'MyOtherMutation'
             description = 'Documentation'
 
-        @classmethod
-        def mutate(cls, *args, **kwargs):
-            pass
+        def mutate(self, **args):
+            return args
 
     assert MyMutation._meta.name == "MyOtherMutation"
     assert MyMutation._meta.description == "Documentation"
-    assert MyMutation.Field().resolver == MyMutation.mutate
+    resolved = MyMutation.Field().resolver(None, {'name': 'Peter'}, None, None)
+    assert resolved == {'name': 'Peter'}
 
 
 def test_mutation_raises_exception_if_no_mutate():
@@ -59,15 +59,15 @@ class Input:
 
         Output = User
 
-        @classmethod
-        def mutate(cls, args, context, info):
-            name = args.get('name')
+        def mutate(self, name):
             return User(name=name)
 
     field = CreateUser.Field()
     assert field.type == User
     assert field.args == {'name': Argument(String)}
-    assert field.resolver == CreateUser.mutate
+    resolved = field.resolver(None, {'name': 'Peter'}, None, None)
+    assert isinstance(resolved, User)
+    assert resolved.name == 'Peter'
 
 
 def test_mutation_execution():
@@ -81,9 +81,7 @@ class Input:
         name = String()
         dynamic = Dynamic(lambda: String())
 
-        def mutate(self, args, context, info):
-            name = args.get('name')
-            dynamic = args.get('dynamic')
+        def mutate(self, name, dynamic):
             return CreateUser(name=name, dynamic=dynamic)
 
     class Query(ObjectType):
diff --git a/graphene/types/tests/test_query.py b/graphene/types/tests/test_query.py
diff --git a/graphene/types/tests/test_typemap.py b/graphene/types/tests/test_typemap.py
diff --git a/graphene/types/typemap.py b/graphene/types/typemap.py
diff --git a/graphene/utils/auto_resolver.py b/graphene/utils/auto_resolver.py
diff --git a/graphene/utils/resolver_from_annotations.py b/graphene/utils/resolver_from_annotations.py
diff --git a/graphene/utils/tests/test_auto_resolver.py b/graphene/utils/tests/test_auto_resolver.py
