omlish 0.0.0.dev382__tar.gz → 0.0.0.dev384__tar.gz

{omlish-0.0.0.dev382/omlish.egg-info → omlish-0.0.0.dev384}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev382
+Version: 0.0.0.dev384
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -9,6 +9,8 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE

{omlish-0.0.0.dev382 → omlish-0.0.0.dev384}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev382'
-__revision__ = 'a0b130f7b364be52667bb3c7e3fd94132933b066'
+__version__ = '0.0.0.dev384'
+__revision__ = '13eb429134387bdc2ec6e494bd89553b650b23e3'
 
 
 #
@@ -22,6 +22,9 @@ class ProjectBase:
 
         'Operating System :: OS Independent',
         'Operating System :: POSIX',
+
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.13',
     ]
 
 

{omlish-0.0.0.dev382 → omlish-0.0.0.dev384}/omlish/inject/__init__.py

@@ -4,6 +4,8 @@
 from .binder import (  # noqa
     bind,
     bind_as_fn,
+    bind_map_entry_const,
+    bind_set_entry_const,
 )
 
 from .bindings import (  # noqa
@@ -112,6 +114,10 @@ from .scopes import (  # noqa
     enter_seeded_scope,
 )
 
+from .tags import (  # noqa
+    Id,
+)
+
 from .types import (  # noqa
     Scope,
     Tag,
@@ -120,5 +126,4 @@ from .types import (  # noqa
 
 from .utils import (  # noqa
     ConstFn,
-    Id,
 )

{omlish-0.0.0.dev382 → omlish-0.0.0.dev384}/omlish/inject/binder.py

@@ -11,8 +11,13 @@ 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 ConstProvider
 from .providers import CtorProvider
@@ -21,6 +26,7 @@ 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
 
@@ -180,3 +186,45 @@ 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.dev382 → omlish-0.0.0.dev384}/omlish/inject/keys.py

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

{omlish-0.0.0.dev382 → omlish-0.0.0.dev384}/omlish/inject/multis.py

@@ -25,34 +25,34 @@ V = ta.TypeVar('V')
 ##
 
 
-def _check_set_multi_key(mk: Key) -> bool:
+def is_set_multi_key(mk: Key) -> bool:
     return rfl.get_concrete_type(mk.ty) is collections.abc.Set
 
 
 @dc.dataclass(frozen=True)
 @dc.extra_class_params(cache_hash=True)
 class SetBinding(Element, lang.Final):
-    multi_key: Key = dc.xfield(validate=_check_set_multi_key)
+    multi_key: Key = dc.xfield(validate=is_set_multi_key)
     dst: Key = dc.xfield(coerce=check.of_isinstance(Key))
 
 
 @dc.dataclass(frozen=True)
 @dc.extra_class_params(cache_hash=True)
 class SetProvider(Provider):
-    multi_key: Key = dc.xfield(validate=_check_set_multi_key)
+    multi_key: Key = dc.xfield(validate=is_set_multi_key)
 
 
-##
+#
 
 
-def _check_map_multi_key(mk: Key) -> bool:
+def is_map_multi_key(mk: Key) -> bool:
     return rfl.get_concrete_type(mk.ty) is collections.abc.Mapping
 
 
 @dc.dataclass(frozen=True)
 @dc.extra_class_params(cache_hash=True)
 class MapBinding(Element, lang.Final):
-    multi_key: Key = dc.xfield(validate=_check_map_multi_key)
+    multi_key: Key = dc.xfield(validate=is_map_multi_key)
     map_key: ta.Any = dc.xfield()
     dst: Key = dc.xfield(coerce=check.of_isinstance(Key))
 
@@ -60,7 +60,7 @@ class MapBinding(Element, lang.Final):
 @dc.dataclass(frozen=True)
 @dc.extra_class_params(cache_hash=True)
 class MapProvider(Provider):
-    multi_key: Key = dc.xfield(validate=_check_map_multi_key)
+    multi_key: Key = dc.xfield(validate=is_map_multi_key)
 
 
 ##
@@ -94,6 +94,9 @@ class SetBinder(ElementGenerator, ta.Generic[T]):
         yield from self._sbs
 
 
+#
+
+
 class MapBinder(ElementGenerator, ta.Generic[K, V]):
     def __init__(self, *, tag: ta.Any = None) -> None:
         super().__init__()

omlish-0.0.0.dev384/omlish/inject/tags.py

@@ -0,0 +1,22 @@
+import typing as ta
+
+from .. import dataclasses as dc
+from .types import Tag
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+@dc.extra_class_params(cache_hash=True, terse_repr=True)
+class Id:
+    """A utility dataclass intended to be used as a key tag for disambiguation."""
+
+    v: int
+
+    tag: ta.Any = dc.xfield(
+        default=None,
+        kw_only=True,
+        validate=lambda o: not isinstance(o, Tag),
+        repr_fn=dc.opt_repr,
+    )

{omlish-0.0.0.dev382 → omlish-0.0.0.dev384}/omlish/inject/utils.py

@@ -19,14 +19,3 @@ class ConstFn(HasOriginsImpl, lang.Final, ta.Generic[T]):
 
     def __call__(self) -> T:
         return self.v
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-@dc.extra_class_params(terse_repr=True)
-class Id:
-    """A utility dataclass intended to be used as a key tag for disambiguation."""
-
-    v: int

{omlish-0.0.0.dev382 → omlish-0.0.0.dev384/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev382
+Version: 0.0.0.dev384
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -9,6 +9,8 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE

{omlish-0.0.0.dev382 → omlish-0.0.0.dev384}/omlish.egg-info/SOURCES.txt

@@ -382,6 +382,7 @@ omlish/inject/overrides.py
 omlish/inject/privates.py
 omlish/inject/providers.py
 omlish/inject/scopes.py
+omlish/inject/tags.py
 omlish/inject/types.py
 omlish/inject/utils.py
 omlish/inject/impl/__init__.py

{omlish-0.0.0.dev382 → omlish-0.0.0.dev384}/pyproject.toml

@@ -13,12 +13,14 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev382'
+version = '0.0.0.dev384'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
     'Operating System :: OS Independent',
     'Operating System :: POSIX',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.13',
 ]
 description = 'omlish'