ominfra 0.0.0.dev295__tar.gz → 0.0.0.dev297__tar.gz

{ominfra-0.0.0.dev295/ominfra.egg-info → ominfra-0.0.0.dev297}/PKG-INFO

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

{ominfra-0.0.0.dev295 → ominfra-0.0.0.dev297}/ominfra/clouds/aws/models/gen/gen.py

@@ -194,6 +194,19 @@ class ModelGen:
 
     #
 
+    NAME_REPLACEMENTS: ta.ClassVar[ta.Sequence[tuple[str, str]]] = [
+        *[
+            (p + l, p + r)
+            for p in 'KMGTP '
+            for l, r in [
+                ('bps', 'bips'),
+                ('Bps', 'bps'),
+                ('ibps', 'ibips'),
+                ('iBps', 'ibps'),
+            ]
+        ],
+    ]
+
     DEMANGLE_PREFIXES: ta.ClassVar[ta.Sequence[str]] = [
 
         'AAAA',
@@ -217,7 +230,6 @@ class ModelGen:
         'IP',
         'JSON',
         'KMS',
-        'MBps',
         'MD5',
         'MFA',
         'NVME',
@@ -230,6 +242,9 @@ class ModelGen:
     ]
 
     def demangle_name(self, n: str) -> str:
+        for l, r in self.NAME_REPLACEMENTS:
+            n = n.replace(l, r)
+
         ps: list[str] = []
         while n:
             ms: list[tuple[str, int]] = []
@@ -334,6 +349,8 @@ class ModelGen:
                 lines.append('    pass')
 
             ms: botocore.model.Shape
+            seen_fns: set[str] = set()
+
             for i, (mn, ms) in enumerate(shape.members.items()):
                 mds = [
                     f'member_name={mn!r}',
@@ -381,6 +398,8 @@ class ModelGen:
                     fd = 'default=None, '
 
                 fn = self.sanitize_local_name(self.demangle_name(mn))
+                check.not_in(fn, seen_fns)
+                seen_fns.add(fn)
 
                 fls = [
                     f'{fn}: {fa} = _dc.field({fd}metadata=_base.field_metadata(',

{ominfra-0.0.0.dev295 → ominfra-0.0.0.dev297}/ominfra/clouds/aws/models/services/ec2.py

@@ -2274,7 +2274,7 @@ class EbsOptimizedInfo(
     _base.Shape,
     shape_name='EbsOptimizedInfo',
 ):
-    baseline_bandwidth_in_mbps: BaselineBandwidthInMbps | None = _dc.field(default=None, metadata=_base.field_metadata(
+    baseline_bandwidth_in_mbips: BaselineBandwidthInMbps | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='BaselineBandwidthInMbps',
         serialization_name='baselineBandwidthInMbps',
         shape_name='BaselineBandwidthInMbps',
@@ -2292,7 +2292,7 @@ class EbsOptimizedInfo(
         shape_name='BaselineIops',
     ))
 
-    maximum_bandwidth_in_mbps: MaximumBandwidthInMbps | None = _dc.field(default=None, metadata=_base.field_metadata(
+    maximum_bandwidth_in_mbips: MaximumBandwidthInMbps | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='MaximumBandwidthInMbps',
         serialization_name='maximumBandwidthInMbps',
         shape_name='MaximumBandwidthInMbps',
@@ -3059,13 +3059,13 @@ class NetworkCardInfo(
         shape_name='MaxNetworkInterfaces',
     ))
 
-    baseline_bandwidth_in_gbps: BaselineBandwidthInGbps | None = _dc.field(default=None, metadata=_base.field_metadata(
+    baseline_bandwidth_in_gbips: BaselineBandwidthInGbps | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='BaselineBandwidthInGbps',
         serialization_name='baselineBandwidthInGbps',
         shape_name='BaselineBandwidthInGbps',
     ))
 
-    peak_bandwidth_in_gbps: PeakBandwidthInGbps | None = _dc.field(default=None, metadata=_base.field_metadata(
+    peak_bandwidth_in_gbips: PeakBandwidthInGbps | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='PeakBandwidthInGbps',
         serialization_name='peakBandwidthInGbps',
         shape_name='PeakBandwidthInGbps',

{ominfra-0.0.0.dev295 → ominfra-0.0.0.dev297}/ominfra/pyremote.py

@@ -185,29 +185,33 @@ def _get_pyremote_env_info() -> PyremoteEnvInfo:
 ##
 
 
-_PYREMOTE_BOOTSTRAP_INPUT_FD = 100
-_PYREMOTE_BOOTSTRAP_SRC_FD = 101
-
-_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR = '_OPYR_CHILD_PID'
-_PYREMOTE_BOOTSTRAP_ARGV0_VAR = '_OPYR_ARGV0'
-_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR = '_OPYR_CONTEXT_NAME'
-_PYREMOTE_BOOTSTRAP_SRC_FILE_VAR = '_OPYR_SRC_FILE'
-_PYREMOTE_BOOTSTRAP_OPTIONS_JSON_VAR = '_OPYR_OPTIONS_JSON'
-
-_PYREMOTE_BOOTSTRAP_ACK0 = b'OPYR000\n'
-_PYREMOTE_BOOTSTRAP_ACK1 = b'OPYR001\n'
-_PYREMOTE_BOOTSTRAP_ACK2 = b'OPYR002\n'
-_PYREMOTE_BOOTSTRAP_ACK3 = b'OPYR003\n'
-
-_PYREMOTE_BOOTSTRAP_PROC_TITLE_FMT = '(pyremote:%s)'
-
-_PYREMOTE_BOOTSTRAP_IMPORTS = [
-    'base64',
-    'os',
-    'struct',
-    'sys',
-    'zlib',
-]
+class _PyremoteBootstrapConsts:
+    def __new__(cls, *args, **kwargs):  # noqa
+        raise TypeError
+
+    INPUT_FD = 100
+    SRC_FD = 101
+
+    CHILD_PID_VAR = '_OPYR_CHILD_PID'
+    ARGV0_VAR = '_OPYR_ARGV0'
+    CONTEXT_NAME_VAR = '_OPYR_CONTEXT_NAME'
+    SRC_FILE_VAR = '_OPYR_SRC_FILE'
+    OPTIONS_JSON_VAR = '_OPYR_OPTIONS_JSON'
+
+    ACK0 = b'OPYR000\n'
+    ACK1 = b'OPYR001\n'
+    ACK2 = b'OPYR002\n'
+    ACK3 = b'OPYR003\n'
+
+    PROC_TITLE_FMT = '(pyremote:%s)'
+
+    IMPORTS = (
+        'base64',
+        'os',
+        'struct',
+        'sys',
+        'zlib',
+    )
 
 
 def _pyremote_bootstrap_main(context_name: str) -> None:
@@ -222,13 +226,13 @@ 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_INPUT_FD)
+        os.dup2(0, _PyremoteBootstrapConsts.INPUT_FD)
 
         # Overwrite stdin (fed to python repl) with first copy of src
         os.dup2(r0, 0)
 
         # Dup second copy of src to src_fd to recover after launch
-        os.dup2(r1, _PYREMOTE_BOOTSTRAP_SRC_FD)
+        os.dup2(r1, _PyremoteBootstrapConsts.SRC_FD)
 
         # Close remaining fd's
         for f in [r0, w0, r1, w1]:
@@ -237,18 +241,18 @@ def _pyremote_bootstrap_main(context_name: str) -> None:
         # Save vars
         env = os.environ
         exe = sys.executable
-        env[_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR] = str(cp)
-        env[_PYREMOTE_BOOTSTRAP_ARGV0_VAR] = exe
-        env[_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR] = context_name
+        env[_PyremoteBootstrapConsts.CHILD_PID_VAR] = str(cp)
+        env[_PyremoteBootstrapConsts.ARGV0_VAR] = exe
+        env[_PyremoteBootstrapConsts.CONTEXT_NAME_VAR] = context_name
 
         # Start repl reading stdin from r0
-        os.execl(exe, exe + (_PYREMOTE_BOOTSTRAP_PROC_TITLE_FMT % (context_name,)))
+        os.execl(exe, exe + (_PyremoteBootstrapConsts.PROC_TITLE_FMT % (context_name,)))
 
     else:
         # Child process
 
         # Write first ack
-        os.write(1, _PYREMOTE_BOOTSTRAP_ACK0)
+        os.write(1, _PyremoteBootstrapConsts.ACK0)
 
         # Write pid
         os.write(1, struct.pack('<Q', pid))
@@ -267,7 +271,7 @@ def _pyremote_bootstrap_main(context_name: str) -> None:
             fp.close()
 
         # Write second ack
-        os.write(1, _PYREMOTE_BOOTSTRAP_ACK1)
+        os.write(1, _PyremoteBootstrapConsts.ACK1)
 
         # Exit child
         sys.exit(0)
@@ -284,20 +288,8 @@ def pyremote_build_bootstrap_cmd(context_name: str) -> str:
     import textwrap
     bs_src = textwrap.dedent(inspect.getsource(_pyremote_bootstrap_main))
 
-    for gl in [
-        '_PYREMOTE_BOOTSTRAP_INPUT_FD',
-        '_PYREMOTE_BOOTSTRAP_SRC_FD',
-
-        '_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR',
-        '_PYREMOTE_BOOTSTRAP_ARGV0_VAR',
-        '_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR',
-
-        '_PYREMOTE_BOOTSTRAP_ACK0',
-        '_PYREMOTE_BOOTSTRAP_ACK1',
-
-        '_PYREMOTE_BOOTSTRAP_PROC_TITLE_FMT',
-    ]:
-        bs_src = bs_src.replace(gl, repr(globals()[gl]))
+    for an, av in sorted(_PyremoteBootstrapConsts.__dict__.items(), key=lambda kv: -len(kv[0])):
+        bs_src = bs_src.replace(f'_PyremoteBootstrapConsts.{an}', repr(av))
 
     bs_src = '\n'.join(
         cl
@@ -312,7 +304,7 @@ def pyremote_build_bootstrap_cmd(context_name: str) -> str:
         raise ValueError(bs_z85)
 
     stmts = [
-        f'import {", ".join(_PYREMOTE_BOOTSTRAP_IMPORTS)}',
+        f'import {", ".join(_PyremoteBootstrapConsts.IMPORTS)}',
         f'exec(zlib.decompress(base64.b85decode(b"{bs_z85.decode("ascii")}")))',
         f'_pyremote_bootstrap_main("{context_name}")',
     ]
@@ -336,19 +328,19 @@ class PyremotePayloadRuntime:
 
 def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
     # If src file var is not present we need to do initial finalization
-    if _PYREMOTE_BOOTSTRAP_SRC_FILE_VAR not in os.environ:
+    if _PyremoteBootstrapConsts.SRC_FILE_VAR not in os.environ:
         # Read second copy of payload src
-        r1 = os.fdopen(_PYREMOTE_BOOTSTRAP_SRC_FD, 'rb', 0)
+        r1 = os.fdopen(_PyremoteBootstrapConsts.SRC_FD, 'rb', 0)
         payload_src = r1.read().decode('utf-8')
         r1.close()
 
         # Reap boostrap child. Must be done after reading second copy of source because source may be too big to fit in
         # a pipe at once.
-        os.waitpid(int(os.environ.pop(_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR)), 0)
+        os.waitpid(int(os.environ.pop(_PyremoteBootstrapConsts.CHILD_PID_VAR)), 0)
 
         # Read options
-        options_json_len = struct.unpack('<I', os.read(_PYREMOTE_BOOTSTRAP_INPUT_FD, 4))[0]
-        if len(options_json := os.read(_PYREMOTE_BOOTSTRAP_INPUT_FD, options_json_len)) != options_json_len:
+        options_json_len = struct.unpack('<I', os.read(_PyremoteBootstrapConsts.INPUT_FD, 4))[0]
+        if len(options_json := os.read(_PyremoteBootstrapConsts.INPUT_FD, options_json_len)) != options_json_len:
             raise EOFError
         options = PyremoteBootstrapOptions(**json.loads(options_json.decode('utf-8')))
 
@@ -361,29 +353,29 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
             os.close(tfd)
 
             # Set vars
-            os.environ[_PYREMOTE_BOOTSTRAP_SRC_FILE_VAR] = tfn
-            os.environ[_PYREMOTE_BOOTSTRAP_OPTIONS_JSON_VAR] = options_json.decode('utf-8')
+            os.environ[_PyremoteBootstrapConsts.SRC_FILE_VAR] = tfn
+            os.environ[_PyremoteBootstrapConsts.OPTIONS_JSON_VAR] = options_json.decode('utf-8')
 
             # Re-exec temp file
-            exe = os.environ[_PYREMOTE_BOOTSTRAP_ARGV0_VAR]
-            context_name = os.environ[_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR]
-            os.execl(exe, exe + (_PYREMOTE_BOOTSTRAP_PROC_TITLE_FMT % (context_name,)), tfn)
+            exe = os.environ[_PyremoteBootstrapConsts.ARGV0_VAR]
+            context_name = os.environ[_PyremoteBootstrapConsts.CONTEXT_NAME_VAR]
+            os.execl(exe, exe + (_PyremoteBootstrapConsts.PROC_TITLE_FMT % (context_name,)), tfn)
 
     else:
         # Load options json var
-        options_json_str = os.environ.pop(_PYREMOTE_BOOTSTRAP_OPTIONS_JSON_VAR)
+        options_json_str = os.environ.pop(_PyremoteBootstrapConsts.OPTIONS_JSON_VAR)
         options = PyremoteBootstrapOptions(**json.loads(options_json_str))
 
         # Read temp source file
-        with open(os.environ.pop(_PYREMOTE_BOOTSTRAP_SRC_FILE_VAR)) as sf:
+        with open(os.environ.pop(_PyremoteBootstrapConsts.SRC_FILE_VAR)) as sf:
             payload_src = sf.read()
 
     # Restore vars
-    sys.executable = os.environ.pop(_PYREMOTE_BOOTSTRAP_ARGV0_VAR)
-    context_name = os.environ.pop(_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR)
+    sys.executable = os.environ.pop(_PyremoteBootstrapConsts.ARGV0_VAR)
+    context_name = os.environ.pop(_PyremoteBootstrapConsts.CONTEXT_NAME_VAR)
 
     # Write third ack
-    os.write(1, _PYREMOTE_BOOTSTRAP_ACK2)
+    os.write(1, _PyremoteBootstrapConsts.ACK2)
 
     # Write env info
     env_info = _get_pyremote_env_info()
@@ -392,7 +384,7 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
     os.write(1, env_info_json.encode('utf-8'))
 
     # Setup IO
-    input = os.fdopen(_PYREMOTE_BOOTSTRAP_INPUT_FD, 'rb', 0)  # noqa
+    input = os.fdopen(_PyremoteBootstrapConsts.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)
@@ -402,7 +394,7 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
         sys.modules[mn] = sys.modules['__main__']
 
     # Write fourth ack
-    output.write(_PYREMOTE_BOOTSTRAP_ACK3)
+    output.write(_PyremoteBootstrapConsts.ACK3)
 
     # Return
     return PyremotePayloadRuntime(
@@ -476,7 +468,7 @@ class PyremoteBootstrapDriver:
 
     def gen(self) -> ta.Generator[ta.Union[Read, Write], ta.Optional[bytes], Result]:
         # Read first ack (after fork)
-        yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK0)
+        yield from self._expect(_PyremoteBootstrapConsts.ACK0)
 
         # Read pid
         d = yield from self._read(8)
@@ -487,14 +479,14 @@ class PyremoteBootstrapDriver:
         yield from self._write(self._payload_z)
 
         # Read second ack (after writing src copies)
-        yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK1)
+        yield from self._expect(_PyremoteBootstrapConsts.ACK1)
 
         # Write options
         yield from self._write(struct.pack('<I', len(self._options_json)))
         yield from self._write(self._options_json)
 
         # Read third ack (after reaping child process)
-        yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK2)
+        yield from self._expect(_PyremoteBootstrapConsts.ACK2)
 
         # Read env info
         d = yield from self._read(4)
@@ -504,7 +496,7 @@ class PyremoteBootstrapDriver:
         env_info = PyremoteEnvInfo.from_dict(json.loads(env_info_json))
 
         # Read fourth ack (after finalization completed)
-        yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK3)
+        yield from self._expect(_PyremoteBootstrapConsts.ACK3)
 
         # Return
         return self.Result(

{ominfra-0.0.0.dev295 → ominfra-0.0.0.dev297}/ominfra/scripts/manage.py

@@ -848,29 +848,33 @@ def _get_pyremote_env_info() -> PyremoteEnvInfo:
 ##
 
 
-_PYREMOTE_BOOTSTRAP_INPUT_FD = 100
-_PYREMOTE_BOOTSTRAP_SRC_FD = 101
-
-_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR = '_OPYR_CHILD_PID'
-_PYREMOTE_BOOTSTRAP_ARGV0_VAR = '_OPYR_ARGV0'
-_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR = '_OPYR_CONTEXT_NAME'
-_PYREMOTE_BOOTSTRAP_SRC_FILE_VAR = '_OPYR_SRC_FILE'
-_PYREMOTE_BOOTSTRAP_OPTIONS_JSON_VAR = '_OPYR_OPTIONS_JSON'
-
-_PYREMOTE_BOOTSTRAP_ACK0 = b'OPYR000\n'
-_PYREMOTE_BOOTSTRAP_ACK1 = b'OPYR001\n'
-_PYREMOTE_BOOTSTRAP_ACK2 = b'OPYR002\n'
-_PYREMOTE_BOOTSTRAP_ACK3 = b'OPYR003\n'
-
-_PYREMOTE_BOOTSTRAP_PROC_TITLE_FMT = '(pyremote:%s)'
-
-_PYREMOTE_BOOTSTRAP_IMPORTS = [
-    'base64',
-    'os',
-    'struct',
-    'sys',
-    'zlib',
-]
+class _PyremoteBootstrapConsts:
+    def __new__(cls, *args, **kwargs):  # noqa
+        raise TypeError
+
+    INPUT_FD = 100
+    SRC_FD = 101
+
+    CHILD_PID_VAR = '_OPYR_CHILD_PID'
+    ARGV0_VAR = '_OPYR_ARGV0'
+    CONTEXT_NAME_VAR = '_OPYR_CONTEXT_NAME'
+    SRC_FILE_VAR = '_OPYR_SRC_FILE'
+    OPTIONS_JSON_VAR = '_OPYR_OPTIONS_JSON'
+
+    ACK0 = b'OPYR000\n'
+    ACK1 = b'OPYR001\n'
+    ACK2 = b'OPYR002\n'
+    ACK3 = b'OPYR003\n'
+
+    PROC_TITLE_FMT = '(pyremote:%s)'
+
+    IMPORTS = (
+        'base64',
+        'os',
+        'struct',
+        'sys',
+        'zlib',
+    )
 
 
 def _pyremote_bootstrap_main(context_name: str) -> None:
@@ -885,13 +889,13 @@ 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_INPUT_FD)
+        os.dup2(0, _PyremoteBootstrapConsts.INPUT_FD)
 
         # Overwrite stdin (fed to python repl) with first copy of src
         os.dup2(r0, 0)
 
         # Dup second copy of src to src_fd to recover after launch
-        os.dup2(r1, _PYREMOTE_BOOTSTRAP_SRC_FD)
+        os.dup2(r1, _PyremoteBootstrapConsts.SRC_FD)
 
         # Close remaining fd's
         for f in [r0, w0, r1, w1]:
@@ -900,18 +904,18 @@ def _pyremote_bootstrap_main(context_name: str) -> None:
         # Save vars
         env = os.environ
         exe = sys.executable
-        env[_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR] = str(cp)
-        env[_PYREMOTE_BOOTSTRAP_ARGV0_VAR] = exe
-        env[_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR] = context_name
+        env[_PyremoteBootstrapConsts.CHILD_PID_VAR] = str(cp)
+        env[_PyremoteBootstrapConsts.ARGV0_VAR] = exe
+        env[_PyremoteBootstrapConsts.CONTEXT_NAME_VAR] = context_name
 
         # Start repl reading stdin from r0
-        os.execl(exe, exe + (_PYREMOTE_BOOTSTRAP_PROC_TITLE_FMT % (context_name,)))
+        os.execl(exe, exe + (_PyremoteBootstrapConsts.PROC_TITLE_FMT % (context_name,)))
 
     else:
         # Child process
 
         # Write first ack
-        os.write(1, _PYREMOTE_BOOTSTRAP_ACK0)
+        os.write(1, _PyremoteBootstrapConsts.ACK0)
 
         # Write pid
         os.write(1, struct.pack('<Q', pid))
@@ -930,7 +934,7 @@ def _pyremote_bootstrap_main(context_name: str) -> None:
             fp.close()
 
         # Write second ack
-        os.write(1, _PYREMOTE_BOOTSTRAP_ACK1)
+        os.write(1, _PyremoteBootstrapConsts.ACK1)
 
         # Exit child
         sys.exit(0)
@@ -947,20 +951,8 @@ def pyremote_build_bootstrap_cmd(context_name: str) -> str:
     import textwrap
     bs_src = textwrap.dedent(inspect.getsource(_pyremote_bootstrap_main))
 
-    for gl in [
-        '_PYREMOTE_BOOTSTRAP_INPUT_FD',
-        '_PYREMOTE_BOOTSTRAP_SRC_FD',
-
-        '_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR',
-        '_PYREMOTE_BOOTSTRAP_ARGV0_VAR',
-        '_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR',
-
-        '_PYREMOTE_BOOTSTRAP_ACK0',
-        '_PYREMOTE_BOOTSTRAP_ACK1',
-
-        '_PYREMOTE_BOOTSTRAP_PROC_TITLE_FMT',
-    ]:
-        bs_src = bs_src.replace(gl, repr(globals()[gl]))
+    for an, av in sorted(_PyremoteBootstrapConsts.__dict__.items(), key=lambda kv: -len(kv[0])):
+        bs_src = bs_src.replace(f'_PyremoteBootstrapConsts.{an}', repr(av))
 
     bs_src = '\n'.join(
         cl
@@ -975,7 +967,7 @@ def pyremote_build_bootstrap_cmd(context_name: str) -> str:
         raise ValueError(bs_z85)
 
     stmts = [
-        f'import {", ".join(_PYREMOTE_BOOTSTRAP_IMPORTS)}',
+        f'import {", ".join(_PyremoteBootstrapConsts.IMPORTS)}',
         f'exec(zlib.decompress(base64.b85decode(b"{bs_z85.decode("ascii")}")))',
         f'_pyremote_bootstrap_main("{context_name}")',
     ]
@@ -999,19 +991,19 @@ class PyremotePayloadRuntime:
 
 def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
     # If src file var is not present we need to do initial finalization
-    if _PYREMOTE_BOOTSTRAP_SRC_FILE_VAR not in os.environ:
+    if _PyremoteBootstrapConsts.SRC_FILE_VAR not in os.environ:
         # Read second copy of payload src
-        r1 = os.fdopen(_PYREMOTE_BOOTSTRAP_SRC_FD, 'rb', 0)
+        r1 = os.fdopen(_PyremoteBootstrapConsts.SRC_FD, 'rb', 0)
         payload_src = r1.read().decode('utf-8')
         r1.close()
 
         # Reap boostrap child. Must be done after reading second copy of source because source may be too big to fit in
         # a pipe at once.
-        os.waitpid(int(os.environ.pop(_PYREMOTE_BOOTSTRAP_CHILD_PID_VAR)), 0)
+        os.waitpid(int(os.environ.pop(_PyremoteBootstrapConsts.CHILD_PID_VAR)), 0)
 
         # Read options
-        options_json_len = struct.unpack('<I', os.read(_PYREMOTE_BOOTSTRAP_INPUT_FD, 4))[0]
-        if len(options_json := os.read(_PYREMOTE_BOOTSTRAP_INPUT_FD, options_json_len)) != options_json_len:
+        options_json_len = struct.unpack('<I', os.read(_PyremoteBootstrapConsts.INPUT_FD, 4))[0]
+        if len(options_json := os.read(_PyremoteBootstrapConsts.INPUT_FD, options_json_len)) != options_json_len:
             raise EOFError
         options = PyremoteBootstrapOptions(**json.loads(options_json.decode('utf-8')))
 
@@ -1024,29 +1016,29 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
             os.close(tfd)
 
             # Set vars
-            os.environ[_PYREMOTE_BOOTSTRAP_SRC_FILE_VAR] = tfn
-            os.environ[_PYREMOTE_BOOTSTRAP_OPTIONS_JSON_VAR] = options_json.decode('utf-8')
+            os.environ[_PyremoteBootstrapConsts.SRC_FILE_VAR] = tfn
+            os.environ[_PyremoteBootstrapConsts.OPTIONS_JSON_VAR] = options_json.decode('utf-8')
 
             # Re-exec temp file
-            exe = os.environ[_PYREMOTE_BOOTSTRAP_ARGV0_VAR]
-            context_name = os.environ[_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR]
-            os.execl(exe, exe + (_PYREMOTE_BOOTSTRAP_PROC_TITLE_FMT % (context_name,)), tfn)
+            exe = os.environ[_PyremoteBootstrapConsts.ARGV0_VAR]
+            context_name = os.environ[_PyremoteBootstrapConsts.CONTEXT_NAME_VAR]
+            os.execl(exe, exe + (_PyremoteBootstrapConsts.PROC_TITLE_FMT % (context_name,)), tfn)
 
     else:
         # Load options json var
-        options_json_str = os.environ.pop(_PYREMOTE_BOOTSTRAP_OPTIONS_JSON_VAR)
+        options_json_str = os.environ.pop(_PyremoteBootstrapConsts.OPTIONS_JSON_VAR)
         options = PyremoteBootstrapOptions(**json.loads(options_json_str))
 
         # Read temp source file
-        with open(os.environ.pop(_PYREMOTE_BOOTSTRAP_SRC_FILE_VAR)) as sf:
+        with open(os.environ.pop(_PyremoteBootstrapConsts.SRC_FILE_VAR)) as sf:
             payload_src = sf.read()
 
     # Restore vars
-    sys.executable = os.environ.pop(_PYREMOTE_BOOTSTRAP_ARGV0_VAR)
-    context_name = os.environ.pop(_PYREMOTE_BOOTSTRAP_CONTEXT_NAME_VAR)
+    sys.executable = os.environ.pop(_PyremoteBootstrapConsts.ARGV0_VAR)
+    context_name = os.environ.pop(_PyremoteBootstrapConsts.CONTEXT_NAME_VAR)
 
     # Write third ack
-    os.write(1, _PYREMOTE_BOOTSTRAP_ACK2)
+    os.write(1, _PyremoteBootstrapConsts.ACK2)
 
     # Write env info
     env_info = _get_pyremote_env_info()
@@ -1055,7 +1047,7 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
     os.write(1, env_info_json.encode('utf-8'))
 
     # Setup IO
-    input = os.fdopen(_PYREMOTE_BOOTSTRAP_INPUT_FD, 'rb', 0)  # noqa
+    input = os.fdopen(_PyremoteBootstrapConsts.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)
@@ -1065,7 +1057,7 @@ def pyremote_bootstrap_finalize() -> PyremotePayloadRuntime:
         sys.modules[mn] = sys.modules['__main__']
 
     # Write fourth ack
-    output.write(_PYREMOTE_BOOTSTRAP_ACK3)
+    output.write(_PyremoteBootstrapConsts.ACK3)
 
     # Return
     return PyremotePayloadRuntime(
@@ -1139,7 +1131,7 @@ class PyremoteBootstrapDriver:
 
     def gen(self) -> ta.Generator[ta.Union[Read, Write], ta.Optional[bytes], Result]:
         # Read first ack (after fork)
-        yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK0)
+        yield from self._expect(_PyremoteBootstrapConsts.ACK0)
 
         # Read pid
         d = yield from self._read(8)
@@ -1150,14 +1142,14 @@ class PyremoteBootstrapDriver:
         yield from self._write(self._payload_z)
 
         # Read second ack (after writing src copies)
-        yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK1)
+        yield from self._expect(_PyremoteBootstrapConsts.ACK1)
 
         # Write options
         yield from self._write(struct.pack('<I', len(self._options_json)))
         yield from self._write(self._options_json)
 
         # Read third ack (after reaping child process)
-        yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK2)
+        yield from self._expect(_PyremoteBootstrapConsts.ACK2)
 
         # Read env info
         d = yield from self._read(4)
@@ -1167,7 +1159,7 @@ class PyremoteBootstrapDriver:
         env_info = PyremoteEnvInfo.from_dict(json.loads(env_info_json))
 
         # Read fourth ack (after finalization completed)
-        yield from self._expect(_PYREMOTE_BOOTSTRAP_ACK3)
+        yield from self._expect(_PyremoteBootstrapConsts.ACK3)
 
         # Return
         return self.Result(
@@ -7887,7 +7879,7 @@ class SubprocessRunnable(abc.ABC, ta.Generic[T]):
 
 
 class IndentWriter:
-    DEFAULT_INDENT = ' ' * 4
+    DEFAULT_INDENT: ta.ClassVar[str] = ' ' * 4
 
     def __init__(
             self,
@@ -7900,6 +7892,7 @@ class IndentWriter:
         self._buf = buf if buf is not None else io.StringIO()
         self._indent = check.isinstance(indent, str) if indent is not None else self.DEFAULT_INDENT
         self._level = 0
+        self._cache: ta.Dict[int, str] = {}
         self._has_indented = False
 
     @contextlib.contextmanager
@@ -7911,7 +7904,10 @@ class IndentWriter:
             self._level -= num
 
     def write(self, s: str) -> None:
-        indent = self._indent * self._level
+        try:
+            indent = self._cache[self._level]
+        except KeyError:
+            indent = self._cache[self._level] = self._indent * self._level
         i = 0
         while i < len(s):
             if not self._has_indented:

{ominfra-0.0.0.dev295 → ominfra-0.0.0.dev297/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev295 → ominfra-0.0.0.dev297}/ominfra.egg-info/requires.txt

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