omlish 0.0.0.dev151__tar.gz → 0.0.0.dev153__tar.gz

{omlish-0.0.0.dev151/omlish.egg-info → omlish-0.0.0.dev153}/PKG-INFO

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

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev151'
-__revision__ = '7d978888ef2b04964976a01388376b919ec8bafe'
+__version__ = '0.0.0.dev153'
+__revision__ = '98ab8eed12f9cf5fa241294e648759c21741ad57'
 
 
 #

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish/argparse/cli.py

@@ -4,6 +4,8 @@
 TODO:
  - default command
  - auto match all underscores to hyphens
+ - pre-run, post-run hooks
+ - exitstack?
 """
 import argparse
 import dataclasses as dc
@@ -136,11 +138,12 @@ class ArgparseCli:
 
         self._args, self._unknown_args = self.get_parser().parse_known_args(self._argv)
 
+    #
+
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
         ns = cls.__dict__
-
         objs = {}
         mro = cls.__mro__[::-1]
         for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
@@ -153,24 +156,33 @@ class ArgparseCli:
                 elif k in objs:
                     del [k]
 
+        #
+
         anns = ta.get_type_hints(_ArgparseCliAnnotationBox({
             **{k: v for bcls in reversed(mro) for k, v in getattr(bcls, '__annotations__', {}).items()},
             **ns.get('__annotations__', {}),
         }), globalns=ns.get('__globals__', {}))
 
+        #
+
         if '_parser' in ns:
             parser = check.isinstance(ns['_parser'], argparse.ArgumentParser)
         else:
             parser = argparse.ArgumentParser()
             setattr(cls, '_parser', parser)
 
+        #
+
         subparsers = parser.add_subparsers()
+
         for att, obj in objs.items():
             if isinstance(obj, ArgparseCommand):
                 if obj.parent is not None:
                     raise NotImplementedError
+
                 for cn in [obj.name, *(obj.aliases or [])]:
-                    cparser = subparsers.add_parser(cn)
+                    subparser = subparsers.add_parser(cn)
+
                     for arg in (obj.args or []):
                         if (
                                 len(arg.args) == 1 and
@@ -178,29 +190,34 @@ class ArgparseCli:
                                 not (n := check.isinstance(arg.args[0], str)).startswith('-') and
                                 'metavar' not in arg.kwargs
                         ):
-                            cparser.add_argument(
+                            subparser.add_argument(
                                 n.replace('-', '_'),
                                 **arg.kwargs,
                                 metavar=n,
                             )
                         else:
-                            cparser.add_argument(*arg.args, **arg.kwargs)
-                    cparser.set_defaults(_cmd=obj)
+                            subparser.add_argument(*arg.args, **arg.kwargs)
+
+                    subparser.set_defaults(_cmd=obj)
 
             elif isinstance(obj, ArgparseArg):
                 if att in anns:
-                    akwargs = _get_argparse_arg_ann_kwargs(anns[att])
-                    obj.kwargs = {**akwargs, **obj.kwargs}
+                    ann_kwargs = _get_argparse_arg_ann_kwargs(anns[att])
+                    obj.kwargs = {**ann_kwargs, **obj.kwargs}
+
                 if not obj.dest:
                     if 'dest' in obj.kwargs:
                         obj.dest = obj.kwargs['dest']
                     else:
                         obj.dest = obj.kwargs['dest'] = att  # type: ignore
+
                 parser.add_argument(*obj.args, **obj.kwargs)
 
             else:
                 raise TypeError(obj)
 
+    #
+
     _parser: ta.ClassVar[argparse.ArgumentParser]
 
     @classmethod
@@ -219,10 +236,12 @@ class ArgparseCli:
     def unknown_args(self) -> ta.Sequence[str]:
         return self._unknown_args
 
-    def _run_cmd(self, cmd: ArgparseCommand) -> ta.Optional[int]:
-        return cmd.__get__(self, type(self))()
+    #
+
+    def _bind_cli_cmd(self, cmd: ArgparseCommand) -> ta.Callable:
+        return cmd.__get__(self, type(self))
 
-    def __call__(self) -> ta.Optional[int]:
+    def prepare_cli_run(self) -> ta.Optional[ta.Callable]:
         cmd = getattr(self.args, '_cmd', None)
 
         if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
@@ -234,9 +253,31 @@ class ArgparseCli:
 
         if cmd is None:
             self.get_parser().print_help()
+            return None
+
+        return self._bind_cli_cmd(cmd)
+
+    #
+
+    def cli_run(self) -> ta.Optional[int]:
+        if (fn := self.prepare_cli_run()) is None:
             return 0
 
-        return self._run_cmd(cmd)
+        return fn()
+
+    def cli_run_and_exit(self) -> ta.NoReturn:
+        sys.exit(rc if isinstance(rc := self.cli_run(), int) else 0)
+
+    def __call__(self, *, exit: bool = False) -> ta.Optional[int]:  # noqa
+        if exit:
+            return self.cli_run_and_exit()
+        else:
+            return self.cli_run()
+
+    #
+
+    async def async_cli_run(self) -> ta.Optional[int]:
+        if (fn := self.prepare_cli_run()) is None:
+            return 0
 
-    def call_and_exit(self) -> ta.NoReturn:
-        sys.exit(rc if isinstance(rc := self(), int) else 0)
+        return await fn()

omlish-0.0.0.dev153/omlish/asyncs/asyncio/all.py

@@ -0,0 +1,7 @@
+# ruff: noqa: I001
+from .asyncio import (  # noqa
+    asyncio_once,
+    get_real_current_loop,
+    drain_tasks,
+    draining_asyncio_tasks,
+)

omlish-0.0.0.dev153/omlish/asyncs/asyncio/channels.py

@@ -0,0 +1,40 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import asyncio
+import typing as ta
+
+
+class AsyncioBytesChannelTransport(asyncio.Transport):
+    def __init__(self, reader: asyncio.StreamReader) -> None:
+        super().__init__()
+
+        self.reader = reader
+        self.closed: asyncio.Future = asyncio.Future()
+
+    # @ta.override
+    def write(self, data: bytes) -> None:
+        self.reader.feed_data(data)
+
+    # @ta.override
+    def close(self) -> None:
+        self.reader.feed_eof()
+        if not self.closed.done():
+            self.closed.set_result(True)
+
+    # @ta.override
+    def is_closing(self) -> bool:
+        return self.closed.done()
+
+
+def asyncio_create_bytes_channel(
+        loop: ta.Any = None,
+) -> ta.Tuple[asyncio.StreamReader, asyncio.StreamWriter]:
+    if loop is None:
+        loop = asyncio.get_running_loop()
+
+    reader = asyncio.StreamReader()
+    protocol = asyncio.StreamReaderProtocol(reader)
+    transport = AsyncioBytesChannelTransport(reader)
+    writer = asyncio.StreamWriter(transport, protocol, reader, loop)
+
+    return reader, writer

omlish-0.0.0.dev151/omlish/lite/asyncio/asyncio.py → omlish-0.0.0.dev153/omlish/asyncs/asyncio/streams.py

@@ -1,15 +1,9 @@
 # ruff: noqa: UP006 UP007
-import asyncio.base_subprocess
-import asyncio.subprocess
+# @omlish-lite
+import asyncio
 import typing as ta
 
 
-AwaitableT = ta.TypeVar('AwaitableT', bound=ta.Awaitable)
-
-
-##
-
-
 ASYNCIO_DEFAULT_BUFFER_LIMIT = 2 ** 16
 
 
@@ -49,15 +43,3 @@ async def asyncio_open_stream_writer(
         None,
         loop,
     )
-
-
-##
-
-
-def asyncio_maybe_timeout(
-        fut: AwaitableT,
-        timeout: ta.Optional[float] = None,
-) -> AwaitableT:
-    if timeout is not None:
-        fut = asyncio.wait_for(fut, timeout)  # type: ignore
-    return fut

omlish-0.0.0.dev153/omlish/asyncs/asyncio/timeouts.py

@@ -0,0 +1,16 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import asyncio
+import typing as ta
+
+
+AwaitableT = ta.TypeVar('AwaitableT', bound=ta.Awaitable)
+
+
+def asyncio_maybe_timeout(
+        fut: AwaitableT,
+        timeout: ta.Optional[float] = None,
+) -> AwaitableT:
+    if timeout is not None:
+        fut = asyncio.wait_for(fut, timeout)  # type: ignore
+    return fut

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish/bootstrap/sys.py

@@ -23,13 +23,13 @@ if ta.TYPE_CHECKING:
     from .. import libc
     from .. import logs
     from ..formats import dotenv
-    from ..lite import pidfile
+    from ..os import pidfile
 
 else:
     libc = lang.proxy_import('..libc', __package__)
     logs = lang.proxy_import('..logs', __package__)
     dotenv = lang.proxy_import('..formats.dotenv', __package__)
-    pidfile = lang.proxy_import('..lite.pidfile', __package__)
+    pidfile = lang.proxy_import('..os.pidfile', __package__)
 
 
 ##

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish/diag/procfs.py

@@ -13,8 +13,8 @@ import typing as ta
 
 from .. import iterators as it
 from .. import lang
-from .. import os as oos
 from ..formats import json
+from ..os.sizes import PAGE_SIZE
 from .procstats import ProcStats
 
 
@@ -239,8 +239,8 @@ def get_process_range_pagemaps(start: int, end: int, pid: PidLike = 'self') -> t
     """https://www.kernel.org/doc/Documentation/vm/pagemap.txt"""
 
     _check_linux()
-    offset = (start // oos.PAGE_SIZE) * 8
-    npages = ((end - start) // oos.PAGE_SIZE)
+    offset = (start // PAGE_SIZE) * 8
+    npages = ((end - start) // PAGE_SIZE)
     size = npages * 8
     with open(f'/proc/{pid}/pagemap', 'rb') as pagemap_file:
         pagemap_file.seek(offset)
@@ -251,7 +251,7 @@ def get_process_range_pagemaps(start: int, end: int, pid: PidLike = 'self') -> t
     for pagenum in range(npages):
         [packed] = _struct_unpack('Q', pagemap_buf[pagenum * 8:(pagenum + 1) * 8])
         yield {
-            'address': start + (pagenum * oos.PAGE_SIZE),
+            'address': start + (pagenum * PAGE_SIZE),
             'pfn': (packed & ((1 << (54 + 1)) - 1)),
             'swap_type': (packed & ((1 << (4 + 1)) - 1)),
             'swap_offset': (packed & ((1 << (54 + 1)) - 1)) >> 5,
@@ -280,7 +280,7 @@ def _dump_cmd(args: ta.Any) -> None:
         sys.stdout.write('\n')
         for pm in get_process_range_pagemaps(m['address'], m['end_address'], args.pid):
             if pm['pte_soft_dirty']:
-                dirty_total += oos.PAGE_SIZE
+                dirty_total += PAGE_SIZE
             sys.stdout.write(json.dumps({'page': tuple(pm[k] for k in PAGEMAP_KEYS)}))
             sys.stdout.write('\n')
     dct = {
@@ -326,11 +326,11 @@ def _cmp_cmd(args: ta.Any) -> None:
     r_pages += c_pages
     dct = {
         'l_pages': l_pages,
-        'l_bytes': l_pages * oos.PAGE_SIZE,
+        'l_bytes': l_pages * PAGE_SIZE,
         'r_pages': r_pages,
-        'r_bytes': r_pages * oos.PAGE_SIZE,
+        'r_bytes': r_pages * PAGE_SIZE,
         'c_pages': c_pages,
-        'c_bytes': c_pages * oos.PAGE_SIZE,
+        'c_bytes': c_pages * PAGE_SIZE,
     }
     sys.stdout.write(json.dumps(dct))
     sys.stdout.write('\n')

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish/inject/managed.py

@@ -14,9 +14,9 @@ from .injector import create_injector
 
 
 if ta.TYPE_CHECKING:
-    from .. import asyncs as _asyncs
+    from ..asyncs import all as _asyncs
 else:
-    _asyncs = lang.proxy_import('..asyncs', __package__)
+    _asyncs = lang.proxy_import('..asyncs.all', __package__)
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish/lite/asyncio/subprocesses.py

@@ -8,12 +8,12 @@ import subprocess
 import sys
 import typing as ta
 
+from ...asyncs.asyncio.timeouts import asyncio_maybe_timeout
 from ..check import check
 from ..logs import log
 from ..subprocesses import DEFAULT_SUBPROCESS_TRY_EXCEPTIONS
 from ..subprocesses import prepare_subprocess_invocation
 from ..subprocesses import subprocess_common_context
-from .asyncio import asyncio_maybe_timeout
 
 
 T = ta.TypeVar('T')
@@ -177,22 +177,25 @@ async def asyncio_subprocess_communicate(
     return await AsyncioProcessCommunicator(proc).communicate(input, timeout)  # noqa
 
 
-##
-
-
-async def _asyncio_subprocess_check_run(
+async def asyncio_subprocess_run(
         *args: str,
         input: ta.Any = None,  # noqa
         timeout: ta.Optional[float] = None,
+        check: bool = False,  # noqa
+        capture_output: ta.Optional[bool] = None,
         **kwargs: ta.Any,
 ) -> ta.Tuple[ta.Optional[bytes], ta.Optional[bytes]]:
+    if capture_output:
+        kwargs.setdefault('stdout', subprocess.PIPE)
+        kwargs.setdefault('stderr', subprocess.PIPE)
+
     args, kwargs = prepare_subprocess_invocation(*args, **kwargs)
 
     proc: asyncio.subprocess.Process
     async with asyncio_subprocess_popen(*args, **kwargs) as proc:
         stdout, stderr = await asyncio_subprocess_communicate(proc, input, timeout)
 
-    if proc.returncode:
+    if check and proc.returncode:
         raise subprocess.CalledProcessError(
             proc.returncode,
             args,
@@ -203,6 +206,9 @@ async def _asyncio_subprocess_check_run(
     return stdout, stderr
 
 
+##
+
+
 async def asyncio_subprocess_check_call(
         *args: str,
         stdout: ta.Any = sys.stderr,
@@ -210,11 +216,12 @@ async def asyncio_subprocess_check_call(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> None:
-    _, _ = await _asyncio_subprocess_check_run(
+    _, _ = await asyncio_subprocess_run(
         *args,
         stdout=stdout,
         input=input,
         timeout=timeout,
+        check=True,
         **kwargs,
     )
 
@@ -225,11 +232,12 @@ async def asyncio_subprocess_check_output(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> bytes:
-    stdout, stderr = await _asyncio_subprocess_check_run(
+    stdout, stderr = await asyncio_subprocess_run(
         *args,
         stdout=asyncio.subprocess.PIPE,
         input=input,
         timeout=timeout,
+        check=True,
         **kwargs,
     )
 

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish/lite/subprocesses.py

@@ -13,7 +13,7 @@ from .runtime import is_debugger_attached
 
 
 T = ta.TypeVar('T')
-SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']
+SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlias
 
 
 ##

{omlish-0.0.0.dev151/omlish/lite → omlish-0.0.0.dev153/omlish/os}/deathsig.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 import ctypes as ct
 import sys
 

omlish-0.0.0.dev151/omlish/os.py → omlish-0.0.0.dev153/omlish/os/files.py

@@ -1,19 +1,10 @@
 import contextlib
 import os
-import resource
 import shutil
 import tempfile
 import typing as ta
 
 
-PAGE_SIZE = resource.getpagesize()
-
-
-def round_to_page_size(sz: int) -> int:
-    sz += PAGE_SIZE - 1
-    return sz - (sz % PAGE_SIZE)
-
-
 @contextlib.contextmanager
 def tmp_dir(
         root_dir: str | None = None,

{omlish-0.0.0.dev151/omlish/lite → omlish-0.0.0.dev153/omlish/os}/journald.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP007 UP012
+# @omlish-lite
 import ctypes as ct
 import logging
 import sys
@@ -6,7 +7,7 @@ import syslog
 import threading
 import typing as ta
 
-from .cached import cached_nullary
+from ..lite.cached import cached_nullary
 
 
 ##

{omlish-0.0.0.dev151/omlish/lite → omlish-0.0.0.dev153/omlish/os}/pidfile.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP007
+# @omlish-lite
 import fcntl
 import os
 import signal

omlish-0.0.0.dev153/omlish/os/sizes.py

@@ -0,0 +1,9 @@
+import resource
+
+
+PAGE_SIZE = resource.getpagesize()
+
+
+def round_to_page_size(sz: int) -> int:
+    sz += PAGE_SIZE - 1
+    return sz - (sz % PAGE_SIZE)

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish/sql/alchemy/asyncs.py

@@ -9,7 +9,7 @@ import typing as ta
 import sqlalchemy as sa
 import sqlalchemy.ext.asyncio as saa
 
-from ... import asyncs as au
+from ...asyncs import all as au
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish/testing/pytest/marks.py

@@ -7,9 +7,9 @@ from .plugins.managermarks import ManagerMark  # noqa
 
 
 if ta.TYPE_CHECKING:
-    from ...asyncs import asyncio as aiu
+    from ...asyncs.asyncio import all as aiu
 else:
-    aiu = lang.proxy_import('...asyncs.asyncio', __package__)
+    aiu = lang.proxy_import('...asyncs.asyncio.all', __package__)
 
 
 class drain_asyncio(ManagerMark):  # noqa

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/omlish.egg-info/SOURCES.txt

@@ -14,7 +14,6 @@ omlish/dynamic.py
 omlish/iterators.py
 omlish/libc.py
 omlish/multiprocessing.py
-omlish/os.py
 omlish/runmodule.py
 omlish/sync.py
 omlish/term.py
@@ -88,13 +87,19 @@ omlish/argparse/__init__.py
 omlish/argparse/all.py
 omlish/argparse/cli.py
 omlish/asyncs/__init__.py
+omlish/asyncs/all.py
 omlish/asyncs/anyio.py
-omlish/asyncs/asyncio.py
 omlish/asyncs/asyncs.py
 omlish/asyncs/bridge.py
 omlish/asyncs/flavors.py
 omlish/asyncs/trio.py
 omlish/asyncs/trio_asyncio.py
+omlish/asyncs/asyncio/__init__.py
+omlish/asyncs/asyncio/all.py
+omlish/asyncs/asyncio/asyncio.py
+omlish/asyncs/asyncio/channels.py
+omlish/asyncs/asyncio/streams.py
+omlish/asyncs/asyncio/timeouts.py
 omlish/bootstrap/__init__.py
 omlish/bootstrap/__main__.py
 omlish/bootstrap/base.py
@@ -341,14 +346,11 @@ omlish/lite/__init__.py
 omlish/lite/cached.py
 omlish/lite/check.py
 omlish/lite/contextmanagers.py
-omlish/lite/deathsig.py
 omlish/lite/inject.py
-omlish/lite/journald.py
 omlish/lite/json.py
 omlish/lite/logs.py
 omlish/lite/marshal.py
 omlish/lite/maybes.py
-omlish/lite/pidfile.py
 omlish/lite/pycharm.py
 omlish/lite/reflect.py
 omlish/lite/resources.py
@@ -360,7 +362,6 @@ omlish/lite/strings.py
 omlish/lite/subprocesses.py
 omlish/lite/typing.py
 omlish/lite/asyncio/__init__.py
-omlish/lite/asyncio/asyncio.py
 omlish/lite/asyncio/subprocesses.py
 omlish/logs/__init__.py
 omlish/logs/abc.py
@@ -406,6 +407,12 @@ omlish/math/__init__.py
 omlish/math/bits.py
 omlish/math/floats.py
 omlish/math/stats.py
+omlish/os/__init__.py
+omlish/os/deathsig.py
+omlish/os/files.py
+omlish/os/journald.py
+omlish/os/pidfile.py
+omlish/os/sizes.py
 omlish/reflect/__init__.py
 omlish/reflect/inspect.py
 omlish/reflect/ops.py

{omlish-0.0.0.dev151 → omlish-0.0.0.dev153}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev151'
+version = '0.0.0.dev153'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',