omlish 0.0.0.dev150__tar.gz → 0.0.0.dev152__tar.gz

{omlish-0.0.0.dev150/omlish.egg-info → omlish-0.0.0.dev152}/PKG-INFO

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

{omlish-0.0.0.dev150 → omlish-0.0.0.dev152}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev150'
-__revision__ = 'ab779edf0b58378203e055980af0fedacedb20aa'
+__version__ = '0.0.0.dev152'
+__revision__ = '53e32242b8e9bfcfe60359cf06ca1530082fc343'
 
 
 #

{omlish-0.0.0.dev150 → omlish-0.0.0.dev152}/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.dev150 → omlish-0.0.0.dev152}/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.dev150 → omlish-0.0.0.dev152}/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.dev150/omlish/docker/__init__.py → omlish-0.0.0.dev152/omlish/docker/all.py

@@ -13,10 +13,10 @@ from .compose import (  # noqa
     get_compose_port,
 )
 
-from .helpers import (  # noqa
+from .detect import (  # noqa
     DOCKER_HOST_PLATFORM_KEY,
     get_docker_host_platform,
-    timebomb_payload,
+    is_likely_in_docker,
 )
 
 from .hub import (  # noqa
@@ -26,12 +26,6 @@ from .hub import (  # noqa
     split_tag_suffix,
 )
 
-
-##
-
-
-from ..lite.docker import (  # noqa
-    DOCKER_FOR_MAC_HOSTNAME,
-
-    is_likely_in_docker,
+from .timebomb import (  # noqa
+    timebomb_payload,
 )

omlish-0.0.0.dev152/omlish/docker/consts.py

@@ -0,0 +1,4 @@
+# @omlish-lite
+
+
+DOCKER_FOR_MAC_HOSTNAME = 'docker.for.mac.localhost'

omlish-0.0.0.dev150/omlish/lite/docker.py → omlish-0.0.0.dev152/omlish/docker/detect.py

@@ -1,8 +1,23 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import os
 import re
 import sys
+import typing as ta
 
 
-DOCKER_FOR_MAC_HOSTNAME = 'docker.for.mac.localhost'
+##
+
+
+# Set by pyproject, docker-dev script
+DOCKER_HOST_PLATFORM_KEY = 'DOCKER_HOST_PLATFORM'
+
+
+def get_docker_host_platform() -> ta.Optional[str]:
+    return os.environ.get(DOCKER_HOST_PLATFORM_KEY)
+
+
+##
 
 
 _LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/(docker|desktop-containerd)/')

omlish-0.0.0.dev150/omlish/docker/helpers.py → omlish-0.0.0.dev152/omlish/docker/timebomb.py

@@ -1,10 +1,6 @@
-import os
 import shlex
 
 
-##
-
-
 _DEFAULT_TIMEBOMB_NAME = '-'.join([*__name__.split('.'), 'timebomb'])
 
 
@@ -16,14 +12,3 @@ def timebomb_payload(delay_s: float, name: str = _DEFAULT_TIMEBOMB_NAME) -> str:
         'sh -c \'killall5 -9 -o $PPID -o $$ ; kill 1\''
         ') &'
     )
-
-
-##
-
-
-# Set by pyproject, docker-dev script
-DOCKER_HOST_PLATFORM_KEY = 'DOCKER_HOST_PLATFORM'
-
-
-def get_docker_host_platform() -> str | None:
-    return os.environ.get(DOCKER_HOST_PLATFORM_KEY)

{omlish-0.0.0.dev150 → omlish-0.0.0.dev152}/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.dev150 → omlish-0.0.0.dev152}/omlish/lite/check.py

@@ -14,7 +14,7 @@ T = ta.TypeVar('T')
 SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
 
 CheckMessage = ta.Union[str, ta.Callable[..., ta.Optional[str]], None]  # ta.TypeAlias
-CheckLateConfigureFn = ta.Callable[['Checks'], None]
+CheckLateConfigureFn = ta.Callable[['Checks'], None]  # ta.TypeAlias
 CheckOnRaiseFn = ta.Callable[[Exception], None]  # ta.TypeAlias
 CheckExceptionFactory = ta.Callable[..., Exception]  # ta.TypeAlias
 CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias

{omlish-0.0.0.dev150 → omlish-0.0.0.dev152}/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.dev150/omlish/lite → omlish-0.0.0.dev152/omlish/os}/deathsig.py

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

omlish-0.0.0.dev150/omlish/os.py → omlish-0.0.0.dev152/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.dev150/omlish/lite → omlish-0.0.0.dev152/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.dev150/omlish/lite → omlish-0.0.0.dev152/omlish/os}/pidfile.py

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

omlish-0.0.0.dev152/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.dev150 → omlish-0.0.0.dev152}/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.dev150 → omlish-0.0.0.dev152}/omlish/testing/pytest/plugins/switches.py

@@ -10,8 +10,8 @@ import pytest
 
 from .... import check
 from .... import collections as col
-from .... import docker
 from .... import lang
+from ....docker import all as docker
 from ._registry import register
 
 

{omlish-0.0.0.dev150 → omlish-0.0.0.dev152/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev150 → omlish-0.0.0.dev152}/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,6 +87,7 @@ 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
@@ -180,11 +180,14 @@ omlish/dispatch/dispatch.py
 omlish/dispatch/functions.py
 omlish/dispatch/methods.py
 omlish/docker/__init__.py
+omlish/docker/all.py
 omlish/docker/cli.py
 omlish/docker/compose.py
-omlish/docker/helpers.py
+omlish/docker/consts.py
+omlish/docker/detect.py
 omlish/docker/hub.py
 omlish/docker/manifests.py
+omlish/docker/timebomb.py
 omlish/formats/__init__.py
 omlish/formats/dotenv.py
 omlish/formats/props.py
@@ -338,15 +341,11 @@ omlish/lite/__init__.py
 omlish/lite/cached.py
 omlish/lite/check.py
 omlish/lite/contextmanagers.py
-omlish/lite/deathsig.py
-omlish/lite/docker.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
@@ -404,6 +403,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.dev150 → omlish-0.0.0.dev152}/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.dev150'
+version = '0.0.0.dev152'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',