omlish 0.0.0.dev283__tar.gz → 0.0.0.dev284__tar.gz

{omlish-0.0.0.dev283/omlish.egg-info → omlish-0.0.0.dev284}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev283
+Version: 0.0.0.dev284
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -15,7 +15,7 @@ License-File: LICENSE
 Provides-Extra: all
 Requires-Dist: anyio~=4.9; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
-Requires-Dist: greenlet~=3.1; extra == "all"
+Requires-Dist: greenlet~=3.2; extra == "all"
 Requires-Dist: trio~=0.29; extra == "all"
 Requires-Dist: trio-asyncio~=0.15; extra == "all"
 Requires-Dist: lz4~=4.4; extra == "all"
@@ -53,7 +53,7 @@ Requires-Dist: wrapt~=1.17; extra == "all"
 Provides-Extra: async
 Requires-Dist: anyio~=4.9; extra == "async"
 Requires-Dist: sniffio~=1.3; extra == "async"
-Requires-Dist: greenlet~=3.1; extra == "async"
+Requires-Dist: greenlet~=3.2; extra == "async"
 Requires-Dist: trio~=0.29; extra == "async"
 Requires-Dist: trio-asyncio~=0.15; extra == "async"
 Provides-Extra: compress

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev283'
-__revision__ = 'cb2339041915213e0f3c8ffacbb6339c5606f479'
+__version__ = '0.0.0.dev284'
+__revision__ = 'e10caaddb37a1fedcbe1bf3e711062e82a8cc7cb'
 
 
 #
@@ -35,7 +35,7 @@ class Project(ProjectBase):
             'anyio ~= 4.9',
             'sniffio ~= 1.3',
 
-            'greenlet ~= 3.1',
+            'greenlet ~= 3.2',
 
             'trio ~= 0.29',
             'trio-asyncio ~= 0.15',
@@ -92,7 +92,7 @@ class Project(ProjectBase):
             # 'psycopg ~= 3.2',
 
             'pymysql ~= 1.1',
-            # 'mysql-connector-python ~= 9.1',
+            # 'mysql-connector-python ~= 9.3',
             # 'mysqlclient ~= 2.2',
 
             'aiomysql ~= 0.2',

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/dataclasses/__init__.py

@@ -28,7 +28,7 @@ from .impl.api import (  # noqa
     dataclass as xdataclass,
     make_dataclass as xmake_dataclass,
 
-    extra_params,
+    extra_class_params,
 )
 
 from .impl.as_ import (  # noqa

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/dataclasses/impl/api.py

@@ -247,7 +247,7 @@ class _ExtraParamsKwargs:
     pass
 
 
-def extra_params(  # noqa
+def extra_class_params(  # noqa
         *,
         reorder=MISSING,
         cache_hash=MISSING,

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/dataclasses/impl/order.py

@@ -40,7 +40,17 @@ class OrderProcessor(Processor):
             ('__gt__', '>'),
             ('__ge__', '>='),
         ]:
-            if set_new_attribute(self._cls, name, cmp_fn(name, op, self_tuple, other_tuple, globals=self._info.globals)):  # noqa
+            if set_new_attribute(
+                    self._cls,  # noqa
+                    name,
+                    cmp_fn(
+                        name,
+                        op,
+                        self_tuple,
+                        other_tuple,
+                        globals=self._info.globals,
+                    ),
+            ):
                 raise TypeError(
                     f'Cannot overwrite attribute {name} in class {self._cls.__name__}. '
                     f'Consider using functools.total_ordering',

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/bindings.py

@@ -12,7 +12,7 @@ from .types import Unscoped
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class Binding(Element, lang.Final):
     key: Key = dc.xfield(coerce=check.of_isinstance(Key))
     provider: Provider = dc.xfield(coerce=check.of_isinstance(Provider))

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/eagers.py

@@ -13,6 +13,6 @@ from .keys import Key
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class Eager(Element, lang.Final):
     key: Key = dc.xfield(coerce=check.of_isinstance(Key))

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/impl/bindings.py

@@ -11,7 +11,7 @@ from .providers import ProviderImpl
 
 
 @dc.dataclass(frozen=True, eq=False)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class BindingImpl(lang.Final):
     key: Key
     provider: ProviderImpl

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/keys.py

@@ -14,7 +14,7 @@ T = ta.TypeVar('T')
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class Key(lang.Final, ta.Generic[T]):
     ty: rfl.Type = dc.xfield(coerce=rfl.type_)
 

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/listeners.py

@@ -20,7 +20,7 @@ ProvisionListener: ta.TypeAlias = ta.Callable[[
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class ProvisionListenerBinding(Element, lang.Final):
     listener: ProvisionListener
 

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/multis.py

@@ -30,14 +30,14 @@ def _check_set_multi_key(mk: Key) -> bool:
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class SetBinding(Element, lang.Final):
     multi_key: Key = dc.xfield(validate=_check_set_multi_key)
     dst: Key = dc.xfield(coerce=check.of_isinstance(Key))
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class SetProvider(Provider):
     multi_key: Key = dc.xfield(validate=_check_set_multi_key)
 
@@ -50,7 +50,7 @@ def _check_map_multi_key(mk: Key) -> bool:
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class MapBinding(Element, lang.Final):
     multi_key: Key = dc.xfield(validate=_check_map_multi_key)
     map_key: ta.Any = dc.xfield()
@@ -58,7 +58,7 @@ class MapBinding(Element, lang.Final):
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class MapProvider(Provider):
     multi_key: Key = dc.xfield(validate=_check_map_multi_key)
 

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/origins.py

@@ -12,13 +12,13 @@ T = ta.TypeVar('T')
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class Origin:
     lst: ta.Sequence[str]
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class Origins:
     lst: ta.Sequence[Origin]
 

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/overrides.py

@@ -12,7 +12,7 @@ from .elements import as_elements
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class Overrides(Element, lang.Final):
     ovr: Elements = dc.xfield(coerce=check.of_isinstance(Elements))
     src: Elements = dc.xfield(coerce=check.of_isinstance(Elements))

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/privates.py

@@ -13,13 +13,13 @@ from .keys import as_key
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class Expose(Element, lang.Final):
     key: Key = dc.xfield(coerce=as_key)
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class Private(Element, lang.Final):
     elements: Elements = dc.xfield(coerce=check.of_isinstance(Elements))
 

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/providers.py

@@ -18,24 +18,24 @@ class Provider(lang.Abstract):
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class FnProvider(Provider):
     fn: ta.Any = dc.xfield(validate=callable)
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class CtorProvider(Provider):
     ty: type = dc.xfield(coerce=check.of_isinstance(type))
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class ConstProvider(Provider):
     v: ta.Any
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class LinkProvider(Provider):
     k: Key = dc.xfield(coerce=check.of_isinstance(Key))

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/inject/scopes.py

@@ -27,7 +27,7 @@ SCOPE_ALIASES: dict[str, Scope] = {}
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class ScopeBinding(Element, lang.Final):
     scope: Scope = dc.xfield(coerce=check.of_isinstance(Scope))
 
@@ -60,7 +60,7 @@ SCOPE_ALIASES['thread'] = ThreadScope()
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class SeededScope(Scope, lang.Final):
     tag: ta.Any = dc.xfield(coerce=check.not_none)
 
@@ -71,7 +71,7 @@ class SeededScope(Scope, lang.Final):
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class ScopeSeededProvider(Provider):
     ss: SeededScope = dc.xfield(coerce=check.of_isinstance(SeededScope))
     key: Key = dc.xfield(coerce=check.of_isinstance(Key))

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/lang/__init__.py

@@ -166,6 +166,7 @@ from .generators import (  # noqa
 )
 
 from .imports import (  # noqa
+    LazyGlobals,
     can_import,
     get_real_module_name,
     import_all,
@@ -201,11 +202,9 @@ from .maybes import (  # noqa
 )
 
 from .objects import (  # noqa
-    AttrRepr,
     SimpleProxy,
     anon_object,
     arg_repr,
-    attr_repr,
     can_weakref,
     deep_subclasses,
     dir_dict,
@@ -304,6 +303,11 @@ from ..lite.imports import (  # noqa
     import_module_attr,
 )
 
+from ..lite.reprs import (  # noqa
+    AttrRepr,
+    attr_repr,
+)
+
 from ..lite.timeouts import (  # noqa
     DeadlineTimeout,
     InfiniteTimeout,

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/lang/cached/function.py

@@ -1,6 +1,10 @@
 """
 TODO:
+ - !!! lighter weight bound methods
+  - keymaker overhead less important than not rebuilding a whole dc every __get__ on a new instance
  - !! specialize nullary, explicit kwarg
+ - !! use c-backed functools.cache if possible
+  - also just riic
  - !! reconcile A().f() with A.f(A())
   - unbound descriptor *should* still hit instance cache
  - integrate / expose with collections.cache
@@ -10,6 +14,7 @@ TODO:
   - 'staticmethod' or effective equiv - which must resolve to the shared instance
    - and must be transient?
  - use __transient_dict__ to support common state nuking
+ - use __set_name__ ?
 """
 import dataclasses as dc
 import functools
@@ -353,10 +358,14 @@ class _DescriptorCachedFunction(_CachedFunction[T]):
 def cached_function(fn=None, **kwargs):  # noqa
     if fn is None:
         return functools.partial(cached_function, **kwargs)
+
     opts = _CachedFunction.Opts(**kwargs)
+
     if isinstance(fn, staticmethod):
         return _FreeCachedFunction(fn, opts=opts, value_fn=unwrap_func(fn))
+
     scope = classmethod if isinstance(fn, classmethod) else None
+
     return _DescriptorCachedFunction(fn, scope, opts=opts)
 
 

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/lang/cached/property.py

@@ -112,7 +112,9 @@ class _TransientCachedProperty(_CachedProperty):
 def cached_property(fn=None, *, transient=False, **kwargs):  # noqa
     if fn is None:
         return functools.partial(cached_property, transient=transient, **kwargs)
-    if transient:
+
+    elif transient:
         return _TransientCachedProperty(fn, **kwargs)
+
     else:
         return _DictCachedProperty(fn, **kwargs)

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/lang/imports.py

@@ -3,6 +3,7 @@ TODO:
  - proxy_init 'as' alias support - attrs of (src, dst)
 """
 import contextlib
+import functools
 import importlib.util
 import sys
 import types
@@ -254,6 +255,64 @@ def _trigger_conditional_imports(package: str) -> None:
 ##
 
 
+class LazyGlobals:
+    def __init__(
+            self,
+            *,
+            globals: ta.MutableMapping[str, ta.Any] | None = None,  # noqa
+            update_globals: bool = False,
+    ) -> None:
+        super().__init__()
+
+        self._globals = globals
+        self._update_globals = update_globals
+
+        self._attr_fns: dict[str, ta.Callable[[], ta.Any]] = {}
+
+    @classmethod
+    def install(cls, globals: ta.MutableMapping[str, ta.Any]) -> 'LazyGlobals':  # noqa
+        try:
+            xga = globals['__getattr__']
+        except KeyError:
+            pass
+        else:
+            if not isinstance(xga, cls):
+                raise RuntimeError(f'Module already has __getattr__ hook: {xga}')  # noqa
+            return xga
+
+        lm = cls(
+            globals=globals,
+            update_globals=True,
+        )
+
+        globals['__getattr__'] = lm
+
+        return lm
+
+    def set_fn(self, attr: str, fn: ta.Callable[[], ta.Any]) -> 'LazyGlobals':
+        self._attr_fns[attr] = fn
+        return self
+
+    def get(self, attr: str) -> ta.Any:
+        try:
+            fn = self._attr_fns[attr]
+        except KeyError:
+            raise AttributeError(attr) from None
+
+        val = fn()
+
+        if self._update_globals and self._globals is not None:
+            self._globals[attr] = val
+
+        return val
+
+    def __call__(self, attr: str) -> ta.Any:
+        return self.get(attr)
+
+
+##
+
+
 class NamePackage(ta.NamedTuple):
     name: str
     package: str
@@ -266,16 +325,13 @@ class _ProxyInit:
 
     def __init__(
             self,
+            lazy_globals: LazyGlobals,
             name_package: NamePackage,
-            *,
-            globals: ta.MutableMapping[str, ta.Any] | None = None,  # noqa
-            update_globals: bool = False,
     ) -> None:
         super().__init__()
 
+        self._lazy_globals = lazy_globals
         self._name_package = name_package
-        self._globals = globals
-        self._update_globals = update_globals
 
         self._imps_by_attr: dict[str, _ProxyInit._Import] = {}
         self._mods_by_pkgs: dict[str, ta.Any] = {}
@@ -287,13 +343,17 @@ class _ProxyInit:
     def add(self, package: str, attrs: ta.Iterable[str | tuple[str, str]]) -> None:
         if isinstance(attrs, str):
             raise TypeError(attrs)
+
         for attr in attrs:
             if isinstance(attr, tuple):
                 imp_attr, attr = attr
             else:
                 imp_attr = attr
+
             self._imps_by_attr[attr] = self._Import(package, imp_attr)
 
+            self._lazy_globals.set_fn(attr, functools.partial(self.get, attr))
+
     def get(self, attr: str) -> ta.Any:
         try:
             imp = self._imps_by_attr[attr]
@@ -307,9 +367,6 @@ class _ProxyInit:
 
         val = getattr(mod, imp.attr)
 
-        if self._update_globals and self._globals is not None:
-            self._globals[attr] = val
-
         return val
 
 
@@ -329,13 +386,14 @@ def proxy_init(
     pi: _ProxyInit
     try:
         pi = globals['__proxy_init__']
+
     except KeyError:
         pi = _ProxyInit(
+            LazyGlobals.install(globals),
             init_name_package,
-            globals=globals,
         )
         globals['__proxy_init__'] = pi
-        globals['__getattr__'] = pi.get
+
     else:
         if pi.name_package != init_name_package:
             raise Exception(f'Wrong init name: {pi.name_package=} != {init_name_package=}')

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/lang/objects.py

@@ -1,8 +1,3 @@
-"""
-TODO:
- - reprlib / recur guard (merge w/ defs.py)
-"""
-import dataclasses as dc
 import types
 import typing as ta
 import weakref
@@ -16,47 +11,6 @@ T = ta.TypeVar('T')
 ##
 
 
-@dc.dataclass(frozen=True)
-class AttrRepr:
-    attrs: ta.Sequence[str]
-
-    _: dc.KW_ONLY
-
-    with_module: bool = False
-    use_qualname: bool = False
-    with_id: bool = False
-    value_filter: ta.Callable[[ta.Any], bool] | None = None
-
-    @classmethod
-    def of(cls, *attrs: str, **kwargs: ta.Any) -> 'AttrRepr':
-        return cls(attrs, **kwargs)
-
-    def __call__(self, obj: ta.Any) -> str:
-        vs = ', '.join(
-            f'{attr}={v!r}'
-            for attr in self.attrs
-            for v in [getattr(obj, attr)]
-            if self.value_filter is None or self.value_filter(v)
-        )
-        return (
-            f'{obj.__class__.__module__ + "." if self.with_module else ""}'
-            f'{obj.__class__.__qualname__ if self.use_qualname else obj.__class__.__name__}'
-            f'{("@" + hex(id(obj))[2:]) if self.with_id else ""}'
-            f'({vs})'
-        )
-
-    def __get__(self, instance, owner):
-        if instance is None:
-            return self
-        def __repr__(other):  # noqa
-            return self(other)
-        return __repr__.__get__(instance, owner)
-
-
-def attr_repr(obj: ta.Any, *attrs: str, **kwargs: ta.Any) -> str:
-    return AttrRepr(attrs, **kwargs)(obj)
-
-
 def arg_repr(*args: ta.Any, **kwargs: ta.Any) -> str:
     return ', '.join(*(
         list(map(repr, args)) +

omlish-0.0.0.dev284/omlish/lite/reprs.py

@@ -0,0 +1,84 @@
+# ruff: noqa: UP007
+import dataclasses as dc
+import typing as ta
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class AttrRepr:
+    attrs: ta.Sequence[str]
+
+    # _: dc.KW_ONLY
+
+    with_module: bool = False
+    use_qualname: bool = False
+    with_id: bool = False
+    value_filter: ta.Optional[ta.Callable[[ta.Any], bool]] = None
+    recursive: bool = False
+
+    @classmethod
+    def of(cls, *attrs: str, **kwargs: ta.Any) -> 'AttrRepr':
+        return cls(attrs, **kwargs)
+
+    #
+
+    def _build_(self, obj: ta.Any) -> str:
+        vs = ', '.join(
+            f'{attr}={v!r}'
+            for attr in self.attrs
+            for v in [getattr(obj, attr)]
+            if self.value_filter is None or self.value_filter(v)
+        )
+
+        return (
+            f'{obj.__class__.__module__ + "." if self.with_module else ""}'
+            f'{obj.__class__.__qualname__ if self.use_qualname else obj.__class__.__name__}'
+            f'{("@" + hex(id(obj))[2:]) if self.with_id else ""}'
+            f'({vs})'
+        )
+
+    _build: ta.ClassVar[ta.Callable[[ta.Any], str]]
+
+    def __call__(self, obj: ta.Any) -> str:
+        try:
+            build: ta.Any = self._build
+
+        except AttributeError:
+            build = self._build_
+            if self.recursive:
+                build = self._reprlib().recursive_repr()(build)
+            object.__setattr__(self, '_build', build)
+
+        return build(obj)
+
+    #
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+
+        def __repr__(other):  # noqa
+            return self(other)
+
+        return __repr__.__get__(instance, owner)
+
+    #
+
+    _reprlib_: ta.ClassVar[ta.Any]
+
+    @classmethod
+    def _reprlib(cls) -> ta.Any:
+        try:
+            return cls._reprlib_
+        except AttributeError:
+            pass
+
+        reprlib = __import__('reprlib')
+        cls._reprlib_ = reprlib
+        return reprlib
+
+
+def attr_repr(obj: ta.Any, *attrs: str, **kwargs: ta.Any) -> str:
+    return AttrRepr(attrs, **kwargs)(obj)

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/marshal/objects/dataclasses.py

@@ -50,7 +50,7 @@ def get_dataclass_field_infos(
 
     dc_md = get_dataclass_metadata(ty)
     dc_naming = dc_md.field_naming or opts.get(Naming)
-    dc_rf = dc.reflect(ty)
+    dc_rfl = dc.reflect(ty)
 
     fi_defaults = {
         k: v
@@ -66,7 +66,7 @@ def get_dataclass_field_infos(
     type_hints = ta.get_type_hints(ty)
 
     ret: list[FieldInfo] = []
-    for field in dc_rf.instance_fields:
+    for field in dc_rfl.instance_fields:
         if (f_naming := field.metadata.get(Naming, dc_naming)) is not None:
             um_name = translate_name(field.name, f_naming)
         else:
@@ -76,10 +76,10 @@ def get_dataclass_field_infos(
 
         f_ty: ta.Any
         if (
-                ((cpx := dc_rf.cls_params_extras) is not None and cpx.generic_init) or
+                ((cpx := dc_rfl.cls_params_extras) is not None and cpx.generic_init) or
                 (fmd is not None and fmd.options.generic_replace)
         ):
-            f_ty = rfl.to_annotation(dc_rf.generic_replaced_field_type(field.name))
+            f_ty = rfl.to_annotation(dc_rfl.generic_replaced_field_type(field.name))
         else:
             f_ty = type_hints[field.name]
 

{omlish-0.0.0.dev283 → omlish-0.0.0.dev284}/omlish/sql/queries/base.py

@@ -61,10 +61,10 @@ class Node(
         except KeyError:
             pass
 
-        dc_info = dc.reflect(cls)
+        dc_rfl = dc.reflect(cls)
         fields = Node._Fields(
-            cmp_fields=tuple(f.name for f in dc_info.instance_fields if f.compare),
-            hash_fields=tuple(f.name for f in dc_info.instance_fields if (f.compare if f.hash is None else f.hash)),
+            cmp_fields=tuple(f.name for f in dc_rfl.instance_fields if f.compare),
+            hash_fields=tuple(f.name for f in dc_rfl.instance_fields if (f.compare if f.hash is None else f.hash)),
         )
 
         setattr(cls, '__node_fields__', fields)