omlish 0.0.0.dev451__tar.gz → 0.0.0.dev453__tar.gz

{omlish-0.0.0.dev451/omlish.egg-info → omlish-0.0.0.dev453}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev451
+Version: 0.0.0.dev453
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev451 → omlish-0.0.0.dev453}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev451'
-__revision__ = 'b98dd08060441838ed591bdf5f4d756786413c17'
+__version__ = '0.0.0.dev453'
+__revision__ = '66cf981e193780bd726e2a5ea06dd1ac590f7298'
 
 
 #

{omlish-0.0.0.dev451 → omlish-0.0.0.dev453}/omlish/collections/__init__.py

@@ -6,6 +6,11 @@ from .. import lang as _lang
 with _lang.auto_proxy_init(globals()):
     ##
 
+    from .attrregistry import (  # noqa
+        AttrRegistry,
+        AttrRegistryCache,
+    )
+
     from .bimap import (  # noqa
         BiMap,
 
@@ -64,9 +69,10 @@ with _lang.auto_proxy_init(globals()):
     from . import kv  # noqa
 
     from .mappings import (  # noqa
+        DynamicTypeMap,
         MissingDict,
         TypeMap,
-        DynamicTypeMap,
+        dict_factory,
         guarded_map_update,
         multikey_dict,
     )

omlish-0.0.0.dev453/omlish/collections/attrregistry.py

@@ -0,0 +1,182 @@
+import dataclasses as dc
+import typing as ta
+import weakref
+
+from .. import check
+from .. import lang
+from .mappings import dict_factory
+
+
+T = ta.TypeVar('T')
+K = ta.TypeVar('K')
+V = ta.TypeVar('V')
+
+
+##
+
+
+class AttrRegistry(ta.Generic[K, V]):
+    """
+    MRO-honoring class member registry. There are many ways to do this, and this one is attr name based: a class is
+    considered to have objects registered to it based on whether or not they are accessible by a non-shadowed,
+    MRO-resolved named attribute on that class.
+
+    Care must be taken when overriding registered objects from superclasses in subclasses - shadowing the attribute name
+    of the superclass member will not automatically register the new member with the same name to the registry - it must
+    be explicitly registered itself. This is a feature, allowing for selective de-registration of objects in subclasses
+    via name shadowing.
+    """
+
+    def __init__(
+            self,
+            *,
+            requires_override: bool = False,
+            is_override: ta.Callable[[ta.Any], bool] | None = None,
+            forbid_duplicates: bool = False,
+            identity: bool = False,
+            weak: bool = False,
+    ) -> None:
+        super().__init__()
+
+        self._requires_override = requires_override
+        self._is_override = is_override
+        self._forbid_duplicates = forbid_duplicates
+        self._identity = identity
+        self._weak = weak
+
+        self._objs: ta.MutableMapping[K, V] = dict_factory(identity=identity, weak=weak)()
+        self._invalidate_callbacks: list[ta.Callable[[], None]] = []
+
+    def add_invalidate_callback(self, callback: ta.Callable[[], None]) -> None:
+        self._invalidate_callbacks.append(callback)
+
+    def register(self, obj: K, val: V) -> None:
+        check.not_in(obj, self._objs)
+
+        self._objs[obj] = val
+
+        for iv in self._invalidate_callbacks:
+            iv()
+
+    def _lookup(self, obj: ta.Any) -> lang.Maybe[V]:
+        if not self._identity:
+            try:
+                hash(obj)
+            except TypeError:
+                return lang.empty()
+
+        try:
+            val = self._objs[obj]
+        except KeyError:
+            return lang.empty()
+        else:
+            return lang.just(val)
+
+    @dc.dataclass()
+    class DuplicatesForbiddenError(Exception):
+        owner_cls: type
+        instance_cls: type
+        att: str
+        ex_att: str
+
+    def collect(self, instance_cls: type, owner_cls: type | None = None) -> dict[str, tuple[K, V]]:
+        if owner_cls is None:
+            owner_cls = instance_cls
+
+        mro = instance_cls.__mro__[-2::-1]
+        try:
+            mro_pos = mro.index(owner_cls)
+        except ValueError:
+            raise TypeError(f'Owner class {owner_cls} not in mro of instance class {instance_cls}') from None
+
+        mro_dct: dict[str, list[tuple[type, ta.Any]]] = {}
+        for cur_cls in mro[:mro_pos + 1]:
+            for att, obj in cur_cls.__dict__.items():
+                if att not in mro_dct:
+                    if not self._lookup(obj).present:
+                        continue
+
+                try:
+                    lst = mro_dct[att]
+                except KeyError:
+                    lst = mro_dct[att] = []
+                lst.append((cur_cls, obj))
+
+        #
+
+        seen: ta.MutableMapping[ta.Any, str] | None = None
+        if self._forbid_duplicates:
+            seen = dict_factory(identity=self._identity)()
+
+        out: dict[str, tuple[K, V]] = {}
+        for att, lst in mro_dct.items():
+            if not lst:
+                raise RuntimeError
+            _, obj = lst[-1]
+
+            if len(lst) > 1:
+                if self._requires_override and not (self._is_override or lang.is_override)(obj):
+                    raise lang.RequiresOverrideError(
+                        att,
+                        instance_cls,
+                        lst[-1][0],
+                        lst[0][0],
+                    )
+
+            if not (mv := self._lookup(obj)).present:
+                continue
+
+            if seen is not None:
+                try:
+                    ex_att = seen[obj]
+                except KeyError:
+                    pass
+                else:
+                    raise AttrRegistry.DuplicatesForbiddenError(owner_cls, instance_cls, att, ex_att)  # noqa
+                seen[obj] = att
+
+            out[att] = (obj, mv.must())
+
+        return out
+
+
+##
+
+
+class AttrRegistryCache(ta.Generic[K, V, T]):
+    def __init__(
+            self,
+            registry: AttrRegistry[K, V],
+            prepare: ta.Callable[[type, dict[str, tuple[K, V]]], T],
+    ) -> None:
+        super().__init__()
+
+        self._registry = registry
+        self._prepare = prepare
+
+        self._cache: dict[ta.Any, T] = {}
+
+        def cache_remove(k, self_ref=weakref.ref(self)):
+            if (ref_self := self_ref()) is not None:
+                cache = ref_self._cache  # noqa
+                try:
+                    del cache[k]
+                except KeyError:
+                    pass
+
+        self._cache_remove = cache_remove
+
+        registry.add_invalidate_callback(self._cache.clear)
+
+    def get(self, instance_cls: type) -> T:
+        cls_ref = weakref.ref(instance_cls)
+        try:
+            return self._cache[cls_ref]
+        except KeyError:
+            pass
+        del cls_ref
+
+        collected = self._registry.collect(instance_cls)
+        out = self._prepare(instance_cls, collected)
+        self._cache[weakref.ref(instance_cls, self._cache_remove)] = out
+        return out

{omlish-0.0.0.dev451 → omlish-0.0.0.dev453}/omlish/collections/mappings.py

@@ -1,6 +1,12 @@
 import typing as ta
 import weakref
 
+from .. import lang
+
+
+with lang.auto_proxy_import(globals()):
+    from . import identity as _identity
+
 
 T = ta.TypeVar('T')
 K = ta.TypeVar('K')
@@ -141,3 +147,22 @@ class MissingDict(dict[K, V]):
     def __missing__(self, key):
         v = self[key] = self._missing_fn(key)
         return v
+
+
+##
+
+
+def dict_factory[K, V](
+        *,
+        identity: bool = False,
+        weak: bool = False,
+) -> ta.Callable[..., ta.MutableMapping[K, V]]:
+    if identity:
+        if weak:
+            return _identity.IdentityWeakKeyDictionary
+        else:
+            return _identity.IdentityKeyDict
+    elif weak:
+        return weakref.WeakKeyDictionary
+    else:
+        return dict

{omlish-0.0.0.dev451 → omlish-0.0.0.dev453}/omlish/diag/pycharm.py

@@ -191,9 +191,23 @@ def pycharm_remote_debugger_attach(prd: PycharmRemoteDebugger) -> None:
     else:
         pydevd_pycharm = _import_pydevd_pycharm(version=version)
 
+    import inspect
+    st_sig = inspect.signature(pydevd_pycharm.settrace)
+
+    kw: dict = {}
+    if 'stdoutToServer' in st_sig.parameters:
+        kw.update(
+            stdoutToServer=True,
+            stderrToServer=True,
+        )
+    else:
+        kw.update(
+            stdout_to_server=True,
+            stderr_to_server=True,
+        )
+
     pydevd_pycharm.settrace(
         host,
         port=prd.port,
-        stdoutToServer=True,
-        stderrToServer=True,
+        **kw,
     )

{omlish-0.0.0.dev451 → omlish-0.0.0.dev453}/omlish/dispatch/methods.py

@@ -4,13 +4,11 @@ TODO:
  - ALT: A.f(super(), ... ? :/
  - classmethod/staticmethod
 """
-import contextlib
 import functools
 import typing as ta
-import weakref
 
 from .. import check
-from .. import lang
+from .. import collections as col
 from .dispatch import Dispatcher
 from .impls import get_impl_func_cls_set
 
@@ -34,9 +32,8 @@ class Method(ta.Generic[P, R]):
     it must be explicitly `@register`'ed itself. This is a feature, allowing for selective de-registration of
     implementations in subclasses via name shadowing.
 
-    Methods have ability to choose to allow external installation of implementations outside of direct subclasses. This
-    is to be used *extremely* rarely - basically only in the rare case of externally extensible type hierarchies with
-    visitors.
+    Methods can choose to allow external installation of implementations outside of direct subclasses. This is to be
+    used *extremely* rarely - basically only in the rare case of externally extensible type hierarchies with visitors.
     """
 
     def __init__(
@@ -45,6 +42,7 @@ class Method(ta.Generic[P, R]):
             *,
             installable: bool = False,
             requires_override: bool = False,
+            instance_cache: bool = False,
     ) -> None:
         super().__init__()
 
@@ -53,9 +51,16 @@ class Method(ta.Generic[P, R]):
 
         self._func = func
         self._installable = installable
-        self._requires_override = requires_override
+        self._instance_cache = instance_cache
 
-        self._impls: ta.MutableMapping[ta.Callable, frozenset[type] | None] = weakref.WeakKeyDictionary()
+        self._registry: col.AttrRegistry[ta.Callable, Method._Entry] = col.AttrRegistry(
+            requires_override=requires_override,
+        )
+
+        self._cache: col.AttrRegistryCache[ta.Callable, Method._Entry, ta.Callable] = col.AttrRegistryCache(
+            self._registry,
+            self._prepare,
+        )
 
         # bpo-45678: special-casing for classmethod/staticmethod in Python <=3.9, as functools.update_wrapper doesn't
         # work properly in singledispatchmethod.__get__ if it is applied to an unbound classmethod/staticmethod
@@ -68,19 +73,12 @@ class Method(ta.Generic[P, R]):
         self._is_abstractmethod = getattr(func, '__isabstractmethod__', False)  # noqa
         self.update_wrapper(self)
 
-        self._dispatch_func_cache: dict[ta.Any, ta.Callable] = {}
-
-        def dispatch_func_cache_remove(k, self_ref=weakref.ref(self)):
-            if (ref_self := self_ref()) is not None:
-                cache = ref_self._dispatch_func_cache  # noqa
-                with contextlib.suppress(KeyError):
-                    del cache[k]
-
-        self._dispatch_func_cache_remove = dispatch_func_cache_remove
-
         self._owner: type | None = None
         self._name: str | None = None
 
+    class _Entry:
+        cls_set: frozenset[type]
+
     def __set_name__(self, owner, name):
         if self._owner is None:
             self._owner = owner
@@ -102,83 +100,29 @@ class Method(ta.Generic[P, R]):
 
     def register(self, impl: T, cls_set: frozenset[type] | None = None) -> T:
         check.callable(impl)
-        if impl not in self._impls:
-            self._impls[impl] = cls_set  # type: ignore
-            self._dispatch_func_cache.clear()
-
-        return impl
-
-    def _is_impl(self, obj: ta.Any) -> bool:
-        try:
-            hash(obj)
-        except TypeError:
-            return False
-
-        return obj in self._impls
 
-    def build_attr_dispatcher(self, instance_cls: type, owner_cls: type | None = None) -> Dispatcher[str]:
-        if owner_cls is None:
-            owner_cls = instance_cls
+        entry = Method._Entry()
+        if cls_set is not None:
+            entry.cls_set = cls_set
 
-        mro = instance_cls.__mro__[-2::-1]
-        try:
-            mro_pos = mro.index(owner_cls)
-        except ValueError:
-            raise TypeError(f'Owner class {owner_cls} not in mro of instance class {instance_cls}') from None
+        self._registry.register(ta.cast(ta.Callable, impl), entry)
 
-        mro_dct: dict[str, list[tuple[type, ta.Any]]] = {}
-        for cur_cls in mro[:mro_pos + 1]:
-            for att, obj in cur_cls.__dict__.items():
-                if att not in mro_dct:
-                    if not self._is_impl(obj):
-                        continue
-
-                try:
-                    lst = mro_dct[att]
-                except KeyError:
-                    lst = mro_dct[att] = []
-                lst.append((cur_cls, obj))
-
-        #
+        return impl
 
+    def _build_dispatcher(self, collected: ta.Mapping[str, tuple[ta.Callable, _Entry]]) -> Dispatcher[str]:
         disp: Dispatcher[str] = Dispatcher()
 
-        seen: dict[ta.Any, str] = {}
-        for att, lst in mro_dct.items():
-            if not lst:
-                raise RuntimeError
-            _, obj = lst[-1]
-
-            if len(lst) > 1:
-                if self._requires_override and not lang.is_override(obj):
-                    raise lang.RequiresOverrideError(
-                        att,
-                        instance_cls,
-                        lst[-1][0],
-                        lst[0][0],
-                    )
-
-            if not self._is_impl(obj):
-                continue
-
-            cls_set = self._impls[obj]
-            if cls_set is None:
-                cls_set = get_impl_func_cls_set(obj, arg_offset=1)
-                self._impls[obj] = cls_set
-
+        for a, (f, e) in collected.items():
             try:
-                ex_att = seen[obj]
-            except KeyError:
-                pass
-            else:
-                raise TypeError(f'Duplicate impl: {owner_cls} {instance_cls} {att} {ex_att}')
-            seen[obj] = att
+                cls_set = e.cls_set
+            except AttributeError:
+                cls_set = e.cls_set = get_impl_func_cls_set(f, arg_offset=1)
 
-            disp.register(att, cls_set)
+            disp.register(a, cls_set)
 
         return disp
 
-    def build_dispatch_func(self, disp: Dispatcher[str]) -> ta.Callable:
+    def _build_dispatch_func(self, disp: Dispatcher[str]) -> ta.Callable:
         dispatch = disp.dispatch
         type_ = type
         getattr_ = getattr
@@ -190,25 +134,16 @@ class Method(ta.Generic[P, R]):
                 raise TypeError(f'{func_name} requires at least 1 positional argument')
 
             if (impl_att := dispatch(type_(args[0]))) is not None:
-                fn = getattr_(self, impl_att)
-                return fn(*args, **kwargs)
+                return getattr_(self, impl_att)(*args, **kwargs)
 
             return base_func.__get__(self)(*args, **kwargs)  # noqa
 
         self.update_wrapper(__call__)
         return __call__
 
-    def get_dispatch_func(self, instance_cls: type) -> ta.Callable:
-        cls_ref = weakref.ref(instance_cls)
-        try:
-            return self._dispatch_func_cache[cls_ref]
-        except KeyError:
-            pass
-        del cls_ref
-
-        att_disp = self.build_attr_dispatcher(instance_cls)
-        func = self.build_dispatch_func(att_disp)
-        self._dispatch_func_cache[weakref.ref(instance_cls, self._dispatch_func_cache_remove)] = func
+    def _prepare(self, instance_cls: type, collected: ta.Mapping[str, tuple[ta.Callable, _Entry]]) -> ta.Callable:
+        disp = self._build_dispatcher(collected)
+        func = self._build_dispatch_func(disp)
         return func
 
     def __get__(self, instance, owner=None):
@@ -216,16 +151,21 @@ class Method(ta.Generic[P, R]):
             # FIXME: classmethod/staticmethod
             return self
 
-        instance_cls = type(instance)
-        try:
-            func = self._dispatch_func_cache[weakref.ref(instance_cls)]
-        except KeyError:
-            func = self.get_dispatch_func(instance_cls)
-        return func.__get__(instance, owner)  # noqa
+        if self._instance_cache:
+            try:
+                return instance.__dict__[self._name]
+            except KeyError:
+                pass
+
+        bound = self._cache.get(type(instance)).__get__(instance, owner)  # noqa
+
+        if self._instance_cache:
+            instance.__dict__[self._name] = bound
+
+        return bound
 
     def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
         instance, *rest = args
-        instance_cls = type(instance)
 
         # if instance_cls is super:
         #     owner = instance.__self_class__.__mro__[instance.__self_class__.__mro__.index(instance.__thisclass__) + 1]
@@ -233,55 +173,25 @@ class Method(ta.Generic[P, R]):
         #     func = self.build_dispatch_func(att_disp)
         #     return func.__get__(instance, instance.__thisclass__)(*rest, **kwargs)
 
-        try:
-            func = self._dispatch_func_cache[weakref.ref(instance_cls)]
-        except KeyError:
-            func = self.get_dispatch_func(instance_cls)
-        return func.__get__(instance)(*rest, **kwargs)  # noqa
+        return self.__get__(instance)(*rest, **kwargs)
 
 
 ##
 
 
-@ta.overload
-def method(
-        func: ta.Callable[P, R],
-        /,
-        *,
-        installable: bool = False,
-        requires_override: bool = False,
-) -> Method[P, R]:  # noqa
-    ...
-
-
-@ta.overload
 def method(
-        func: None = None,
-        /,
         *,
         installable: bool = False,
         requires_override: bool = False,
+        instance_cache: bool = False,
 ) -> ta.Callable[[ta.Callable[P, R]], Method[P, R]]:  # noqa
-    ...
-
-
-def method(
-        func=None,
-        /,
-        *,
-        installable=False,
-        requires_override=False,
-):
-    kw = dict(
+    return functools.partial(
+        Method,  # type: ignore[arg-type]
         installable=installable,
         requires_override=requires_override,
+        instance_cache=instance_cache,
     )
 
-    if func is None:
-        return functools.partial(Method, **kw)
-
-    return Method(func, **kw)
-
 
 #
 
@@ -305,7 +215,7 @@ def install_method(
         if on is None:
             cls = owner
         else:
-            cls = check.issubclass(on, owner)
+            cls = check.issubclass(on, owner)  # noqa
 
         check.arg(not hasattr(cls, a))
         setattr(cls, a, fn)

{omlish-0.0.0.dev451 → omlish-0.0.0.dev453}/omlish/dom/rendering.py

@@ -100,7 +100,7 @@ class Renderer:
 
     #
 
-    @dispatch.method
+    @dispatch.method(instance_cache=True)
     def render(self, o: ta.Any) -> None:
         raise TypeError(o)