omlish 0.0.0.dev461__tar.gz → 0.0.0.dev463__tar.gz

{omlish-0.0.0.dev461/omlish.egg-info → omlish-0.0.0.dev463}/PKG-INFO

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

{omlish-0.0.0.dev461 → omlish-0.0.0.dev463}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev461'
-__revision__ = '7ebd7a07f84e80a8d1855b8a182da756dbb7d6ec'
+__version__ = '0.0.0.dev463'
+__revision__ = '3ce0d0667b2ff4d64b7757f449fef0c480e8790f'
 
 
 #

{omlish-0.0.0.dev461 → omlish-0.0.0.dev463}/omlish/argparse/all.py

@@ -1,17 +1,25 @@
 # ruff: noqa: I001
 import argparse
 
-from .cli import (  # noqa
-    ArgparseArg as Arg,
-    argparse_arg as arg,
-    argparse_arg_ as arg_,
+from .. import lang as _lang
 
-    ArgparseCmdFn as CmdFn,
-    ArgparseCmd as Cmd,
-    argparse_cmd as cmd,
 
-    ArgparseCli as Cli,
-)
+with _lang.auto_proxy_init(globals()):
+    from .cli import (  # noqa
+        ArgparseArg as Arg,
+        argparse_arg as arg,
+        argparse_arg_ as arg_,
+
+        ArgparseCmdFn as CmdFn,
+        ArgparseCmd as Cmd,
+        argparse_cmd as cmd,
+
+        ArgparseCli as Cli,
+    )
+
+    from .utils import (  # noqa
+        NoExitArgumentParser,
+    )
 
 
 ##

omlish-0.0.0.dev463/omlish/argparse/utils.py

@@ -0,0 +1,21 @@
+import argparse
+import typing as ta
+
+
+##
+
+
+class NoExitArgumentParser(argparse.ArgumentParser):
+    def __init__(
+            self,
+            *args: ta.Any,
+            exit_on_error: bool = False,
+            **kwargs: ta.Any,
+    ) -> None:
+        if exit_on_error:
+            raise TypeError('exit_on_error=True not supported')
+
+        super().__init__(*args, exit_on_error=False, **kwargs)  # type: ignore[misc]
+
+    def exit(self, status=0, message=None):
+        raise TypeError('NoExitArgumentParser.exit() not supported')

{omlish-0.0.0.dev461 → omlish-0.0.0.dev463}/omlish/inject/__init__.py

@@ -19,11 +19,28 @@ 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 as items_binder_helper,  # noqa
+    )
+
+    from .helpers.wrappers import (  # noqa
+        WrapperBinderHelper as wrapper_binder_helper,  # noqa
+    )
+
     from .binder import (  # noqa
         bind,
         bind_as_fn,
-        bind_map_entry_const,
-        bind_set_entry_const,
     )
 
     from .bindings import (  # noqa
@@ -36,9 +53,10 @@ with _lang.auto_proxy_init(globals()):
 
     from .elements import (  # noqa
         Element,
-        Elemental,
         Elements,
+        Elemental,
         as_elements,
+        iter_elements,
     )
 
     from .errors import (  # noqa
@@ -153,16 +171,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-0.0.0.dev461 → omlish-0.0.0.dev463}/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-0.0.0.dev461 → omlish-0.0.0.dev463}/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-0.0.0.dev461/omlish/inject/utils.py → omlish-0.0.0.dev463/omlish/inject/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-0.0.0.dev461/omlish/inject/tags.py → omlish-0.0.0.dev463/omlish/inject/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-0.0.0.dev463/omlish/inject/helpers/multis.py

@@ -0,0 +1,140 @@
+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,
+            ),
+        )

omlish-0.0.0.dev463/omlish/inject/helpers/wrappers.py

@@ -0,0 +1,51 @@
+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

{omlish-0.0.0.dev461 → omlish-0.0.0.dev463}/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-0.0.0.dev461 → omlish-0.0.0.dev463}/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-0.0.0.dev461 → omlish-0.0.0.dev463}/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-0.0.0.dev463/omlish/inject/inspect.py

@@ -0,0 +1,70 @@
+import typing as ta
+
+from .. import lang
+from .keys import Key
+from .keys import as_key
+
+
+if ta.TYPE_CHECKING:
+    from .impl import inspect as _inspect
+else:
+    _inspect = lang.proxy_import('.impl.inspect', __package__)
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+class Kwarg(ta.NamedTuple):
+    name: str
+    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)
+
+
+def build_kwargs_target(obj: ta.Any, **kwargs: ta.Any) -> KwargsTarget:
+    return _inspect.build_kwargs_target(obj, **kwargs)

{omlish-0.0.0.dev461 → omlish-0.0.0.dev463}/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-0.0.0.dev461 → omlish-0.0.0.dev463}/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-0.0.0.dev461 → omlish-0.0.0.dev463}/omlish/lang/__init__.py

@@ -63,6 +63,9 @@ with _auto_proxy_init(globals(), update_exports=True):
         snake_case,
         up_snake_case,
 
+        camel_to_snake,
+        snake_to_camel,
+
         get_string_casing,
         split_string_casing,
     )