Adapted code to the new resovlers api

Author: syrusakbary

graphene_sqlalchemy/fields.py

@@ -2,7 +2,6 @@
 
 from sqlalchemy.orm.query import Query
 
-from graphene import final_resolver
 from graphene.relay import ConnectionField
 from graphene.relay.connection import PageInfo
 from graphql_relay.connection.arrayconnection import connection_from_list_slice
@@ -17,8 +16,8 @@ def model(self):
         return self.type._meta.node._meta.model
 
     @classmethod
-    def get_query(cls, model, context, info, args):
-        return get_query(model, context)
+    def get_query(cls, model, info, **args):
+        return get_query(model, info.context)
 
     @property
     def type(self):
@@ -31,10 +30,10 @@ def type(self):
         return _type._meta.connection
 
     @classmethod
-    def connection_resolver(cls, resolver, connection, model, root, args, context, info):
-        iterable = resolver(root, args, context, info)
+    def connection_resolver(cls, resolver, connection, model, root, info, **args):
+        iterable = resolver(root, info, **args)
         if iterable is None:
-            iterable = cls.get_query(model, context, info, args)
+            iterable = cls.get_query(model, info, **args)
         if isinstance(iterable, Query):
             _len = iterable.count()
         else:
@@ -54,7 +53,7 @@ def connection_resolver(cls, resolver, connection, model, root, args, context, i
         return connection
 
     def get_resolver(self, parent_resolver):
-        return final_resolver(partial(self.connection_resolver, parent_resolver, self.type, self.model))
+        return partial(self.connection_resolver, parent_resolver, self.type, self.model)
 
 
 __connectionFactory = SQLAlchemyConnectionField

graphene_sqlalchemy/tests/test_query.py

@@ -277,7 +277,7 @@ class Arguments:
         ok = graphene.Boolean()
         article = graphene.Field(ArticleNode)
 
-        def mutate(self, headline, reporter_id):
+        def mutate(self, info, headline, reporter_id):
             new_article = Article(
                 headline=headline,
                 reporter_id=reporter_id,

graphene_sqlalchemy/tests/test_utils.py

@@ -1,4 +1,4 @@
-from graphene import ObjectType, Schema, String, annotate, Context
+from graphene import ObjectType, Schema, String
 
 from ..utils import get_session
 
@@ -9,9 +9,8 @@ def test_get_session():
     class Query(ObjectType):
         x = String()
 
-        @annotate(context=Context)
-        def resolve_x(self, context):
-            return get_session(context)
+        def resolve_x(self, info):
+            return get_session(info.context)
 
     query = '''
         query ReporterQuery {

graphene_sqlalchemy/types.py

@@ -134,7 +134,7 @@ def __init_subclass_with_meta__(cls, model=None, registry=None, skip_registry=Fa
             registry.register(cls)
 
     @classmethod
-    def is_type_of(cls, root, context, info):
+    def is_type_of(cls, root, info):
         if isinstance(root, cls):
             return True
         if not is_mapped_instance(root):
@@ -144,19 +144,18 @@ def is_type_of(cls, root, context, info):
         return isinstance(root, cls._meta.model)
 
     @classmethod
-    def get_query(cls, context):
+    def get_query(cls, info):
         model = cls._meta.model
-        return get_query(model, context)
+        return get_query(model, info.context)
 
     @classmethod
-    def get_node(cls, id, context, info):
+    def get_node(cls, info, id):
         try:
-            return cls.get_query(context).get(id)
+            return cls.get_query(info).get(id)
         except NoResultFound:
             return None
 
-    # @annotate(info=ResolveInfo)
-    def resolve_id(self):
+    def resolve_id(self, info):
         # graphene_type = info.parent_type.graphene_type
         keys = self.__mapper__.primary_key_from_instance(self)
         return tuple(keys) if len(keys) > 1 else keys[0]