omlish 0.0.0.dev447__py3-none-any.whl → 0.0.0.dev493__py3-none-any.whl

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,
@@ -93,7 +88,7 @@ def bind(
         in_: Scope | None = None,
         singleton: bool = False,
 
-        eager: bool = False,
+        eager: bool | int = False,
         expose: bool = False,
 ) -> Element | Elements:
     if obj is None or obj is inspect.Parameter.empty:
@@ -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
@@ -121,7 +117,10 @@ def bind(
     elif _is_fn(obj) and not has_to:
         sig = _inspect.signature(obj)
         ty = rfl.type_(sig.return_annotation)
-        to_fn = obj
+        if inspect.iscoroutinefunction(obj):
+            to_async_fn = obj
+        else:
+            to_fn = obj
         key = Key(ty)
     else:
         if to_const is not None:
@@ -140,6 +139,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:
@@ -182,8 +183,8 @@ def bind(
 
     elements: list[Element] = [binding]
 
-    if eager:
-        elements.append(Eager(key))
+    if eager is not False:
+        elements.append(Eager(key, priority=eager if isinstance(eager, int) else 0))
     if expose:
         elements.append(Expose(key))
 
@@ -191,45 +192,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/eagers.py

@@ -16,3 +16,5 @@ from .keys import Key
 @dc.extra_class_params(cache_hash=True)
 class Eager(Element, lang.Final):
     key: Key = dc.xfield(coerce=check.of_isinstance(Key))
+
+    priority: int = dc.xfield(0, kw_only=True)

omlish/inject/elements.py

@@ -6,6 +6,12 @@ from .. import lang
 from .impl.origins import HasOriginsImpl
 
 
+if ta.TYPE_CHECKING:
+    from .impl import elements as _elements
+else:
+    _elements = lang.proxy_import('.impl.elements', __package__)
+
+
 ##
 
 
@@ -64,3 +70,24 @@ 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)
+
+
+##
+
+
+class CollectedElements(lang.PackageSealed, lang.Abstract):
+    pass
+
+
+def collect_elements(es: Elements | CollectedElements) -> CollectedElements:
+    return _elements.collect_elements(es)

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/late.py

@@ -0,0 +1,76 @@
+"""
+A minor tidiness for hiding refs to [Async]Injector in circ-dep workarounds. Unfortunately unsuitable outside of
+injection modules due to it itself being in here (as user code shouldn't reference injector guts), but at least it's
+something.
+"""
+import abc
+import functools
+import typing as ta
+
+from ... import lang
+from ... import reflect as rfl
+from ..binder import bind
+from ..elements import Elements
+from ..elements import as_elements
+from ..injector import AsyncInjector
+from ..inspect import KwargsTarget
+from ..keys import Key
+from ..keys import as_key
+from ..sync import Injector
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+class Late(lang.Abstract, ta.Generic[T]):
+    @abc.abstractmethod
+    def __call__(self) -> T:
+        raise NotImplementedError
+
+
+class AsyncLate(lang.Abstract, ta.Generic[T]):
+    @abc.abstractmethod
+    def __call__(self) -> ta.Awaitable[T]:
+        raise NotImplementedError
+
+
+#
+
+
+def _bind_late(
+        injector_cls: type,
+        late_cls: ta.Any,
+        inner: ta.Any,
+        outer: ta.Any | None = None,
+) -> Elements:
+    inner_key = as_key(inner)
+
+    outer_key: Key
+    outer_fac: ta.Callable[[ta.Any], ta.Any]
+    if outer is None:
+        inner_ann = rfl.to_annotation(inner_key.ty)
+        outer_ann = late_cls[inner_ann]
+        outer_key = Key(rfl.type_(outer_ann))
+        outer_fac = lang.identity
+    else:
+        outer_key = as_key(outer)
+        outer_cls = rfl.get_concrete_type(outer_key.ty)
+        outer_fac = outer_cls  # type: ignore[assignment]
+
+    return as_elements(
+        bind(outer_key, to_fn=KwargsTarget.of(  # noqa
+            lambda i: outer_fac(functools.partial(i.provide, inner_key)),
+            i=injector_cls,
+        )),
+    )
+
+
+def bind_late(inner: ta.Any, outer: ta.Any | None = None) -> Elements:
+    return _bind_late(Injector, Late, inner, outer)
+
+
+def bind_async_late(inner: ta.Any, outer: ta.Any | None = None) -> Elements:
+    return _bind_late(AsyncInjector, AsyncLate, inner, outer)

omlish/inject/{managed.py → helpers/managed.py}

@@ -5,20 +5,20 @@ TODO:
 import contextlib
 import typing as ta
 
-from .. import lang
-from .binder import bind
-from .elements import Elemental
-from .impl.inspect import build_kwargs_target
+from ... import lang
+from ..binder import bind
+from ..elements import Elemental
+from ..impl.inspect import build_kwargs_target
 
 
 if ta.TYPE_CHECKING:
-    from . import injector as _injector
-    from . import maysync as _maysync
-    from . import sync as _sync
+    from .. import injector as _injector
+    from .. import maysync as _maysync
+    from .. import sync as _sync
 else:
-    _injector = lang.proxy_import('.injector', __package__)
-    _maysync = lang.proxy_import('.maysync', __package__)
-    _sync = lang.proxy_import('.sync', __package__)
+    _injector = lang.proxy_import('..injector', __package__)
+    _maysync = lang.proxy_import('..maysync', __package__)
+    _sync = lang.proxy_import('..sync', __package__)
 
 
 T = ta.TypeVar('T')

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

@@ -27,6 +27,7 @@ from ... import collections as col
 from ... import lang
 from ..bindings import Binding
 from ..eagers import Eager
+from ..elements import CollectedElements
 from ..elements import Element
 from ..elements import Elements
 from ..errors import ConflictingKeyError
@@ -47,7 +48,7 @@ from .multis import make_multi_provider_impl
 from .origins import Origins
 from .origins import set_origins
 from .providers import ProviderImpl
-from .providers2 import make_provider_impl
+from .providersmap import make_provider_impl
 from .scopes import make_scope_impl
 
 
@@ -63,7 +64,24 @@ ElementT = ta.TypeVar('ElementT', bound=Element)
 ##
 
 
-class ElementCollection(lang.Final):
+_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(CollectedElements, lang.Final):
     def __init__(self, es: Elements) -> None:
         super().__init__()
 
@@ -96,28 +114,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 +184,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 +193,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)
 
@@ -194,10 +210,27 @@ class ElementCollection(lang.Final):
     ##
 
     @lang.cached_function
-    def eager_keys_by_scope(self) -> ta.Mapping[Scope, ta.Sequence[Key]]:
+    def scope_binding_scopes(self) -> ta.Sequence[Scope]:
+        return [sb.scope for sb in self.elements_of_type(ScopeBinding)]
+
+    @lang.cached_function
+    def sorted_eager_keys_by_scope(self) -> ta.Mapping[Scope, ta.Sequence[Key]]:
         bim = self.binding_impl_map()
-        ret: dict[Scope, list[Key]] = {}
+        dct: dict[Scope, list[Eager]] = {}
         for e in self.elements_of_type(Eager):
             bi = bim[e.key]
-            ret.setdefault(bi.scope, []).append(e.key)
-        return ret
+            dct.setdefault(bi.scope, []).append(e)
+        return {
+            sc: tuple(eg.key for eg in sorted(egs, key=lambda eg: eg.priority))
+            for sc, egs in dct.items()
+        }
+
+
+##
+
+
+def collect_elements(es: Elements | CollectedElements) -> ElementCollection:
+    if isinstance(es, CollectedElements):
+        return check.isinstance(es, ElementCollection)
+    else:
+        return ElementCollection(es)