Support using enums in the query builder (#932)

Work on #635

Author: msullivan

gel/_internal/_codegen/_models/_pydantic.py

@@ -2508,11 +2508,15 @@ def _write_enum_scalar_type(
         type_name = stype.schemapath
         tname = type_name.name
         assert stype.enum_values
-        anyenum = self.import_name(BASE_IMPL, "AnyEnum")
+        anyenum = self.get_object(
+            SchemaPath('std', 'anyenum'),
+            aspect=ModuleAspect.SHAPES,
+        )
         with self._class_def(tname, [anyenum]):
             self.write_description(stype)
             for value in stype.enum_values:
                 self.write(f"{ident(value)} = {value!r}")
+            self.write_type_reflection(stype)
         self.write_section_break()
 
     def _write_scalar_type(
@@ -2601,6 +2605,8 @@ def _write_regular_scalar_type(
             typecheck_meta_parents.append(anyenummeta_)
             typecheck_meta_ignores = ["misc", "unused-ignore"]
 
+            self.export("anyenum")
+
         if not runtime_parents:
             typecheck_parents = [self.get_type(self._types_by_name["anytype"])]
             runtime_parents = typecheck_parents
@@ -4176,7 +4182,7 @@ def _write_object_type_qb_methods(
                 )
                 union = []
                 select_union = [builtin_bool, expr_closure, expr_proto]
-                if reflection.is_non_enum_scalar_type(target_t):
+                if reflection.is_scalar_type(target_t):
                     broad_ptr_t = self._get_pytype_for_scalar(target_t)
                     union.extend(broad_ptr_t)
                     select_union.extend(broad_ptr_t)

gel/_internal/_qbmodel/_abstract/_expressions.py

@@ -24,7 +24,7 @@
 from ._primitive import (
     GelPrimitiveType,
     PyConstType,
-    PyTypeScalar,
+    GelScalarType,
     get_literal_for_scalar,
     get_literal_for_value,
 )
@@ -106,7 +106,7 @@ def _const_to_expr(
     if isinstance(attr, ModelFieldDescriptor) and (
         tp := attr.get_resolved_type()
     ):
-        if issubclass(tp, PyTypeScalar):
+        if issubclass(tp, GelScalarType):
             return get_literal_for_scalar(tp, val)
 
         raise TypeError(f"unsupported const variant for {cls!r}.{pname!r}")

gel/_internal/_qbmodel/_abstract/_primitive.py

@@ -153,7 +153,11 @@ def __setitem__(self, key: str, value: Any) -> None:
 
 
 class AnyEnum(GelScalarType, StrEnum, metaclass=AnyEnumMeta):
-    pass
+    def __edgeql_literal__(self) -> _qb.Literal | _qb.CastOp:
+        return _qb.Literal(
+            val=str(self),
+            type_=type(self).__gel_reflection__.name,
+        )
 
 
 if TYPE_CHECKING:
@@ -776,12 +780,14 @@ def get_literal_for_value(
 
 
 def get_literal_for_scalar(
-    t: type[PyTypeScalar[_PT_co]],
+    t: type[GelScalarType],
     v: Any,
 ) -> _qb.Literal | _qb.CastOp:
     if not isinstance(v, t):
-        v = t(v)
-    ltype = _py_type_to_literal.get(t.__gel_py_type__)  # type: ignore [arg-type]
+        v = t(v)  # type: ignore [call-arg]
+    ltype = None
+    if issubclass(t, PyTypeScalar):
+        ltype = _py_type_to_literal.get(t.__gel_py_type__)
     if ltype is not None:
         return ltype(val=v)  # type: ignore [call-arg]
     else:

tests/test_qb.py

@@ -1091,11 +1091,6 @@ def test_qb_boolean_operator_error_01(self):
         with self.assertRaisesRegex(TypeError, "use std.exists"):
             default.User.filter(lambda u: u.name is not None)  # type: ignore
 
-    @tb.xfail('''
-        Filtering on enums broken. And Enums need __gel_type_class__?
-        See #635
-    ''')
-    @tb.skip_typecheck
     def test_qb_enum_01(self):
         from models.orm import default
 
@@ -1338,10 +1333,6 @@ def test_qb_delete_03(self):
         self.assertEqual(res[1].body, "I'm Alice")
         self.assertEqual(res[1].author.name, "Alice")
 
-    @tb.xfail('''
-        Filtering on enums broken. And Enums need __gel_type_class__?
-        See #635
-    ''')
     def test_qb_enum_edit_01(self):
         from models.orm import default
 
@@ -1356,10 +1347,6 @@ def test_qb_enum_edit_01(self):
         self.assertEqual(e.color, default.Color.Orange)
         self.assertEqual(e.name, "red")
 
-    @tb.xfail('''
-        Filtering on enums broken. And Enums need __gel_type_class__?
-        See #635
-    ''')
     def test_qb_enum_edit_02(self):
         from models.orm import default