ominfra 0.0.0.dev151__tar.gz → 0.0.0.dev152__tar.gz

{ominfra-0.0.0.dev151/ominfra.egg-info → ominfra-0.0.0.dev152}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev151
+Version: 0.0.0.dev152
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev151
-Requires-Dist: omlish==0.0.0.dev151
+Requires-Dist: omdev==0.0.0.dev152
+Requires-Dist: omlish==0.0.0.dev152
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev151 → ominfra-0.0.0.dev152}/ominfra/clouds/aws/journald2aws/driver.py

@@ -41,8 +41,8 @@ from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.contextmanagers import ExitStacked
 from omlish.lite.logs import log
-from omlish.lite.pidfile import Pidfile
 from omlish.lite.runtime import is_debugger_attached
+from omlish.os.pidfile import Pidfile
 
 from ....journald.messages import JournalctlMessage  # noqa
 from ....journald.tailer import JournalctlTailerWorker

{ominfra-0.0.0.dev151 → ominfra-0.0.0.dev152}/ominfra/manage/main.py

@@ -8,6 +8,7 @@ manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
 import asyncio
 import contextlib
 import json
+import sys
 import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
@@ -31,7 +32,7 @@ from .remote.spawning import RemoteSpawning
 
 class MainCli(ArgparseCli):
     @argparse_command(
-        argparse_arg('--payload-file'),
+        argparse_arg('--_payload-file'),
 
         argparse_arg('-s', '--shell'),
         argparse_arg('-q', '--shell-quote', action='store_true'),
@@ -49,10 +50,7 @@ class MainCli(ArgparseCli):
 
         argparse_arg('command', nargs='+'),
     )
-    def run(self) -> None:
-        asyncio.run(self._async_run())
-
-    async def _async_run(self) -> None:
+    async def run(self) -> None:
         bs = MainBootstrap(
             main_config=MainConfig(
                 log_level='DEBUG' if self.args.debug else 'INFO',
@@ -61,7 +59,7 @@ class MainCli(ArgparseCli):
             ),
 
             remote_config=RemoteConfig(
-                payload_file=self.args.payload_file,  # noqa
+                payload_file=self.args._payload_file,  # noqa
 
                 pycharm_remote_debug=PycharmRemoteDebug(
                     port=self.args.pycharm_debug_port,
@@ -124,7 +122,7 @@ class MainCli(ArgparseCli):
 
 
 def _main() -> None:
-    MainCli().call_and_exit()
+    sys.exit(asyncio.run(MainCli().async_cli_run()))
 
 
 if __name__ == '__main__':

{ominfra-0.0.0.dev151 → ominfra-0.0.0.dev152}/ominfra/manage/remote/_main.py

@@ -12,11 +12,11 @@ from omlish.lite.asyncio.asyncio import asyncio_open_stream_reader
 from omlish.lite.asyncio.asyncio import asyncio_open_stream_writer
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.deathsig import set_process_deathsig
 from omlish.lite.inject import Injector
 from omlish.lite.logs import log
 from omlish.lite.marshal import ObjMarshalerManager
 from omlish.lite.pycharm import pycharm_debug_connect
+from omlish.os.deathsig import set_process_deathsig
 
 from ...pyremote import pyremote_bootstrap_finalize
 from ..bootstrap import MainBootstrap

{ominfra-0.0.0.dev151 → ominfra-0.0.0.dev152}/ominfra/scripts/journald2aws.py

@@ -79,7 +79,7 @@ ConfigMapping = ta.Mapping[str, ta.Any]
 ThreadWorkerT = ta.TypeVar('ThreadWorkerT', bound='ThreadWorker')
 
 # ../../../../omlish/lite/subprocesses.py
-SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']
+SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlias
 
 
 ########################################
@@ -1439,73 +1439,6 @@ json_dump_compact: ta.Callable[..., bytes] = functools.partial(json.dump, **JSON
 json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON_COMPACT_KWARGS)
 
 
-########################################
-# ../../../../../omlish/lite/pidfile.py
-
-
-class Pidfile:
-    def __init__(self, path: str) -> None:
-        super().__init__()
-        self._path = path
-
-    _f: ta.TextIO
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({self._path!r})'
-
-    def __enter__(self) -> 'Pidfile':
-        fd = os.open(self._path, os.O_RDWR | os.O_CREAT, 0o600)
-        try:
-            os.set_inheritable(fd, True)
-            f = os.fdopen(fd, 'r+')
-        except Exception:
-            try:
-                os.close(fd)
-            except Exception:  # noqa
-                pass
-            raise
-        self._f = f
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if hasattr(self, '_f'):
-            self._f.close()
-            del self._f
-
-    def try_lock(self) -> bool:
-        try:
-            fcntl.flock(self._f, fcntl.LOCK_EX | fcntl.LOCK_NB)
-            return True
-        except OSError:
-            return False
-
-    def ensure_locked(self) -> None:
-        if not self.try_lock():
-            raise RuntimeError('Could not get lock')
-
-    def write(self, pid: ta.Optional[int] = None) -> None:
-        self.ensure_locked()
-        if pid is None:
-            pid = os.getpid()
-        self._f.write(f'{pid}\n')
-        self._f.flush()
-
-    def clear(self) -> None:
-        self.ensure_locked()
-        self._f.seek(0)
-        self._f.truncate()
-
-    def read(self) -> int:
-        if self.try_lock():
-            raise RuntimeError('Got lock')
-        self._f.seek(0)
-        return int(self._f.read())
-
-    def kill(self, sig: int = signal.SIGTERM) -> None:
-        pid = self.read()
-        os.kill(pid, sig)  # FIXME: Still racy
-
-
 ########################################
 # ../../../../../omlish/lite/reflect.py
 
@@ -1628,6 +1561,73 @@ def format_num_bytes(num_bytes: int) -> str:
     return f'{num_bytes / 1024 ** (len(FORMAT_NUM_BYTES_SUFFIXES) - 1):.2f}{FORMAT_NUM_BYTES_SUFFIXES[-1]}'
 
 
+########################################
+# ../../../../../omlish/os/pidfile.py
+
+
+class Pidfile:
+    def __init__(self, path: str) -> None:
+        super().__init__()
+        self._path = path
+
+    _f: ta.TextIO
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self._path!r})'
+
+    def __enter__(self) -> 'Pidfile':
+        fd = os.open(self._path, os.O_RDWR | os.O_CREAT, 0o600)
+        try:
+            os.set_inheritable(fd, True)
+            f = os.fdopen(fd, 'r+')
+        except Exception:
+            try:
+                os.close(fd)
+            except Exception:  # noqa
+                pass
+            raise
+        self._f = f
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if hasattr(self, '_f'):
+            self._f.close()
+            del self._f
+
+    def try_lock(self) -> bool:
+        try:
+            fcntl.flock(self._f, fcntl.LOCK_EX | fcntl.LOCK_NB)
+            return True
+        except OSError:
+            return False
+
+    def ensure_locked(self) -> None:
+        if not self.try_lock():
+            raise RuntimeError('Could not get lock')
+
+    def write(self, pid: ta.Optional[int] = None) -> None:
+        self.ensure_locked()
+        if pid is None:
+            pid = os.getpid()
+        self._f.write(f'{pid}\n')
+        self._f.flush()
+
+    def clear(self) -> None:
+        self.ensure_locked()
+        self._f.seek(0)
+        self._f.truncate()
+
+    def read(self) -> int:
+        if self.try_lock():
+            raise RuntimeError('Got lock')
+        self._f.seek(0)
+        return int(self._f.read())
+
+    def kill(self, sig: int = signal.SIGTERM) -> None:
+        pid = self.read()
+        os.kill(pid, sig)  # FIXME: Still racy
+
+
 ########################################
 # ../../auth.py
 """

{ominfra-0.0.0.dev151 → ominfra-0.0.0.dev152}/ominfra/scripts/manage.py

@@ -103,7 +103,7 @@ InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
 InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']
 
 # ../../omlish/lite/subprocesses.py
-SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']
+SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlias
 
 
 ########################################
@@ -1611,30 +1611,6 @@ class Checks:
 check = Checks()
 
 
-########################################
-# ../../../omlish/lite/deathsig.py
-
-
-LINUX_PR_SET_PDEATHSIG = 1  # Second arg is a signal
-LINUX_PR_GET_PDEATHSIG = 2  # Second arg is a ptr to return the signal
-
-
-def set_process_deathsig(sig: int) -> bool:
-    if sys.platform == 'linux':
-        libc = ct.CDLL('libc.so.6')
-
-        # int prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);
-        libc.prctl.restype = ct.c_int
-        libc.prctl.argtypes = [ct.c_int, ct.c_ulong, ct.c_ulong, ct.c_ulong, ct.c_ulong]
-
-        libc.prctl(LINUX_PR_SET_PDEATHSIG, sig, 0, 0, 0, 0)
-
-        return True
-
-    else:
-        return False
-
-
 ########################################
 # ../../../omlish/lite/json.py
 
@@ -1880,6 +1856,30 @@ def format_num_bytes(num_bytes: int) -> str:
     return f'{num_bytes / 1024 ** (len(FORMAT_NUM_BYTES_SUFFIXES) - 1):.2f}{FORMAT_NUM_BYTES_SUFFIXES[-1]}'
 
 
+########################################
+# ../../../omlish/os/deathsig.py
+
+
+LINUX_PR_SET_PDEATHSIG = 1  # Second arg is a signal
+LINUX_PR_GET_PDEATHSIG = 2  # Second arg is a ptr to return the signal
+
+
+def set_process_deathsig(sig: int) -> bool:
+    if sys.platform == 'linux':
+        libc = ct.CDLL('libc.so.6')
+
+        # int prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);
+        libc.prctl.restype = ct.c_int
+        libc.prctl.argtypes = [ct.c_int, ct.c_ulong, ct.c_ulong, ct.c_ulong, ct.c_ulong]
+
+        libc.prctl(LINUX_PR_SET_PDEATHSIG, sig, 0, 0, 0, 0)
+
+        return True
+
+    else:
+        return False
+
+
 ########################################
 # ../../../omdev/packaging/specifiers.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -2618,6 +2618,8 @@ def get_remote_payload_src(
 TODO:
  - default command
  - auto match all underscores to hyphens
+ - pre-run, post-run hooks
+ - exitstack?
 """
 
 
@@ -2737,11 +2739,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]:
@@ -2754,24 +2757,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
@@ -2779,29 +2791,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
@@ -2820,10 +2837,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):
@@ -2835,12 +2854,34 @@ 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 call_and_exit(self) -> ta.NoReturn:
-        sys.exit(rc if isinstance(rc := self(), int) else 0)
+    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
+
+        return await fn()
 
 
 ########################################
@@ -6975,7 +7016,7 @@ def main_bootstrap(bs: MainBootstrap) -> Injector:
 
 class MainCli(ArgparseCli):
     @argparse_command(
-        argparse_arg('--payload-file'),
+        argparse_arg('--_payload-file'),
 
         argparse_arg('-s', '--shell'),
         argparse_arg('-q', '--shell-quote', action='store_true'),
@@ -6993,10 +7034,7 @@ class MainCli(ArgparseCli):
 
         argparse_arg('command', nargs='+'),
     )
-    def run(self) -> None:
-        asyncio.run(self._async_run())
-
-    async def _async_run(self) -> None:
+    async def run(self) -> None:
         bs = MainBootstrap(
             main_config=MainConfig(
                 log_level='DEBUG' if self.args.debug else 'INFO',
@@ -7005,7 +7043,7 @@ class MainCli(ArgparseCli):
             ),
 
             remote_config=RemoteConfig(
-                payload_file=self.args.payload_file,  # noqa
+                payload_file=self.args._payload_file,  # noqa
 
                 pycharm_remote_debug=PycharmRemoteDebug(
                     port=self.args.pycharm_debug_port,
@@ -7068,7 +7106,7 @@ class MainCli(ArgparseCli):
 
 
 def _main() -> None:
-    MainCli().call_and_exit()
+    sys.exit(asyncio.run(MainCli().async_cli_run()))
 
 
 if __name__ == '__main__':