omlish 0.0.0.dev319__py3-none-any.whl → 0.0.0.dev320__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev319'
-__revision__ = 'db501bf0b4fbb5f1af2b467b004ffec22f3e769c'
+__version__ = '0.0.0.dev320'
+__revision__ = '22973e588f6a8205d0cf900b83dcaaa9237fa441'
 
 
 #

omlish/collections/__init__.py

@@ -4,6 +4,12 @@ import typing as _ta
 from .. import lang as _lang
 
 
+from .bimap import (  # noqa
+    BiMap,
+
+    make_bi_map,
+)
+
 from .coerce import (  # noqa
     abs_set,
     abs_set_of,

omlish/collections/bimap.py

@@ -0,0 +1,89 @@
+import abc
+import typing as ta
+
+from .. import check
+from .. import lang
+
+
+K = ta.TypeVar('K')
+V = ta.TypeVar('V')
+
+K2 = ta.TypeVar('K2')
+V2 = ta.TypeVar('V2')
+
+
+##
+
+
+class BiMap(ta.Mapping[K, V], lang.Abstract):
+    @abc.abstractmethod
+    def inverse(self) -> 'BiMap[V, K]':
+        raise NotImplementedError
+
+
+##
+
+
+class _BaseBiMapImpl(BiMap[K, V], lang.Abstract):
+    def __init__(
+            self,
+            dct: ta.Mapping[K, V],
+            inverse: BiMap[V, K],
+    ) -> None:
+        super().__init__()
+
+        self._dct = dct
+        self._inverse = inverse
+
+    def inverse(self) -> 'BiMap[V, K]':
+        return self._inverse
+
+    def __getitem__(self, key, /):
+        return self._dct[key]
+
+    def __len__(self) -> int:
+        return len(self._dct)
+
+    def __iter__(self):
+        return iter(self._dct)
+
+
+class _BiMapImpl(_BaseBiMapImpl[K, V]):
+    def __init__(self, *args, **kwargs) -> None:
+        dct: dict[K, V] = {}
+        inv_dct: dict[V, K] = {}
+        for k, v in lang.yield_dict_init(*args, **kwargs):
+            check.not_in(k, dct)
+            check.not_in(v, dct)
+            dct[k] = v
+            inv_dct[v] = k
+
+        self._dct = dct
+        self._inv_dct = inv_dct
+
+        super().__init__(dct, _BiMapImpl._Inverse(inv_dct, self))
+
+    class _Inverse(_BaseBiMapImpl):
+        pass
+
+
+##
+
+
+@ta.overload
+def make_bi_map(dct: ta.Mapping[K, V]) -> BiMap[K, V]:
+    ...
+
+
+@ta.overload
+def make_bi_map(items: ta.Iterable[tuple[K, V]]) -> BiMap[K, V]:
+    ...
+
+
+@ta.overload
+def make_bi_map(**kwargs: str) -> BiMap[str, str]:
+    ...
+
+
+def make_bi_map(*args, **kwargs):
+    return _BiMapImpl(*args, **kwargs)

omlish/dispatch/methods.py

@@ -217,6 +217,13 @@ class Method(ta.Generic[P, R]):
     def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
         instance, *rest = args
         instance_cls = type(instance)
+
+        # if instance_cls is super:
+        #     owner = instance.__self_class__.__mro__[instance.__self_class__.__mro__.index(instance.__thisclass__) + 1]
+        #     att_disp = self.build_attr_dispatcher(instance.__self_class__, owner)
+        #     func = self.build_dispatch_func(att_disp)
+        #     return func.__get__(instance, instance.__thisclass__)(*rest, **kwargs)
+
         try:
             func = self._dispatch_func_cache[weakref.ref(instance_cls)]
         except KeyError:

omlish/lang/__init__.py

@@ -61,6 +61,12 @@ from .classes.abstract import (  # noqa
     unabstract_class,
 )
 
+from .classes.namespaces import (  # noqa
+    GenericNamespaceMeta,
+    Namespace,
+    NamespaceMeta,
+)
+
 from .classes.restrict import (  # noqa
     AnySensitive,
     Final,
@@ -79,7 +85,6 @@ from .classes.restrict import (  # noqa
 from .classes.simple import (  # noqa
     LazySingleton,
     Marker,
-    Namespace,
     SimpleMetaDict,
     Singleton,
 )

omlish/lang/classes/abstract.py

@@ -52,7 +52,11 @@ class Abstract(abc.ABC):  # noqa
 
         super().__init_subclass__(**kwargs)
 
-        if not _DISABLE_CHECKS and Abstract not in cls.__bases__:
+        if (
+                not _DISABLE_CHECKS and
+                Abstract not in cls.__bases__ and
+                abc.ABC not in cls.__bases__
+        ):
             ams = {a for a, o in cls.__dict__.items() if is_abstract_method(o)}
             seen = set(cls.__dict__)
             for b in cls.__bases__:

omlish/lang/classes/namespaces.py

@@ -0,0 +1,126 @@
+import abc
+import typing as ta
+
+from .restrict import NotInstantiable
+
+
+V = ta.TypeVar('V')
+
+
+##
+
+
+class _NOT_SET:  # noqa
+    def __new__(cls, *args, **kwargs):  # noqa
+        raise TypeError
+
+
+NamespaceCheckValue: ta.TypeAlias = type | tuple[type, ...] | ta.Callable[[ta.Any], bool]
+
+
+class GenericNamespaceMeta(abc.ABCMeta, ta.Generic[V]):
+    __namespace_check_values__: NamespaceCheckValue | None = None
+    __namespace_case_insensitive__: bool = False
+
+    def __init_subclass__(
+            mcls,
+            *,
+            check_values: NamespaceCheckValue | None | type[_NOT_SET] = _NOT_SET,
+            case_insensitive: bool | type[_NOT_SET] = _NOT_SET,
+            **kwargs,
+    ):
+        super().__init_subclass__(**kwargs)
+
+        if check_values is not _NOT_SET:
+            mcls.__namespace_check_values__ = check_values
+        if case_insensitive is not _NOT_SET:
+            mcls.__namespace_case_insensitive__ = case_insensitive  # type: ignore
+
+    __namespace_attrs__: ta.Mapping[str, V]
+    __namespace_values__: ta.Mapping[str, V]
+
+    def __new__(
+            mcls,
+            name,
+            bases,
+            namespace,
+            *,
+            check_values: NamespaceCheckValue | None | type[_NOT_SET] = _NOT_SET,
+            case_insensitive: bool | type[_NOT_SET] = _NOT_SET,
+            **kwargs,
+    ):
+        if bases:
+            for nc in (NotInstantiable,):
+                if nc not in bases:
+                    bases += (nc,)
+
+        if check_values is _NOT_SET:
+            check_values = mcls.__namespace_check_values__
+        if case_insensitive is _NOT_SET:
+            case_insensitive = mcls.__namespace_case_insensitive__
+
+        cls = super().__new__(
+            mcls,
+            name,
+            bases,
+            namespace,
+            **kwargs,
+        )
+
+        cls.__namespace_check_values__ = check_values
+        cls.__namespace_case_insensitive__ = case_insensitive  # type: ignore
+
+        if isinstance(check_values, (type, tuple)):
+            cvt = check_values
+
+            def _cv(o):
+                if not isinstance(o, cvt):
+                    raise TypeError(o, cvt)
+                return True
+
+            check_values = _cv
+
+        a_dct: dict[str, V] = {}
+        v_dct: dict[str, V] = {}
+        for b_cls in cls.__mro__[-2::-1]:
+            # FIXME: must list() to avoid `RuntimeError: dictionary changed size during iteration`
+            for att in list(b_cls.__dict__):
+                if att.startswith('_') or att in a_dct:
+                    continue
+
+                name = att
+                if case_insensitive:
+                    name = att.lower()
+                    if name in v_dct:
+                        raise NameError(f'Ambiguous case-insensitive namespace attr: {name!r}, {att!r}')
+
+                obj = getattr(cls, att)
+                if check_values is not None and not check_values(obj):
+                    raise ValueError(obj)
+
+                a_dct[att] = obj
+                v_dct[name] = obj
+
+        cls.__namespace_attrs__ = a_dct
+        cls.__namespace_values__ = v_dct
+
+        return cls
+
+    def __iter__(cls) -> ta.Iterator[tuple[str, V]]:
+        return iter(cls.__namespace_attrs__.items())
+
+    def __contains__(self, n: str) -> bool:
+        return n in self.__namespace_values__
+
+    def __getitem__(cls, n: str) -> V:
+        if cls.__namespace_case_insensitive__:
+            n = n.lower()
+        return cls.__namespace_values__[n]
+
+
+class NamespaceMeta(GenericNamespaceMeta[ta.Any]):
+    pass
+
+
+class Namespace(metaclass=NamespaceMeta):
+    pass

omlish/lang/classes/simple.py

@@ -25,35 +25,6 @@ class SimpleMetaDict(dict):
 ##
 
 
-class _NamespaceMeta(abc.ABCMeta):
-    def __new__(mcls, name, bases, namespace):
-        if bases:
-            for nc in (NotInstantiable,):
-                if nc not in bases:
-                    bases += (nc,)
-        return super().__new__(mcls, name, bases, namespace)
-
-    def __iter__(cls) -> ta.Iterator[tuple[str, ta.Any]]:
-        seen: set[str] = set()
-        for bcls in reversed(cls.__mro__):
-            for a in bcls.__dict__:
-                if a in seen:
-                    continue
-                seen.add(a)
-                if not a.startswith('_'):
-                    yield (a, getattr(cls, a))
-
-    def __getitem__(cls, n: str) -> ta.Any:
-        return getattr(cls, n)
-
-
-class Namespace(metaclass=_NamespaceMeta):
-    pass
-
-
-##
-
-
 _MARKER_NAMESPACE_KEYS: set[str] | None = None
 
 

{omlish-0.0.0.dev319.dist-info → omlish-0.0.0.dev320.dist-info}/METADATA

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

{omlish-0.0.0.dev319.dist-info → omlish-0.0.0.dev320.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=BUm8C0RUF_mH5RRsEW0hH9yf1ygPXOnka9jzpOJkyck,3478
+omlish/__about__.py,sha256=FeukuYwaj2C76Mzk3hq5wOg3XQJAHeMSMrlYj3FUAow,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -76,8 +76,9 @@ omlish/codecs/funcs.py,sha256=p4imNt7TobyZVXWC-WhntHVu9KfJrO4QwdtPRh-cVOk,850
 omlish/codecs/registry.py,sha256=2FnO5YP7ui1LzkguwESY0MP3WIdwgPTIJTM_4RyTOEg,3896
 omlish/codecs/standard.py,sha256=eiZ4u9ep0XrA4Z_D1zJI0vmWyuN8HLrX4Se_r_Cq_ZM,60
 omlish/codecs/text.py,sha256=JzrdwMpQPo2NBBg3K1EZszzQy5vEWmd82SIerJd4yeQ,5723
-omlish/collections/__init__.py,sha256=YHnllmObi8oL_q3h6SMjim7VaNaABmCGUSIiOh2cF2c,2333
+omlish/collections/__init__.py,sha256=7r4qY9paGL-pC8ZNJn6taod9T2qAyMjIpcL7ptb8GaI,2394
 omlish/collections/abc.py,sha256=ikTJlJ5dhXjU6tlNsI0Wm0_7GaIEpe3mftpvdGY_nc8,2620
+omlish/collections/bimap.py,sha256=8lPBCE7B99FgNZMFFYY1iWI_Q1D0whlbELRuJr5_eh0,1647
 omlish/collections/coerce.py,sha256=tAls15v_7p5bUN33R7Zbko87KW5toWHl9fRialCqyNY,7030
 omlish/collections/errors.py,sha256=shcS-NCnEUudF8qC_SmO2TQyjivKlS4TDjaz_faqQ0c,44
 omlish/collections/frozen.py,sha256=LMbAHYDENIQk1hvjCTvpnx66m1TalrHa4CSn8n_tsXQ,4142
@@ -225,7 +226,7 @@ omlish/dispatch/_dispatch3.py,sha256=9Zjd7bINAC3keiaBdssc4v5dY0-8OI6XooV2DR9U7Z0
 omlish/dispatch/dispatch.py,sha256=KA5l49AiGLRjp4J7RDJW9RiDp9WUD1ewR1AOPEF8g38,3062
 omlish/dispatch/functions.py,sha256=cwNzGIg2ZIalEgn9I03cnJVbMTHjWloyDTaowlO3UPs,1524
 omlish/dispatch/impls.py,sha256=K_okKvpZml4NkTHJmTVyMQSrIaIJcqTEgkreGwukaOw,1895
-omlish/dispatch/methods.py,sha256=sSGA52swdrdHEbm_jAPBZVoKP9xMIfVcw2MnTvIJtrI,8913
+omlish/dispatch/methods.py,sha256=GdVsC-Zo3N-OorE0mr3lFI70dATkD2aWqZ8TvExiR5k,9297
 omlish/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/docker/all.py,sha256=xXRgJgLGPwAtr7bDMJ_Dp9jTfOwfGvohNhc6LsoELJc,514
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
@@ -403,7 +404,7 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=c4hArZEVV8y9_dFfmRwakusv1cWJLT4MkTkGRjnGN5U,2556
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
-omlish/lang/__init__.py,sha256=ZtAmS2HiXPaJexoyPXD2fCl-8DNA4s8zlErlvhU_2o0,6045
+omlish/lang/__init__.py,sha256=FvYmM3q0Z2wYOq0m7DWiksMSYgszdxWrSHDHFetpW_0,6135
 omlish/lang/attrs.py,sha256=i7euRF81uNF8QDmUVXSK_BtqLGshaMi4VVdUnMjiMwg,5050
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -431,9 +432,10 @@ omlish/lang/cached/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 omlish/lang/cached/function.py,sha256=tch6VlDljfUUFMP61RY0LYXYyNwj1Sy8CAQQQMHCypA,11344
 omlish/lang/cached/property.py,sha256=WHYyg4-6EA86TcNMfbXTjVhjEZPc0kngt9hfY3WN5w8,2768
 omlish/lang/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/lang/classes/abstract.py,sha256=n4rDlDraUKxPF0GtOWEFZ6mEzEDmP7Z8LSI6Jww_thw,3715
+omlish/lang/classes/abstract.py,sha256=A-Jg5X8o_WvFryN0Cm2TpVkrZoTT1SYKQnv_pXjZk7o,3808
+omlish/lang/classes/namespaces.py,sha256=_FBLekx2gNLql1C1ZRlpBtxuLWbcdFEzBm8CrD5XeOA,3589
 omlish/lang/classes/restrict.py,sha256=nCsQuSFsKTwLhYfmwZr9af00qdVA8TuPQXaSJQNKzBI,3543
-omlish/lang/classes/simple.py,sha256=XQ8b86WvQA0qtSYqlbMOJS7tHgE8sv9onda33uQmbkM,3294
+omlish/lang/classes/simple.py,sha256=2C7u8k0K75xzcr6DT8zYd8U-1Yr_Xq1pfF3a0J6wo3g,2538
 omlish/lang/classes/virtual.py,sha256=z0MYQD9Q5MkX8DzF325wDB4J9XoYbsB09jZ1omC62To,3366
 omlish/lifecycles/__init__.py,sha256=1FjYceXs-4fc-S-C9zFYmc2axHs4znnQHcJVHdY7a6E,578
 omlish/lifecycles/abstract.py,sha256=70CQyZy-c9a2o0ZJxPeUT7eYjWZTBrp2HpUBnrHdAOM,1109
@@ -854,9 +856,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev319.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev319.dist-info/METADATA,sha256=AJfjWjvSfK3uESd-jYGGUmEgPjkW22rJLSBh3h6hGbk,4416
-omlish-0.0.0.dev319.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-omlish-0.0.0.dev319.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev319.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev319.dist-info/RECORD,,
+omlish-0.0.0.dev320.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev320.dist-info/METADATA,sha256=vbJ5M90IBzxV3KWEV0QnEI-t7UtQCT6RI2XftEOlcZE,4416
+omlish-0.0.0.dev320.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+omlish-0.0.0.dev320.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev320.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev320.dist-info/RECORD,,