omlish 0.0.0.dev215__py3-none-any.whl → 0.0.0.dev217__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev215'
-__revision__ = 'c5c874e5a29ecc0725c701f47a3a498d9d5745f1'
+__version__ = '0.0.0.dev217'
+__revision__ = 'd43ca6092cff650a9fc533e97d87ce9112f6f71a'
 
 
 #

omlish/asyncs/asyncio/all.py

@@ -1,6 +1,7 @@
 # ruff: noqa: I001
 from .asyncio import (  # noqa
-    asyncio_once,
-    drain_tasks,
-    draining_asyncio_tasks,
+    asyncio_once as once,
+    asyncio_wait_concurrent as wait_concurrent,
+    drain_asyncio_tasks as drain_tasks,
+    draining_asyncio_tasks as draining_tasks,
 )

omlish/asyncs/asyncio/asyncio.py

@@ -24,7 +24,7 @@ def asyncio_once(fn: CallableT) -> CallableT:
     return ta.cast(CallableT, inner)
 
 
-def drain_tasks(loop=None):
+def drain_asyncio_tasks(loop=None):
     if loop is None:
         loop = asyncio.get_running_loop()
 
@@ -39,7 +39,7 @@ def draining_asyncio_tasks() -> ta.Iterator[None]:
         yield
     finally:
         if loop is not None:
-            drain_tasks(loop)  # noqa
+            drain_asyncio_tasks(loop)  # noqa
 
 
 async def asyncio_wait_concurrent(

omlish/dataclasses/__init__.py

@@ -93,8 +93,6 @@ from .impl.reflect import (  # noqa
 from .utils import (  # noqa
     is_immediate_dataclass,
 
-    maybe_post_init,
-
     opt_repr,
     truthy_repr,
 
@@ -113,3 +111,9 @@ from .utils import (  # noqa
     iter_keys,
     iter_values,
 )
+
+##
+
+from ..lite.dataclasses import (  # noqa
+    dataclass_maybe_post_init as maybe_post_init,
+)

omlish/dataclasses/utils.py

@@ -26,18 +26,6 @@ def is_immediate_dataclass(cls: type) -> bool:
 ##
 
 
-def maybe_post_init(sup: ta.Any) -> bool:
-    try:
-        fn = sup.__post_init__
-    except AttributeError:
-        return False
-    fn()
-    return True
-
-
-##
-
-
 def opt_repr(o: ta.Any) -> str | None:
     return repr(o) if o is not None else None
 

omlish/docker/oci.py

@@ -0,0 +1,81 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import dataclasses as dc
+import typing as ta
+
+from omlish.lite import marshal as msh
+
+
+@dc.dataclass(frozen=True)
+class OciImageIndex:
+    """https://github.com/opencontainers/image-spec/blob/92353b0bee778725c617e7d57317b568a7796bd0/image-index.md"""
+
+    @dc.dataclass(frozen=True)
+    class Manifest:
+        digest: str
+        size: int
+
+        #
+
+        platform: ta.Optional[ta.Mapping[str, ta.Any]] = dc.field(default=None, metadata={msh.OBJ_MARSHALER_OMIT_IF_NONE: True})  # noqa
+        annotations: ta.Optional[ta.Mapping[str, str]] = dc.field(default=None, metadata={msh.OBJ_MARSHALER_OMIT_IF_NONE: True})  # noqa
+
+        #
+
+        MEDIA_TYPE: ta.ClassVar[str] = 'application/vnd.oci.image.manifest.v1+json'
+        media_type: str = dc.field(default=MEDIA_TYPE, metadata={msh.OBJ_MARSHALER_FIELD_KEY: 'mediaType'})
+
+    manifests: ta.Sequence[Manifest]
+
+    #
+
+    annotations: ta.Optional[ta.Mapping[str, str]] = dc.field(default=None, metadata={msh.OBJ_MARSHALER_OMIT_IF_NONE: True})  # noqa
+
+    #
+
+    SCHEMA_VERSION: ta.ClassVar[int] = 2
+    schema_version: int = dc.field(default=SCHEMA_VERSION, metadata={msh.OBJ_MARSHALER_FIELD_KEY: 'schemaVersion'})
+
+    MEDIA_TYPE: ta.ClassVar[str] = 'application/vnd.oci.image.index.v1+json'
+    media_type: str = dc.field(default=MEDIA_TYPE, metadata={msh.OBJ_MARSHALER_FIELD_KEY: 'mediaType'})
+
+
+@dc.dataclass(frozen=True)
+class OciImageManifest:
+    """https://github.com/opencontainers/image-spec/blob/92353b0bee778725c617e7d57317b568a7796bd0/manifest.md"""
+
+    @dc.dataclass(frozen=True)
+    class Config:
+        digest: str
+        size: int
+
+        #
+
+        MEDIA_TYPE: ta.ClassVar[str] = 'application/vnd.oci.image.config.v1+json'
+        media_type: str = dc.field(default=MEDIA_TYPE, metadata={msh.OBJ_MARSHALER_FIELD_KEY: 'mediaType'})
+
+    config: Config
+
+    @dc.dataclass(frozen=True)
+    class Layer:
+        digest: str
+        size: int
+
+        #
+
+        MEDIA_TYPES: ta.ClassVar[ta.Mapping[str, str]] = {
+            'TAR': 'application/vnd.oci.image.layer.v1.tar',
+            'TAR_GZIP': 'application/vnd.oci.image.layer.v1.tar+gzip',
+            'TAR_ZSTD': 'application/vnd.oci.image.layer.v1.tar+zstd',
+        }
+        media_type: str = dc.field(default=MEDIA_TYPES['TAR'], metadata={msh.OBJ_MARSHALER_FIELD_KEY: 'mediaType'})
+
+    layers: ta.Sequence[Layer]
+
+    #
+
+    SCHEMA_VERSION: ta.ClassVar[int] = 2
+    schema_version: int = dc.field(default=SCHEMA_VERSION, metadata={msh.OBJ_MARSHALER_FIELD_KEY: 'schemaVersion'})
+
+    MEDIA_TYPE: ta.ClassVar[str] = 'application/vnd.oci.image.manifest.v1+json'
+    media_type: str = dc.field(default=MEDIA_TYPE, metadata={msh.OBJ_MARSHALER_FIELD_KEY: 'mediaType'})

omlish/docker/portrelay.py

@@ -0,0 +1,49 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import dataclasses as dc
+import os
+import typing as ta
+
+
+@dc.dataclass(frozen=True)
+class DockerPortRelay:
+    docker_port: int
+    host_port: int
+
+    name: ta.Optional[str] = None
+
+    DEFAULT_HOST_NAME: ta.ClassVar[str] = 'host.docker.internal'
+    host_name: str = DEFAULT_HOST_NAME
+
+    DEFAULT_INTERMEDIATE_PORT: ta.ClassVar[int] = 5000
+    intermediate_port: int = DEFAULT_INTERMEDIATE_PORT
+
+    DEFAULT_IMAGE: ta.ClassVar[str] = 'alpine/socat'
+    image: str = DEFAULT_IMAGE
+
+    def socat_args(self) -> ta.List[str]:
+        return [
+            '-d',
+            f'TCP-LISTEN:{self.intermediate_port},fork,reuseaddr',
+            f'TCP:{self.host_name}:{self.host_port}',
+        ]
+
+    def run_args(self) -> ta.List[str]:
+        if (name := self.name) is None:
+            name = f'docker_port_relay-{os.getpid()}'
+
+        return [
+            '--name', name,
+            '--rm',
+            '-p', f'{self.docker_port}:{self.intermediate_port}',
+            self.image,
+            *self.socat_args(),
+        ]
+
+    def run_cmd(self) -> ta.List[str]:
+        return [
+            'docker',
+            'run',
+            '-i',
+            *self.run_args(),
+        ]

omlish/lang/imports.py

@@ -281,6 +281,10 @@ class NamePackage(ta.NamedTuple):
 
 
 class _ProxyInit:
+    class _Import(ta.NamedTuple):
+        pkg: str
+        attr: str
+
     def __init__(
             self,
             name_package: NamePackage,
@@ -294,31 +298,35 @@ class _ProxyInit:
         self._globals = globals
         self._update_globals = update_globals
 
-        self._pkgs_by_attr: dict[str, str] = {}
+        self._imps_by_attr: dict[str, _ProxyInit._Import] = {}
         self._mods_by_pkgs: dict[str, ta.Any] = {}
 
     @property
     def name_package(self) -> NamePackage:
         return self._name_package
 
-    def add(self, package: str, attrs: ta.Iterable[str]) -> None:
+    def add(self, package: str, attrs: ta.Iterable[str | tuple[str, str]]) -> None:
         if isinstance(attrs, str):
             raise TypeError(attrs)
         for attr in attrs:
-            self._pkgs_by_attr[attr] = package
+            if isinstance(attr, tuple):
+                imp_attr, attr = attr
+            else:
+                imp_attr = attr
+            self._imps_by_attr[attr] = self._Import(package, imp_attr)
 
     def get(self, attr: str) -> ta.Any:
         try:
-            pkg = self._pkgs_by_attr[attr]
+            imp = self._imps_by_attr[attr]
         except KeyError:
             raise AttributeError(attr)  # noqa
 
         try:
-            mod = self._mods_by_pkgs[pkg]
+            mod = self._mods_by_pkgs[imp.pkg]
         except KeyError:
-            mod = importlib.import_module(pkg, package=self._name_package.package)
+            mod = importlib.import_module(imp.pkg, package=self._name_package.package)
 
-        val = getattr(mod, attr)
+        val = getattr(mod, imp.attr)
 
         if self._update_globals and self._globals is not None:
             self._globals[attr] = val
@@ -329,7 +337,7 @@ class _ProxyInit:
 def proxy_init(
         globals: ta.MutableMapping[str, ta.Any],  # noqa
         package: str,
-        attrs: ta.Iterable[str],
+        attrs: ta.Iterable[str | tuple[str, str]],
 ) -> None:
     if isinstance(attrs, str):
         raise TypeError(attrs)

omlish/lite/dataclasses.py

@@ -34,8 +34,10 @@ def dataclass_cache_hash(
 
 
 def dataclass_maybe_post_init(sup: ta.Any) -> bool:
+    if not isinstance(sup, super):
+        raise TypeError(sup)
     try:
-        fn = sup.__post_init__
+        fn = sup.__post_init__  # type: ignore
     except AttributeError:
         return False
     fn()

omlish/logs/standard.py

@@ -22,7 +22,7 @@ from .proxy import ProxyLogHandler
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),

omlish/marshal/dataclasses.py

@@ -9,6 +9,7 @@ from .. import collections as col
 from .. import dataclasses as dc
 from .. import lang
 from .. import reflect as rfl
+from ..lite import marshal as lm
 from .base import MarshalContext
 from .base import Marshaler
 from .base import MarshalerFactory
@@ -96,6 +97,31 @@ def get_field_infos(
                     unmarshal_names=col.unique([fmd.name, *(fmd.alts or ())]),
                 )
 
+        else:
+            try:
+                lfk = field.metadata[lm.OBJ_MARSHALER_FIELD_KEY]
+            except KeyError:
+                pass
+            else:
+                if lfk is not None:
+                    check.non_empty_str(lfk)
+                    has_set_name = True
+                    fi_kw.update(
+                        marshal_name=lfk,
+                        unmarshal_names=[lfk],
+                    )
+                else:
+                    fo_kw.update(
+                        no_marshal=True,
+                        no_unmarshal=True,
+                    )
+
+            if (lon := field.metadata.get(lm.OBJ_MARSHALER_OMIT_IF_NONE)) is not None:
+                if check.isinstance(lon, bool):
+                    fo_kw.update(
+                        omit_if=lang.is_none,
+                    )
+
         if fo_kw.get('embed') and not has_set_name:
             fi_kw.update(
                 marshal_name=fi_kw['marshal_name'] + '_',

omlish/subprocesses.py

@@ -20,6 +20,12 @@ SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlia
 ##
 
 
+# Valid channel type kwarg values:
+#  - A special flag negative int
+#  - A positive fd int
+#  - A file-like object
+#  - None
+
 SUBPROCESS_CHANNEL_OPTION_VALUES: ta.Mapping[SubprocessChannelOption, int] = {
     'pipe': subprocess.PIPE,
     'stdout': subprocess.STDOUT,
@@ -65,6 +71,25 @@ def subprocess_close(
 ##
 
 
+class VerboseCalledProcessError(subprocess.CalledProcessError):
+    @classmethod
+    def from_std(cls, e: subprocess.CalledProcessError) -> 'VerboseCalledProcessError':
+        return cls(
+            e.returncode,
+            e.cmd,
+            output=e.output,
+            stderr=e.stderr,
+        )
+
+    def __str__(self) -> str:
+        msg = super().__str__()
+        if self.output is not None:
+            msg += f' Output: {self.output!r}'
+        if self.stderr is not None:
+            msg += f' Stderr: {self.stderr!r}'
+        return msg
+
+
 class BaseSubprocesses(abc.ABC):  # noqa
     DEFAULT_LOGGER: ta.ClassVar[ta.Optional[logging.Logger]] = None
 
@@ -98,16 +123,31 @@ class BaseSubprocesses(abc.ABC):  # noqa
             if extra_env:
                 self._log.debug('Subprocesses.prepare_args: extra_env=%r', extra_env)
 
+        #
+
         if extra_env:
             env = {**(env if env is not None else os.environ), **extra_env}
 
+        #
+
         if quiet and 'stderr' not in kwargs:
             if self._log and not self._log.isEnabledFor(logging.DEBUG):
                 kwargs['stderr'] = subprocess.DEVNULL
 
+        for chk in ('stdout', 'stderr'):
+            try:
+                chv = kwargs[chk]
+            except KeyError:
+                continue
+            kwargs[chk] = SUBPROCESS_CHANNEL_OPTION_VALUES.get(chv, chv)
+
+        #
+
         if not shell:
             cmd = subprocess_maybe_shell_wrap_exec(*cmd)
 
+        #
+
         return cmd, dict(
             env=env,
             shell=shell,
@@ -115,35 +155,57 @@ class BaseSubprocesses(abc.ABC):  # noqa
         )
 
     @contextlib.contextmanager
-    def wrap_call(self, *cmd: ta.Any, **kwargs: ta.Any) -> ta.Iterator[None]:
+    def wrap_call(
+            self,
+            *cmd: ta.Any,
+            raise_verbose: bool = False,
+            **kwargs: ta.Any,
+    ) -> ta.Iterator[None]:
         start_time = time.time()
         try:
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.try: cmd=%r', cmd)
+
             yield
 
         except Exception as exc:  # noqa
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.except: exc=%r', exc)
+
+            if (
+                    raise_verbose and
+                    isinstance(exc, subprocess.CalledProcessError) and
+                    not isinstance(exc, VerboseCalledProcessError) and
+                    (exc.output is not None or exc.stderr is not None)
+            ):
+                raise VerboseCalledProcessError.from_std(exc) from exc
+
             raise
 
         finally:
             end_time = time.time()
             elapsed_s = end_time - start_time
+
             if self._log:
-                self._log.debug('sSubprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
+                self._log.debug('Subprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
 
     @contextlib.contextmanager
     def prepare_and_wrap(
             self,
             *cmd: ta.Any,
+            raise_verbose: bool = False,
             **kwargs: ta.Any,
     ) -> ta.Iterator[ta.Tuple[
         ta.Tuple[ta.Any, ...],
         ta.Dict[str, ta.Any],
     ]]:
         cmd, kwargs = self.prepare_args(*cmd, **kwargs)
-        with self.wrap_call(*cmd, **kwargs):
+
+        with self.wrap_call(
+                *cmd,
+                raise_verbose=raise_verbose,
+                **kwargs,
+        ):
             yield cmd, kwargs
 
     #

{omlish-0.0.0.dev215.dist-info → omlish-0.0.0.dev217.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev215
+Version: 0.0.0.dev217
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev215.dist-info → omlish-0.0.0.dev217.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=YGmAnUBszmosQQ_7Hh2wwtDiYdYZ4unNKYzOtALuels,7968
-omlish/__about__.py,sha256=Z_q3fQprjpJxjsLLgSeWVB1UJcxxPVoYEpw8Zkc85bs,3380
+omlish/__about__.py,sha256=kDIujbwF1DOvbfOg4BotM1Kd9bV-L3rLG99gQZvd-EU,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -11,7 +11,7 @@ omlish/libc.py,sha256=8r7Ejyhttk9ruCfBkxNTrlzir5WPbDE2vmY7VPlceMA,15362
 omlish/outcome.py,sha256=ABIE0zjjTyTNtn-ZqQ_9_mUzLiBQ3sDAyqc9JVD8N2k,7852
 omlish/runmodule.py,sha256=PWvuAaJ9wQQn6bx9ftEL3_d04DyotNn8dR_twm2pgw0,700
 omlish/shlex.py,sha256=bsW2XUD8GiMTUTDefJejZ5AyqT1pTgWMPD0BMoF02jE,248
-omlish/subprocesses.py,sha256=KOvt5gvpq2uisjYKyU_XUPZyM6yq8ywgbfWjz-lx9CQ,8686
+omlish/subprocesses.py,sha256=c7arxsQ7JiaNCmK3GKqwRO6BwrvxeK7eez8A4SrvGBo,10199
 omlish/sync.py,sha256=QJ79kxmIqDP9SeHDoZAf--DpFIhDQe1jACy8H4N0yZI,2928
 omlish/antlr/__init__.py,sha256=88bMl_28cfSKslgOkMGYXqALgsHz3KC4LFvAVtzj7k8,89
 omlish/antlr/delimit.py,sha256=3Byvh9_Ip8ftM_SeSEmMbnNo1jrxk-xm8HnHDp_nDaI,3466
@@ -93,8 +93,8 @@ omlish/asyncs/flavors.py,sha256=1mNxGNRVmjUHzA13K5ht8vdJv4CLEmzYTQ6BZXr1520,4866
 omlish/asyncs/trio.py,sha256=fmZ5b_lKdVV8NQ3euCUutWgnkqTFzSnOjvJSA_jvmrE,367
 omlish/asyncs/trio_asyncio.py,sha256=oqdOHy0slj9PjVxaDf3gJkq9AAgg7wYZbB469jOftVw,1327
 omlish/asyncs/asyncio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/asyncs/asyncio/all.py,sha256=eZDtL8atzHqIdGCAAcQYWVmNvgRYerJB9Sy0reh-09k,115
-omlish/asyncs/asyncio/asyncio.py,sha256=uNd1h2EIaQb0pZVtvAkq-GnWjf9gn-sSHY0gkmm-7e0,1767
+omlish/asyncs/asyncio/all.py,sha256=KpTanEtpTlc3rqv5SyiJaJGb_DXBzp_WKLhlRq6lrhY,212
+omlish/asyncs/asyncio/asyncio.py,sha256=3BMhVIF-QTjsFRGDtNYlRbBqKPCA3_AwJsjJoIWdM8k,1783
 omlish/asyncs/asyncio/channels.py,sha256=ZbmsEmdK1fV96liHdcVpRqA2dAMkXJt4Q3rFAg3YOIw,1074
 omlish/asyncs/asyncio/streams.py,sha256=Uc9PCWSfBqrK2kdVtfjjQU1eaYTWYmZm8QISDj2xiuw,1004
 omlish/asyncs/asyncio/subprocesses.py,sha256=XlIWwSxpVB7sMVc75-f7dI6r08JkdipNFRWXUKS8zAw,6960
@@ -169,8 +169,8 @@ omlish/configs/processing/matching.py,sha256=R64RxpPB1uX5Ztvvk2dQ2xi_xwlaxkxQgZw
 omlish/configs/processing/names.py,sha256=weHmaTclzgM9lUn3aBtw-kwZ3mc2N-CZlFg3Kd_UsKo,1093
 omlish/configs/processing/rewriting.py,sha256=v7PfHtuTn5v_5Y6Au7oMN2Z0nxAMy1iYyO5CXnTvZhs,4226
 omlish/configs/processing/strings.py,sha256=qFS2oh6z02IaM_q4lTKLdufzkJqAJ6J-Qjrz5S-QJoM,826
-omlish/dataclasses/__init__.py,sha256=lw-ItSe_zE_iKGGEnkbT92Kv4Zu3KqS1vh-CFOFUGd8,1467
-omlish/dataclasses/utils.py,sha256=hbQfbdCjQ9oA3h9kmGcM5bWZM1GbboXsq02ns5ycJwQ,3958
+omlish/dataclasses/__init__.py,sha256=4LYQCg0kqBNwexcXvK6drjxdi79sMvqa4augNhCBHLU,1543
+omlish/dataclasses/utils.py,sha256=N2seT8cJtfOv-41D7F3E-q4us-FCTQmnxxPv3dt1OcI,3796
 omlish/dataclasses/impl/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
 omlish/dataclasses/impl/__init__.py,sha256=zqGBC5gSbjJxaqG_zS1LL1PX-zAfhIua8UqOE4IwO2k,789
 omlish/dataclasses/impl/api.py,sha256=p7W519_EnDAWlkOVS-4BpP4SxadWIiUzC3RldSoB28o,6431
@@ -224,6 +224,8 @@ omlish/docker/consts.py,sha256=wvwfUtEFrEWZKfREWqSMrx8xjjl8P5MNUSF6qzzgJHY,70
 omlish/docker/detect.py,sha256=Qrdbosm2wJkxKDuy8gaGmbQoxk4Wnp1HJjAEz58NA8Y,614
 omlish/docker/hub.py,sha256=7LIuJGdA-N1Y1dmo50ynKM1KUTcnQM_5XbtPbdT_QLU,3940
 omlish/docker/manifests.py,sha256=LR4FpOGNUT3bZQ-gTjB6r_-1C3YiG30QvevZjrsVUQM,7068
+omlish/docker/oci.py,sha256=wbiOpZQWZtiCtyoDpZhYyHvwkZv5przil9DRLAvHrfs,2743
+omlish/docker/portrelay.py,sha256=QlRoTnQXs5INguR7XOj1xH0gNdL9SUeZm5z45DUctXo,1222
 omlish/docker/timebomb.py,sha256=A_pgIDaXKsQwPiikrCTgIJl91gwYqkPGFY6j-Naq07Q,342
 omlish/formats/__init__.py,sha256=T0AG1gFnqQ5JiHN0UPQjQ-7g5tnxMIG-mgOvMYExYAM,21
 omlish/formats/cbor.py,sha256=o_Hbe4kthO9CeXK-FySrw0dHVlrdyTo2Y8PpGRDfZ3c,514
@@ -383,7 +385,7 @@ omlish/lang/descriptors.py,sha256=RRBbkMgTzg82fFFE4D0muqobpM-ZZaOta6yB1lpX3s8,66
 omlish/lang/exceptions.py,sha256=qJBo3NU1mOWWm-NhQUHCY5feYXR3arZVyEHinLsmRH4,47
 omlish/lang/functions.py,sha256=t9nsnWwhsibG0w908VMx-_pRM5tZfruE3faPxrCWTbI,4160
 omlish/lang/generators.py,sha256=5LX17j-Ej3QXhwBgZvRTm_dq3n9veC4IOUcVmvSu2vU,5243
-omlish/lang/imports.py,sha256=3C04Z0Hsj-BQIfHDWd-MQFGyZqTWuyJc2di6GfE-eUM,9327
+omlish/lang/imports.py,sha256=oGigWiLkLog29mWWYdu7untyX--K1SueFmKzCpXdtug,9612
 omlish/lang/iterables.py,sha256=HOjcxOwyI5bBApDLsxRAGGhTTmw7fdZl2kEckxRVl-0,1994
 omlish/lang/maybes.py,sha256=1RN7chX_x2XvgUwryZRz0W7hAX-be3eEFcFub5vvf6M,3417
 omlish/lang/objects.py,sha256=LOC3JvX1g5hPxJ7Sv2TK9kNkAo9c8J-Jw2NmClR_rkA,4576
@@ -411,7 +413,7 @@ omlish/lite/cached.py,sha256=O7ozcoDNFm1Hg2wtpHEqYSp_i_nCLNOP6Ueq_Uk-7mU,1300
 omlish/lite/check.py,sha256=OLwtE2x6nlbGx4vS3Rda7zMHpgqzDSLJminTAX2lqLA,13529
 omlish/lite/configs.py,sha256=Ev_19sbII67pTWzInYjYqa9VyTiZBvyjhZqyG8TtufE,908
 omlish/lite/contextmanagers.py,sha256=ciaMl0D3QDHToM7M28-kwZ-Q48LtwgCxiud3nekgutA,2863
-omlish/lite/dataclasses.py,sha256=M6UD4VwGo0Ky7RNzKWbO0IOy7iBZVCIbTiC6EYbFnX8,1035
+omlish/lite/dataclasses.py,sha256=k1588egoF3h_Kb21tuQb8WyJ9wxhT06EztFvaKOHzNU,1115
 omlish/lite/inject.py,sha256=qBUftFeXMiRgANYbNS2e7TePMYyFAcuLgsJiLyMTW5o,28769
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
@@ -435,7 +437,7 @@ omlish/logs/handlers.py,sha256=zgSnKQA5q9Fu7T0Nkd7twog9H1Wg9-bDCzz4_F1TOBo,319
 omlish/logs/json.py,sha256=zyqMWpZY3lk4WRk4wgmataBomGX9S3iDsydiM1sS-lI,1366
 omlish/logs/noisy.py,sha256=Ubc-eTH6ZbGYsLfUUi69JAotwuUwzb-SJBeGo_0dIZI,348
 omlish/logs/proxy.py,sha256=A-ROPUUAlF397qTbEqhel6YhQMstNuXL3Xmts7w9dAo,2347
-omlish/logs/standard.py,sha256=BVFn8pFyafxuco1sjA5COYxX5Q0Wv80_OE9zo6uDp2Q,3164
+omlish/logs/standard.py,sha256=FbKdF2Z4Na5i2TNwKn0avLJXyICe2JKsPufjvKCHGn0,3162
 omlish/logs/utils.py,sha256=mzHrZ9ji75p5A8qR29eUr05CBAHMb8J753MSkID_VaQ,393
 omlish/manifests/__init__.py,sha256=P2B0dpT8D7l5lJwRGPA92IcQj6oeXfd90X5-q9BJrKg,51
 omlish/manifests/load.py,sha256=LrWAvBfdzDkFdLuVwfw2RwFvLjxx-rvfkpU9eBsWeIc,5626
@@ -444,7 +446,7 @@ omlish/marshal/__init__.py,sha256=iVA7n31L08Bdub6HKPvYOXVvDhk2CMA6rPeKDL_u1to,22
 omlish/marshal/any.py,sha256=e82OyYK3Emm1P1ClnsnxP7fIWC2iNVyW0H5nK4mLmWM,779
 omlish/marshal/base.py,sha256=HEzfby-PgGzIhiRpBkFrkw5-hKacRSC5W_jwLjT8aYw,6740
 omlish/marshal/base64.py,sha256=F-3ogJdcFCtWINRgJgWT0rErqgx6f4qahhcg8OrkqhE,1089
-omlish/marshal/dataclasses.py,sha256=G6Uh8t4vvNBAx2BhzH8ksj8Hq_bo6npFphQhyF298VU,6892
+omlish/marshal/dataclasses.py,sha256=ZpfNaIdhKwWouWkoQGuequKwrEeehbz9QSQoW3acyPo,7756
 omlish/marshal/datetimes.py,sha256=0ffg8cEvx9SMKIXZGD9b7MqpLfmgw0uKKdn6YTfoqok,3714
 omlish/marshal/enums.py,sha256=CMAbx6RI2EcQoo7SoD-5q2l-3DFKreWMiOxs6mFpl_4,1472
 omlish/marshal/exceptions.py,sha256=jwQWn4LcPnadT2KRI_1JJCOSkwWh0yHnYK9BmSkNN4U,302
@@ -626,9 +628,9 @@ omlish/text/indent.py,sha256=YjtJEBYWuk8--b9JU_T6q4yxV85_TR7VEVr5ViRCFwk,1336
 omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev215.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev215.dist-info/METADATA,sha256=sgYLWshnIstVsakEiP6G0Nytn1GDKeCvZGuP0wKtIgU,4176
-omlish-0.0.0.dev215.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omlish-0.0.0.dev215.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev215.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev215.dist-info/RECORD,,
+omlish-0.0.0.dev217.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev217.dist-info/METADATA,sha256=ej8P7o2EGJWFumDVus7JjRA14H1OZPQWWqQ_mB7vRhE,4176
+omlish-0.0.0.dev217.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omlish-0.0.0.dev217.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev217.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev217.dist-info/RECORD,,