omlish 0.0.0.dev240__py3-none-any.whl → 0.0.0.dev242__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev240'
-__revision__ = '971f90a65c71e29b2ef80c9a63301bac68a526e8'
+__version__ = '0.0.0.dev242'
+__revision__ = '0866b8cd6f11d42061b0949c01a15583a1a6b39d'
 
 
 #

omlish/asyncs/asyncio/all.py

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

omlish/asyncs/asyncio/asyncio.py

@@ -1,5 +1,9 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
+"""
+TODO:
+ - split module
+"""
 import asyncio
 import contextlib
 import functools
@@ -11,19 +15,37 @@ T = ta.TypeVar('T')
 CallableT = ta.TypeVar('CallableT', bound=ta.Callable)
 
 
+##
+
+
+def asyncio_ensure_task(obj: ta.Awaitable) -> asyncio.Task:
+    if isinstance(obj, asyncio.Task):
+        return obj
+    elif isinstance(obj, ta.Coroutine):
+        return asyncio.create_task(obj)
+    else:
+        raise TypeError(obj)
+
+
+##
+
+
 def asyncio_once(fn: CallableT) -> CallableT:
-    future = None
+    task = None
 
     @functools.wraps(fn)
     async def inner(*args, **kwargs):
-        nonlocal future
-        if not future:
-            future = asyncio.create_task(fn(*args, **kwargs))
-        return await future
+        nonlocal task
+        if not task:
+            task = asyncio.create_task(fn(*args, **kwargs))
+        return await task
 
     return ta.cast(CallableT, inner)
 
 
+##
+
+
 def drain_asyncio_tasks(loop=None):
     if loop is None:
         loop = asyncio.get_running_loop()
@@ -42,8 +64,11 @@ def draining_asyncio_tasks() -> ta.Iterator[None]:
             drain_asyncio_tasks(loop)  # noqa
 
 
+##
+
+
 async def asyncio_wait_concurrent(
-        coros: ta.Iterable[ta.Awaitable[T]],
+        awaitables: ta.Iterable[ta.Awaitable[T]],
         concurrency: ta.Union[int, asyncio.Semaphore],
         *,
         return_when: ta.Any = asyncio.FIRST_EXCEPTION,
@@ -55,18 +80,30 @@ async def asyncio_wait_concurrent(
     else:
         raise TypeError(concurrency)
 
-    async def limited_task(coro):
+    async def limited_task(a):
         async with semaphore:
-            return await coro
+            return await a
+
+    futs = [asyncio.create_task(limited_task(a)) for a in awaitables]
+    done, pending = await asyncio.wait(futs, return_when=return_when)
 
-    tasks = [asyncio.create_task(limited_task(coro)) for coro in coros]
-    done, pending = await asyncio.wait(tasks, return_when=return_when)
+    for fut in pending:
+        fut.cancel()
 
-    for task in pending:
-        task.cancel()
+    for fut in done:
+        if fut.exception():
+            raise fut.exception()  # type: ignore
 
-    for task in done:
-        if task.exception():
-            raise task.exception()  # type: ignore
+    return [fut.result() for fut in done]
 
-    return [task.result() for task in done]
+
+async def asyncio_wait_maybe_concurrent(
+        awaitables: ta.Iterable[ta.Awaitable[T]],
+        concurrency: ta.Union[int, asyncio.Semaphore, None],
+) -> ta.List[T]:
+    # Note: Only supports return_when=asyncio.FIRST_EXCEPTION
+    if concurrency is None:
+        return [await a for a in awaitables]
+
+    else:
+        return await asyncio_wait_concurrent(awaitables, concurrency)

omlish/docker/all.py

@@ -27,5 +27,5 @@ from .hub import (  # noqa
 )
 
 from .timebomb import (  # noqa
-    timebomb_payload,
+    docker_timebomb_payload as timebomb_payload,
 )

omlish/docker/ns1.py

@@ -0,0 +1,98 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import dataclasses as dc
+import re
+import typing as ta
+
+from ..lite.check import check
+from ..subprocesses.run import SubprocessRun
+from ..subprocesses.run import SubprocessRunnable
+from ..subprocesses.run import SubprocessRunOutput
+
+
+##
+
+
+DEFAULT_DOCKER_NS1_RUN_IMAGE: str = 'debian'
+
+
+def build_docker_ns1_run_args(
+        *cmd: str,
+        image: ta.Optional[str] = None,
+        nsenter: str = 'nsenter',
+) -> ta.List[str]:
+    """
+    - https://gist.github.com/BretFisher/5e1a0c7bcca4c735e716abf62afad389
+    - https://github.com/justincormack/nsenter1/blob/8d3ba504b2c14d73c70cf34f1ec6943c093f1b02/nsenter1.c
+
+    alt:
+     - nc -U ~/Library/Containers/com.docker.docker/Data/debug-shell.sock
+    """
+
+    return [
+        '--privileged',
+        '--pid=host',
+        (image if image is not None else DEFAULT_DOCKER_NS1_RUN_IMAGE),
+
+        nsenter,
+        '-t', '1',
+
+        '-m',  # mount
+        '-u',  # uts
+        '-i',  # ipc
+        '-n',  # net
+        '-p',  # pid
+        '-C',  # cgroup
+        # '-U',  # user
+        '-T',  # time
+
+        *cmd,
+    ]
+
+
+def build_docker_ns1_run_cmd(
+        *cmd: str,
+        exe: str = 'docker',
+        run_args: ta.Optional[ta.Sequence[str]] = None,
+        **kwargs: ta.Any,
+) -> ta.List[str]:
+    if run_args is not None:
+        check.not_isinstance(run_args, str)
+
+    return [
+        exe,
+        'run',
+        '--rm',
+        *(run_args if run_args is not None else []),
+        '-i',
+        *build_docker_ns1_run_args(*cmd, **kwargs),
+    ]
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DockerNs1ListUsedTcpPortsCommand(SubprocessRunnable[ta.List[int]]):
+    kwargs: ta.Optional[ta.Mapping[str, str]] = None
+
+    def make_run(self) -> SubprocessRun:
+        return SubprocessRun.of(
+            *build_docker_ns1_run_cmd(
+                'netstat', '-tan',
+            ),
+            stdout='pipe',
+            stderr='devnull',
+            check=True,
+        )
+
+    _NETSTAT_LINE_PAT: ta.ClassVar[re.Pattern] = re.compile(r'\d{1,3}(.(\d{1,3})){3}:(?P<port>\d+)')
+
+    def handle_run_output(self, output: SubprocessRunOutput) -> ta.List[int]:
+        lines = [s for l in check.not_none(output.stdout).decode().splitlines() if (s := l.strip())]
+        return [
+            int(m.groupdict()['port'])
+            for l in lines
+            if len(ps := l.split(maxsplit=4)) > 3
+            if (m := self._NETSTAT_LINE_PAT.fullmatch(ps[3])) is not None
+        ]

omlish/docker/{portrelay.py → ports.py}

@@ -1,13 +1,33 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
+"""
+TODO:
+ - docstring
+ - timebomb
+ - auto-discover available ports
+"""
 import dataclasses as dc
 import os
 import typing as ta
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class DockerPortRelay:
-    docker_port: int
+    """
+    Uses roughly the following command to forward connections from inside docker-for-mac's vm to the mac host:
+
+      docker run --rm -i -p 5001:5000 alpine/socat -d -d TCP-LISTEN:5000,fork,reuseaddr TCP:host.docker.internal:5021
+
+    This allows requests made by the docker daemon running inside the vm to `host.docker.internal:5001` to be forwarded
+    to the mac host on port 5021. The reason for this is to be able to use a docker registry running locally directly on
+    the host mac - specifically to be able to do so with ssl certificate checking disabled (which docker will only do on
+    localhost, which on a mac in the vm isn't actually the mac host - hence the necessity of the relay).
+    """
+
+    docker_port: int  # port
     host_port: int
 
     name: ta.Optional[str] = None
@@ -30,7 +50,7 @@ class DockerPortRelay:
 
     def run_args(self) -> ta.List[str]:
         if (name := self.name) is None:
-            name = f'docker_port_relay-{os.getpid()}'
+            name = f'docker_port_relay-{os.getpid()}-{self.docker_port}-{self.intermediate_port}-{self.host_port}'
 
         return [
             '--name', name,

omlish/docker/timebomb.py

@@ -1,10 +1,14 @@
+# @omlish-lite
 import shlex
 
 
-_DEFAULT_TIMEBOMB_NAME = '-'.join([*__name__.split('.'), 'timebomb'])
+##
 
 
-def timebomb_payload(delay_s: float, name: str = _DEFAULT_TIMEBOMB_NAME) -> str:
+_DEFAULT_DOCKER_TIMEBOMB_NAME = 'omlish-timebomb'
+
+
+def docker_timebomb_payload(delay_s: float, name: str = _DEFAULT_DOCKER_TIMEBOMB_NAME) -> str:
     return (
         '('
         f'echo {shlex.quote(name)} && '

omlish/http/coro/simple.py

@@ -1,5 +1,9 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
+"""
+TODO:
+ - logging
+"""
 import concurrent.futures as cf
 import contextlib
 import functools
@@ -15,6 +19,7 @@ from ...sockets.server.handlers import SocketServerHandler
 from ...sockets.server.handlers import SocketWrappingSocketServerHandler
 from ...sockets.server.handlers import StandardSocketServerHandler
 from ...sockets.server.server import SocketServer
+from ...sockets.server.ssl import SslErrorHandlingSocketServerHandler
 from ...sockets.server.threading import ThreadingSocketServerHandler
 from ..handlers import HttpHandler
 from ..parsing import HttpRequestParser
@@ -35,6 +40,7 @@ def make_simple_http_server(
         *,
         server_version: HttpProtocolVersion = HttpProtocolVersions.HTTP_1_1,
         ssl_context: ta.Optional['ssl.SSLContext'] = None,
+        ignore_ssl_errors: bool = False,
         executor: ta.Optional[cf.Executor] = None,
         use_threads: bool = False,
 ) -> ta.Iterator[SocketServer]:
@@ -72,6 +78,11 @@ def make_simple_http_server(
                 )),
             )
 
+        if ignore_ssl_errors:
+            server_handler = SslErrorHandlingSocketServerHandler(
+                server_handler,
+            )
+
         #
 
         server_handler = StandardSocketServerHandler(

omlish/lite/inject.py

@@ -510,14 +510,6 @@ _INJECTION_INSPECTION_CACHE: ta.MutableMapping[ta.Any, _InjectionInspection] = w
 
 def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     tgt = obj
-    if isinstance(tgt, type) and tgt.__init__ is not object.__init__:  # type: ignore[misc]
-        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
-        #  - https://bugs.python.org/issue40897
-        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
-        tgt = tgt.__init__  # type: ignore[misc]
-        has_generic_base = True
-    else:
-        has_generic_base = False
 
     # inspect.signature(eval_str=True) was added in 3.10 and we have to support 3.8, so we have to get_type_hints to
     # eval str annotations *in addition to* getting the signature for parameter information.
@@ -525,23 +517,40 @@ def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     has_partial = False
     while True:
         if isinstance(uw, functools.partial):
-            has_partial = True
             uw = uw.func
+            has_partial = True
         else:
             if (uw2 := inspect.unwrap(uw)) is uw:
                 break
             uw = uw2
 
-    if has_generic_base and has_partial:
+    has_args_offset = False
+
+    if isinstance(tgt, type) and tgt.__new__ is not object.__new__:
+        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
+        #  - https://bugs.python.org/issue40897
+        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
+        tgt = tgt.__init__  # type: ignore[misc]
+        has_args_offset = True
+
+    if tgt in (object.__init__, object.__new__):
+        # inspect strips self for types but not the underlying methods.
+        def dummy(self):
+            pass
+        tgt = dummy
+        has_args_offset = True
+
+    if has_partial and has_args_offset:
+        # TODO: unwrap partials masking parameters like modern python
         raise InjectorError(
-            'Injector inspection does not currently support both a typing.Generic base and a functools.partial: '
+            'Injector inspection does not currently support both an args offset and a functools.partial: '
             f'{obj}',
         )
 
     return _InjectionInspection(
         inspect.signature(tgt),
         ta.get_type_hints(uw),
-        1 if has_generic_base else 0,
+        1 if has_args_offset else 0,
     )
 
 

omlish/marshal/base.py

@@ -13,6 +13,7 @@ See:
  - https://github.com/python-attrs/cattrs
  - https://github.com/jcrist/msgspec
  - https://github.com/Fatal1ty/mashumaro
+ - https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serializers.md#custom-serializers
 
 cattrs:
  *

omlish/metadata.py

@@ -8,6 +8,7 @@ TODO:
   - merge mro?
   - are these better left up to callers? too usecase-specific to favor either way?
 """
+import threading
 import types
 import typing as ta
 
@@ -60,6 +61,8 @@ def _unwrap_object_metadata_target(obj: ta.Any) -> ta.Any:
 ##
 
 
+_OBJECT_METADATA_LOCK = threading.RLock()
+
 _OBJECT_METADATA_ATTR = '__' + __name__.replace('.', '_') + '__metadata__'
 
 
@@ -71,15 +74,14 @@ def append_object_metadata(obj: T, *mds: ObjectMetadata) -> T:
     dct = tgt.__dict__
 
     if isinstance(dct, types.MappingProxyType):
-        for _ in range(2):
-            try:
-                lst = dct[_OBJECT_METADATA_ATTR]
-            except KeyError:
-                setattr(tgt, _OBJECT_METADATA_ATTR, [])
-            else:
-                break
-        else:
-            raise RuntimeError
+        try:
+            lst = dct[_OBJECT_METADATA_ATTR]
+        except KeyError:
+            with _OBJECT_METADATA_LOCK:
+                try:
+                    lst = dct[_OBJECT_METADATA_ATTR]
+                except KeyError:
+                    setattr(tgt, _OBJECT_METADATA_ATTR, lst := [])
 
     else:
         lst = dct.setdefault(_OBJECT_METADATA_ATTR, [])

omlish/os/mangle.py

@@ -1,5 +1,9 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
+"""
+TODO:
+ - use ..text.mangle
+"""
 
 
 #

omlish/sockets/bind.py

@@ -175,11 +175,11 @@ class SocketBinder(abc.ABC, ta.Generic[SocketBinderConfigT]):
         if hasattr(self, '_socket'):
             raise self.AlreadyBoundError
 
-        socket = socket_.socket(self.address_family, socket_.SOCK_STREAM)
-        self._socket = socket
+        sock = socket_.socket(self.address_family, socket_.SOCK_STREAM)
+        self._socket = sock
 
         if self._config.allow_reuse_address and hasattr(socket_, 'SO_REUSEADDR'):
-            socket.setsockopt(socket_.SOL_SOCKET, socket_.SO_REUSEADDR, 1)
+            sock.setsockopt(socket_.SOL_SOCKET, socket_.SO_REUSEADDR, 1)
 
         # Since Linux 6.12.9, SO_REUSEPORT is not allowed on other address families than AF_INET/AF_INET6.
         if (
@@ -187,13 +187,13 @@ class SocketBinder(abc.ABC, ta.Generic[SocketBinderConfigT]):
                 self.address_family in (socket_.AF_INET, socket_.AF_INET6)
         ):
             try:
-                socket.setsockopt(socket_.SOL_SOCKET, socket_.SO_REUSEPORT, 1)
+                sock.setsockopt(socket_.SOL_SOCKET, socket_.SO_REUSEPORT, 1)
             except OSError as err:
                 if err.errno not in (errno.ENOPROTOOPT, errno.EINVAL):
                     raise
 
-        if self._config.set_inheritable and hasattr(socket, 'set_inheritable'):
-            socket.set_inheritable(True)
+        if self._config.set_inheritable and hasattr(sock, 'set_inheritable'):
+            sock.set_inheritable(True)
 
     def _pre_bind(self) -> None:
         pass
@@ -224,7 +224,7 @@ class SocketBinder(abc.ABC, ta.Generic[SocketBinderConfigT]):
         self.socket.listen(self._config.listen_backlog)
 
     @abc.abstractmethod
-    def accept(self, socket: ta.Optional[socket_.socket] = None) -> SocketAndAddress:
+    def accept(self, sock: ta.Optional[socket_.socket] = None) -> SocketAndAddress:
         raise NotImplementedError
 
 
@@ -270,11 +270,11 @@ class TcpSocketBinder(SocketBinder):
 
     #
 
-    def accept(self, socket: ta.Optional[socket_.socket] = None) -> SocketAndAddress:
-        if socket is None:
-            socket = self.socket
+    def accept(self, sock: ta.Optional[socket_.socket] = None) -> SocketAndAddress:
+        if sock is None:
+            sock = self.socket
 
-        conn, client_address = socket.accept()
+        conn, client_address = sock.accept()
         return SocketAndAddress(conn, client_address)
 
 

omlish/sockets/ports.py

@@ -0,0 +1,62 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import contextlib
+import socket
+import typing as ta
+
+from ..lite.check import check
+from ..lite.timeouts import Timeout
+from ..lite.timeouts import TimeoutLike
+
+
+##
+
+
+DEFAULT_AVAILABLE_PORT_HOST: str = '127.0.0.1'
+
+
+@contextlib.contextmanager
+def get_available_port_context(host: ta.Optional[str] = None) -> ta.Iterator[int]:
+    if host is None:
+        host = DEFAULT_AVAILABLE_PORT_HOST
+
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+        sock.bind((host, 0))
+        sock.listen(1)
+        port = sock.getsockname()[1]
+        yield port
+
+
+def get_available_port(host: ta.Optional[str] = None) -> int:
+    with get_available_port_context(host) as port:
+        pass
+    return port
+
+
+def get_available_ports(
+        n: int,
+        *,
+        host: ta.Optional[str] = None,
+        exclude: ta.Optional[ta.Iterable[int]] = None,
+        timeout: ta.Optional[TimeoutLike] = None,
+) -> ta.List[int]:
+    exclude = set(exclude or [])
+
+    seen: ta.Set[int] = set()
+    ret: ta.List[int] = []
+
+    timeout = Timeout.of(timeout)
+
+    with contextlib.ExitStack() as es:
+        while len(ret) < n:
+            timeout()
+
+            cur = es.enter_context(get_available_port_context(host))
+
+            check.not_in(cur, seen)
+            seen.add(cur)
+
+            if cur not in exclude:
+                ret.append(cur)
+
+    return ret

omlish/sockets/server/handlers.py

@@ -13,7 +13,7 @@ from ..io import SocketIoPair
 from ..io import close_socket_immediately
 
 
-SocketServerHandler = ta.Callable[[SocketAndAddress], None]  # ta.TypeAlias
+SocketServerHandler = ta.Callable[['SocketAndAddress'], None]  # ta.TypeAlias
 
 
 ##

omlish/sockets/server/ssl.py

@@ -0,0 +1,39 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import dataclasses as dc
+import logging
+import typing as ta
+
+from ..addresses import SocketAndAddress
+from ..io import close_socket_immediately
+from .handlers import SocketServerHandler
+from .handlers import SocketServerHandler_
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class SslErrorHandlingSocketServerHandler(SocketServerHandler_):
+    handler: SocketServerHandler
+
+    log: ta.Optional[logging.Logger] = None
+
+    #
+
+    _error_cls: ta.ClassVar[ta.Optional[ta.Type[BaseException]]] = None
+
+    @classmethod
+    def _get_error_cls(cls) -> ta.Type[BaseException]:
+        if (error_cls := cls._error_cls) is None:
+            import ssl
+            error_cls = cls._error_cls = ssl.SSLError
+        return error_cls
+
+    def __call__(self, conn: SocketAndAddress) -> None:
+        try:
+            self.handler(conn)
+        except self._get_error_cls():  # noqa
+            if (log := self.log) is not None:
+                log.exception('SSL Error in connection %r', conn)
+            close_socket_immediately(conn.socket)

omlish/sql/abc.py

@@ -1,6 +1,7 @@
 """
 https://peps.python.org/pep-0249/
 """
+import enum
 import typing as ta
 
 
@@ -83,3 +84,88 @@ class DbapiCursor(ta.Protocol):
     def setinputsizes(self, sizes: ta.Sequence[DbapiTypeCode | int | None]) -> object: ...
 
     def setoutputsize(self, size: int, column: int = ...) -> object: ...
+
+
+class DbapiThreadSafety(enum.IntEnum):
+    NONE = 0
+    MODULE = 1
+    CONNECTION = 2
+    CURSOR = 3
+
+
+class DbapiModule(ta.Protocol):
+    def connect(self, *args: ta.Any, **kwargs: ta.Any) -> DbapiConnection: ...
+
+    #
+
+    @property
+    def apilevel(self) -> str: ...
+
+    @property
+    def threadsafety(self) -> int: ...
+
+    @property
+    def paramstyle(self) -> str: ...
+
+    #
+
+    @property
+    def Warning(self) -> type[Exception]: ...  # noqa
+
+    @property
+    def Error(self) -> type[Exception]: ...  # noqa
+
+    @property
+    def InterfaceError(self) -> type[Exception]: ...  # noqa
+
+    @property
+    def DatabaseError(self) -> type[Exception]: ...  # noqa
+
+    @property
+    def DataError(self) -> type[Exception]: ...  # noqa
+
+    @property
+    def OperationalError(self) -> type[Exception]: ...  # noqa
+
+    @property
+    def IntegrityError(self) -> type[Exception]: ...  # noqa
+
+    @property
+    def InternalError(self) -> type[Exception]: ...  # noqa
+
+    @property
+    def ProgrammingError(self) -> type[Exception]: ...  # noqa
+
+    @property
+    def NotSupportedError(self) -> type[Exception]: ...  # noqa
+
+    #
+
+    def Date(self, year: ta.Any, month: ta.Any, day: ta.Any) -> ta.Any: ...  # noqa
+
+    def Time(self, hour: ta.Any, minute: ta.Any, second: ta.Any) -> ta.Any: ...  # noqa
+
+    def Timestamp(self, year, month, day, hour, minute, second) -> ta.Any: ...  # noqa
+
+    def DateFromTicks(self, ticks: ta.Any) -> ta.Any: ...  # noqa
+
+    def TimeFromTicks(self, ticks: ta.Any) -> ta.Any: ...  # noqa
+
+    def TimestampFromTicks(self, ticks: ta.Any) -> ta.Any: ...  # noqa
+
+    def Binary(self, string: ta.Any) -> ta.Any: ...  # noqa
+
+    @property
+    def STRING(self) -> type: ...  # noqa
+
+    @property
+    def BINARY(self) -> type: ...  # noqa
+
+    @property
+    def NUMBER(self) -> type: ...  # noqa
+
+    @property
+    def DATETIME(self) -> type: ...  # noqa
+
+    @property
+    def ROWID(self) -> type: ...  # noqa

omlish/sql/api/base.py

@@ -20,7 +20,7 @@ class Closer(lang.Abstract):
         pass
 
 
-class SelfCloser(Closer):
+class ContextCloser(Closer):
     def __enter__(self) -> ta.Self:
         return self
 
@@ -31,7 +31,7 @@ class SelfCloser(Closer):
 ##
 
 
-class Querier(SelfCloser, lang.Abstract):
+class Querier(ContextCloser, lang.Abstract):
     @property
     @abc.abstractmethod
     def adapter(self) -> 'Adapter':
@@ -45,7 +45,7 @@ class Querier(SelfCloser, lang.Abstract):
 ##
 
 
-class Rows(SelfCloser, lang.Abstract):
+class Rows(ContextCloser, lang.Abstract):
     @property
     @abc.abstractmethod
     def columns(self) -> Columns:

omlish/sql/dbapi.py

@@ -5,12 +5,6 @@ https://peps.python.org/pep-0249/
 
 apilevel = '2.0'
 
-threadsafety:
- 0 - Threads may not share the module.
- 1 - Threads may share the module, but not connections.
- 2 - Threads may share the module and connections.
- 3 - Threads may share the module, connections and cursors.
-
 paramstyle:
  qmark - Question mark style, e.g. ...WHERE name=?
  numeric - Numeric, positional style, e.g. ...WHERE name=:1

omlish/testing/pytest/skip.py

@@ -20,6 +20,10 @@ def if_python_version_less_than(num: ta.Sequence[int]):
     return pytest.mark.skipif(sys.version_info < tuple(num), reason=f'python version {tuple(sys.version_info)} < {tuple(num)}')  # noqa
 
 
+def if_not_platform(*platforms: str):
+    return pytest.mark.skipif(sys.platform not in platforms, reason=f'requires platform in {platforms}')
+
+
 def if_not_single():
     # FIXME
     # [resolve_collection_argument(a) for a in session.config.args]

omlish/text/mangle.py

@@ -0,0 +1,38 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import dataclasses as dc
+import typing as ta
+
+from ..lite.cached import cached_nullary
+from ..lite.check import check
+
+
+@dc.dataclass(frozen=True)
+class StringMangler:
+    escape: str
+    escaped: ta.Sequence[str]
+
+    @classmethod
+    def of(cls, escape: str, escaped: ta.Iterable[str]) -> 'StringMangler':
+        check.arg(len(escape) == 1)
+        return StringMangler(escape, sorted(set(escaped) - {escape}))
+
+    def __post_init__(self) -> None:
+        check.non_empty_str(self.escape)
+        check.arg(len(self.escape) == 1)
+        check.not_in(self.escape, self.escaped)
+        check.arg(len(set(self.escaped)) == len(self.escaped))
+
+    @cached_nullary
+    def replacements(self) -> ta.Sequence[ta.Tuple[str, str]]:
+        return [(l, self.escape + str(i)) for i, l in enumerate([self.escape, *self.escaped])]
+
+    def mangle(self, s: str) -> str:
+        for l, r in self.replacements():
+            s = s.replace(l, r)
+        return s
+
+    def unmangle(self, s: str) -> str:
+        for l, r in reversed(self.replacements()):
+            s = s.replace(r, l)
+        return s

{omlish-0.0.0.dev240.dist-info → omlish-0.0.0.dev242.dist-info}/METADATA

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

{omlish-0.0.0.dev240.dist-info → omlish-0.0.0.dev242.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=vQTAIvR8OblSq-uP2GUfnbei0RnmAnM5j0T1-OToh9E,8253
-omlish/__about__.py,sha256=yWkALlaBMUZQGBFqzomouYR0oDIe1-AI6oxA2oWnPx4,3380
+omlish/__about__.py,sha256=v3KofXu74aLHjSY2AMiIiv61EfsLsoedesWKEUsNxWA,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -8,7 +8,7 @@ omlish/datetimes.py,sha256=HajeM1kBvwlTa-uR1TTZHmZ3zTPnnUr1uGGQhiO1XQ0,2152
 omlish/defs.py,sha256=9uUjJuVIbCBL3g14fyzAp-9gH935MFofvlfOGwcBIaM,4913
 omlish/dynamic.py,sha256=kIZokHHid8a0pIAPXMNiXrVJvJJyBnY49WP1a2m-HUQ,6525
 omlish/libc.py,sha256=8K4c66YV1ziJerl5poAAYCmsV-VSsHkT3EHhPW04ufg,15639
-omlish/metadata.py,sha256=IJFczp-bkFk_lCYTUt5UmM_MvCbKICjJunEi2MqnC1w,3495
+omlish/metadata.py,sha256=q8UG-fpcXhEF7BZnhVikIE_IHyud9-8YT8iv646zU2s,3589
 omlish/outcome.py,sha256=ABIE0zjjTyTNtn-ZqQ_9_mUzLiBQ3sDAyqc9JVD8N2k,7852
 omlish/runmodule.py,sha256=PWvuAaJ9wQQn6bx9ftEL3_d04DyotNn8dR_twm2pgw0,700
 omlish/shlex.py,sha256=bsW2XUD8GiMTUTDefJejZ5AyqT1pTgWMPD0BMoF02jE,248
@@ -98,8 +98,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=KpTanEtpTlc3rqv5SyiJaJGb_DXBzp_WKLhlRq6lrhY,212
-omlish/asyncs/asyncio/asyncio.py,sha256=3BMhVIF-QTjsFRGDtNYlRbBqKPCA3_AwJsjJoIWdM8k,1783
+omlish/asyncs/asyncio/all.py,sha256=EksCHjRQKobiGrxuDW72IaH53WJMs7rdj_ZDBI3iKcg,315
+omlish/asyncs/asyncio/asyncio.py,sha256=mDjYNm1cylUhQ8slWXwdPoXasuWfafjzu78GHt2Mdig,2437
 omlish/asyncs/asyncio/channels.py,sha256=ZbmsEmdK1fV96liHdcVpRqA2dAMkXJt4Q3rFAg3YOIw,1074
 omlish/asyncs/asyncio/streams.py,sha256=Uc9PCWSfBqrK2kdVtfjjQU1eaYTWYmZm8QISDj2xiuw,1004
 omlish/asyncs/asyncio/subprocesses.py,sha256=f30-wi-3n9R5dftm4CMrzp23EEa4GX283bORixm1_UU,6931
@@ -238,15 +238,16 @@ omlish/dispatch/dispatch.py,sha256=p3-RqBf9RKZaNub1FMGHZkETewF43mU_rv4fYD_ERqU,4
 omlish/dispatch/functions.py,sha256=S8ElsLi6DKxTdtFGigWaF0vAquwy2sK-3f4iRLaYq70,1522
 omlish/dispatch/methods.py,sha256=Sg134xzG41-__czfnWdzDlXdsxVt7ELOq90N2E6NSzI,5501
 omlish/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/docker/all.py,sha256=2BqXMehpqj4j6-rVq_iOMcjoWgw4oyC3jWeHd_jPOZo,487
+omlish/docker/all.py,sha256=xXRgJgLGPwAtr7bDMJ_Dp9jTfOwfGvohNhc6LsoELJc,514
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
 omlish/docker/compose.py,sha256=4drmnGQzbkOFJ9B6XSg9rnXkJeZz1ETmdcMe1PE790U,1237
 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/portrelay.py,sha256=QlRoTnQXs5INguR7XOj1xH0gNdL9SUeZm5z45DUctXo,1222
-omlish/docker/timebomb.py,sha256=A_pgIDaXKsQwPiikrCTgIJl91gwYqkPGFY6j-Naq07Q,342
+omlish/docker/ns1.py,sha256=75L_9zjXK5qZbvi20Kd0cus-bm3n4oKFYcmEtk1c5-o,2470
+omlish/docker/ports.py,sha256=ov4Lq5JweAThD3qwnjaJbONcHAkRhEx96-NU7ftMcK0,2083
+omlish/docker/timebomb.py,sha256=EnFt8pJeXkowF_F5NXnN0ogDmxUmVymV4h1CYPwyJr4,356
 omlish/formats/__init__.py,sha256=T0AG1gFnqQ5JiHN0UPQjQ-7g5tnxMIG-mgOvMYExYAM,21
 omlish/formats/cbor.py,sha256=o_Hbe4kthO9CeXK-FySrw0dHVlrdyTo2Y8PpGRDfZ3c,514
 omlish/formats/cloudpickle.py,sha256=16si4yUp_pAdDWGECAWf6HLA2PwSANGGgDoMLGZUem8,579
@@ -331,7 +332,7 @@ omlish/http/wsgi.py,sha256=czZsVUX-l2YTlMrUjKN49wRoP4rVpS0qpeBn4O5BoMY,948
 omlish/http/coro/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/http/coro/fdio.py,sha256=bd9K4EYVWbXV3e3npDPXI9DuDAruJiyDmrgFpgNcjzY,4035
 omlish/http/coro/server.py,sha256=30FTcJG8kuFeThf0HJYpTzMZN-giLTBP7wr5Wl3b9X0,18285
-omlish/http/coro/simple.py,sha256=ys4l0F0UofvfZaioYgsEIMW2mG4txf45cXOSoHxfxsk,2873
+omlish/http/coro/simple.py,sha256=_ZKFlfLda9Gatd3bNBNGJpITNQl4tuTAbL3P-Mr5j5w,3152
 omlish/http/coro/sockets.py,sha256=rtpZZ-XCOfC5tXr4Fmo1HSn-8f5nxfIOlJaPUkQeDyU,1654
 omlish/inject/__init__.py,sha256=n0RC9UDGsBQQ39cST39-XJqJPq2M0tnnh9yJubW9azo,1891
 omlish/inject/binder.py,sha256=DAbc8TZi5w8Mna0TUtq0mT4jeDVA7i7SlBtOFrh2swc,4185
@@ -436,7 +437,7 @@ omlish/lite/configs.py,sha256=Ev_19sbII67pTWzInYjYqa9VyTiZBvyjhZqyG8TtufE,908
 omlish/lite/contextmanagers.py,sha256=ciaMl0D3QDHToM7M28-kwZ-Q48LtwgCxiud3nekgutA,2863
 omlish/lite/dataclasses.py,sha256=t1G5-xOuvE6o6w9RyqHzLT9wHD0HkqBh5P8HUZWxGzs,1912
 omlish/lite/imports.py,sha256=o9WWrNrWg0hKeMvaj91giaovED_9VFanN2MyEHBGekY,1346
-omlish/lite/inject.py,sha256=qBUftFeXMiRgANYbNS2e7TePMYyFAcuLgsJiLyMTW5o,28769
+omlish/lite/inject.py,sha256=-tTsOqqef-Ix5Tgl2DP_JAsNWJQDFUptERl3lk14Uzs,29007
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
 omlish/lite/marshal.py,sha256=UMwSLEM-QvkvnSHmcChJVkIXkGp9WAyMYyZMB-NZefw,18463
@@ -472,7 +473,7 @@ omlish/manifests/load.py,sha256=9mdsS3egmSX9pymO-m-y2Fhs4p6ruOdbsYaKT1-1Hwg,6655
 omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
 omlish/manifests/types.py,sha256=IOt9dOe0r8okCHSL82ryi3sn4VZ6AT80g_QQR6oZtCE,306
 omlish/marshal/__init__.py,sha256=00D3S6qwUld1TUWd67hVHuNcrj3c_FAFSkCVXgGWT-s,2607
-omlish/marshal/base.py,sha256=tJ4iNuD7cW2GpGMznOhkAf2hugqp2pF2em0FaQcekrk,6740
+omlish/marshal/base.py,sha256=s1wQRPG2Y6kH0qQXoL3d60ldYaVTqLuFs0NdbYXwAGg,6842
 omlish/marshal/exceptions.py,sha256=jwQWn4LcPnadT2KRI_1JJCOSkwWh0yHnYK9BmSkNN4U,302
 omlish/marshal/factories.py,sha256=Q926jSVjaQLEmStnHLhm_c_vqEysN1LnDCwAsFLIzXw,2970
 omlish/marshal/global_.py,sha256=K76wB1-pdg4VWgiqR7wyxRNYr-voJApexYW2nV-R4DM,1127
@@ -527,7 +528,7 @@ omlish/os/files.py,sha256=WJ_42vsZIZukQURN3TTccp-n74ZNhbux_ps3TLbHj18,1106
 omlish/os/forkhooks.py,sha256=yjodOvs90ClXskv5oBIJbHn0Y7dzajLmZmOpRMKbyxM,5656
 omlish/os/journald.py,sha256=2nI8Res1poXkbLc31--MPUlzYMESnCcPUkIxDOCjZW0,3903
 omlish/os/linux.py,sha256=whJ6scwMKSFBdXiVhJW0BCpJV4jOGMr-a_a3Bhwz6Ls,18938
-omlish/os/mangle.py,sha256=dRp5uBxPuM6g52GnxuBoJUdUKW3CVVRr2ZwvQPHHxnA,489
+omlish/os/mangle.py,sha256=M0v-SDt4TMnL68I45GekQrUaXkTIILXIlPdqRxKBTKM,524
 omlish/os/paths.py,sha256=hqPiyg_eYaRoIVPdAeX4oeLEV4Kpln_XsH0tHvbOf8Q,844
 omlish/os/signals.py,sha256=FtzkovLb58N3vNdfxflUeXWFCqqKzseCjk5kBdWT-ds,267
 omlish/os/sizes.py,sha256=ohkALLvqSqBX4iR-7DMKJ4pfOCRdZXV8htH4QywUNM0,152
@@ -560,12 +561,14 @@ omlish/secrets/subprocesses.py,sha256=ffjfbgPbEE_Pwb_87vG4yYR2CGZy3I31mHNCo_0JtH
 omlish/secrets/tempssl.py,sha256=tlwRrbHHvgKJtNAC31I5sDKryya4fagqN6kGt-tV4Qg,1874
 omlish/sockets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/sockets/addresses.py,sha256=vbVeQBkzI513H4vRv-JS89QtRbr9U8v5zqkm3oODl_s,1869
-omlish/sockets/bind.py,sha256=uRHZJvBxWXadd3Qt7deDEJ1rWzjC-lVodRgPA6VMwNU,8025
+omlish/sockets/bind.py,sha256=J1SfFFFnVf3H5nqESDX2NGEY8DmjyIMUXZciZM33zQY,8003
 omlish/sockets/handlers.py,sha256=Gj6xZoo4vommge8XvkehYw3B7O4aql2P4qzZIIa0p24,462
 omlish/sockets/io.py,sha256=lfhTkB7NnAIx9kuQhAkwgsEUXY78Mp1_WtYrIQNS_k8,1408
+omlish/sockets/ports.py,sha256=Wm4mRFFz5MdD8KbdaEfT1c4PbJnsuK_iyJlZJE_-8jo,1402
 omlish/sockets/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/sockets/server/handlers.py,sha256=y41oftA22gpOoR6MCaOp0_A6T4HgI144Wg9kj0XFWes,3865
+omlish/sockets/server/handlers.py,sha256=PPsb1X5oU9dN8jfztaMGsRiqWTyEANT-1aSLbS6bUVg,3867
 omlish/sockets/server/server.py,sha256=mZmHPkCRPitous56_7FJdAsDLZag2wDqjj-LaYM8_Fg,4943
+omlish/sockets/server/ssl.py,sha256=VE0GpdA-gYsN2m9_uvfDwWmXtIbRQqJomVdpGJO8o2M,1061
 omlish/sockets/server/threading.py,sha256=YmW3Ym_p5j_F4SIH9BgRHIObywjq1HS39j9CGWIcMAY,2856
 omlish/specs/__init__.py,sha256=zZwF8yXTEkSstYtORkDhVLK-_hWU8WOJCuBpognb_NY,118
 omlish/specs/irc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -629,8 +632,8 @@ omlish/specs/openapi/__init__.py,sha256=zilQhafjvteRDF_TUIRgF293dBC6g-TJChmUb6T9
 omlish/specs/openapi/marshal.py,sha256=Z-E2Knm04C81N8AA8cibCVSl2ImhSpHZVc7yAhmPx88,2135
 omlish/specs/openapi/openapi.py,sha256=y4h04jeB7ORJSVrcy7apaBdpwLjIyscv1Ub5SderH2c,12682
 omlish/sql/__init__.py,sha256=TpZLsEJKJzvJ0eMzuV8hwOJJbkxBCV1RZPUMLAVB6io,173
-omlish/sql/abc.py,sha256=K3AmEPVxzvQrrc1AXdlbM9-9LERGq6lko9slx88kB90,2074
-omlish/sql/dbapi.py,sha256=5ghJH-HexsmDlYdWlhf00nCGQX2IC98_gxIxMkucOas,3195
+omlish/sql/abc.py,sha256=yrUSO2OSY6rtMyA0_MlrEFEyIKXLJymSPpmJwEjEJuc,4038
+omlish/sql/dbapi.py,sha256=o6umqE7zVFI_ax0TnCKAikhAIPXChYOwVULb_OdcL1c,2974
 omlish/sql/dbs.py,sha256=65e388987upJpsFX8bNL7uhiYv2sCsmk9Y04V0MXdsI,1873
 omlish/sql/params.py,sha256=Z4VPet6GhNqD1T_MXSWSHkdy3cpUEhST-OplC4B_fYI,4433
 omlish/sql/qualifiedname.py,sha256=rlW3gVmyucJbqwcxj_7BfK4X2HoXrMroZT2H45zPgJQ,2264
@@ -641,7 +644,7 @@ omlish/sql/alchemy/exprs.py,sha256=gO4Fj4xEY-PuDgV-N8hBMy55glZz7O-4H7v1LWabfZY,3
 omlish/sql/alchemy/secrets.py,sha256=WEeaec1ejQcE3Yaa7p5BSP9AMGEzy1lwr7QMSRL0VBw,180
 omlish/sql/alchemy/sqlean.py,sha256=RbkuOuFIfM4fowwKk8-sQ6Dxk-tTUwxS94nY5Kxt52s,403
 omlish/sql/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/sql/api/base.py,sha256=iPvLwI_noMzazgPlYOZb9xzpXfyb_OfX2WKD9nzWpQc,1506
+omlish/sql/api/base.py,sha256=fvCg-bGVPEZOwrob_Kn4bpk_rYdiEKutyPXamCbLrWw,1515
 omlish/sql/api/columns.py,sha256=UBol4bfwZ1nhcjv2gE1JhUMzRFeqtiCDo2T9CUGYb64,1943
 omlish/sql/api/dbapi.py,sha256=H3bFoWI-ox81APX3xBbjylNWyMUXh78ICMQjRrlDNxw,2426
 omlish/sql/api/errors.py,sha256=YtC2gz5DqRTT3uCJniUOufVH1GEnFIc5ElkYLK3BHwM,230
@@ -691,7 +694,7 @@ omlish/testing/__init__.py,sha256=M_BQrcCHkoL-ZvE-UpQ8XxXNYRRawhjUz4rCJnAqM2A,15
 omlish/testing/testing.py,sha256=TT2wwSzPZ_KhIvKxpM1qc1yHKD-LHDNgGrcr_h8vs7c,2895
 omlish/testing/pytest/__init__.py,sha256=rOpQYgp7jYjEIMjInzl-a_uIMqmOtVwGzDgJyCDpvxg,206
 omlish/testing/pytest/helpers.py,sha256=TJpD60mBtLi9FtxX4TThfuXvg5FIRPSiZk1aeRwe-D4,197
-omlish/testing/pytest/skip.py,sha256=NxTkAQiS3HKZR3sfFdxOR2LCFwtCveY6Ap-qtexiZbw,839
+omlish/testing/pytest/skip.py,sha256=Mk7iIfXxp6JWl8vJRP9BK9LoirSOLTJ3mLeLL6Ipi9M,984
 omlish/testing/pytest/inject/__init__.py,sha256=pdRKv1HcDmJ_yArKJbYITPXXZthRSGgBJWqITr0Er38,117
 omlish/testing/pytest/inject/harness.py,sha256=_Qf7lLcYc_dpauYOE68u_a65jPCFWmQUYv9m_OOdNqs,5724
 omlish/testing/pytest/plugins/__init__.py,sha256=ys1zXrYrNm7Uo6YOIVJ6Bd3dQo6kv387k7MbTYlqZSI,467
@@ -720,12 +723,13 @@ omlish/text/asdl.py,sha256=AS3irh-sag5pqyH3beJif78PjCbOaFso1NeKq-HXuTs,16867
 omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=kqqjglRdxGo0czYZxOz9Vi8aBmVsCOq8h6lPwRA5xe0,3803
 omlish/text/indent.py,sha256=YjtJEBYWuk8--b9JU_T6q4yxV85_TR7VEVr5ViRCFwk,1336
+omlish/text/mangle.py,sha256=kfzFLfvepH-chl1P89_mdc5vC4FSqyPA2aVtgzuB8IY,1133
 omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
 omlish/text/parts.py,sha256=JkNZpyR2tv2CNcTaWJJhpQ9E4F0yPR8P_YfDbZfMtwQ,6182
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev240.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev240.dist-info/METADATA,sha256=Ok-6z9aF1wMJzIfXr6vec_L1ztsSkFtHnwfMZPOFi54,4176
-omlish-0.0.0.dev240.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-omlish-0.0.0.dev240.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev240.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev240.dist-info/RECORD,,
+omlish-0.0.0.dev242.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev242.dist-info/METADATA,sha256=f11RfSbCLw8fvLQKc--nQePc_WBXEXJ_ljN3zB8QuvM,4176
+omlish-0.0.0.dev242.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+omlish-0.0.0.dev242.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev242.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev242.dist-info/RECORD,,