ominfra 0.0.0.dev134__py3-none-any.whl → 0.0.0.dev135__py3-none-any.whl

ominfra/manage/new/commands/base.py

@@ -0,0 +1,25 @@
+# ruff: noqa: UP006 UP007
+import abc
+import dataclasses as dc
+import typing as ta
+
+
+CommandInputT = ta.TypeVar('CommandInputT', bound='Command.Input')
+CommandOutputT = ta.TypeVar('CommandOutputT', bound='Command.Output')
+
+
+##
+
+
+class Command(abc.ABC, ta.Generic[CommandInputT, CommandOutputT]):
+    @dc.dataclass(frozen=True)
+    class Input(abc.ABC):  # noqa
+        pass
+
+    @dc.dataclass(frozen=True)
+    class Output(abc.ABC):  # noqa
+        pass
+
+    @abc.abstractmethod
+    def _execute(self, inp: CommandInputT) -> CommandOutputT:
+        raise NotImplementedError

ominfra/manage/new/commands/subprocess.py

@@ -0,0 +1,73 @@
+# ruff: noqa: UP006 UP007
+import dataclasses as dc
+import os
+import subprocess
+import time
+import typing as ta
+
+from omlish.lite.subprocesses import subprocess_maybe_shell_wrap_exec
+
+from .base import Command
+
+
+##
+
+
+class SubprocessCommand(Command['SubprocessCommand.Input', 'SubprocessCommand.Output']):
+    @dc.dataclass(frozen=True)
+    class Input(Command.Input):
+        args: ta.Sequence[str]
+
+        shell: bool = False
+        cwd: ta.Optional[str] = None
+        env: ta.Optional[ta.Mapping[str, str]] = None
+
+        capture_stdout: bool = False
+        capture_stderr: bool = False
+
+        input: ta.Optional[bytes] = None
+        timeout: ta.Optional[float] = None
+
+        def __post_init__(self) -> None:
+            if isinstance(self.args, str):
+                raise TypeError(self.args)
+
+    @dc.dataclass(frozen=True)
+    class Output(Command.Output):
+        rc: int
+        pid: int
+
+        elapsed_s: float
+
+        stdout: ta.Optional[bytes] = None
+        stderr: ta.Optional[bytes] = None
+
+    def _execute(self, inp: Input) -> Output:
+        proc = subprocess.Popen(
+            subprocess_maybe_shell_wrap_exec(*inp.args),
+
+            shell=inp.shell,
+            cwd=inp.cwd,
+            env={**os.environ, **(inp.env or {})},
+
+            stdin=subprocess.PIPE if inp.input is not None else None,
+            stdout=subprocess.PIPE if inp.capture_stdout else None,
+            stderr=subprocess.PIPE if inp.capture_stderr else None,
+        )
+
+        start_time = time.time()
+        stdout, stderr = proc.communicate(
+            input=inp.input,
+            timeout=inp.timeout,
+        )
+        end_time = time.time()
+
+        return SubprocessCommand.Output(
+            rc=proc.returncode,
+            pid=proc.pid,
+
+            elapsed_s=end_time - start_time,
+
+            stdout=stdout,  # noqa
+            stderr=stderr,  # noqa
+        )

ominfra/manage/new/main.py

@@ -0,0 +1,159 @@
+#!/usr/bin/env python3
+# @omlish-amalg ./_manage.py
+# ruff: noqa: UP006 UP007
+import inspect
+import json
+import os
+import shlex
+import struct
+import subprocess
+import sys
+import typing as ta
+
+from omlish.lite.check import check_not_none
+from omlish.lite.json import json_dumps_compact
+from omlish.lite.marshal import marshal_obj
+from omlish.lite.marshal import unmarshal_obj
+from omlish.lite.subprocesses import subprocess_maybe_shell_wrap_exec
+
+from ...pyremote import PyremoteBootstrapDriver
+from ...pyremote import pyremote_bootstrap_finalize
+from ...pyremote import pyremote_build_bootstrap_cmd
+from .commands.subprocess import SubprocessCommand
+
+
+##
+
+
+def _send_obj(f: ta.IO, o: ta.Any) -> None:
+    j = json_dumps_compact(marshal_obj(o))
+    d = j.encode('utf-8')
+
+    f.write(struct.pack('<I', len(d)))
+    f.write(d)
+    f.flush()
+
+
+def _recv_obj(f: ta.IO, ty: type) -> ta.Any:
+    d = f.read(4)
+    if not d:
+        return None
+    if len(d) != 4:
+        raise Exception
+
+    sz = struct.unpack('<I', d)[0]
+    d = f.read(sz)
+    if not d:
+        raise Exception
+
+    j = json.loads(d.decode('utf-8'))
+    return unmarshal_obj(j, ty)
+
+
+def _remote_main() -> None:
+    rt = pyremote_bootstrap_finalize()  # noqa
+
+    while True:
+        i = _recv_obj(rt.input, SubprocessCommand.Input)
+        if i is None:
+            break
+
+        o = SubprocessCommand()._execute(i)  # noqa
+
+        _send_obj(sys.stdout.buffer, o)
+
+
+def _main() -> None:
+    import argparse
+
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument('--ssh')
+    parser.add_argument('--python', default='python3')
+    parser.add_argument('--_amalg-file')
+
+    args = parser.parse_args()
+
+    #
+
+    self_src = inspect.getsource(sys.modules[__name__])
+    self_src_lines = self_src.splitlines()
+    for l in self_src_lines:
+        if l.startswith('# @omlish-amalg-output '):
+            is_self_amalg = True
+            break
+    else:
+        is_self_amalg = False
+
+    if is_self_amalg:
+        amalg_src = self_src
+    else:
+        amalg_file = args._amalg_file  # noqa
+        if amalg_file is None:
+            amalg_file = os.path.join(os.path.dirname(__file__), '_manage.py')
+        with open(amalg_file) as f:
+            amalg_src = f.read()
+
+    #
+
+    remote_src = '\n\n'.join([
+        '__name__ = "__remote__"',
+        amalg_src,
+        '_remote_main()',
+    ])
+
+    #
+
+    bs_src = pyremote_build_bootstrap_cmd(__package__ or 'manage')
+
+    if args.ssh is not None:
+        sh_src = ' '.join([args.python, '-c', shlex.quote(bs_src)])
+        sh_cmd = f'{args.ssh} {shlex.quote(sh_src)}'
+        cmd = [sh_cmd]
+        shell = True
+    else:
+        cmd = [args.python, '-c', bs_src]
+        shell = False
+
+    proc = subprocess.Popen(
+        subprocess_maybe_shell_wrap_exec(*cmd),
+        shell=shell,
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+    )
+
+    stdin = check_not_none(proc.stdin)
+    stdout = check_not_none(proc.stdout)
+
+    res = PyremoteBootstrapDriver(remote_src).run(stdin, stdout)
+    print(res)
+
+    #
+
+    for ci in [
+        SubprocessCommand.Input(
+            args=['python3', '-'],
+            input=b'print(1)\n',
+            capture_stdout=True,
+        ),
+        SubprocessCommand.Input(
+            args=['uname'],
+            capture_stdout=True,
+        ),
+    ]:
+        _send_obj(stdin, ci)
+
+        o = _recv_obj(stdout, SubprocessCommand.Output)
+
+        print(o)
+
+    try:
+        stdin.close()
+    except BrokenPipeError:
+        pass
+
+    proc.wait()
+
+
+if __name__ == '__main__':
+    _main()

ominfra/pyremote.py

@@ -107,6 +107,9 @@ def _pyremote_bootstrap_main(context_name: str) -> None:
 
 
 def pyremote_build_bootstrap_cmd(context_name: str) -> str:
+    if any(c in context_name for c in '\'"'):
+        raise NameError(context_name)
+
     bs_src = textwrap.dedent(inspect.getsource(_pyremote_bootstrap_main))
 
     for gl in [
@@ -133,6 +136,9 @@ def pyremote_build_bootstrap_cmd(context_name: str) -> str:
     bs_z = zlib.compress(bs_src.encode('utf-8'))
     bs_z64 = base64.encodebytes(bs_z).replace(b'\n', b'')
 
+    def dq_repr(o: ta.Any) -> str:
+        return '"' + repr(o)[1:-1] + '"'
+
     stmts = [
         f'import {", ".join(_PYREMOTE_BOOTSTRAP_IMPORTS)}',
         f'exec(zlib.decompress(base64.decodebytes({bs_z64!r})))',
@@ -326,7 +332,7 @@ class PyremoteBootstrapDriver:
     def run(self, stdin: ta.IO, stdout: ta.IO) -> Result:
         gen = self.gen()
 
-        gi: bytes | None = None
+        gi: ta.Optional[bytes] = None
         while True:
             try:
                 if gi is not None:

ominfra/scripts/journald2aws.py

@@ -2289,6 +2289,13 @@ class PolymorphicObjMarshaler(ObjMarshaler):
     impls_by_ty: ta.Mapping[type, Impl]
     impls_by_tag: ta.Mapping[str, Impl]
 
+    @classmethod
+    def of(cls, impls: ta.Iterable[Impl]) -> 'PolymorphicObjMarshaler':
+        return cls(
+            {i.ty: i for i in impls},
+            {i.tag: i for i in impls},
+        )
+
     def marshal(self, o: ta.Any) -> ta.Any:
         impl = self.impls_by_ty[type(o)]
         return {impl.tag: impl.m.marshal(o)}
@@ -2376,7 +2383,7 @@ def _make_obj_marshaler(
 ) -> ObjMarshaler:
     if isinstance(ty, type):
         if abc.ABC in ty.__bases__:
-            impls = [  # type: ignore
+            return PolymorphicObjMarshaler.of([  # type: ignore
                 PolymorphicObjMarshaler.Impl(
                     ity,
                     ity.__qualname__,
@@ -2384,11 +2391,7 @@ def _make_obj_marshaler(
                 )
                 for ity in deep_subclasses(ty)
                 if abc.ABC not in ity.__bases__
-            ]
-            return PolymorphicObjMarshaler(
-                {i.ty: i for i in impls},
-                {i.tag: i for i in impls},
-            )
+            ])
 
         if issubclass(ty, enum.Enum):
             return EnumObjMarshaler(ty)

ominfra/scripts/supervisor.py

@@ -4861,6 +4861,13 @@ class PolymorphicObjMarshaler(ObjMarshaler):
     impls_by_ty: ta.Mapping[type, Impl]
     impls_by_tag: ta.Mapping[str, Impl]
 
+    @classmethod
+    def of(cls, impls: ta.Iterable[Impl]) -> 'PolymorphicObjMarshaler':
+        return cls(
+            {i.ty: i for i in impls},
+            {i.tag: i for i in impls},
+        )
+
     def marshal(self, o: ta.Any) -> ta.Any:
         impl = self.impls_by_ty[type(o)]
         return {impl.tag: impl.m.marshal(o)}
@@ -4948,7 +4955,7 @@ def _make_obj_marshaler(
 ) -> ObjMarshaler:
     if isinstance(ty, type):
         if abc.ABC in ty.__bases__:
-            impls = [  # type: ignore
+            return PolymorphicObjMarshaler.of([  # type: ignore
                 PolymorphicObjMarshaler.Impl(
                     ity,
                     ity.__qualname__,
@@ -4956,11 +4963,7 @@ def _make_obj_marshaler(
                 )
                 for ity in deep_subclasses(ty)
                 if abc.ABC not in ity.__bases__
-            ]
-            return PolymorphicObjMarshaler(
-                {i.ty: i for i in impls},
-                {i.tag: i for i in impls},
-            )
+            ])
 
         if issubclass(ty, enum.Enum):
             return EnumObjMarshaler(ty)
@@ -6182,6 +6185,7 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
             *,
             read_size: int = 0x10000,
             write_size: int = 0x10000,
+            log_handler: ta.Optional[ta.Callable[[CoroHttpServer, CoroHttpServer.AnyLogIo], None]] = None,
     ) -> None:
         check_state(not sock.getblocking())
 
@@ -6190,6 +6194,7 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
         self._handler = handler
         self._read_size = read_size
         self._write_size = write_size
+        self._log_handler = log_handler
 
         self._read_buf = ReadableListBuffer()
         self._write_buf: IncrementalWriteBuffer | None = None
@@ -6224,7 +6229,8 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
                     break
 
             if isinstance(o, CoroHttpServer.AnyLogIo):
-                print(o)
+                if self._log_handler is not None:
+                    self._log_handler(self._coro_srv, o)
                 o = None
 
             elif isinstance(o, CoroHttpServer.ReadIo):

{ominfra-0.0.0.dev134.dist-info → ominfra-0.0.0.dev135.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev134
+Version: 0.0.0.dev135
 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.dev134
-Requires-Dist: omlish==0.0.0.dev134
+Requires-Dist: omdev==0.0.0.dev135
+Requires-Dist: omlish==0.0.0.dev135
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev134.dist-info → ominfra-0.0.0.dev135.dist-info}/RECORD

@@ -3,7 +3,7 @@ ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
 ominfra/configs.py,sha256=8aU1Qmbr-qjaE2iP3gAbA2SWJYMPZ-uGK007L01PoOI,1727
-ominfra/pyremote.py,sha256=nqzmMKZvUMiw2y65v8VVjx832sKfSB7jBOkP8SQBmGI,10121
+ominfra/pyremote.py,sha256=z3D9nj26omHgl3_q_h7uSHRtgYu-Sb06fMQCqS69_QI,10289
 ominfra/ssh.py,sha256=jQpc4WvkMckIfk4vILda8zFaeharRqc_6wxW50b0OjQ,5431
 ominfra/threadworkers.py,sha256=oX4ubZn7h932saXpRIJu2MNhBExgGGMuGhdXarZxLJw,4948
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,7 +30,7 @@ ominfra/journald/tailer.py,sha256=5abcFMfgi7fnY9ZEQe2ZVobaJxjQkeu6d9Kagw33a1w,33
 ominfra/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/manage.py,sha256=BttL8LFEknHZE_h2Pt5dAqbfUkv6qy43WI0raXBZ1a8,151
 ominfra/manage/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/deploy/_executor.py,sha256=lk1pXkwqijudeQ9Ti8oxP4O-qUFDFzcXI8H-Ox5K-SA,35385
+ominfra/manage/deploy/_executor.py,sha256=amAnQWG5PBrsYVqd7K6xILyq88mhTUZucTWtSenceTE,35466
 ominfra/manage/deploy/configs.py,sha256=qi0kwT7G2NH7dXLOQic-u6R3yeadup_QtvrjwWIggbM,435
 ominfra/manage/deploy/remote.py,sha256=WHHElLmYk6wEDC4R8s_jHi1z71CCuV3soqF3elzIWEM,2145
 ominfra/manage/deploy/executor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -56,9 +56,15 @@ ominfra/manage/deploy/poly/runtime.py,sha256=G66AI-a27Wi6QYpG3M0ryqI7c5MnJkXt-_j
 ominfra/manage/deploy/poly/site.py,sha256=QJwDDJoVm2-kxi4bxIrp-mn4y2qDLuW3CAUax3W8gv8,239
 ominfra/manage/deploy/poly/supervisor.py,sha256=zkl6VQBcAZaMAhyR9DbbbqULcgFCDZoe9S_vP-mMFQ8,2289
 ominfra/manage/deploy/poly/venv.py,sha256=BoipDEa4NTeodjf3L57KJfq9eGKLagFNKwD8pS4yrzA,1552
+ominfra/manage/new/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
+ominfra/manage/new/_manage.py,sha256=ycfNgyFofYs6f5jYV2SrAprGChQd-uVhWc79Tvd9iB0,40217
+ominfra/manage/new/main.py,sha256=WeiBAM7HQosnDbKahRmDWNvNYUZaKH2d3ooaqk9kQ04,3558
+ominfra/manage/new/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ominfra/manage/new/commands/base.py,sha256=TTrHL213jf-ClVqToiNHuxQey1Yf6052E8u3E9hAf7Q,574
+ominfra/manage/new/commands/subprocess.py,sha256=GpbD-cTorgCRg203lCl81HAh-NBYA6ObKa5ZP2ss9rg,1884
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=o6WgI9R3MXdH4-BKUYAK2pcu3E5T0GAl5pggzR4Lhrk,131537
-ominfra/scripts/supervisor.py,sha256=gy2P8K8aATDQDvSFqgnvIun2qlZrWg2F066kzcoQRdc,245528
+ominfra/scripts/journald2aws.py,sha256=kCyeyCo53GRoCKAdVAe0aGkgmINxi8IBcUfRXphACek,131618
+ominfra/scripts/supervisor.py,sha256=GO_e3e6WWqdBE-WejtaTrzU8yjtZBiadD-o2Nb-aJ6o,245838
 ominfra/supervisor/LICENSE.txt,sha256=yvqaMNsDhWxziHa9ien6qCW1SkZv-DQlAg96XjfSee8,1746
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -100,9 +106,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=DSGp4hn5xwOW-l_u_InKlSF6kIobxtUtVssf_73STs0,3567
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev134.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev134.dist-info/METADATA,sha256=pJ8EYFED29tv1T8wzhlFFm2rKeNXXS2c4Iw8hjFEvSA,731
-ominfra-0.0.0.dev134.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ominfra-0.0.0.dev134.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev134.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev134.dist-info/RECORD,,
+ominfra-0.0.0.dev135.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev135.dist-info/METADATA,sha256=l8zW4aJP_w8h0b-wfdGnlXqPlofGjiw0HLQAfdFfJK4,731
+ominfra-0.0.0.dev135.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ominfra-0.0.0.dev135.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev135.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev135.dist-info/RECORD,,