omlish 0.0.0.dev62__py3-none-any.whl → 0.0.0.dev64__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev62'
-__revision__ = 'a5ef2d1548d1cdfb856b4a7ff99fe61080ab791e'
+__version__ = '0.0.0.dev64'
+__revision__ = '65b4d26bc20b482253b288f29eebe58b9ae531dd'
 
 
 #
@@ -92,7 +92,7 @@ class Project(ProjectBase):
             # 'psycopg ~= 3.2',
 
             'pymysql ~= 1.1',
-            # 'mysql-connector-python ~= 9.0',
+            # 'mysql-connector-python ~= 9.1',
             # 'mysqlclient ~= 2.2',
 
             'aiomysql ~= 0.2',

omlish/argparse.py

@@ -70,7 +70,7 @@ def arg(*args, **kwargs) -> Arg:
 #
 
 
-CommandFn = ta.Callable[[], None]
+CommandFn = ta.Callable[[], int | None]
 
 
 @dc.dataclass(eq=False)
@@ -96,9 +96,9 @@ class Command:
     def __get__(self, instance, owner=None):
         if instance is None:
             return self
-        return dc.replace(self, fn=self.fn.__get__(instance, owner))
+        return dc.replace(self, fn=self.fn.__get__(instance, owner))  # noqa
 
-    def __call__(self, *args, **kwargs) -> None:
+    def __call__(self, *args, **kwargs) -> int | None:
         return self.fn(*args, **kwargs)
 
 
@@ -234,10 +234,10 @@ class Cli(metaclass=_CliMeta):
     def unknown_args(self) -> ta.Sequence[str]:
         return self._unknown_args
 
-    def _run_cmd(self, cmd: Command) -> None:
-        cmd.__get__(self, type(self))()
+    def _run_cmd(self, cmd: Command) -> int | None:
+        return cmd.__get__(self, type(self))()
 
-    def __call__(self) -> None:
+    def __call__(self) -> int | None:
         cmd = getattr(self.args, '_cmd', None)
 
         if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
@@ -249,6 +249,9 @@ class Cli(metaclass=_CliMeta):
 
         if cmd is None:
             self.get_parser().print_help()
-            return
+            return 0
 
-        self._run_cmd(cmd)
+        return self._run_cmd(cmd)
+
+    def call_and_exit(self) -> ta.NoReturn:
+        sys.exit(rc if isinstance(rc := self(), int) else 0)

omlish/bootstrap/main.py

@@ -83,7 +83,7 @@ def _add_arguments(parser: argparse.ArgumentParser) -> None:
             else:
                 raise TypeError(fld)
 
-            parser.add_argument(aname, action=_OrderedArgsAction, **kw)
+            parser.add_argument(aname.replace('_', '-'), action=_OrderedArgsAction, **kw)
 
 
 def _process_arguments(args: ta.Any) -> ta.Sequence[Bootstrap.Config]:

omlish/collections/indexed.py

@@ -13,7 +13,7 @@ class IndexedSeq(ta.Sequence[T]):
         super().__init__()
 
         self._lst = list(it)
-        self._idxs = (IdentityKeyDict if identity else dict)(map(reversed, enumerate(self._lst)))
+        self._idxs: ta.Mapping[T, int] = (IdentityKeyDict if identity else dict)((e, i) for i, e in enumerate(self._lst))  # noqa
         if len(self._idxs) != len(self._lst):
             raise ValueError(f'{len(self._idxs)} != {len(self._lst)}')
 
@@ -47,7 +47,7 @@ class IndexedSetSeq(ta.Sequence[ta.AbstractSet[T]]):
         super().__init__()
 
         self._lst = [(IdentitySet if identity else set)(e) for e in it]
-        self._idxs = (IdentityKeyDict if identity else dict)((e, i) for i, es in enumerate(self._lst) for e in es)
+        self._idxs: ta.Mapping[T, int] = (IdentityKeyDict if identity else dict)((e, i) for i, es in enumerate(self._lst) for e in es)  # noqa
         if len(self._idxs) != sum(map(len, self._lst)):
             raise ValueError(f'{len(self._idxs)} != {sum(map(len, self._lst))}')
 

omlish/docker/__init__.py

@@ -24,4 +24,6 @@ from .helpers import (  # noqa
 from .hub import (  # noqa
     HubRepoInfo,
     get_hub_repo_info,
+    select_latest_tag,
+    split_tag_suffix,
 )

omlish/docker/hub.py

@@ -1,15 +1,79 @@
 import typing as ta
+import urllib.error
 import urllib.request
 
+from .. import check
 from .. import dataclasses as dc
 from ..formats import json
 
 
+##
+
+
+def _tag_sort_key(s: str) -> tuple:
+    l = []
+    for p in s.split('.'):
+        v: ta.Any
+        try:
+            v = int(p)
+        except ValueError:
+            v = s
+        l.append((not isinstance(v, int), v))
+    return tuple(l)
+
+
+DEFAULT_TAG_SUFFIX_DELIM = '-+'
+
+
+def split_tag_suffix(
+        tag: str,
+        suffix_delim: ta.Iterable[str] = DEFAULT_TAG_SUFFIX_DELIM,
+) -> tuple[str, str | None]:
+    for d in suffix_delim:
+        if d in tag:
+            p, _, s = tag.partition(d)
+            return p, s
+    return tag, None
+
+
+def select_latest_tag(
+        tags: ta.Iterable[str],
+        *,
+        base: str | None = None,
+        suffix: str | None = None,
+        suffix_delim: ta.Iterable[str] = '-+',
+) -> str:
+    check.not_isinstance(tags, str)
+
+    tags_by_sfx: dict[str | None, set[tuple[tuple, str]]] = {}
+    for t in tags:
+        p, s = split_tag_suffix(t, suffix_delim)
+        tags_by_sfx.setdefault(s, set()).add((_tag_sort_key(p), t))
+
+    if base is not None:
+        bp, bs = split_tag_suffix(base, suffix_delim)
+        if suffix is None:
+            suffix = bs
+        base_key = _tag_sort_key(bp)
+    else:
+        base_key = None
+
+    sl = sorted(tags_by_sfx[suffix])
+
+    if base_key is not None:
+        sl = [(k, t) for k, t in sl if k[0] == base_key[0]]
+
+    return sl[-1][1]
+
+
+##
+
+
 @dc.dataclass(frozen=True)
 class HubRepoInfo:
     repo: str
-    tags: ta.Mapping[str, ta.Any]
-    latest_manifests: ta.Mapping[str, ta.Any]
+    tags: ta.Sequence[str]
+    manifests: ta.Mapping[str, ta.Mapping[str, ta.Any]]
 
 
 def get_hub_repo_info(
@@ -17,7 +81,9 @@ def get_hub_repo_info(
         *,
         auth_url: str = 'https://auth.docker.io/',
         api_url: str = 'https://registry-1.docker.io/v2/',
-) -> HubRepoInfo:
+        tags: ta.Iterable[str] | None = None,
+        handled_codes: ta.Container[int] | None = (401, 404),
+) -> HubRepoInfo | None:
     """
     https://stackoverflow.com/a/39376254
 
@@ -36,10 +102,19 @@ def get_hub_repo_info(
         -s "https://registry-1.docker.io/v2/${repo}/manifests/latest" \
     | jq .
     """
+    if tags is not None:
+        check.not_isinstance(tags, str)
+    else:
+        tags = []
 
     auth_url = auth_url.rstrip('/')
     api_url = api_url.rstrip('/')
 
+    if '/' not in repo:
+        repo = '_/' + repo
+    if repo.startswith('_/'):
+        repo = 'library' + repo[1:]
+
     #
 
     def req_json(url: str, **kwargs: ta.Any) -> ta.Any:
@@ -55,21 +130,32 @@ def get_hub_repo_info(
 
     #
 
-    tags_dct = req_json(
-        f'{api_url}/{repo}/tags/list',
-        headers=req_hdrs,
-    )
-
-    latest_mani_dct = req_json(
-        f'{api_url}/{repo}/manifests/latest',
-        headers={
-            **req_hdrs,
-            'Accept': 'application/vnd.docker.distribution.manifest.v2+json',
-        },
-    )
+    try:
+        tags_resp = req_json(
+            f'{api_url}/{repo}/tags/list',
+            headers=req_hdrs,
+        )
+    except urllib.error.HTTPError as ue:
+        if ue.code in (handled_codes or ()):
+            return None
+        else:
+            raise
+
+    tags_dct = tags_resp.get('tags', {})
+
+    manis = {}
+    for tag in tags:
+        mani = req_json(
+            f'{api_url}/{repo}/manifests/latest',
+            headers={
+                **req_hdrs,
+                'Accept': 'application/vnd.docker.distribution.manifest.v2+json',
+            },
+        )
+        manis[tag] = mani
 
     return HubRepoInfo(
         repo,
         tags_dct,
-        latest_mani_dct,
+        manis,
     )

omlish/formats/yaml.py

@@ -225,6 +225,14 @@ def load_all(stream, Loader):  # noqa
             yield loader.get_data()
 
 
+def safe_load(stream):  # noqa
+    return load(stream, yaml.SafeLoader)
+
+
+def safe_load_all(stream):  # noqa  # noqa
+    return load_all(stream, yaml.SafeLoader)
+
+
 def full_load(stream):  # noqa
     return load(stream, yaml.FullLoader)
 

omlish/lang/classes/simple.py

@@ -14,6 +14,17 @@ V = ta.TypeVar('V')
 ##
 
 
+class SimpleMetaDict(dict):
+    def update(self, m: ta.Mapping[K, V], **kwargs: V) -> None:  # type: ignore
+        for k, v in m.items():
+            self[k] = v
+        for k, v in kwargs.items():  # type: ignore
+            self[k] = v
+
+
+##
+
+
 class _NamespaceMeta(abc.ABCMeta):
     def __new__(mcls, name, bases, namespace):
         if bases:
@@ -23,9 +34,14 @@ class _NamespaceMeta(abc.ABCMeta):
         return super().__new__(mcls, name, bases, namespace)
 
     def __iter__(cls) -> ta.Iterator[tuple[str, ta.Any]]:
-        for a in dir(cls):
-            if not a.startswith('_'):
-                yield (a, getattr(cls, a))
+        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)
@@ -75,17 +91,6 @@ class Marker(NotInstantiable, metaclass=_MarkerMeta):
 ##
 
 
-class SimpleMetaDict(dict):
-    def update(self, m: ta.Mapping[K, V], **kwargs: V) -> None:  # type: ignore
-        for k, v in m.items():
-            self[k] = v
-        for k, v in kwargs.items():  # type: ignore
-            self[k] = v
-
-
-##
-
-
 _SINGLETON_INSTANCE_ATTR = '__singleton_instance__'
 _SINGLETON_LOCK = threading.RLock()
 

omlish/lang/descriptors.py

@@ -97,15 +97,15 @@ def update_wrapper(
         assigned: ta.Iterable[str] = functools.WRAPPER_ASSIGNMENTS,
         updated: ta.Iterable[str] = functools.WRAPPER_UPDATES,
         *,
-        filter: ta.Iterable[str] | None = None,  # noqa
+        exclude: ta.Iterable[str] | None = None,
         getattr: ta.Callable = getattr,  # noqa
         setattr: ta.Callable = setattr,  # noqa
 ) -> T:
-    if filter:
-        if isinstance(filter, str):
-            filter = [filter]  # noqa
-        assigned = tuple(a for a in assigned if a not in filter)
-        updated = tuple(a for a in updated if a not in filter)
+    if exclude:
+        if isinstance(exclude, str):
+            exclude = [exclude]  # noqa
+        assigned = tuple(a for a in assigned if a not in exclude)
+        updated = tuple(a for a in updated if a not in exclude)
 
     for attr in assigned:
         try:
@@ -135,7 +135,7 @@ class _decorator_descriptor:  # noqa
     if not _DECORATOR_HANDLES_UNBOUND_METHODS:
         def __init__(self, wrapper, fn):
             self._wrapper, self._fn = wrapper, fn
-            update_wrapper(self, fn, filter='__dict__')
+            update_wrapper(self, fn, exclude='__dict__')
 
         def __get__(self, instance, owner=None):
             return functools.update_wrapper(functools.partial(self._wrapper, fn := self._fn.__get__(instance, owner)), fn)  # noqa
@@ -144,7 +144,7 @@ class _decorator_descriptor:  # noqa
         def __init__(self, wrapper, fn):
             self._wrapper, self._fn = wrapper, fn
             self._md = _has_method_descriptor(fn)
-            update_wrapper(self, fn, filter='__dict__')
+            update_wrapper(self, fn, exclude='__dict__')
 
         def __get__(self, instance, owner=None):
             fn = self._fn.__get__(instance, owner)
@@ -174,7 +174,7 @@ class _decorator_descriptor:  # noqa
 class _decorator:  # noqa
     def __init__(self, wrapper):
         self._wrapper = wrapper
-        update_wrapper(self, wrapper, filter='__dict__')
+        update_wrapper(self, wrapper, exclude='__dict__')
 
     def __repr__(self):
         return f'{self.__class__.__name__}<{self._wrapper}>'

omlish/lang/strings.py

@@ -14,7 +14,7 @@ def prefix_delimited(s: StrOrBytesT, p: StrOrBytesT, d: StrOrBytesT) -> StrOrByt
 
 
 def prefix_lines(s: StrOrBytesT, p: StrOrBytesT) -> StrOrBytesT:
-    return prefix_delimited(s, p, '\n' if isinstance(s, str) else b'\n')
+    return prefix_delimited(s, p, '\n' if isinstance(s, str) else b'\n')  # type: ignore
 
 
 def indent_lines(s: StrOrBytesT, num: StrOrBytesT) -> StrOrBytesT:

omlish/lite/marshal.py

@@ -246,29 +246,30 @@ def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
 
 
 def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
-    if isinstance(ty, type) and abc.ABC in ty.__bases__:
-        impls = [  # type: ignore
-            PolymorphicObjMarshaler.Impl(
-                ity,
-                ity.__qualname__,
-                get_obj_marshaler(ity),
+    if isinstance(ty, type):
+        if abc.ABC in ty.__bases__:
+            impls = [  # type: ignore
+                PolymorphicObjMarshaler.Impl(
+                    ity,
+                    ity.__qualname__,
+                    get_obj_marshaler(ity),
+                )
+                for ity in deep_subclasses(ty)
+                if abc.ABC not in ity.__bases__
+            ]
+            return PolymorphicObjMarshaler(
+                {i.ty: i for i in impls},
+                {i.tag: i for i in impls},
+            )
+
+        if issubclass(ty, enum.Enum):
+            return EnumObjMarshaler(ty)
+
+        if dc.is_dataclass(ty):
+            return DataclassObjMarshaler(
+                ty,
+                {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
             )
-            for ity in deep_subclasses(ty)
-            if abc.ABC not in ity.__bases__
-        ]
-        return PolymorphicObjMarshaler(
-            {i.ty: i for i in impls},
-            {i.tag: i for i in impls},
-        )
-
-    if isinstance(ty, type) and issubclass(ty, enum.Enum):
-        return EnumObjMarshaler(ty)
-
-    if dc.is_dataclass(ty):
-        return DataclassObjMarshaler(
-            ty,
-            {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
-        )
 
     if is_generic_alias(ty):
         try:

{omlish-0.0.0.dev62.dist-info → omlish-0.0.0.dev64.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev62
+Version: 0.0.0.dev64
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev62.dist-info → omlish-0.0.0.dev64.dist-info}/RECORD

@@ -1,7 +1,7 @@
 omlish/.manifests.json,sha256=jvyoQ7x8UJ9lpRgkh7eElwJ8qnzyG5aUGameT9Yk8GM,1419
-omlish/__about__.py,sha256=u-gRUFmrAMM8C-1-u6UfjGvA_1qc3iVQiZLYnMGHQxg,3420
+omlish/__about__.py,sha256=GXVeIGR5dUduDtgf1PYJSdJKJyBBSxbzWMxY1GQOHN8,3420
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/argparse.py,sha256=Vr70_85EVLJLgEkRtwOr264tMRtqtlN7ncFfXRUk5aM,6914
+omlish/argparse.py,sha256=XLrLFCLNY1RfbiXIAELkzHK-vUPum_9dyylEdJi9Pog,7068
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
 omlish/cached.py,sha256=UAizxlH4eMWHPzQtmItmyE6FEpFEUFzIkxaO2BHWZ5s,196
 omlish/check.py,sha256=fgWiBoHvqZlE8tjaxK7OMW4J8z3_rEGRENTka3EohbI,10378
@@ -91,7 +91,7 @@ omlish/bootstrap/__main__.py,sha256=4jCwsaogp0FrJjJZ85hzF4-WqluPeheHbfeoKynKvNs,
 omlish/bootstrap/base.py,sha256=d8hqn4hp1XMMi5PgcJBQXPKmW47epu8CxBlqDZiRZb4,1073
 omlish/bootstrap/diag.py,sha256=LADLhusbJ1tKxVD8-gmia1HShX1VeszRO1OApIQhSpI,5507
 omlish/bootstrap/harness.py,sha256=VW8YP-yENGyXIuJ8GL_xintArF13nafwpz-iAghPt34,1967
-omlish/bootstrap/main.py,sha256=ripSWAlYz3LVyv6S_Js9MWYO3QNKgBSaFQv3gqGjuRM,5885
+omlish/bootstrap/main.py,sha256=yZhOHDDlj4xB5a89dRdT8z58FsqqnpoBg1-tvY2CJe4,5903
 omlish/bootstrap/marshal.py,sha256=ZxdAeMNd2qXRZ1HUK89HmEhz8tqlS9OduW34QBscKw0,516
 omlish/bootstrap/sys.py,sha256=i6veZeE83wO0HTl9b6ykj_pEN05fqu0enoAv4sw5Ayc,8742
 omlish/collections/__init__.py,sha256=tGUzvS_ZjiqALsLRy7JX3h4KZRQX2CmtdAfTRD7UwMk,1677
@@ -101,7 +101,7 @@ omlish/collections/coerce.py,sha256=o11AMrUiyoadd8WkdqeKPIpXf2xd0LyylzNCyJivCLU,
 omlish/collections/exceptions.py,sha256=shcS-NCnEUudF8qC_SmO2TQyjivKlS4TDjaz_faqQ0c,44
 omlish/collections/frozen.py,sha256=DGxemj_pVID85tSBm-Wns_x4ov0wOEIT6X5bVgJtmkA,4152
 omlish/collections/identity.py,sha256=jhEpC8tnfh3Sg-MJff1Fp9eMydt150wits_UeVdctUk,2723
-omlish/collections/indexed.py,sha256=YHs_q0GALisXPKKMgeDQxZ6hMzYndqDL3m3ag8cnzH0,2143
+omlish/collections/indexed.py,sha256=tFQsIWH4k9QqsF5VB7DsIVNsRThiQNx-ooRF36X_PnU,2203
 omlish/collections/mappings.py,sha256=eEifLZez-BWunTuj6974bGxBFfNRODZpu6Oa7_2ME94,3190
 omlish/collections/ordered.py,sha256=RzEC3fHvrDeJQSWThVDNYQKke263Vje1II5YwtDwT1Q,2335
 omlish/collections/persistent.py,sha256=KG471s0bhhReQrjlmX0xaN9HeAIcrtT264ddZCxsExo,875
@@ -168,16 +168,16 @@ omlish/dispatch/_dispatch3.py,sha256=Vnu5DfoPWFJLodudBqoZBXGTi2wYk-Az56MXJgdQvwc
 omlish/dispatch/dispatch.py,sha256=8XQiLVoAq4u2oO0DnDSXQB9Q5qDk569l4CIFBqwDSyc,3847
 omlish/dispatch/functions.py,sha256=S8ElsLi6DKxTdtFGigWaF0vAquwy2sK-3f4iRLaYq70,1522
 omlish/dispatch/methods.py,sha256=XHjwwC9Gn4iDWxbyLAcbdSwRgVaq-8Bnn5cAwf5oZdA,5403
-omlish/docker/__init__.py,sha256=LGL5ByHrd7EaQnIDO6eLQvovDamngUiTfnpThV_4-MA,437
+omlish/docker/__init__.py,sha256=dmda-4zBo0UM_CMws_1MOwtyObdF79LB0HF5IT3sDVk,482
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
 omlish/docker/compose.py,sha256=4drmnGQzbkOFJ9B6XSg9rnXkJeZz1ETmdcMe1PE790U,1237
 omlish/docker/helpers.py,sha256=j2eZIqIUpy34ZmoGyIzsYuKx9HeewwYBfrGNC99EFYk,928
-omlish/docker/hub.py,sha256=YcDYOi6t1FA2Sp0RVrmZ9cBXbzFWQ8wTps3wOskA-K0,1955
+omlish/docker/hub.py,sha256=7LIuJGdA-N1Y1dmo50ynKM1KUTcnQM_5XbtPbdT_QLU,3940
 omlish/docker/manifests.py,sha256=LR4FpOGNUT3bZQ-gTjB6r_-1C3YiG30QvevZjrsVUQM,7068
 omlish/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/dotenv.py,sha256=UjZl3gac-0U24sDjCCGMcCqO1UCWG2Zs8PZ4JdAg2YE,17348
 omlish/formats/props.py,sha256=JwFJbKblqzqnzXf7YKFzQSDfcAXzkKsfoYvad6FPy98,18945
-omlish/formats/yaml.py,sha256=R3NTkjomsIfjsUNmSf_bOaCUIID3JTyHJHsliQDSYQo,6688
+omlish/formats/yaml.py,sha256=DSJXUq9yanfxdS6ufNTyBHMtIZO57LRnJj4w9fLY1aM,6852
 omlish/formats/json/__init__.py,sha256=moSR67Qkju2eYb_qVDtaivepe44mxAnYuC8OCSbtETg,298
 omlish/formats/json/__main__.py,sha256=1wxxKZVkj_u7HCcewwMIbGuZj_Wph95yrUbm474Op9M,188
 omlish/formats/json/cli.py,sha256=4zftNijlIOnGUHYn5J1s4yRDRM1K4udBzS3Kh8R2vNc,3374
@@ -242,7 +242,7 @@ omlish/lang/clsdct.py,sha256=AjtIWLlx2E6D5rC97zQ3Lwq2SOMkbg08pdO_AxpzEHI,1744
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
 omlish/lang/contextmanagers.py,sha256=NEwaTLQMfhKawD5x_0HgI2RpeLXbMa5r9NqWqfDnUXI,10408
 omlish/lang/datetimes.py,sha256=ehI_DhQRM-bDxAavnp470XcekbbXc4Gdw9y1KpHDJT0,223
-omlish/lang/descriptors.py,sha256=tszC_fMICqCz1cUXejJ4beWzt6DlIBulknJFRkSTZp4,6615
+omlish/lang/descriptors.py,sha256=RRBbkMgTzg82fFFE4D0muqobpM-ZZaOta6yB1lpX3s8,6617
 omlish/lang/exceptions.py,sha256=qJBo3NU1mOWWm-NhQUHCY5feYXR3arZVyEHinLsmRH4,47
 omlish/lang/functions.py,sha256=kkPfcdocg-OmyN7skIqrFxNvqAv89Zc_kXKYAN8vw8g,3895
 omlish/lang/imports.py,sha256=04ugFC8NI5sbL7NH4V0r0q_nFsP_AMkHLz697CVkMtQ,6274
@@ -251,14 +251,14 @@ omlish/lang/maybes.py,sha256=NYHZDjqDtwPMheDrj2VtUVujxRPf8Qpgk4ZlZCTvBZc,3492
 omlish/lang/objects.py,sha256=PJXGm-WgC7vpWzaXGwofk48V2XZNaQLje60K1ariwvQ,4454
 omlish/lang/resolving.py,sha256=OuN2mDTPNyBUbcrswtvFKtj4xgH4H4WglgqSKv3MTy0,1606
 omlish/lang/resources.py,sha256=-NmVTrSMKFZ6smVfOMz46ekZYVGgYh8cPooxQlFpG6s,2135
-omlish/lang/strings.py,sha256=LWgUy9WghUyV0zmZ1c3HZjEfekLlNPy7Jl6J1Z5vzp0,3882
+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/restrict.py,sha256=pSK7ZT_kpwqS6lWRrxwuEe-tt07F0-uZVazgGh-HDco,3921
-omlish/lang/classes/simple.py,sha256=roGxmtl5BAXl6_WAt89Hfd1Xmu-Cvnwo-YCZgs1Wq-s,3116
+omlish/lang/classes/simple.py,sha256=XQ8b86WvQA0qtSYqlbMOJS7tHgE8sv9onda33uQmbkM,3294
 omlish/lang/classes/virtual.py,sha256=W-QJuKsDehOcrydwg6eMN0bFPTYbk3Tz84TSH3blb44,3367
 omlish/lifecycles/__init__.py,sha256=1FjYceXs-4fc-S-C9zFYmc2axHs4znnQHcJVHdY7a6E,578
 omlish/lifecycles/abstract.py,sha256=70CQyZy-c9a2o0ZJxPeUT7eYjWZTBrp2HpUBnrHdAOM,1109
@@ -274,7 +274,7 @@ omlish/lite/check.py,sha256=B0VnyBSWI5qipidkwnU-BP43S9E-UOgp4WUM17pVpHc,750
 omlish/lite/contextmanagers.py,sha256=HnQJiyrOmSvTL22XRJrFl5CLpCyHD9fsntEUAr9G-60,427
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=vkFkSX0Izb2P-NNMqqNLSec0BzeLOtHoQWgdXwQuDPU,6007
-omlish/lite/marshal.py,sha256=u6jYUN_AndvI6__HJBvSw5ElHWC0CfHqgiDS28Vpqjg,8593
+omlish/lite/marshal.py,sha256=kZtfIiFfmxEi8ZKne3fT0R8g8kLmJ-Q5nq4kOvwhiqk,8656
 omlish/lite/reflect.py,sha256=9QYJwdINraq1JNMEgvoqeSlVvRRgOXpxAkpgX8EgRXc,1307
 omlish/lite/runtime.py,sha256=VUhmNQvwf8QzkWSKj4Q0ReieJA_PzHaJNRBivfTseow,452
 omlish/lite/secrets.py,sha256=3Mz3V2jf__XU9qNHcH56sBSw95L3U2UPL24bjvobG0c,816
@@ -408,9 +408,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.dev62.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev62.dist-info/METADATA,sha256=mt0fT8Bk_wKy64eUKY_AYPNxHg-yruiGNd2EYcnYUPw,4167
-omlish-0.0.0.dev62.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev62.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev62.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev62.dist-info/RECORD,,
+omlish-0.0.0.dev64.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev64.dist-info/METADATA,sha256=fd-7ozSHicCgpU4SOmqEUW7WJAsroSMO531X7vxMDVo,4167
+omlish-0.0.0.dev64.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev64.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev64.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev64.dist-info/RECORD,,