omlish 0.0.0.dev462__py3-none-any.whl → 0.0.0.dev464__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev462'
-__revision__ = '5e5ee1d71115ec07b8f9627222c9f5d6d4016e5a'
+__version__ = '0.0.0.dev464'
+__revision__ = '8f9a53b4670200336b1878510977fc9165f866c2'
 
 
 #

omlish/collections/cache/impl.py

@@ -41,6 +41,7 @@ def LRU(cache: 'Cache') -> None:  # noqa
     cache._kill(cache._root.lru_next)  # type: ignore  # noqa
 
 
+# aka FIFO
 def LRI(cache: 'Cache') -> None:  # noqa
     cache._kill(cache._root.ins_next)  # type: ignore  # noqa
 

omlish/inject/__init__.py

@@ -19,11 +19,30 @@ from .. import lang as _lang  # noqa
 with _lang.auto_proxy_init(globals()):
     ##
 
+    from .helpers.constfn import (  # noqa
+        ConstFn,
+    )
+
+    from .helpers.id import (  # noqa
+        Id,
+    )
+
+    from .helpers.multis import (  # noqa
+        bind_map_entry_const,
+        bind_set_entry_const,
+
+        ItemsBinderHelper,
+        items_binder_helper,
+    )
+
+    from .helpers.wrappers import (  # noqa
+        WrapperBinderHelper,
+        wrapper_binder_helper,
+    )
+
     from .binder import (  # noqa
         bind,
         bind_as_fn,
-        bind_map_entry_const,
-        bind_set_entry_const,
     )
 
     from .bindings import (  # noqa
@@ -36,9 +55,10 @@ with _lang.auto_proxy_init(globals()):
 
     from .elements import (  # noqa
         Element,
-        Elemental,
         Elements,
+        Elemental,
         as_elements,
+        iter_elements,
     )
 
     from .errors import (  # noqa
@@ -91,15 +111,19 @@ with _lang.auto_proxy_init(globals()):
     )
 
     from .multis import (  # noqa
-        MapBinding,
-        MapProvider,
+        is_set_multi_key,
         SetBinding,
         SetProvider,
-        MapBinder,
+
+        is_map_multi_key,
+        MapBinding,
+        MapProvider,
+
         SetBinder,
+        set_binder,
 
-        MapBinder as map_binder,  # noqa
-        SetBinder as set_binder,  # noqa
+        MapBinder,
+        map_binder,
     )
 
 
@@ -116,10 +140,10 @@ with _lang.auto_proxy_init(globals()):
 
     from .privates import (  # noqa
         Expose,
+        expose,
+
         Private,
         private,
-
-        Expose as expose,  # noqa
     )
 
     from .providers import (  # noqa
@@ -153,16 +177,8 @@ with _lang.auto_proxy_init(globals()):
         create_injector,
     )
 
-    from .tags import (  # noqa
-        Id,
-    )
-
     from .types import (  # noqa
         Scope,
         Tag,
         Unscoped,
     )
-
-    from .utils import (  # noqa
-        ConstFn,
-    )

omlish/inject/binder.py

@@ -11,13 +11,8 @@ from .bindings import Binding
 from .eagers import Eager
 from .elements import Element
 from .elements import Elements
-from .elements import as_elements
 from .keys import Key
 from .keys import as_key
-from .multis import MapBinding
-from .multis import SetBinding
-from .multis import is_map_multi_key
-from .multis import is_set_multi_key
 from .privates import Expose
 from .providers import AsyncFnProvider
 from .providers import ConstProvider
@@ -27,7 +22,6 @@ from .providers import LinkProvider
 from .providers import Provider
 from .scopes import SCOPE_ALIASES
 from .scopes import Singleton
-from .tags import Id
 from .types import Scope
 from .types import Unscoped
 
@@ -84,6 +78,7 @@ def bind(
         *,
         tag: ta.Any = None,
 
+        to_provider: Provider | None = None,
         to_async_fn: ta.Any = None,
         to_fn: ta.Any = None,
         to_ctor: ta.Any = None,
@@ -104,6 +99,7 @@ def bind(
     ##
 
     has_to = (
+        to_provider is not None or
         to_async_fn is not None or
         to_fn is not None or
         to_ctor is not None or
@@ -140,6 +136,8 @@ def bind(
     ##
 
     providers: list[Provider] = []
+    if to_provider is not None:
+        providers.append(to_provider)
     if to_async_fn is not None:
         providers.append(AsyncFnProvider(to_async_fn))
     if to_fn is not None:
@@ -191,45 +189,3 @@ def bind(
         return elements[0]
     else:
         return Elements(frozenset(elements))
-
-
-##
-
-
-def bind_set_entry_const(
-        multi_key: ta.Any,
-        obj: ta.Any,
-        *,
-        tag: ta.Any | None = None,
-) -> Elements:
-    multi_key = as_key(multi_key)
-    check.arg(is_set_multi_key(multi_key))
-
-    if tag is None:
-        tag = Id(id(obj), tag=multi_key.tag)
-    obj_key: Key = Key(type(obj), tag=tag)
-
-    return as_elements(
-        bind(obj_key, to_const=obj),
-        SetBinding(multi_key, obj_key),
-    )
-
-
-def bind_map_entry_const(
-        multi_key: ta.Any,
-        map_key: ta.Any,
-        obj: ta.Any,
-        *,
-        tag: ta.Any | None = None,
-) -> Elements:
-    multi_key = as_key(multi_key)
-    check.arg(is_map_multi_key(multi_key))
-
-    if tag is None:
-        tag = Id(id(obj), tag=multi_key.tag)
-    obj_key: Key = Key(type(obj), tag=tag)
-
-    return as_elements(
-        bind(obj_key, to_const=obj),
-        MapBinding(multi_key, map_key, obj_key),
-    )

omlish/inject/elements.py

@@ -64,3 +64,13 @@ def as_elements(*args: Elemental) -> Elements:
         es if es else None,
         cs if cs else None,
     )
+
+
+def iter_elements(*args: Elemental) -> ta.Iterator[Element]:
+    for a in args:
+        if isinstance(a, Element):
+            yield a
+        elif isinstance(a, (Elements, ElementGenerator)):
+            yield from a
+        else:
+            raise TypeError(a)

omlish/inject/{utils.py → helpers/constfn.py}

@@ -1,8 +1,8 @@
 import typing as ta
 
-from .. import dataclasses as dc
-from .. import lang
-from .impl.origins import HasOriginsImpl
+from ... import dataclasses as dc
+from ... import lang
+from ..impl.origins import HasOriginsImpl
 
 
 T = ta.TypeVar('T')

omlish/inject/{tags.py → helpers/id.py}

@@ -1,7 +1,7 @@
 import typing as ta
 
-from .. import dataclasses as dc
-from .types import Tag
+from ... import dataclasses as dc
+from ..types import Tag
 
 
 ##

omlish/inject/helpers/multis.py

@@ -0,0 +1,143 @@
+import typing as ta
+
+from ... import cached
+from ... import check
+from ... import dataclasses as dc
+from ... import lang
+from ... import reflect as rfl
+from ..binder import bind
+from ..elements import Elements
+from ..elements import as_elements
+from ..inspect import KwargsTarget
+from ..keys import Key
+from ..keys import as_key
+from ..multis import MapBinding
+from ..multis import SetBinder
+from ..multis import SetBinding
+from ..multis import is_map_multi_key
+from ..multis import is_set_multi_key
+from ..providers import FnProvider
+from .id import Id
+
+
+ItemT = ta.TypeVar('ItemT')
+
+
+##
+
+
+def bind_set_entry_const(
+        multi_key: ta.Any,
+        obj: ta.Any,
+        *,
+        tag: ta.Any | None = None,
+) -> Elements:
+    multi_key = as_key(multi_key)
+    check.arg(is_set_multi_key(multi_key))
+
+    if tag is None:
+        tag = Id(id(obj), tag=multi_key.tag)
+    obj_key: Key = Key(type(obj), tag=tag)
+
+    return as_elements(
+        bind(obj_key, to_const=obj),
+        SetBinding(multi_key, obj_key),
+    )
+
+
+def bind_map_entry_const(
+        multi_key: ta.Any,
+        map_key: ta.Any,
+        obj: ta.Any,
+        *,
+        tag: ta.Any | None = None,
+) -> Elements:
+    multi_key = as_key(multi_key)
+    check.arg(is_map_multi_key(multi_key))
+
+    if tag is None:
+        tag = Id(id(obj), tag=multi_key.tag)
+    obj_key: Key = Key(type(obj), tag=tag)
+
+    return as_elements(
+        bind(obj_key, to_const=obj),
+        MapBinding(multi_key, map_key, obj_key),
+    )
+
+
+##
+
+
+@ta.final
+class ItemsBinderHelper(ta.Generic[ItemT]):
+    def __init__(self, items_cls: ta.Any) -> None:
+        self._items_cls = items_cls
+
+    @cached.property
+    def _item_rty(self) -> rfl.Type:
+        rty = check.isinstance(rfl.type_(rfl.get_orig_class(self)), rfl.Generic)
+        check.is_(rty.cls, self.__class__)
+        return check.single(rty.args)
+
+    @dc.dataclass(frozen=True, eq=False)
+    class _ItemsBox:
+        vs: ta.Sequence
+
+    @cached.property
+    def _items_box(self) -> type[_ItemsBox]:
+        if isinstance(item_rty := self._item_rty, type):
+            sfx = item_rty.__qualname__
+        else:
+            sfx = str(item_rty).replace("'", '')
+
+        return lang.new_type(  # noqa
+            f'{ItemsBinderHelper._ItemsBox.__qualname__}${sfx}@{id(self):x}',
+            (ItemsBinderHelper._ItemsBox,),
+            {},
+        )
+
+    @cached.property
+    def _set_key(self) -> Key:
+        return as_key(ta.AbstractSet[self._item_rty])  # type: ignore
+
+    def bind_item_consts(self, *items: ItemT) -> Elements:
+        return as_elements(
+            bind_set_entry_const(self._set_key, self._items_box(items)),
+        )
+
+    @dc.dataclass(frozen=True, eq=False)
+    @dc.extra_class_params(repr_id=True)
+    class _ItemTag:
+        pass
+
+    def bind_item(self, **kwargs: ta.Any) -> Elements:
+        tag = ItemsBinderHelper._ItemTag()
+        item_key: Key = Key(ta.Any, tag=tag)
+        items_box_key: Key = Key(self._items_box, tag=tag)
+        return as_elements(
+            bind(item_key, **kwargs),
+            bind(
+                items_box_key,
+                to_provider=FnProvider(KwargsTarget.of(
+                    lambda v: self._items_box([v]),
+                    v=item_key,
+                )),
+            ),
+            SetBinding(self._set_key, items_box_key),
+        )
+
+    def bind_items_provider(self, **kwargs: ta.Any) -> Elements:
+        return as_elements(
+            SetBinder[self._item_rty](),  # type: ignore
+            bind(
+                self._items_cls,
+                to_provider=FnProvider(KwargsTarget.of(
+                    lambda s: self._items_cls([v for i in s for v in i.vs]),
+                    s=self._set_key,
+                )),
+                **kwargs,
+            ),
+        )
+
+
+items_binder_helper = ItemsBinderHelper

omlish/inject/helpers/wrappers.py

@@ -0,0 +1,54 @@
+import typing as ta
+
+from ... import cached
+from ... import dataclasses as dc
+from ..binder import bind
+from ..elements import Elemental
+from ..keys import Key
+from ..keys import as_key
+from ..privates import private
+
+
+##
+
+
+@ta.final
+class WrapperBinderHelper:
+    def __init__(self, key: ta.Any) -> None:
+        self._key = as_key(key)
+        self._root = WrapperBinderHelper._Root()
+        self._top = WrapperBinderHelper._Level(self._root, 0)
+
+    @dc.dataclass(frozen=True, eq=False)
+    @dc.extra_class_params(repr_id=True)
+    class _Root:
+        pass
+
+    @dc.dataclass(frozen=True)
+    class _Level:
+        root: 'WrapperBinderHelper._Root'
+        level: int
+
+        def next(self) -> 'WrapperBinderHelper._Level':
+            return WrapperBinderHelper._Level(self.root, self.level + 1)
+
+        @cached.property
+        def key(self) -> Key:
+            return Key(ta.Any, tag=self)
+
+    @property
+    def top(self) -> Key:
+        return self._top.key
+
+    def push_bind(self, **kwargs: ta.Any) -> Elemental:
+        prv = self._top
+        nxt = prv.next()
+        out = private(
+            *([bind(self._key, to_key=prv.key)] if prv.level else []),
+            bind(nxt.key, **kwargs, expose=True),
+        )
+        self._top = nxt
+        return out
+
+
+wrapper_binder_helper = WrapperBinderHelper

omlish/inject/impl/elements.py

@@ -63,6 +63,23 @@ ElementT = ta.TypeVar('ElementT', bound=Element)
 ##
 
 
+_SIMPLE_KEYED_ELEMENT_TYPES: tuple[type[Element], ...] = (
+    Binding,
+    Eager,
+    Expose,
+)
+
+_SIMPLE_NON_KEYED_ELEMENT_TYPES: tuple[type[Element], ...] = (
+    ProvisionListenerBinding,
+)
+
+_NON_BINDING_ELEMENT_TYPES: tuple[type[Element], ...] = (
+    Eager,
+    Expose,
+    ProvisionListenerBinding,
+)
+
+
 class ElementCollection(lang.Final):
     def __init__(self, es: Elements) -> None:
         super().__init__()
@@ -96,28 +113,28 @@ class ElementCollection(lang.Final):
             out.setdefault(k, []).extend(e)
 
         for e in es:
-            if isinstance(e, ScopeBinding):
+            if isinstance(e, _SIMPLE_KEYED_ELEMENT_TYPES):
+                add(e.key, e)  # type: ignore[attr-defined]  # noqa
+
+            elif isinstance(e, _SIMPLE_NON_KEYED_ELEMENT_TYPES):
+                add(None, e)
+
+            elif isinstance(e, (SetBinding, MapBinding)):
+                add(e.multi_key, e)
+
+            elif isinstance(e, ScopeBinding):
                 add(None, e)
                 sci = make_scope_impl(e.scope)
                 if (sae := sci.auto_elements()) is not None:
                     self._build_raw_element_multimap(sae, out)
 
-            elif isinstance(e, (Binding, Eager, Expose)):
-                add(e.key, e)
-
             elif isinstance(e, Private):
                 pi = self._get_private_info(e)
                 self._build_raw_element_multimap(pi.owner_elements(), out)
 
-            elif isinstance(e, (SetBinding, MapBinding)):
-                add(e.multi_key, e)
-
-            elif isinstance(e, ProvisionListenerBinding):
-                add(None, e)
-
             elif isinstance(e, Overrides):
-                ovr = self._build_raw_element_multimap(e.ovr)
                 src = self._build_raw_element_multimap(e.src)
+                ovr = self._build_raw_element_multimap(e.ovr)
                 for k, b in src.items():  # FIXME: merge None keys?
                     try:
                         bs = ovr[k]
@@ -166,9 +183,8 @@ class ElementCollection(lang.Final):
 
             es_by_ty = col.multi_map_by(type, es)
 
-            es_by_ty.pop(Eager, None)
-            es_by_ty.pop(Expose, None)
-            es_by_ty.pop(ProvisionListenerBinding, None)
+            for nb_ty in _NON_BINDING_ELEMENT_TYPES:
+                es_by_ty.pop(nb_ty, None)
 
             if (bs := es_by_ty.pop(Binding, None)):
                 b = self._get_single_binding(k, bs)  # type: ignore
@@ -176,7 +192,6 @@ class ElementCollection(lang.Final):
                 p: ProviderImpl
                 if isinstance(b.provider, (SetProvider, MapProvider)):
                     p = make_multi_provider_impl(b.provider, es_by_ty)
-
                 else:
                     p = make_provider_impl(b.provider)
 

omlish/inject/impl/injector.py

@@ -12,6 +12,8 @@ TODO:
  - injection listeners
  - unions - raise on ambiguous - usecase: sql.AsyncEngineLike
  - multiple live request scopes on single injector - use private injectors?
+ - more listeners - UnboundKeyListener
+  - lazy parent listener chain cache thing
 """
 import contextlib
 import functools
@@ -55,6 +57,7 @@ DEFAULT_SCOPES: list[Scope] = [
 ]
 
 
+@ta.final
 class AsyncInjectorImpl(AsyncInjector, lang.Final):
     def __init__(
             self,
@@ -83,7 +86,7 @@ class AsyncInjectorImpl(AsyncInjector, lang.Final):
             )
         )
 
-        self._cs: weakref.WeakSet[AsyncInjectorImpl] | None = None
+        self._cs: weakref.WeakSet[AsyncInjectorImpl] | None = None  # noqa
         self._root: AsyncInjectorImpl = p._root if p is not None else self  # noqa
 
         self.__cur_req: AsyncInjectorImpl._Request | None = None

omlish/inject/impl/inspect.py

@@ -76,6 +76,9 @@ def build_kwargs_target(
         skip_kwargs: ta.Iterable[str] | None = None,
         raw_optional: bool = False,
 ) -> KwargsTarget:
+    if isinstance(obj, KwargsTarget):
+        return obj
+
     sig = signature(obj)
     tags = _TAGS.get(obj)
 

omlish/inject/impl/multis.py

@@ -1,5 +1,6 @@
 import typing as ta
 
+from ... import check
 from ... import dataclasses as dc
 from ... import lang
 from ..elements import Element
@@ -58,6 +59,7 @@ class MapProviderImpl(ProviderImpl, lang.Final):
 def make_multi_provider_impl(p: Provider, es_by_ty: ta.MutableMapping[type, list[Element]]) -> ProviderImpl:
     if isinstance(p, SetProvider):
         sbs: ta.Iterable[SetBinding] = es_by_ty.pop(SetBinding, ())  # type: ignore
+        check.empty(es_by_ty)
         return SetProviderImpl([
             LinkProviderImpl(LinkProvider(sb.dst))
             for sb in sbs
@@ -65,6 +67,7 @@ def make_multi_provider_impl(p: Provider, es_by_ty: ta.MutableMapping[type, list
 
     elif isinstance(p, MapProvider):
         mbs: ta.Iterable[MapBinding] = es_by_ty.pop(MapBinding, ())  # type: ignore
+        check.empty(es_by_ty)
         return MapProviderImpl([
             MapProviderImpl.Entry(
                 mb.map_key,

omlish/inject/inspect.py

@@ -2,6 +2,7 @@ import typing as ta
 
 from .. import lang
 from .keys import Key
+from .keys import as_key
 
 
 if ta.TYPE_CHECKING:
@@ -21,11 +22,45 @@ class Kwarg(ta.NamedTuple):
     key: Key
     has_default: bool
 
+    @classmethod
+    def of(
+            cls,
+            name: str,
+            key: Key,
+            *,
+            has_default: bool = False,
+    ) -> 'Kwarg':
+        return cls(
+            name,
+            key,
+            has_default,
+        )
+
 
 class KwargsTarget(ta.NamedTuple):
     obj: ta.Any
     kwargs: ta.Sequence[Kwarg]
 
+    @classmethod
+    def of(
+            cls,
+            obj: ta.Any,
+            *kws: Kwarg,
+            **kwargs: tuple[Key, bool] | Key | ta.Any,
+    ) -> 'KwargsTarget':
+        kw_kwargs: list[Kwarg] = []
+        for n, v in kwargs.items():
+            if isinstance(v, tuple):
+                kw_k, kw_hd = v
+                kw_kwargs.append(Kwarg.of(n, kw_k, has_default=kw_hd))
+            else:
+                kw_kwargs.append(Kwarg.of(n, as_key(v)))
+
+        return cls(
+            obj,
+            [*kws, *kw_kwargs],
+        )
+
 
 def tag(obj: T, **kwargs: ta.Any) -> T:
     return _inspect.tag(obj, **kwargs)

omlish/inject/multis.py

@@ -1,5 +1,7 @@
 """
 TODO:
+ - DynamicSetBinding / DynamicMapBinding ? provider of set[T] / map[K, V] ?
+  - doable not guicey - too much dynamism
  - scopes
 """
 import collections.abc
@@ -94,6 +96,9 @@ class SetBinder(ElementGenerator, ta.Generic[T]):
         yield from self._sbs
 
 
+set_binder = SetBinder
+
+
 #
 
 
@@ -123,3 +128,6 @@ class MapBinder(ElementGenerator, ta.Generic[K, V]):
     def __iter__(self) -> ta.Iterator[Element]:
         yield self._map_provider_binding
         yield from self._mbs
+
+
+map_binder = MapBinder

omlish/inject/overrides.py

@@ -14,9 +14,9 @@ from .elements import as_elements
 @dc.dataclass(frozen=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))
+    ovr: Elements = dc.xfield(coerce=check.of_isinstance(Elements))
 
 
-def override(ovr: ta.Any, *a: ta.Any) -> Element:
-    return Overrides(as_elements(ovr), as_elements(*a))
+def override(src: ta.Any, *ovr: ta.Any) -> Element:
+    return Overrides(as_elements(src), as_elements(*ovr))

omlish/inject/privates.py

@@ -18,6 +18,12 @@ class Expose(Element, lang.Final):
     key: Key = dc.xfield(coerce=as_key)
 
 
+expose = Expose
+
+
+#
+
+
 @dc.dataclass(frozen=True)
 @dc.extra_class_params(cache_hash=True)
 class Private(Element, lang.Final):

omlish/inject/providers.py

@@ -3,6 +3,7 @@ import typing as ta
 from .. import check
 from .. import dataclasses as dc
 from .. import lang
+from .inspect import KwargsTarget
 from .keys import Key
 
 
@@ -20,13 +21,13 @@ class Provider(lang.Abstract):
 @dc.dataclass(frozen=True)
 @dc.extra_class_params(cache_hash=True)
 class AsyncFnProvider(Provider):
-    fn: ta.Any = dc.xfield(validate=callable)
+    fn: ta.Any = dc.xfield(validate=lambda v: callable(v) or isinstance(v, KwargsTarget))
 
 
 @dc.dataclass(frozen=True)
 @dc.extra_class_params(cache_hash=True)
 class FnProvider(Provider):
-    fn: ta.Any = dc.xfield(validate=callable)
+    fn: ta.Any = dc.xfield(validate=lambda v: callable(v) or isinstance(v, KwargsTarget))
 
 
 @dc.dataclass(frozen=True)

omlish/lang/recursion.py

@@ -13,7 +13,6 @@ P = ta.ParamSpec('P')
 
 
 _LOCK = threading.RLock()
-
 _LOCAL: threading.local
 
 

omlish/lite/typing.py

@@ -12,6 +12,12 @@ A2 = ta.TypeVar('A2')
 
 ##
 # A workaround for typing deficiencies (like `Argument 2 to NewType(...) must be subclassable`).
+#
+# Note that this problem doesn't happen at runtime - it happens in mypy:
+#
+#   mypy <(echo "import typing as ta; MyCallback = ta.NewType('MyCallback', ta.Callable[[], None])")
+#   /dev/fd/11:1:22: error: Argument 2 to NewType(...) must be subclassable (got "Callable[[], None]")  [valid-newtype]
+#
 
 
 @dc.dataclass(frozen=True)

omlish/reflect/types.py

@@ -9,6 +9,7 @@ give it some guiding North Star to make all of its decisions for it, and to add
 meet, join, solve, ...), but it's quite a bit of work and not a priority at the moment.
 
 TODO:
+ - !!! refactor like a GuardFn - no check_only, return a closure to continue computation !!!
  - !! cache this shit !!
   - especially generic_mro shit
 """

{omlish-0.0.0.dev462.dist-info → omlish-0.0.0.dev464.dist-info}/METADATA

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

{omlish-0.0.0.dev462.dist-info → omlish-0.0.0.dev464.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.omlish-manifests.json,sha256=FLw7xkPiSXuImZgqSP8BwrEib2R1doSzUPLUkc-QUIA,8410
-omlish/__about__.py,sha256=-V3o03Hr1h9gnXTUCGAuhYuAtvBiOS6R2iHHoB5MrB8,3613
+omlish/__about__.py,sha256=WyDJQ2x949KN_uTbi46dCg9PAT7MHo8ImNATkJ1mqb0,3613
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ZNIMl1kwg3qdei4DiUrJPQe5M81S1e76N-GuNSwLBAE,8683
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -82,7 +82,7 @@ omlish/collections/unmodifiable.py,sha256=0ZkA_0paWlkgaU6OupFdSV0yFP--7XoI3lqhs3
 omlish/collections/utils.py,sha256=JYBYoConWxApqJLOjXR6GuQI76G0KQDjg6kkXrTofUw,4063
 omlish/collections/cache/__init__.py,sha256=D1gO71VcwxFTZP9gAc9isHfg_TEdalwhsJcgGLvS9hg,233
 omlish/collections/cache/descriptor.py,sha256=5SOsKNxnhisJY22l7tujMOI6MGGr6TERzgsfjvGXOyA,5013
-omlish/collections/cache/impl.py,sha256=6rOg7zgEn8I5GPjz1RdImB1TdbHZv6EKdv2QAUcUGug,14783
+omlish/collections/cache/impl.py,sha256=Xw8V-koWqtWn9Q0qROxM33-ziUSebhWZv-fzYzkjDfQ,14794
 omlish/collections/cache/types.py,sha256=uND_qOk8bVVmdhrOhjx9QHYqs2jq53NThEqQAl3Nepw,690
 omlish/collections/kv/__init__.py,sha256=qPuE8bmbyOkT_qVGH5owSp0SbC9xI_p_LS0tP7S7QSw,751
 omlish/collections/kv/base.py,sha256=lbE5kj2rNgee8dQOlD7v5oTAn5BcgE3IYRpA11N31Dw,1077
@@ -340,36 +340,39 @@ omlish/http/coro/server/fdio.py,sha256=wd4ShtoX0Ag2xf9PiiQcZR1XLmqHukb_anp0TipNG
 omlish/http/coro/server/server.py,sha256=pB-QV70koRtFwmKmyjnriZDJtErhE6dNqTVvF7s4BVg,18433
 omlish/http/coro/server/simple.py,sha256=j1RZ3niKrgGM2qFnjdYWn_eniZzay5j49Ca4L3u8vO4,3296
 omlish/http/coro/server/sockets.py,sha256=kFZYbcTGYftvm7zpOhkZGtyX2qYdem-Gk018GVBOzeg,2285
-omlish/inject/__init__.py,sha256=8ik0yhn0LCdDr2UMACBeatENs76yprB8pDXUNllXRWg,2954
-omlish/inject/binder.py,sha256=7-Lhf39FuwtpAA57ljJ_h8fIUNCpcd10E6CJiR4Cdxc,5303
+omlish/inject/__init__.py,sha256=oiHZj4WSEyTAeCk6upegNO6EwezhrNf3gvoHXZ3B1jU,3204
+omlish/inject/binder.py,sha256=ET0BC-tCYVhlQK5-7KKwgRGcFFkzscPgY107TnFu7oQ,4361
 omlish/inject/bindings.py,sha256=PlvOnUREjvc6F8nOJdzl1k9SAf80icRB4qWFqDop87M,536
 omlish/inject/eagers.py,sha256=JBY7PcjXt-Rg9scQ1ol9xpcoTLXkXC_Ie9uwTWdzUkA,340
-omlish/inject/elements.py,sha256=y4luEO_-eOlVnLcUDiNGSyMXee4pusl46ZGr0JFhbcY,1405
+omlish/inject/elements.py,sha256=I6_Jdqk265T7KegrChVTRnYrhXFE80tCr7nMxqV9xkE,1670
 omlish/inject/errors.py,sha256=_wkN2tF55gQzmMOMKJC_9jYHBZzaBiCDcyqI9Sf2UZs,626
 omlish/inject/injector.py,sha256=Lw8RLPdJYCHx2zYckttcZnAXBg_UYHe6KAeBilpz-SY,1177
-omlish/inject/inspect.py,sha256=Uq4KMloGWF_YS2mgZbrx-JXhZQnYHHKJSr68i9yoBVc,597
+omlish/inject/inspect.py,sha256=d1IOpgPV1UCUm0uqLRa8PW-jGdfrhzaV1qLitANfCDY,1420
 omlish/inject/keys.py,sha256=7jnI2cw7cvLlzZAfe5SC50O3oPOpOB6iGZGTigyfQvs,682
 omlish/inject/listeners.py,sha256=bav7-uzfpajFAmH_snM0PW2oCfMavmhbE6R4-gjOmJ8,620
 omlish/inject/lite.py,sha256=AFOCj_SznDCPjkiVSKdFXL2hH1q2o4kaDnzkxRWDpsI,2615
 omlish/inject/managed.py,sha256=jaZiiLqHHhL5aHtryou7M15QgHvZ8rSIHveG7ka9sAw,3087
 omlish/inject/maysync.py,sha256=I_gV1efDgqi-A-wJVHAmeswzIxAI0WW_U416E7LnSBs,491
-omlish/inject/multis.py,sha256=Dn63jE8P5ahSKc1IDBdzzx6ByBCgVOth5t4frG9m4UA,3336
+omlish/inject/multis.py,sha256=NNiHConMRmKVqs-FNrSQWIQtXVgTy2cQR59R1p_55kQ,3504
 omlish/inject/origins.py,sha256=-qXa18rIIkNwBdTrvASRDjgPYnoY6n6OPC222jJDrXg,551
-omlish/inject/overrides.py,sha256=ybEcq9cDf6kvqu5mqnwi6Evj0MFjKNeE3r0oUlGw5E4,546
-omlish/inject/privates.py,sha256=CyE-hvQ-F_uyCzcwfdiYVtfm9IF1WZvMDOYilFyZmWk,658
-omlish/inject/providers.py,sha256=Usvi0YgjS5jrAqQFhzeU2artxRSTM4zIoz72lac1PEA,931
+omlish/inject/overrides.py,sha256=3fMHSfX4Xym2NBHP5_vTZTq2Q47SfGhoC5WnTdYOLx0,550
+omlish/inject/privates.py,sha256=46ODWz3PQh6GyH2Rqd-Y7Ye1WBGr9RjSbZ4U12zAolY,680
+omlish/inject/providers.py,sha256=OroBtCBvd0YqfdkLsQLGKmL3cbPngUWFfHqQYo4rYGo,1053
 omlish/inject/scopes.py,sha256=9atVF24QEn073kvoCw_4yLrkdIEzSAqqI0cSXAg4G1A,2722
 omlish/inject/sync.py,sha256=ovVoMY7X9hxe1xverBEec4la3j_041HKjNSlarGsfuA,1051
-omlish/inject/tags.py,sha256=gRDLa-WdZc9DC7KwwmoIPAi8g_qdGpRWuMT7HCd7CL0,433
 omlish/inject/types.py,sha256=Z-ZEdgtCpHBNrbxxKaMVvfeD7hYXdL4rC7A9_VGxZ6g,256
-omlish/inject/utils.py,sha256=Gc2qq45KgkyqDt03WSvOEZBCiuqQ6ESwplx5ZRBcY5M,413
+omlish/inject/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/inject/helpers/constfn.py,sha256=Q7yfaGtxEb3L9izvwWSHh8udvR111qOtUYItw6OiyXo,416
+omlish/inject/helpers/id.py,sha256=F1RYU03q4evteO6O3NDjwHZtPgd7MUK-qwsQAH1X-P0,435
+omlish/inject/helpers/multis.py,sha256=4V85CdxxuYANAEn44IQbXHDYjPbBQ9jLrEP5XpzV2bI,3807
+omlish/inject/helpers/wrappers.py,sha256=f3mulTNuItvmXnn7E4JHk9UESjsf-ponvlDfIpAHbk4,1319
 omlish/inject/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/inject/impl/bindings.py,sha256=xSvUcoDz8NH-aNHPwBPEZsFg73K2WcF_A63npVbGt_k,420
-omlish/inject/impl/elements.py,sha256=BZweNf8lbG_tO5X_A8-yM2ukIwtHHVMR6nsxai95EOA,5948
-omlish/inject/impl/injector.py,sha256=0e8Il9ObzWMDBJDLQk9RRBkK83mk-nIRlKU_LtmQfLI,8266
-omlish/inject/impl/inspect.py,sha256=HLhz5DfP9dwvbIYnwqsfR9ADjCoWs9q4Gh7J4BpImf4,3135
+omlish/inject/impl/elements.py,sha256=qR06KaAjZMaQgdMBE6_tdrT7cWP1Ft0CFq71bnyp224,6265
+omlish/inject/impl/injector.py,sha256=tcPyq_747L12G3CT_rA9KU4l_gWlesX0uCDv3GJOZGY,8366
+omlish/inject/impl/inspect.py,sha256=UcCaQEhQfRINrY9Phz9UYKCuAg7HnZTqBJ2i-6j_O1A,3193
 omlish/inject/impl/maysync.py,sha256=7GWjrvJStOx85BCvk8IJAmmkoGkChFAAi2h7j2pe6Qs,1207
-omlish/inject/impl/multis.py,sha256=fa31UdkBYdAulfYdrkU1klDZicuQRyaBDbG28kaw8SI,2092
+omlish/inject/impl/multis.py,sha256=5aKXnmSocwqu7y6WicvYX1-QGTz9iHubxRq9j0enlgk,2174
 omlish/inject/impl/origins.py,sha256=dgGdkoMN6I4DZrWjlpZYijeFsrF6Up1WPq_QSAgTtuQ,1676
 omlish/inject/impl/privates.py,sha256=uxMAl0MOPu-MeLd-q1DySu7J5FcdRVL1B0XgC4dnB6I,2667
 omlish/inject/impl/providers.py,sha256=qqPUF9qZZ-CGTTc7ZPskjexM2aK8xdY0gLPMshB5VKw,2127
@@ -433,7 +436,7 @@ omlish/lang/objects.py,sha256=JMOZU5I6sK4rJm04898dOJkvef-lDIh5O3k6tlLbBJw,4616
 omlish/lang/outcomes.py,sha256=rCyjWjElNheJ-sQhauxfERT98IZ0mrUoaSI9nMpJZTg,8751
 omlish/lang/overrides.py,sha256=IBzK6ljfLX6TLgIyKTSjhqTLcuKRkQNVtEOnBLS4nuA,2095
 omlish/lang/params.py,sha256=sfbNoGrKCsAtubFufj_uh_WKshIgA8fqJ4PmLH1PH00,6639
-omlish/lang/recursion.py,sha256=1VfSqzKO-8Is3t9LKw0W4jwPfE0aBS70EUlbUxAx4eE,1900
+omlish/lang/recursion.py,sha256=tfCCe4poGcyV56Wj7j9NBjm7akp828mBZegJpm-i9SU,1899
 omlish/lang/resolving.py,sha256=nMosn-rcYjI8t6b35oICDyPw6t6-HvWj5jMdkfn1jfA,1612
 omlish/lang/resources.py,sha256=awfh33Uxkd9Ho-5Z3d9CPWQE3gjktV0XWM6XbdG0ejA,2845
 omlish/lang/sequences.py,sha256=OJ5hdgjvgzOgsb0Bg8vGrwPyef4gkRPp-Bz21sc9_iE,3185
@@ -493,7 +496,7 @@ omlish/lite/strings.py,sha256=rapGrc2BrIDstAEJov3pG_30PimOIR7IFVYioyTi-MM,1831
 omlish/lite/timeouts.py,sha256=OLU9iju2pkk3niM20aPnmA6AqabFmW8zeLDu6WsuaxA,5008
 omlish/lite/timing.py,sha256=KTlEa5PyT6BXf8AwGVWUNtoVgRx9zwSUrBQnkpygK78,262
 omlish/lite/types.py,sha256=QM9whf55r7TmmQBRApIWSlyVKsl1p_jcut_YheyZMFY,146
-omlish/lite/typing.py,sha256=m2CyJTz2OVOCPRvp-0UuEx7oleZgXqs3rYXijE0bTsA,1280
+omlish/lite/typing.py,sha256=RZBto50cqbeZrLbFtSPMmxc0gR-dnRsH02Yx4t4xosQ,1580
 omlish/lite/wrappers.py,sha256=d00Ls2kFHuogKd5wEBaU65VNCN10YXIZtiwu1mbMpmA,530
 omlish/logs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/logs/_amalg.py,sha256=XTfwEPyxNLHgDq3rEDa5WnotoyFIxvvcAKeqOFZxBY8,204
@@ -628,7 +631,7 @@ omlish/reflect/__init__.py,sha256=omD3VLFQtYTwPxrTH6gLATQIax9sTGGKc-7ps96-q0g,12
 omlish/reflect/inspect.py,sha256=dUrVz8VfAdLVFtFpW416DxzVC17D80cvFb_g2Odzgq8,1823
 omlish/reflect/ops.py,sha256=4mGvFMw5D6XGbhDhdCqZ1dZsiqezUTenDv63FIDohpY,3029
 omlish/reflect/subst.py,sha256=_lfNS2m2UiJgqARQtmGLTGo7CrSm9OMvVzt6GWOEX6M,4590
-omlish/reflect/types.py,sha256=4Plo_1cHIk8-68lu8_c_SUEohy19exTNDsgvuVbOJ5A,16066
+omlish/reflect/types.py,sha256=iKLnOhOfbssFp7J4TNFif6as4SyNVFRYlCv7zLQH4iU,16159
 omlish/secrets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/secrets/all.py,sha256=qBxUFIqxCExADL71taNH_W6FYT9QvOrdcaMeUUPO3aw,298
 omlish/secrets/crypto.py,sha256=q0Hca5oMwvh39r0hrupN_ewxhlllbdDgAgVoloYFmDg,3714
@@ -828,9 +831,9 @@ omlish/typedvalues/marshal.py,sha256=2xqX6JllhtGpmeYkU7C-qzgU__0x-vd6CzYbAsocQlc
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev462.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev462.dist-info/METADATA,sha256=cz6Ceh1xL9eOzPJiUFmjYRw1SA220Ujydbg5IBx-ufs,19003
-omlish-0.0.0.dev462.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev462.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev462.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev462.dist-info/RECORD,,
+omlish-0.0.0.dev464.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev464.dist-info/METADATA,sha256=D4GGbbDDetXUn2WacG-QrL6r_ZRprtERgAiGJYpR45k,19003
+omlish-0.0.0.dev464.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev464.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev464.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev464.dist-info/RECORD,,