Properly populate the origin type for members

Author: msullivan

tests/test_type_dir.py

@@ -2,7 +2,6 @@
 import typing
 from typing import Literal, Never, TypeVar, Union
 
-import pytest
 
 from typemap.type_eval import eval_typing
 from typemap.typing import (
@@ -313,9 +312,6 @@ def _get_member(members, name):
     )
 
 
-@pytest.mark.xfail(
-    reason="Members does not actually report the correct origin class!"
-)
 def test_type_members_attr_():
     d = eval_typing(Members[Final])
     member = _get_member(d, "ordinary")
@@ -328,31 +324,21 @@ def test_type_members_func_1a():
     d = eval_typing(Members[Final])
     member = _get_member(d, "foo")
     assert typing.get_origin(member) is Member
-    name, typ, quals, _origin = typing.get_args(member)
+    name, typ, quals, origin = typing.get_args(member)
     assert name == typing.Literal["foo"]
     assert quals == typing.Literal["ClassVar"]
 
     assert (
         str(typ)
         == "\
 typing.Callable[[\
-typemap.typing.Param[typing.Literal['self'], tests.test_type_dir.Final, typing.Never], \
+typemap.typing.Param[typing.Literal['self'], tests.test_type_dir.Base[int], typing.Never], \
 typemap.typing.Param[typing.Literal['a'], int | None, typing.Never], \
 typemap.typing.Param[typing.Literal['b'], int, typing.Literal['keyword', \
 'default']]], \
 dict[str, int]]"
     )
 
-
-@pytest.mark.xfail(
-    reason="Members does not actually report the correct origin class!"
-)
-def test_type_members_func_1b():
-    # This should be merged up with 1a once it is fixed
-    d = eval_typing(Members[Final])
-    member = _get_member(d, "foo")
-    assert typing.get_origin(member) is Member
-    _, _, _, origin = typing.get_args(member)
     assert origin.__name__ == "Base[int]"
 
 
@@ -367,7 +353,7 @@ def test_type_members_func_2():
     assert (
         str(typ)
         == "\
-classmethod[tests.test_type_dir.Final, tuple[typemap.typing.Param[typing.Literal['a'], int | None, typing.Never], typemap.typing.Param[typing.Literal['b'], ~K, typing.Never]], dict[str, int]]"
+classmethod[tests.test_type_dir.Base[int], tuple[typemap.typing.Param[typing.Literal['a'], int | None, typing.Never], typemap.typing.Param[typing.Literal['b'], ~K, typing.Never]], dict[str, int]]"
     )
 
 

typemap/type_eval/_apply_generic.py

@@ -273,6 +273,8 @@ def apply(
     # before we evaluate the contents?
 
     # FIXME: right now we flatten out all the attributes... but should we??
+    # XXX: Yeah, a lot of work is put into copying everything into every
+    # class and it is not worth it, at all.
 
     new = {}
 
@@ -302,6 +304,7 @@ def apply(
 
         annos: dict[str, Any] = {}
         dct: dict[str, Any] = {}
+        sources: dict[str, Any] = {}
 
         cboxed.__local_annotations__, cboxed.__local_defns__ = _get_local_defns(
             boxed
@@ -310,9 +313,12 @@ def apply(
             cbase = new[base]
             annos.update(cbase.__local_annotations__)
             dct.update(cbase.__local_defns__)  # uh.
+            for k in [*cbase.__local_annotations__, *cbase.__local_defns__]:
+                sources[k] = cbase
 
         cboxed.__defn_names__ = set(dct)
         cboxed.__annotations__ = annos
+        cboxed.__defn_sources__ = sources
         cboxed.__generalized_mro__ = [new[b] for b in boxed.mro]
 
         for k, v in dct.items():

typemap/type_eval/_eval_operators.py

@@ -54,6 +54,9 @@ def get_annotated_type_hints(cls, **kwargs):
     for acls in cls.__mro__:
         if not hasattr(acls, "__annotations__"):
             continue
+        # XXX: This is super janky; we should just use the real mro
+        # and not flatten things
+        sources = getattr(acls, "__defn_sources__", {})
         for k in acls.__annotations__:
             if k not in hints:
                 quals = set()
@@ -73,7 +76,7 @@ def get_annotated_type_hints(cls, **kwargs):
                     else:
                         break
 
-                hints[k] = ty, tuple(sorted(quals)), acls
+                hints[k] = ty, tuple(sorted(quals)), sources.get(k, acls)
 
         # Stop early if we are done.
         if len(hints) == len(ohints):
@@ -84,6 +87,7 @@ def get_annotated_type_hints(cls, **kwargs):
 def get_annotated_method_hints(tp):
     hints = {}
     for ptp in reversed(tp.mro()):
+        sources = getattr(ptp, "__defn_sources__", {})
         for name, attr in ptp.__dict__.items():
             if isinstance(
                 attr,
@@ -97,10 +101,11 @@ def get_annotated_method_hints(tp):
                 if attr is typing._no_init_or_replace_init:
                     continue
 
+                rtp = sources.get(name, ptp)
                 hints[name] = (
-                    _function_type(attr, receiver_type=ptp),
+                    _function_type(attr, receiver_type=rtp),
                     ("ClassVar",),
-                    ptp,
+                    rtp,
                 )
 
     return hints