backport: Enable passing values configuration to GraphQLEnumType as a thunk

Replicates graphql/graphql-js@6a1614c

Author: Cito

src/graphql/__init__.py

@@ -342,6 +342,7 @@
     GraphQLArgumentMap,
     GraphQLEnumValue,
     GraphQLEnumValueMap,
+    GraphQLEnumValuesDefinition,
     GraphQLField,
     GraphQLFieldMap,
     GraphQLFieldResolver,
@@ -564,6 +565,7 @@
     "GraphQLArgumentMap",
     "GraphQLEnumValue",
     "GraphQLEnumValueMap",
+    "GraphQLEnumValuesDefinition",
     "GraphQLField",
     "GraphQLFieldMap",
     "GraphQLFieldResolver",

src/graphql/type/__init__.py

@@ -92,6 +92,7 @@
     GraphQLArgumentMap,
     GraphQLEnumValue,
     GraphQLEnumValueMap,
+    GraphQLEnumValuesDefinition,
     GraphQLField,
     GraphQLFieldMap,
     GraphQLInputField,
@@ -245,6 +246,7 @@
     "GraphQLArgumentMap",
     "GraphQLEnumValue",
     "GraphQLEnumValueMap",
+    "GraphQLEnumValuesDefinition",
     "GraphQLField",
     "GraphQLFieldMap",
     "GraphQLInputField",

src/graphql/type/definition.py

@@ -116,6 +116,7 @@
     "GraphQLEnumValue",
     "GraphQLEnumValueKwargs",
     "GraphQLEnumValueMap",
+    "GraphQLEnumValuesDefinition",
     "GraphQLField",
     "GraphQLFieldKwargs",
     "GraphQLFieldMap",
@@ -1106,6 +1107,8 @@ def assert_union_type(type_: Any) -> GraphQLUnionType:
 
 GraphQLEnumValueMap = Dict[str, "GraphQLEnumValue"]
 
+GraphQLEnumValuesDefinition = Union[GraphQLEnumValueMap, Mapping[str, Any], Type[Enum]]
+
 
 class GraphQLEnumTypeKwargs(GraphQLNamedTypeKwargs, total=False):
     values: GraphQLEnumValueMap
@@ -1153,7 +1156,7 @@ class RGBEnum(enum.Enum):
     def __init__(
         self,
         name: str,
-        values: Union[GraphQLEnumValueMap, Mapping[str, Any], Type[Enum]],
+        values: Thunk[GraphQLEnumValuesDefinition],
         names_as_values: Optional[bool] = False,
         description: Optional[str] = None,
         extensions: Optional[Dict[str, Any]] = None,
@@ -1167,6 +1170,8 @@ def __init__(
             ast_node=ast_node,
             extension_ast_nodes=extension_ast_nodes,
         )
+        if not isinstance(values, type):
+            values = resolve_thunk(values)  # type: ignore
         try:  # check for enum
             values = cast(Enum, values).__members__  # type: ignore
         except AttributeError:
@@ -1175,7 +1180,7 @@ def __init__(
             ):
                 try:
                     # noinspection PyTypeChecker
-                    values = dict(values)
+                    values = dict(values)  # type: ignore
                 except (TypeError, ValueError) as error:
                     raise TypeError(
                         f"{name} values must be an Enum or a mapping"

tests/type/test_enum.py

@@ -41,6 +41,8 @@ class Complex2:
 
 ColorType2 = GraphQLEnumType("Color", ColorTypeEnumValues)
 
+ThunkValuesEnum = GraphQLEnumType("ThunkValues", lambda: {"A": "a", "B": "b"})
+
 QueryType = GraphQLObjectType(
     "Query",
     {
@@ -83,6 +85,13 @@ class Complex2:
                 else Complex2() if args.get("provideBadValue") else args.get("fromEnum")
             ),
         ),
+        "thunkValuesString": GraphQLField(
+            GraphQLString,
+            args={
+                "fromEnum": GraphQLArgument(ThunkValuesEnum),
+            },
+            resolve=lambda _source, _info, fromEnum: fromEnum,
+        ),
     },
 )
 
@@ -345,5 +354,10 @@ def may_be_internally_represented_with_complex_values():
             ],
         )
 
+    def may_have_values_specified_via_a_callable():
+        result = execute_query("{ thunkValuesString(fromEnum: B) }")
+
+        assert result == ({"thunkValuesString": "b"}, None)
+
     def can_be_introspected_without_error():
         introspection_from_schema(schema)