omlish 0.0.0.dev382__py3-none-any.whl → 0.0.0.dev384__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → omlish-0.0.0.dev384.dist-info}/METADATA

@@ -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.dist-info → omlish-0.0.0.dev384.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=aT8yZ-Zh-9wfHl5Ym5ouiWC1i0cy7Q7RlhzavB6VLPI,8587
-omlish/__about__.py,sha256=lkQADEaVOdLymPabc9nqxBnnoUh2IftMJDVmxDHhHiU,3445
+omlish/__about__.py,sha256=YCcIz5KJ2sBcOE5C5j7gQV_BFCDb-uuGb0eoIWjBUc0,3543
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -355,25 +355,26 @@ omlish/http/coro/server/fdio.py,sha256=qZE4g5y4XESsTObSKyVggI-yzig57gSGJb4Z0rcHv
 omlish/http/coro/server/server.py,sha256=5gvueSCUzqBqQRf0GJ6wGroD9DiWxQNi6N17MlEtBLU,18660
 omlish/http/coro/server/simple.py,sha256=j1RZ3niKrgGM2qFnjdYWn_eniZzay5j49Ca4L3u8vO4,3296
 omlish/http/coro/server/sockets.py,sha256=24gU6wpIZuzYWKQD8UsHyYfTZlbcUFvkqXq5KVgWpQo,2261
-omlish/inject/__init__.py,sha256=pY-A8Q4v08-Xa4a-XdZ3lSFC3OwCO2T9HhesB67Q4tQ,1895
-omlish/inject/binder.py,sha256=3-6KMOcSgFE5bvthy3YUrRzCX5w7YSGmdJ3Tv2yXZGw,4022
+omlish/inject/__init__.py,sha256=Ou6_wAovmxOpbdhGKsV8GbYRH0_S_h0XQSBDPeYpP0g,1978
+omlish/inject/binder.py,sha256=woOK7I5fk4K4kDF684Ia003jE_lviGQXacNKAmXqx5M,5114
 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/errors.py,sha256=_wkN2tF55gQzmMOMKJC_9jYHBZzaBiCDcyqI9Sf2UZs,626
 omlish/inject/injector.py,sha256=fyvaRoJXo_oibx1_IiGkncP9oXnZSKtDm7-ULNKRXHE,1071
 omlish/inject/inspect.py,sha256=Uq4KMloGWF_YS2mgZbrx-JXhZQnYHHKJSr68i9yoBVc,597
-omlish/inject/keys.py,sha256=bkpaE_hXFZ1pX8xPU_Km4jPJh8rkk07fs5aA_8bpC5M,665
+omlish/inject/keys.py,sha256=7jnI2cw7cvLlzZAfe5SC50O3oPOpOB6iGZGTigyfQvs,682
 omlish/inject/listeners.py,sha256=wyPsAJsl45fZHmrFwsVBxaCiT7r_Riw1I8Eowwg5NHE,592
 omlish/inject/managed.py,sha256=-9aBm1vRPOjNz4kgOmpt8S2T55s727t9RiggFBH8maU,2096
-omlish/inject/multis.py,sha256=JzHTBr9LTy7hRTSax9GOo0Lxw7fk401uRgeHm8Mv4d8,3357
+omlish/inject/multis.py,sha256=Dn63jE8P5ahSKc1IDBdzzx6ByBCgVOth5t4frG9m4UA,3336
 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=GDjSEN6iLsc-Tdu_OCPvFHWu4yP0Vn0pAyH_xjw1DPg,783
 omlish/inject/scopes.py,sha256=MqGus6vCogQVRJlZUnoXFwEeHuGMSYv2NF23_OFxWHE,1995
+omlish/inject/tags.py,sha256=gRDLa-WdZc9DC7KwwmoIPAi8g_qdGpRWuMT7HCd7CL0,433
 omlish/inject/types.py,sha256=Z-ZEdgtCpHBNrbxxKaMVvfeD7hYXdL4rC7A9_VGxZ6g,256
-omlish/inject/utils.py,sha256=5Xm6LEelY7QujhMK7oD5vqEtY7Ymg_oG1Y-ZdEGD3bc,592
+omlish/inject/utils.py,sha256=Gc2qq45KgkyqDt03WSvOEZBCiuqQ6ESwplx5ZRBcY5M,413
 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=PM_055moROskSTQqmohEa6I0tt1OQ-VRNArXCMG6vyk,5947
@@ -890,9 +891,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 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.dev382.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev382.dist-info/METADATA,sha256=yCksZcosieu0N1Nq0ANs_GGJn0Dekpz4CsWFPh117As,18726
-omlish-0.0.0.dev382.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev382.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev382.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev382.dist-info/RECORD,,
+omlish-0.0.0.dev384.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev384.dist-info/METADATA,sha256=PhVWxPb5TWMJN2-RnlTcRyIb2zPG8BQIz4F01yyIiqI,18825
+omlish-0.0.0.dev384.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev384.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev384.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev384.dist-info/RECORD,,