omlish 0.0.0.dev97__py3-none-any.whl → 0.0.0.dev99__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev97'
-__revision__ = '4adbb70454ff03be6ca98d986f768deff72e6e7f'
+__version__ = '0.0.0.dev99'
+__revision__ = '68bd172d5acce0086e88d20a01fe294fc1fc390c'
 
 
 #
@@ -47,7 +47,7 @@ class Project(ProjectBase):
 
             'python-snappy ~= 0.7',
 
-            'zstd ~= 1.5',
+            'zstandard ~= 0.23',
         ],
 
         'diag': [
@@ -67,7 +67,7 @@ class Project(ProjectBase):
 
             'cbor2 ~= 5.6',
 
-            'cloudpickle ~= 3.0',
+            'cloudpickle ~= 3.1',
         ],
 
         'http': [

omlish/cached.py

@@ -1,3 +1,14 @@
+"""
+This module solely exists for import convenience - tools will tend to resolve the imported 'property' as if it were from
+builtins and thus not distinguish it from a normal property.
+
+    from omlish import cached
+
+    class C:
+        @cached.property
+        def p(self) -> str: ...
+
+"""
 from .lang.cached import _CachedProperty  # noqa
 from .lang.cached import cached_function
 

omlish/collections/__init__.py

@@ -37,6 +37,13 @@ from .frozen import (  # noqa
     frozenlist,
 )
 
+from .hasheq import (  # noqa
+    HashEq,
+    HashEqMap,
+    HashEq_,
+    hash_eq,
+)
+
 from .identity import (  # noqa
     IdentityKeyDict,
     IdentitySet,

omlish/collections/hasheq.py

@@ -0,0 +1,155 @@
+"""
+TODO:
+ - order preserving / linked list?
+ - ItemsView
+"""
+import abc
+import dataclasses as dc
+import typing as ta
+
+from .. import lang
+from .mappings import yield_dict_init
+
+
+K = ta.TypeVar('K')
+V = ta.TypeVar('V')
+K2 = ta.TypeVar('K2')
+V2 = ta.TypeVar('V2')
+
+
+class HashEq(lang.Abstract, ta.Generic[K]):
+    @abc.abstractmethod
+    def hash(self, k: K) -> int:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def eq(self, l: K, r: K) -> bool:
+        raise NotImplementedError
+
+
+@lang.unabstract_class([
+    ('hash', '_hash'),
+    ('eq', '_eq'),
+])
+@dc.dataclass(frozen=True)
+class HashEq_(ta.Generic[K]):  # noqa
+    hash: ta.Callable[[K], int]
+    eq: ta.Callable[[K, K], bool]
+
+    def _hash(self, k: K) -> int:
+        return self.hash(k)
+
+    def _eq(self, l: K, r: K) -> bool:
+        return self.eq(l, r)
+
+
+class hash_eq(HashEq[K], lang.NotInstantiable, lang.Final):  # noqa
+    """Workaround for PEP 695 support."""
+
+    def __new__(  # type: ignore[misc]
+            cls,
+            hash: ta.Callable[[K], int],  # noqa
+            eq: ta.Callable[[K, K], bool],
+    ) -> HashEq[K]:
+        return HashEq_(hash, eq)  # type: ignore
+
+    def hash(self, k: K) -> int:
+        raise TypeError
+
+    def eq(self, l: K, r: K) -> bool:
+        raise TypeError
+
+
+class HashEqMap(ta.Mapping[K, V]):
+    class _Node(ta.NamedTuple, ta.Generic[K2, V2]):
+        k: K2
+        v: V2
+        h: int
+
+    def __init__(self, hash_eq: HashEq[K], *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__()
+
+        self._hash_eq = hash_eq
+        self._dct: dict[int, list[HashEqMap._Node[K, V]]] = {}
+        self._len = 0
+
+        for k, v in yield_dict_init(*args, **kwargs):
+            self[k] = v
+
+    def __len__(self) -> int:
+        return self._len
+
+    def __contains__(self, k: K) -> bool:  # type: ignore[override]
+        h = self._hash_eq.hash(k)
+        try:
+            l = self._dct[h]
+        except KeyError:
+            return False
+        return any(self._hash_eq.eq(k, e.k) for e in l)
+
+    def __getitem__(self, k: K) -> V:
+        h = self._hash_eq.hash(k)
+        l = self._dct[h]
+        for e in l:
+            if self._hash_eq.eq(k, e.k):
+                return e.v
+        raise KeyError(k)
+
+    def __setitem__(self, k: K, v: V) -> None:
+        h = self._hash_eq.hash(k)
+        n = HashEqMap._Node(k, v, h)
+
+        try:
+            l = self._dct[h]
+        except KeyError:
+            l = [n]
+            self._dct[h] = l
+            self._len += 1
+            return
+
+        for i, e in enumerate(l):
+            if self._hash_eq.eq(k, e.k):
+                l[i] = n
+                return
+
+        l.append(n)
+        self._len += 1
+
+    def __delitem__(self, k: K) -> None:
+        h = self._hash_eq.hash(k)
+        l = self._dct[h]
+        for i, e in enumerate(l):
+            if self._hash_eq.eq(k, e.k):
+                del l[i]
+                self._len -= 1
+                return
+        raise KeyError(k)
+
+    def __iter__(self) -> ta.Iterator[K]:
+        return self.iterkeys()
+
+    def iterkeys(self) -> ta.Iterator[K]:
+        for l in self._dct.values():
+            for e in l:
+                yield e.k
+
+    def itervalues(self) -> ta.Iterator[V]:
+        for l in self._dct.values():
+            for e in l:
+                yield e.v
+
+    def iteritems(self) -> ta.Iterator[tuple[K, V]]:
+        for l in self._dct.values():
+            for e in l:
+                yield (e.k, e.v)
+
+    # FIXME:
+
+    def keys(self) -> ta.Iterable[K]:  # type: ignore[override]
+        return lang.itergen(self.iterkeys)
+
+    def values(self) -> ta.Iterable[V]:  # type: ignore[override]
+        return lang.itergen(self.itervalues)
+
+    def items(self) -> ta.Iterable[tuple[K, V]]:  # type: ignore[override]
+        return lang.itergen(self.iteritems)

omlish/fnpairs.py

@@ -38,7 +38,7 @@ if ta.TYPE_CHECKING:
     import lz4.frame as _lz4_frame
     import snappy as _snappy
     import yaml as _yaml
-    import zstd as _zstd
+    import zstandard as _zstandard
 
 else:
     _bz2 = lang.proxy_import('bz2')
@@ -55,7 +55,7 @@ else:
     _lz4_frame = lang.proxy_import('lz4.frame')
     _snappy = lang.proxy_import('snappy')
     _yaml = lang.proxy_import('yaml')
-    _zstd = lang.proxy_import('zstd')
+    _zstandard = lang.proxy_import('zstandard')
 
 
 ##
@@ -92,6 +92,10 @@ class FnPair(ta.Generic[F, T], abc.ABC):
 ##
 
 
+@lang.unabstract_class([
+    ('forward', '_forward'),
+    ('backward', 'backward'),
+])
 @dc.dataclass(frozen=True)
 class Simple(FnPair[F, T]):
     forward: ta.Callable[[F], T]  # type: ignore
@@ -104,12 +108,6 @@ class Simple(FnPair[F, T]):
         return self.backward(t)
 
 
-# HACK: ABC workaround. Our dataclasses handle this with `override=True` but we don't want to dep that in here.
-Simple.forward = Simple._forward  # type: ignore  # noqa
-Simple.backward = Simple._backward  # type: ignore  # noqa
-Simple.__abstractmethods__ = frozenset()  # noqa
-
-
 of = Simple
 
 NOP: FnPair[ta.Any, ta.Any] = of(lang.identity, lang.identity)
@@ -356,10 +354,10 @@ class Snappy(Compression):
 @_register_extension('zstd')
 class Zstd(Compression):
     def forward(self, f: bytes) -> bytes:
-        return _zstd.compress(f)
+        return _zstandard.compress(f)
 
     def backward(self, t: bytes) -> bytes:
-        return _zstd.decompress(t)
+        return _zstandard.decompress(t)
 
 
 ##

omlish/lang/__init__.py

@@ -31,6 +31,7 @@ from .classes import (  # noqa
     is_abstract_method,
     make_abstract,
     no_bool,
+    unabstract_class,
     virtual_check,
 )
 

omlish/lang/classes/__init__.py

@@ -4,6 +4,7 @@ from .abstract import (  # noqa
     is_abstract_class,
     is_abstract_method,
     make_abstract,
+    unabstract_class,
 )
 
 from .restrict import (  # noqa

omlish/lang/classes/abstract.py

@@ -72,3 +72,16 @@ def is_abstract_class(obj: ta.Any) -> bool:
 
 def is_abstract(obj: ta.Any) -> bool:
     return is_abstract_method(obj) or is_abstract_class(obj)
+
+
+def unabstract_class(
+        impls: ta.Iterable[tuple[str, ta.Any]],
+) -> ta.Callable[[type[T]], type[T]]:
+    def inner(cls):
+        for name, impl in impls:
+            if isinstance(impl, str):
+                impl = getattr(cls, impl)
+            setattr(cls, name, impl)
+        setattr(cls, '__abstractmethods__', frozenset())
+        return cls
+    return inner

{omlish-0.0.0.dev97.dist-info → omlish-0.0.0.dev99.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev97
+Version: 0.0.0.dev99
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -20,7 +20,7 @@ Requires-Dist: trio ~=0.27 ; extra == 'all'
 Requires-Dist: trio-asyncio ~=0.15 ; extra == 'all'
 Requires-Dist: lz4 ~=4.3 ; extra == 'all'
 Requires-Dist: python-snappy ~=0.7 ; extra == 'all'
-Requires-Dist: zstd ~=1.5 ; extra == 'all'
+Requires-Dist: zstandard ~=0.23 ; extra == 'all'
 Requires-Dist: asttokens ~=2.4 ; extra == 'all'
 Requires-Dist: executing ~=2.1 ; extra == 'all'
 Requires-Dist: psutil ~=6.0 ; extra == 'all'
@@ -29,7 +29,7 @@ Requires-Dist: ujson ~=5.10 ; extra == 'all'
 Requires-Dist: json5 ~=0.9 ; extra == 'all'
 Requires-Dist: pyyaml ~=6.0 ; extra == 'all'
 Requires-Dist: cbor2 ~=5.6 ; extra == 'all'
-Requires-Dist: cloudpickle ~=3.0 ; extra == 'all'
+Requires-Dist: cloudpickle ~=3.1 ; extra == 'all'
 Requires-Dist: httpx[http2] ~=0.27 ; extra == 'all'
 Requires-Dist: wrapt ~=1.14 ; extra == 'all'
 Requires-Dist: cryptography ~=43.0 ; extra == 'all'
@@ -52,7 +52,7 @@ Requires-Dist: trio-asyncio ~=0.15 ; extra == 'async'
 Provides-Extra: compress
 Requires-Dist: lz4 ~=4.3 ; extra == 'compress'
 Requires-Dist: python-snappy ~=0.7 ; extra == 'compress'
-Requires-Dist: zstd ~=1.5 ; extra == 'compress'
+Requires-Dist: zstandard ~=0.23 ; extra == 'compress'
 Provides-Extra: diag
 Requires-Dist: asttokens ~=2.4 ; extra == 'diag'
 Requires-Dist: executing ~=2.1 ; extra == 'diag'
@@ -63,7 +63,7 @@ Requires-Dist: ujson ~=5.10 ; extra == 'formats'
 Requires-Dist: json5 ~=0.9 ; extra == 'formats'
 Requires-Dist: pyyaml ~=6.0 ; extra == 'formats'
 Requires-Dist: cbor2 ~=5.6 ; extra == 'formats'
-Requires-Dist: cloudpickle ~=3.0 ; extra == 'formats'
+Requires-Dist: cloudpickle ~=3.1 ; extra == 'formats'
 Provides-Extra: http
 Requires-Dist: httpx[http2] ~=0.27 ; extra == 'http'
 Provides-Extra: misc

{omlish-0.0.0.dev97.dist-info → omlish-0.0.0.dev99.dist-info}/RECORD

@@ -1,14 +1,14 @@
 omlish/.manifests.json,sha256=hTFp9tvE72BxKloIq1s1SS0LRQlIsvMtO69Sbc47rKg,1704
-omlish/__about__.py,sha256=eIwAtZZmvmulh4BBWUEeTYaDxG6LjN2S_3Q71pIDNfI,3345
+omlish/__about__.py,sha256=6713nqxxPtA38L0r9uYNrMgouxInTcm_aUGG-SmXVbI,3351
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
-omlish/cached.py,sha256=UAizxlH4eMWHPzQtmItmyE6FEpFEUFzIkxaO2BHWZ5s,196
+omlish/cached.py,sha256=vn3ZiKy0d3NW_kzoXCi_Fg_s5vUcH0LQ1idfKBcQhzk,489
 omlish/check.py,sha256=rZFEn6IHiMq4KGCYxlUGcUCJP12pPPUs_-AG0aouPM8,10540
 omlish/datetimes.py,sha256=HajeM1kBvwlTa-uR1TTZHmZ3zTPnnUr1uGGQhiO1XQ0,2152
 omlish/defs.py,sha256=T3bq_7h_tO3nDB5RAFBn7DkdeQgqheXzkFColbOHZko,4890
 omlish/dynamic.py,sha256=35C_cCX_Vq2HrHzGk5T-zbrMvmUdiIiwDzDNixczoDo,6541
-omlish/fnpairs.py,sha256=wHm1AUt-bwDCGnWrKrE2ppJav5OBm39lTyeHGaMTLBo,10885
+omlish/fnpairs.py,sha256=vCuZqLz2IAM3PDaJQE3r1A4EjyrCyUNoCOjoa_SmKCU,10723
 omlish/fnpipes.py,sha256=AJkgz9nvRRm7oqw7ZgYyz21klu276LWi54oYCLg-vOg,2196
 omlish/genmachine.py,sha256=RlU-y_dt2nRdvoo7Z3HsUELlBn3KuyI4qUnqLVbChRI,2450
 omlish/iterators.py,sha256=GGLC7RIT86uXMjhIIIqnff_Iu5SI_b9rXYywYGFyzmo,7292
@@ -94,12 +94,13 @@ omlish/bootstrap/harness.py,sha256=VW8YP-yENGyXIuJ8GL_xintArF13nafwpz-iAghPt34,1
 omlish/bootstrap/main.py,sha256=yZhOHDDlj4xB5a89dRdT8z58FsqqnpoBg1-tvY2CJe4,5903
 omlish/bootstrap/marshal.py,sha256=ZxdAeMNd2qXRZ1HUK89HmEhz8tqlS9OduW34QBscKw0,516
 omlish/bootstrap/sys.py,sha256=iLHUNIuIPv-k-Mc6aHj5sSET78olCVt7t0HquFDO4iQ,8762
-omlish/collections/__init__.py,sha256=tGUzvS_ZjiqALsLRy7JX3h4KZRQX2CmtdAfTRD7UwMk,1677
+omlish/collections/__init__.py,sha256=JFphLT_jEe-h_YBKyjrI0RT4KgNvjPXRErebBHwIHfY,1763
 omlish/collections/_abc.py,sha256=sP7BpTVhx6s6C59mTFeosBi4rHOWC6tbFBYbxdZmvh0,2365
 omlish/collections/_io_abc.py,sha256=Cxs8KB1B_69rxpUYxI-MTsilAmNooJJn3w07DKqYKkE,1255
 omlish/collections/coerce.py,sha256=o11AMrUiyoadd8WkdqeKPIpXf2xd0LyylzNCyJivCLU,7036
 omlish/collections/exceptions.py,sha256=shcS-NCnEUudF8qC_SmO2TQyjivKlS4TDjaz_faqQ0c,44
 omlish/collections/frozen.py,sha256=DGxemj_pVID85tSBm-Wns_x4ov0wOEIT6X5bVgJtmkA,4152
+omlish/collections/hasheq.py,sha256=UXgZQycBTgPLtwt4onBlNzmjy1zuAw32xuUvOwpwM6g,3813
 omlish/collections/identity.py,sha256=jhEpC8tnfh3Sg-MJff1Fp9eMydt150wits_UeVdctUk,2723
 omlish/collections/indexed.py,sha256=tFQsIWH4k9QqsF5VB7DsIVNsRThiQNx-ooRF36X_PnU,2203
 omlish/collections/mappings.py,sha256=eEifLZez-BWunTuj6974bGxBFfNRODZpu6Oa7_2ME94,3190
@@ -256,7 +257,7 @@ omlish/inject/impl/privates.py,sha256=alpCYyk5VJ9lJknbRH2nLVNFYVvFhkj-VC1Vco3zCF
 omlish/inject/impl/providers.py,sha256=QnwhsujJFIHC0JTgd2Wlo1kP53i3CWTrj1nKU2DNxwg,2375
 omlish/inject/impl/proxy.py,sha256=1ko0VaKqzu9UG8bIldp9xtUrAVUOFTKWKTjOCqIGr4s,1636
 omlish/inject/impl/scopes.py,sha256=ASfULXgP_ETlsAqFJfrZmyEaZt64Zr8tNn5ScA-EoXk,5900
-omlish/lang/__init__.py,sha256=pCZoKj7wnFeyl_f7AKBg3Ajl1vrInkqP7miRcjIy6tI,3666
+omlish/lang/__init__.py,sha256=pKAxhQe2qbN9pDXPOz9_MRxTKJPPWHZyAkWoAaZ9P4M,3688
 omlish/lang/cached.py,sha256=92TvRZQ6sWlm7dNn4hgl7aWKbX0J1XUEo3DRjBpgVQk,7834
 omlish/lang/clsdct.py,sha256=AjtIWLlx2E6D5rC97zQ3Lwq2SOMkbg08pdO_AxpzEHI,1744
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
@@ -275,8 +276,8 @@ omlish/lang/strings.py,sha256=BsciSYnckD4vGtC6kmtnugR9IN6CIHdcjO4nZu-pSAw,3898
 omlish/lang/sys.py,sha256=UoZz_PJYVKLQAKqYxxn-LHz1okK_38I__maZgnXMcxU,406
 omlish/lang/timeouts.py,sha256=vECdWYhc_IZgcal1Ng1Y42wf2FV3KAx-i8As-MgGHIQ,1186
 omlish/lang/typing.py,sha256=lJ2NGe4Pmb61I0Tx4A_rOqXNFTws1XHOzafg2knRUio,4155
-omlish/lang/classes/__init__.py,sha256=h9QXrvAKD17_pIog0uF-7BCqZbSpJZYxL7kzVzvljp0,583
-omlish/lang/classes/abstract.py,sha256=IRnjuLLNwpxvEJsp8fwoQdCIpw0MDAd0TiQfoDMgsn4,2306
+omlish/lang/classes/__init__.py,sha256=D3dn4FOQu5f50kW4_jLCI_zI0fTtADdYumirRdIqSuU,605
+omlish/lang/classes/abstract.py,sha256=oleeYCMVbmFAy8aNLNKeb18Jmmgzfolymdw31m4tejQ,2679
 omlish/lang/classes/restrict.py,sha256=pSK7ZT_kpwqS6lWRrxwuEe-tt07F0-uZVazgGh-HDco,3921
 omlish/lang/classes/simple.py,sha256=XQ8b86WvQA0qtSYqlbMOJS7tHgE8sv9onda33uQmbkM,3294
 omlish/lang/classes/virtual.py,sha256=W-QJuKsDehOcrydwg6eMN0bFPTYbk3Tz84TSH3blb44,3367
@@ -457,9 +458,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev97.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev97.dist-info/METADATA,sha256=wmMErtqPFPYd69wceqTe57xiockAvRmzLhdroKiURz4,3987
-omlish-0.0.0.dev97.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-omlish-0.0.0.dev97.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev97.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev97.dist-info/RECORD,,
+omlish-0.0.0.dev99.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev99.dist-info/METADATA,sha256=dlvMKXrg8JClykUv0QJZisR5FWrEFVDWqr5W07gAKP0,3999
+omlish-0.0.0.dev99.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+omlish-0.0.0.dev99.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev99.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev99.dist-info/RECORD,,