Enable passing values configuration to GraphQLEnumType as a thunk

Replicates graphql/graphql-js@9e2e751

Author: Cito

src/graphql/__init__.py

@@ -347,6 +347,7 @@
     GraphQLArgumentMap,
     GraphQLEnumValue,
     GraphQLEnumValueMap,
+    GraphQLEnumValuesDefinition,
     GraphQLField,
     GraphQLFieldMap,
     GraphQLFieldResolver,
@@ -539,6 +540,7 @@
     "GraphQLEnumValue",
     "GraphQLEnumValueKwargs",
     "GraphQLEnumValueMap",
+    "GraphQLEnumValuesDefinition",
     "GraphQLError",
     "GraphQLErrorExtensions",
     "GraphQLField",

src/graphql/type/__init__.py

@@ -94,6 +94,7 @@
     GraphQLArgumentMap,
     GraphQLEnumValue,
     GraphQLEnumValueMap,
+    GraphQLEnumValuesDefinition,
     GraphQLField,
     GraphQLFieldMap,
     GraphQLInputField,
@@ -196,6 +197,7 @@
     "GraphQLEnumValue",
     "GraphQLEnumValueKwargs",
     "GraphQLEnumValueMap",
+    "GraphQLEnumValuesDefinition",
     "GraphQLField",
     "GraphQLFieldKwargs",
     "GraphQLFieldMap",

src/graphql/type/definition.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from enum import Enum
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -13,6 +14,7 @@
     Mapping,
     NamedTuple,
     Optional,
+    Type,
     TypeVar,
     Union,
     cast,
@@ -25,8 +27,6 @@
     from typing_extensions import TypedDict
 
 if TYPE_CHECKING:
-    from enum import Enum
-
     try:
         from typing import TypeAlias, TypeGuard
     except ImportError:  # Python < 3.10
@@ -85,6 +85,7 @@
     "GraphQLEnumValue",
     "GraphQLEnumValueKwargs",
     "GraphQLEnumValueMap",
+    "GraphQLEnumValuesDefinition",
     "GraphQLField",
     "GraphQLFieldKwargs",
     "GraphQLFieldMap",
@@ -1014,6 +1015,10 @@ def assert_union_type(type_: Any) -> GraphQLUnionType:
 
 GraphQLEnumValueMap: TypeAlias = Dict[str, "GraphQLEnumValue"]
 
+GraphQLEnumValuesDefinition: TypeAlias = Union[
+    GraphQLEnumValueMap, Mapping[str, Any], Type[Enum]
+]
+
 
 class GraphQLEnumTypeKwargs(GraphQLNamedTypeKwargs, total=False):
     """Arguments for GraphQL enum types"""
@@ -1063,7 +1068,7 @@ class RGBEnum(enum.Enum):
     def __init__(
         self,
         name: str,
-        values: GraphQLEnumValueMap | Mapping[str, Any] | type[Enum],
+        values: Thunk[GraphQLEnumValuesDefinition],
         names_as_values: bool | None = False,
         description: str | None = None,
         extensions: dict[str, Any] | None = None,
@@ -1077,14 +1082,16 @@ 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:
             if not isinstance(values, Mapping) or not all(
                 isinstance(name, str) for name in values
             ):
                 try:
-                    values = dict(values)  # pyright: ignore
+                    values = dict(values)  # type: ignore
                 except (TypeError, ValueError) as error:
                     msg = (
                         f"{name} values must be an Enum or a mapping"

tests/type/test_enum.py

@@ -42,6 +42,8 @@ class Complex2:
 
 ColorType2 = GraphQLEnumType("Color", ColorTypeEnumValues)
 
+ThunkValuesEnum = GraphQLEnumType("ThunkValues", lambda: {"A": "a", "B": "b"})
+
 QueryType = GraphQLObjectType(
     "Query",
     {
@@ -84,6 +86,13 @@ class Complex2:
             if args.get("provideBadValue")
             else args.get("fromEnum"),
         ),
+        "thunkValuesString": GraphQLField(
+            GraphQLString,
+            args={
+                "fromEnum": GraphQLArgument(ThunkValuesEnum),
+            },
+            resolve=lambda _source, _info, fromEnum: fromEnum,
+        ),
     },
 )
 
@@ -346,5 +355,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)