Make default_resolve_type to match GraphQLTypeResolver type

Replicates graphql/graphql-js@898cf20

Author: Cito

graphql/execution/execute.py

@@ -860,12 +860,8 @@ def complete_abstract_value(
         Complete a value of an abstract type by determining the runtime object type of
         that value, then complete the value for that type.
         """
-        resolve_type = return_type.resolve_type
-        runtime_type = (
-            resolve_type(result, info)
-            if resolve_type
-            else default_resolve_type_fn(result, info, return_type)
-        )
+        resolve_type_fn = return_type.resolve_type or default_resolve_type_fn
+        runtime_type = resolve_type_fn(result, info, return_type)
 
         if isawaitable(runtime_type):
 

graphql/type/definition.py

@@ -509,7 +509,8 @@ class GraphQLResolveInfo(NamedTuple):
 # Note: Contrary to the Javascript implementation of GraphQLTypeResolver,
 # the context is passed as part of the GraphQLResolveInfo:
 GraphQLTypeResolver = Callable[
-    [Any, GraphQLResolveInfo], MaybeAwaitable[Union["GraphQLObjectType", str]]
+    [Any, GraphQLResolveInfo, "GraphQLAbstractType"],
+    MaybeAwaitable[Optional[Union["GraphQLObjectType", str]]],
 ]
 
 # Note: Contrary to the Javascript implementation of GraphQLIsTypeOfFn,

tests/execution/test_abstract.py

@@ -39,7 +39,7 @@ def is_type_of(obj, _info):
 
 
 def get_type_resolver(types):
-    def resolve(obj, _info):
+    def resolve(obj, _info, _type):
         return resolve_thunk(types).get(obj.__class__)
 
     return resolve

tests/execution/test_abstract_async.py

@@ -45,7 +45,7 @@ async def is_type_of(obj, _info):
 
 
 def get_type_resolver(types):
-    async def resolve(obj, _info):
+    async def resolve(obj, _info, _type):
         return resolve_thunk(types).get(obj.__class__)
 
     return resolve

tests/execution/test_union_interface.py

@@ -50,7 +50,7 @@ class Person(NamedTuple):
 )
 
 
-def resolve_pet_type(value, info):
+def resolve_pet_type(value, _info, _type):
     if isinstance(value, Dog):
         return DogType
     if isinstance(value, Cat):
@@ -67,7 +67,7 @@ def resolve_pet_type(value, info):
         "friends": GraphQLField(GraphQLList(NamedType)),
     },
     interfaces=[NamedType],
-    is_type_of=lambda value, info: isinstance(value, Person),
+    is_type_of=lambda value, _info: isinstance(value, Person),
 )
 
 schema = GraphQLSchema(PersonType, types=[PetType])
@@ -312,7 +312,7 @@ def allows_fragment_conditions_to_be_abstract_types():
     def gets_execution_info_in_resolver():
         encountered = {}
 
-        def resolve_type(obj, info):
+        def resolve_type(_obj, info, _type):
             encountered["context"] = info.context
             encountered["schema"] = info.schema
             encountered["root_value"] = info.root_value

tests/star_wars_schema.py

@@ -110,7 +110,7 @@
             GraphQLString, description="All secrets about their past."
         ),
     },
-    resolve_type=lambda character, _info: {
+    resolve_type=lambda character, _info, _type: {
         "Human": human_type,
         "Droid": droid_type,
     }.get(character.type),

tests/validation/harness.py

@@ -77,7 +77,7 @@
         ),
     },
     interfaces=[Being, Pet, Canine],
-    is_type_of=lambda: True,
+    is_type_of=lambda *_args: True,
 )
 
 Cat = GraphQLObjectType(
@@ -90,7 +90,7 @@
         "nickname": GraphQLField(GraphQLString),
     },
     interfaces=[Being, Pet],
-    is_type_of=lambda: True,
+    is_type_of=lambda *_args: True,
 )
 
 CatOrDog = GraphQLUnionType("CatOrDog", [Dog, Cat])
@@ -100,7 +100,7 @@
 Human = GraphQLObjectType(
     name="Human",
     interfaces=[Being, Intelligent],
-    is_type_of=lambda: True,
+    is_type_of=lambda *_args: True,
     fields={
         "name": GraphQLField(
             GraphQLString, {"surname": GraphQLArgument(GraphQLBoolean)}
@@ -112,7 +112,7 @@
 
 Alien = GraphQLObjectType(
     name="Alien",
-    is_type_of=lambda: True,
+    is_type_of=lambda *_args: True,
     interfaces=[Being, Intelligent],
     fields={
         "iq": GraphQLField(GraphQLInt),