ominfra 0.0.0.dev135__tar.gz → 0.0.0.dev137__tar.gz

{ominfra-0.0.0.dev135/ominfra.egg-info → ominfra-0.0.0.dev137}/PKG-INFO

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

{ominfra-0.0.0.dev135 → ominfra-0.0.0.dev137}/ominfra/manage/new/_manage.py

@@ -87,10 +87,10 @@ Basically this: https://mitogen.networkgenomics.com/howitworks.html
 ##
 
 
-_PYREMOTE_BOOTSTRAP_COMM_FD = 100
+_PYREMOTE_BOOTSTRAP_INPUT_FD = 100
 _PYREMOTE_BOOTSTRAP_SRC_FD = 101
 
-_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR = '_OPYR_CPID'
+_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR = '_OPYR_CHILD_PID'
 _PYREMOTE_BOOTSTRAP_ARGV0_VAR = '_OPYR_ARGV0'
 
 _PYREMOTE_BOOTSTRAP_ACK0 = b'OPYR000\n'
@@ -121,7 +121,7 @@ def _pyremote_bootstrap_main(context_name: str) -> None:
         # Parent process
 
         # Dup original stdin to comm_fd for use as comm channel
-        os.dup2(0, _PYREMOTE_BOOTSTRAP_COMM_FD)
+        os.dup2(0, _PYREMOTE_BOOTSTRAP_INPUT_FD)
 
         # Overwrite stdin (fed to python repl) with first copy of src
         os.dup2(r0, 0)
@@ -179,7 +179,7 @@ def pyremote_build_bootstrap_cmd(context_name: str) -> str:
     bs_src = textwrap.dedent(inspect.getsource(_pyremote_bootstrap_main))
 
     for gl in [
-        '_PYREMOTE_BOOTSTRAP_COMM_FD',
+        '_PYREMOTE_BOOTSTRAP_INPUT_FD',
         '_PYREMOTE_BOOTSTRAP_SRC_FD',
 
         '_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR',
@@ -424,6 +424,7 @@ class PyremoteBootstrapDriver:
 @dc.dataclass(frozen=True)
 class PyremotePayloadRuntime:
     input: ta.BinaryIO
+    output: ta.BinaryIO
     main_src: str
     env_info: PyremoteEnvInfo
 
@@ -450,12 +451,19 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
     os.write(1, struct.pack('<I', len(env_info_json)))
     os.write(1, env_info_json.encode('utf-8'))
 
+    # Setup IO
+    input = os.fdopen(_PYREMOTE_BOOTSTRAP_INPUT_FD, 'rb', 0)  # noqa
+    output = os.fdopen(os.dup(1), 'wb', 0)  # noqa
+    os.dup2(nfd := os.open('/dev/null', os.O_WRONLY), 1)
+    os.close(nfd)
+
     # Write fourth ack
-    os.write(1, _PYREMOTE_BOOTSTRAP_ACK3)
+    output.write(_PYREMOTE_BOOTSTRAP_ACK3)
 
     # Return
     return PyremotePayloadRuntime(
-        input=os.fdopen(_PYREMOTE_BOOTSTRAP_COMM_FD, 'rb', 0),
+        input=input,
+        output=output,
         main_src=main_src,
         env_info=env_info,
     )
@@ -1526,6 +1534,9 @@ def _recv_obj(f: ta.IO, ty: type) -> ta.Any:
     return unmarshal_obj(j, ty)
 
 
+##
+
+
 def _remote_main() -> None:
     rt = pyremote_bootstrap_finalize()  # noqa
 
@@ -1536,7 +1547,42 @@ def _remote_main() -> None:
 
         o = SubprocessCommand()._execute(i)  # noqa
 
-        _send_obj(sys.stdout.buffer, o)
+        _send_obj(rt.output, o)
+
+
+##
+
+
+@cached_nullary
+def _get_self_src() -> str:
+    return inspect.getsource(sys.modules[__name__])
+
+
+def _is_src_amalg(src: str) -> bool:
+    for l in src.splitlines():  # noqa
+        if l.startswith('# @omlish-amalg-output '):
+            return True
+    return False
+
+
+@cached_nullary
+def _is_self_amalg() -> bool:
+    return _is_src_amalg(_get_self_src())
+
+
+def _get_amalg_src(*, amalg_file: ta.Optional[str]) -> str:
+    if amalg_file is not None:
+        with open(amalg_file) as f:
+            return f.read()
+
+    if _is_self_amalg():
+        return _get_self_src()
+
+    import importlib.resources
+    return importlib.resources.read_text(__package__, '_manage.py')
+
+
+##
 
 
 def _main() -> None:
@@ -1544,7 +1590,8 @@ def _main() -> None:
 
     parser = argparse.ArgumentParser()
 
-    parser.add_argument('--ssh')
+    parser.add_argument('-s', '--shell')
+    parser.add_argument('-q', '--shell-quote', action='store_true')
     parser.add_argument('--python', default='python3')
     parser.add_argument('--_amalg-file')
 
@@ -1552,23 +1599,7 @@ def _main() -> None:
 
     #
 
-    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()
+    amalg_src = _get_amalg_src(amalg_file=args._amalg_file)  # noqa
 
     #
 
@@ -1582,9 +1613,11 @@ def _main() -> None:
 
     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)}'
+    if args.shell is not None:
+        sh_src = f'{args.python} -c {shlex.quote(bs_src)}'
+        if args.shell_quote:
+            sh_src = shlex.quote(sh_src)
+        sh_cmd = f'{args.shell} {sh_src}'
         cmd = [sh_cmd]
         shell = True
     else:

{ominfra-0.0.0.dev135 → ominfra-0.0.0.dev137}/ominfra/manage/new/main.py

@@ -3,13 +3,13 @@
 # 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.cached import cached_nullary
 from omlish.lite.check import check_not_none
 from omlish.lite.json import json_dumps_compact
 from omlish.lite.marshal import marshal_obj
@@ -50,6 +50,9 @@ def _recv_obj(f: ta.IO, ty: type) -> ta.Any:
     return unmarshal_obj(j, ty)
 
 
+##
+
+
 def _remote_main() -> None:
     rt = pyremote_bootstrap_finalize()  # noqa
 
@@ -60,7 +63,42 @@ def _remote_main() -> None:
 
         o = SubprocessCommand()._execute(i)  # noqa
 
-        _send_obj(sys.stdout.buffer, o)
+        _send_obj(rt.output, o)
+
+
+##
+
+
+@cached_nullary
+def _get_self_src() -> str:
+    return inspect.getsource(sys.modules[__name__])
+
+
+def _is_src_amalg(src: str) -> bool:
+    for l in src.splitlines():  # noqa
+        if l.startswith('# @omlish-amalg-output '):
+            return True
+    return False
+
+
+@cached_nullary
+def _is_self_amalg() -> bool:
+    return _is_src_amalg(_get_self_src())
+
+
+def _get_amalg_src(*, amalg_file: ta.Optional[str]) -> str:
+    if amalg_file is not None:
+        with open(amalg_file) as f:
+            return f.read()
+
+    if _is_self_amalg():
+        return _get_self_src()
+
+    import importlib.resources
+    return importlib.resources.read_text(__package__, '_manage.py')
+
+
+##
 
 
 def _main() -> None:
@@ -68,7 +106,8 @@ def _main() -> None:
 
     parser = argparse.ArgumentParser()
 
-    parser.add_argument('--ssh')
+    parser.add_argument('-s', '--shell')
+    parser.add_argument('-q', '--shell-quote', action='store_true')
     parser.add_argument('--python', default='python3')
     parser.add_argument('--_amalg-file')
 
@@ -76,23 +115,7 @@ def _main() -> None:
 
     #
 
-    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()
+    amalg_src = _get_amalg_src(amalg_file=args._amalg_file)  # noqa
 
     #
 
@@ -106,9 +129,11 @@ def _main() -> None:
 
     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)}'
+    if args.shell is not None:
+        sh_src = f'{args.python} -c {shlex.quote(bs_src)}'
+        if args.shell_quote:
+            sh_src = shlex.quote(sh_src)
+        sh_cmd = f'{args.shell} {sh_src}'
         cmd = [sh_cmd]
         shell = True
     else:

{ominfra-0.0.0.dev135 → ominfra-0.0.0.dev137}/ominfra/pyremote.py

@@ -21,10 +21,10 @@ import zlib
 ##
 
 
-_PYREMOTE_BOOTSTRAP_COMM_FD = 100
+_PYREMOTE_BOOTSTRAP_INPUT_FD = 100
 _PYREMOTE_BOOTSTRAP_SRC_FD = 101
 
-_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR = '_OPYR_CPID'
+_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR = '_OPYR_CHILD_PID'
 _PYREMOTE_BOOTSTRAP_ARGV0_VAR = '_OPYR_ARGV0'
 
 _PYREMOTE_BOOTSTRAP_ACK0 = b'OPYR000\n'
@@ -55,7 +55,7 @@ def _pyremote_bootstrap_main(context_name: str) -> None:
         # Parent process
 
         # Dup original stdin to comm_fd for use as comm channel
-        os.dup2(0, _PYREMOTE_BOOTSTRAP_COMM_FD)
+        os.dup2(0, _PYREMOTE_BOOTSTRAP_INPUT_FD)
 
         # Overwrite stdin (fed to python repl) with first copy of src
         os.dup2(r0, 0)
@@ -113,7 +113,7 @@ def pyremote_build_bootstrap_cmd(context_name: str) -> str:
     bs_src = textwrap.dedent(inspect.getsource(_pyremote_bootstrap_main))
 
     for gl in [
-        '_PYREMOTE_BOOTSTRAP_COMM_FD',
+        '_PYREMOTE_BOOTSTRAP_INPUT_FD',
         '_PYREMOTE_BOOTSTRAP_SRC_FD',
 
         '_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR',
@@ -358,6 +358,7 @@ class PyremoteBootstrapDriver:
 @dc.dataclass(frozen=True)
 class PyremotePayloadRuntime:
     input: ta.BinaryIO
+    output: ta.BinaryIO
     main_src: str
     env_info: PyremoteEnvInfo
 
@@ -384,12 +385,19 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
     os.write(1, struct.pack('<I', len(env_info_json)))
     os.write(1, env_info_json.encode('utf-8'))
 
+    # Setup IO
+    input = os.fdopen(_PYREMOTE_BOOTSTRAP_INPUT_FD, 'rb', 0)  # noqa
+    output = os.fdopen(os.dup(1), 'wb', 0)  # noqa
+    os.dup2(nfd := os.open('/dev/null', os.O_WRONLY), 1)
+    os.close(nfd)
+
     # Write fourth ack
-    os.write(1, _PYREMOTE_BOOTSTRAP_ACK3)
+    output.write(_PYREMOTE_BOOTSTRAP_ACK3)
 
     # Return
     return PyremotePayloadRuntime(
-        input=os.fdopen(_PYREMOTE_BOOTSTRAP_COMM_FD, 'rb', 0),
+        input=input,
+        output=output,
         main_src=main_src,
         env_info=env_info,
     )

{ominfra-0.0.0.dev135 → ominfra-0.0.0.dev137/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev135 → ominfra-0.0.0.dev137}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev135
-omlish==0.0.0.dev135
+omdev==0.0.0.dev137
+omlish==0.0.0.dev137
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev135 → ominfra-0.0.0.dev137}/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.dev135'
+version = '0.0.0.dev137'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev135',
-    'omlish == 0.0.0.dev135',
+    'omdev == 0.0.0.dev137',
+    'omlish == 0.0.0.dev137',
 ]
 
 [project.optional-dependencies]