Try sticking it in the context instead

Author: msullivan

tests/test_call.py

@@ -17,9 +17,9 @@ def test_call_1():
     ret = eval_call(func, a=1, b=2, c="aaa")
     fmt = format_helper.format_class(ret)
 
-    # XXX: Do we like this name?
+    # XXX: We want better than this for a name
     assert fmt == textwrap.dedent("""\
-        class __annotate__:
+        class NewProtocol:
             a: int
             b: int
             c: int

tests/test_type_dir.py

@@ -81,12 +81,10 @@ def sbase[Z](cls, a: int | Literal['gotcha!'] | Z | None, b: ~K) -> dict[str, in
 def test_type_dir_2():
     d = eval_typing(OptionalFinal)
 
-    # XXX: should the class name be further mangled to something like
-    #      "AllOptional__T"?
     # XXX: `DirProperties` skips methods, true to its name. Perhaps we just need
     #      `Dir` that would iterate over everything
     assert format_helper.format_class(d) == textwrap.dedent("""\
-        class AllOptional:
+        class AllOptional[tests.test_type_dir.Final]:
             last: int | typing.Literal[True] | None
             iii: str | int | typing.Literal['gotcha!'] | None
             t: dict[str, str | int | typing.Literal['gotcha!']] | None

tests/test_type_eval.py

@@ -52,11 +52,11 @@ def test_eval_types_2():
     assert evaled.__annotations__["a"].__args__[0] is evaled
 
     assert format_helper.format_class(evaled) == textwrap.dedent("""\
-        class MapRecursive:
+        class MapRecursive[tests.test_type_eval.Recursive]:
             n: int | typing.Literal['gotcha!']
             m: str | typing.Literal['gotcha!']
             t: typing.Literal[False] | typing.Literal['gotcha!']
-            a: tests.test_type_eval.MapRecursive | typing.Literal['gotcha!']
+            a: tests.test_type_eval.MapRecursive[tests.test_type_eval.Recursive] | typing.Literal['gotcha!']
             fff: int | typing.Literal['gotcha!']
             control: float
         """)

typemap/type_eval/__init__.py

@@ -1,6 +1,6 @@
 from ._eval_call import eval_call
-from ._eval_typing import eval_typing
+from ._eval_typing import eval_typing, _current_context
 
 
-__all__ = ("eval_typing", "eval_call")
+__all__ = ("eval_typing", "eval_call", "_current_context")
 1

typemap/type_eval/_eval_typing.py

@@ -21,6 +21,7 @@
 @dataclasses.dataclass
 class EvalContext:
     seen: dict[Any, Any]
+    current_alias: types.GenericAlias | None = None
 
 
 # `eval_types()` calls can be nested, context must be preserved
@@ -131,15 +132,21 @@ def _eval_generic(obj: types.GenericAlias, ctx: EvalContext):
 
     args = tuple(types.CellType(_eval_types(arg, ctx)) for arg in obj.__args__)
     mod = sys.modules[obj.__module__]
-    ff = types.FunctionType(func.__code__, mod.__dict__, None, None, args)
-    unpacked = ff(annotationlib.Format.VALUE)
 
-    ctx.seen[obj] = unpacked
+    old_obj = ctx.current_alias
+    ctx.current_alias = obj
+
     try:
+        ff = types.FunctionType(func.__code__, mod.__dict__, None, None, args)
+        unpacked = ff(annotationlib.Format.VALUE)
+
+        ctx.seen[obj] = unpacked
         evaled = _eval_types(unpacked, ctx)
     except Exception:
-        ctx.seen.pop(obj)
+        ctx.seen.pop(obj, None)
         raise
+    finally:
+        ctx.current_alias = old_obj
 
     return evaled
 

typemap/typing.py

@@ -88,18 +88,14 @@ def __getitem__(cls, val: list[Property]):
         dct = {}
         dct["__annotations__"] = {prop.name: prop.type for prop in val}
 
-        frame = inspect.currentframe()
-
         module_name = __name__
-        name = "Protocol"
-
-        # Peak at the calling frame and use that to produce
-        # a better name than Protocol.
-        # This is probably a 3.14 special?
-        if frame and (prev := frame.f_back):
-            name = prev.f_code.co_name
-            module_name = inspect.getmodule(prev.f_code).__name__
-            # qualname??
+        name = "NewProtocol"
+
+        # If the type evaluation context
+        ctx = type_eval._current_context.get()
+        if ctx and ctx.current_alias:
+            name = str(ctx.current_alias)
+            module_name = ctx.current_alias.__module__
 
         dct["__module__"] = module_name